Skip to content

fix(LoginForm): Adjust wrapper for submit button #12605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rebeccaalpert merged 1 commit into from
Jul 29, 2026
+81 −46
Merged

fix(LoginForm): Adjust wrapper for submit button #12605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions packages/react-core/src/components/LoginPage/LoginForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,11 @@ export const LoginForm: React.FunctionComponent<LoginFormProps> = ({
/>
</FormGroup>
)}
<Button variant="primary" type="submit" onClick={onLoginButtonClick} isBlock isDisabled={isLoginButtonDisabled}>
{loginButtonLabel}
</Button>
<FormGroup isActionGroup>
<Button variant="primary" type="submit" onClick={onLoginButtonClick} isBlock isDisabled={isLoginButtonDisabled}>
{loginButtonLabel}
</Button>
</FormGroup>
</Form>
);
};
Expand Down
119 changes: 76 additions & 43 deletions packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
<DocumentFragment>
<form
class="pf-v6-c-form"
data-ouia-component-id="OUIA-Generated-Form-:r1k:"
data-ouia-component-id="OUIA-Generated-Form-:r1s:"
data-ouia-component-type="PF6/Form"
data-ouia-safe="true"
novalidate=""
>
<div
class="pf-v6-c-form__group"
data-ouia-component-id="OUIA-Generated-FormGroup-:r1l:"
data-ouia-component-id="OUIA-Generated-FormGroup-:r1t:"
data-ouia-component-type="PF6/FormGroup"
data-ouia-safe="true"
>
Expand Down Expand Up @@ -44,7 +44,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
>
<input
aria-invalid="false"
data-ouia-component-id="OUIA-Generated-TextInputBase-:r1o:"
data-ouia-component-id="OUIA-Generated-TextInputBase-:r20:"
data-ouia-component-type="PF6/TextInput"
data-ouia-safe="true"
id="pf-login-username-id"
Expand All @@ -58,7 +58,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
</div>
<div
class="pf-v6-c-form__group"
data-ouia-component-id="OUIA-Generated-FormGroup-:r1p:"
data-ouia-component-id="OUIA-Generated-FormGroup-:r21:"
data-ouia-component-type="PF6/FormGroup"
data-ouia-safe="true"
>
Expand Down Expand Up @@ -91,7 +91,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
>
<input
aria-invalid="false"
data-ouia-component-id="OUIA-Generated-TextInputBase-:r1s:"
data-ouia-component-id="OUIA-Generated-TextInputBase-:r24:"
data-ouia-component-type="PF6/TextInput"
data-ouia-safe="true"
id="pf-login-password-id"
Expand All @@ -105,7 +105,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
</div>
<div
class="pf-v6-c-form__group"
data-ouia-component-id="OUIA-Generated-FormGroup-:r1t:"
data-ouia-component-id="OUIA-Generated-FormGroup-:r25:"
data-ouia-component-type="PF6/FormGroup"
data-ouia-safe="true"
>
Expand All @@ -118,7 +118,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
<input
aria-invalid="false"
class="pf-v6-c-check__input"
data-ouia-component-id="OUIA-Generated-Checkbox-:r20:"
data-ouia-component-id="OUIA-Generated-Checkbox-:r28:"
data-ouia-component-type="PF6/Checkbox"
data-ouia-safe="true"
id="pf-login-remember-me-id"
Expand All @@ -133,19 +133,30 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
</div>
</div>
</div>
<button
class="pf-v6-c-button pf-m-primary pf-m-block"
data-ouia-component-id="OUIA-Generated-Button-primary-:r21:"
data-ouia-component-type="PF6/Button"
<div
class="pf-v6-c-form__group pf-m-action"
data-ouia-component-id="OUIA-Generated-FormGroup-:r29:"
data-ouia-component-type="PF6/FormGroup"
data-ouia-safe="true"
type="submit"
>
<span
class="pf-v6-c-button__text"
<div
class="pf-v6-c-form__group-control"
>
Log In
</span>
</button>
<button
class="pf-v6-c-button pf-m-primary pf-m-block"
data-ouia-component-id="OUIA-Generated-Button-primary-:r2b:"
data-ouia-component-type="PF6/Button"
data-ouia-safe="true"
type="submit"
>
<span
class="pf-v6-c-button__text"
>
Log In
</span>
</button>
</div>
</div>
</form>
</DocumentFragment>
`;
Expand All @@ -154,14 +165,14 @@ exports[`LoginForm LoginForm with show password 1`] = `
<DocumentFragment>
<form
class="pf-v6-c-form"
data-ouia-component-id="OUIA-Generated-Form-:r22:"
data-ouia-component-id="OUIA-Generated-Form-:r2c:"
data-ouia-component-type="PF6/Form"
data-ouia-safe="true"
novalidate=""
>
<div
class="pf-v6-c-form__group"
data-ouia-component-id="OUIA-Generated-FormGroup-:r23:"
data-ouia-component-id="OUIA-Generated-FormGroup-:r2d:"
data-ouia-component-type="PF6/FormGroup"
data-ouia-safe="true"
>
Expand Down Expand Up @@ -194,7 +205,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
>
<input
aria-invalid="false"
data-ouia-component-id="OUIA-Generated-TextInputBase-:r26:"
data-ouia-component-id="OUIA-Generated-TextInputBase-:r2g:"
data-ouia-component-type="PF6/TextInput"
data-ouia-safe="true"
id="pf-login-username-id"
Expand All @@ -208,7 +219,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
</div>
<div
class="pf-v6-c-form__group"
data-ouia-component-id="OUIA-Generated-FormGroup-:r27:"
data-ouia-component-id="OUIA-Generated-FormGroup-:r2h:"
data-ouia-component-type="PF6/FormGroup"
data-ouia-safe="true"
>
Expand Down Expand Up @@ -247,7 +258,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
>
<input
aria-invalid="false"
data-ouia-component-id="OUIA-Generated-TextInputBase-:r2a:"
data-ouia-component-id="OUIA-Generated-TextInputBase-:r2k:"
data-ouia-component-type="PF6/TextInput"
data-ouia-safe="true"
id="pf-login-password-id"
Expand All @@ -264,7 +275,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
<button
aria-label="Show password"
class="pf-v6-c-button pf-m-control"
data-ouia-component-id="OUIA-Generated-Button-control-:r2b:"
data-ouia-component-id="OUIA-Generated-Button-control-:r2l:"
data-ouia-component-type="PF6/Button"
data-ouia-safe="true"
type="button"
Expand All @@ -291,19 +302,30 @@ exports[`LoginForm LoginForm with show password 1`] = `
</div>
</div>
</div>
<button
class="pf-v6-c-button pf-m-primary pf-m-block"
data-ouia-component-id="OUIA-Generated-Button-primary-:r2c:"
data-ouia-component-type="PF6/Button"
<div
class="pf-v6-c-form__group pf-m-action"
data-ouia-component-id="OUIA-Generated-FormGroup-:r2m:"
data-ouia-component-type="PF6/FormGroup"
data-ouia-safe="true"
type="submit"
>
<span
class="pf-v6-c-button__text"
<div
class="pf-v6-c-form__group-control"
>
Log In
</span>
</button>
<button
class="pf-v6-c-button pf-m-primary pf-m-block"
data-ouia-component-id="OUIA-Generated-Button-primary-:r2o:"
data-ouia-component-type="PF6/Button"
data-ouia-safe="true"
type="submit"
>
<span
class="pf-v6-c-button__text"
>
Log In
</span>
</button>
</div>
</div>
</form>
</DocumentFragment>
`;
Expand Down Expand Up @@ -411,19 +433,30 @@ exports[`LoginForm should render Login form 1`] = `
</span>
</div>
</div>
<button
class="pf-v6-c-button pf-m-primary pf-m-block"
data-ouia-component-id="OUIA-Generated-Button-primary-:r9:"
data-ouia-component-type="PF6/Button"
<div
class="pf-v6-c-form__group pf-m-action"
data-ouia-component-id="OUIA-Generated-FormGroup-:r9:"
data-ouia-component-type="PF6/FormGroup"
data-ouia-safe="true"
type="submit"
>
<span
class="pf-v6-c-button__text"
<div
class="pf-v6-c-form__group-control"
>
Log In
</span>
</button>
<button
class="pf-v6-c-button pf-m-primary pf-m-block"
data-ouia-component-id="OUIA-Generated-Button-primary-:rb:"
data-ouia-component-type="PF6/Button"
data-ouia-safe="true"
type="submit"
>
<span
class="pf-v6-c-button__text"
>
Log In
</span>
</button>
</div>
</div>
</form>
</DocumentFragment>
`;
Loading