@patternfly/react-core 6.6.2 → 6.7.0-prerelease.2

package/src/components/Icon/__tests__/__snapshots__/Icon.test.tsx.snap

@@ -14,24 +14,12 @@ exports[`renders basic icon successfully 1`] = `
         fill="currentColor"
         height="1em"
         role="img"
+        viewBox="0 0 20 20"
         width="1em"
       >
-        <svg
-          class="pf-v6-icon-default"
-          viewBox="0 0 512 512"
-        >
-          <path
-            d="M173.898 439.404l-166.4-166.4c-9.997-9.997-9.997-26.206 0-36.204l36.203-36.204c9.997-9.998 26.207-9.998 36.204 0L192 312.69 432.095 72.596c9.997-9.997 26.207-9.997 36.204 0l36.203 36.204c9.997 9.997 9.997 26.206 0 36.204l-294.4 294.401c-9.998 9.997-26.207 9.997-36.204-.001z"
-          />
-        </svg>
-        <svg
-          class="pf-v6-icon-rh-ui"
-          viewBox="0 0 32 32"
-        >
-          <path
-            d="M11 26.792c-.384 0-.769-.146-1.061-.438l-8.646-8.647a.999.999 0 1 1 1.414-1.414L11 24.586 29.293 6.293a.999.999 0 1 1 1.414 1.414L12.061 26.354a1.497 1.497 0 0 1-1.061.438Z"
-          />
-        </svg>
+        <path
+          d="M18.71 4.27c-.4-.38-1.03-.37-1.41.02L7 14.59 2.71 10.3l-.02-.02c-.4-.38-1.03-.37-1.41.02-.38.4-.37 1.03.02 1.41l4.65 4.65a1.499 1.499 0 0 0 2.12 0L18.72 5.71l.02-.02c.38-.4.37-1.03-.02-1.41Z"
+        />
       </svg>
     </span>
   </span>
@@ -52,24 +40,12 @@ exports[`renders progress icon successfully 1`] = `
         fill="currentColor"
         height="1em"
         role="img"
+        viewBox="0 0 20 20"
         width="1em"
       >
-        <svg
-          class="pf-v6-icon-default"
-          viewBox="0 0 512 512"
-        >
-          <path
-            d="M173.898 439.404l-166.4-166.4c-9.997-9.997-9.997-26.206 0-36.204l36.203-36.204c9.997-9.998 26.207-9.998 36.204 0L192 312.69 432.095 72.596c9.997-9.997 26.207-9.997 36.204 0l36.203 36.204c9.997 9.997 9.997 26.206 0 36.204l-294.4 294.401c-9.998 9.997-26.207 9.997-36.204-.001z"
-          />
-        </svg>
-        <svg
-          class="pf-v6-icon-rh-ui"
-          viewBox="0 0 32 32"
-        >
-          <path
-            d="M11 26.792c-.384 0-.769-.146-1.061-.438l-8.646-8.647a.999.999 0 1 1 1.414-1.414L11 24.586 29.293 6.293a.999.999 0 1 1 1.414 1.414L12.061 26.354a1.497 1.497 0 0 1-1.061.438Z"
-          />
-        </svg>
+        <path
+          d="M18.71 4.27c-.4-.38-1.03-.37-1.41.02L7 14.59 2.71 10.3l-.02-.02c-.4-.38-1.03-.37-1.41.02-.38.4-.37 1.03.02 1.41l4.65 4.65a1.499 1.499 0 0 0 2.12 0L18.72 5.71l.02-.02c.38-.4.37-1.03-.02-1.41Z"
+        />
       </svg>
     </span>
     <span
@@ -81,24 +57,12 @@ exports[`renders progress icon successfully 1`] = `
         fill="currentColor"
         height="1em"
         role="img"
+        viewBox="0 0 20 20"
         width="1em"
       >
-        <svg
-          class="pf-v6-icon-default"
-          viewBox="0 0 512 512"
-        >
-          <path
-            d="M173.898 439.404l-166.4-166.4c-9.997-9.997-9.997-26.206 0-36.204l36.203-36.204c9.997-9.998 26.207-9.998 36.204 0L192 312.69 432.095 72.596c9.997-9.997 26.207-9.997 36.204 0l36.203 36.204c9.997 9.997 9.997 26.206 0 36.204l-294.4 294.401c-9.998 9.997-26.207 9.997-36.204-.001z"
-          />
-        </svg>
-        <svg
-          class="pf-v6-icon-rh-ui"
-          viewBox="0 0 32 32"
-        >
-          <path
-            d="M11 26.792c-.384 0-.769-.146-1.061-.438l-8.646-8.647a.999.999 0 1 1 1.414-1.414L11 24.586 29.293 6.293a.999.999 0 1 1 1.414 1.414L12.061 26.354a1.497 1.497 0 0 1-1.061.438Z"
-          />
-        </svg>
+        <path
+          d="M18.71 4.27c-.4-.38-1.03-.37-1.41.02L7 14.59 2.71 10.3l-.02-.02c-.4-.38-1.03-.37-1.41.02-.38.4-.37 1.03.02 1.41l4.65 4.65a1.499 1.499 0 0 0 2.12 0L18.72 5.71l.02-.02c.38-.4.37-1.03-.02-1.41Z"
+        />
       </svg>
     </span>
   </span>

package/src/components/Icon/examples/Icon.md

@@ -6,7 +6,7 @@ propComponents: ['Icon']
 ---
 
 import { Fragment, useState } from 'react';
-import LongArrowAltDownIcon from '@patternfly/react-icons/dist/esm/icons/long-arrow-alt-down-icon';
+import RhMicronsArrowDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-arrow-down-icon';
 import RhMicronsCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-right-icon';
 import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon';
 import RhUiSettingsFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-settings-fill-icon';

package/src/components/Icon/examples/IconBasic.tsx

@@ -1,6 +1,6 @@
 import { Fragment } from 'react';
 import { Icon } from '@patternfly/react-core';
-import LongArrowAltDownIcon from '@patternfly/react-icons/dist/esm/icons/long-arrow-alt-down-icon';
+import RhMicronsArrowDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-arrow-down-icon';
 import RhMicronsCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-right-icon';
 import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon';
 import RhUiSettingsFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-settings-fill-icon';
@@ -8,7 +8,7 @@ import RhUiSettingsFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-s
 export const IconBasic: React.FunctionComponent = () => (
   <Fragment>
     <Icon>
-      <LongArrowAltDownIcon />
+      <RhMicronsArrowDownIcon />
     </Icon>{' '}
     <Icon>
       <RhMicronsCaretRightIcon />

package/src/components/JumpLinks/JumpLinks.tsx

@@ -142,6 +142,10 @@ export const JumpLinks: React.FunctionComponent<JumpLinksProps> = ({
       return;
     }
     const scrollPosition = Math.ceil(scrollableElement.scrollTop + offset);
+    // Take into account the last section not having enough content to trigger a scroll position; without
+    // checking if at the bottom of the scroll container, the last JumpLinksItem never becomes "active".
+    const isAtBottom =
+      Math.ceil(scrollableElement.scrollTop + scrollableElement.clientHeight) >= scrollableElement.scrollHeight;
     window.requestAnimationFrame(() => {
       let newScrollItems = scrollItems;
       // Items might have rendered after this component or offsetTop values may need
@@ -153,6 +157,11 @@ export const JumpLinks: React.FunctionComponent<JumpLinksProps> = ({
         setScrollItems(newScrollItems);
       }
 
+      if (isAtBottom) {
+        const lastIndex = newScrollItems.length - 1;
+        return setActiveIndex(lastIndex);
+      }
+
       const scrollElements = newScrollItems
         .map((e, index) => ({
           y: e ? e.offsetTop : null,

package/src/components/Label/Label.tsx

@@ -205,9 +205,8 @@ export const Label: React.FunctionComponent<LabelProps> = ({
       if (isEditableActive && key === 'Escape') {
         event.preventDefault();
         event.stopImmediatePropagation();
-        // Reset div text to initial children prop - pre-edit
+        setCurrValue(children);
         if (editableInputRef.current.value) {
-          editableInputRef.current.value = children as string;
           onEditCancel && onEditCancel(event, children as string);
         }
         setIsEditableActive(false);

package/src/components/Label/__tests__/Label.test.tsx

@@ -109,6 +109,46 @@ describe('Label', () => {
     expect(asFragment()).toMatchSnapshot();
   });
 
+  test('editable label discards the draft text when the edit is canceled with escape', async () => {
+    const user = userEvent.setup();
+
+    render(<Label isEditable>Something</Label>);
+
+    const label = screen.getByRole('button', { name: 'Something' });
+    await user.click(label);
+
+    const draftInput = screen.getByRole('textbox');
+    await user.type(draftInput, ' else');
+    expect(draftInput).toHaveValue('Something else');
+
+    await user.keyboard('{Escape}');
+    // The button and input remount when the editor toggles, so another query is required
+
+    const labelAfterCancel = screen.getByRole('button', { name: 'Something' });
+    expect(labelAfterCancel).toBeInTheDocument();
+    await user.click(labelAfterCancel);
+
+    const reopenedInput = screen.getByRole('textbox');
+    expect(reopenedInput).toHaveValue('Something');
+  });
+
+  test('editable label calls onEditCancel with the previous text when the edit is canceled with escape', async () => {
+    const user = userEvent.setup();
+    const onEditCancel = jest.fn();
+
+    render(
+      <Label onEditCancel={onEditCancel} isEditable>
+        Something
+      </Label>
+    );
+
+    await user.click(screen.getByRole('button', { name: 'Something' }));
+    await user.type(screen.getByRole('textbox'), ' else');
+    await user.keyboard('{Escape}');
+
+    expect(onEditCancel).toHaveBeenCalledWith(expect.anything(), 'Something');
+  });
+
   test('renders with variant overflow and type is set to button ', () => {
     const { asFragment } = render(<Label variant="overflow">Something</Label>);
     expect(screen.getByRole('button')).toHaveAttribute('type', 'button');

package/src/components/List/__tests__/__snapshots__/ListItem.test.tsx.snap

@@ -23,9 +23,7 @@ exports[`Matches snapshot with icon 1`] = `
 
 exports[`Matches snapshot without icon 1`] = `
 <DocumentFragment>
-  <li
-    class=""
-  >
+  <li>
     <span>
       List item content
     </span>

package/src/components/List/examples/List.md

@@ -6,34 +6,49 @@ propComponents: ['List', 'ListItem']
 ---
 
 import RhUiLearnFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-learn-fill-icon';
-import KeyIcon from '@patternfly/react-icons/dist/esm/icons/key-icon';
-import DesktopIcon from '@patternfly/react-icons/dist/esm/icons/desktop-icon';
+import RhUiKeyIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-key-icon';
+import RhUiDesktopIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-desktop-icon';
 
 ## Examples
+
 ### Basic
+
 ```ts file="./ListBasic.tsx"
+
 ```
 
 ### Inline
+
 ```ts file="./ListInline.tsx"
+
 ```
 
 ### Ordered
+
 ```ts file="./ListOrdered.tsx"
+
 ```
 
 ### Plain
+
 ```ts file="./ListPlain.tsx"
+
 ```
 
 ### With horizontal rules
+
 ```ts file="./ListHorizontalRules.tsx"
+
 ```
 
 ### With icons
+
 ```ts file="./ListIcons.tsx"
+
 ```
 
 ### With large icons
+
 ```ts file="./ListLargeIcons.tsx"
+
 ```

package/src/components/List/examples/ListIcons.tsx

@@ -1,12 +1,12 @@
 import { List, ListItem } from '@patternfly/react-core';
 import RhUiLearnFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-learn-fill-icon';
-import KeyIcon from '@patternfly/react-icons/dist/esm/icons/key-icon';
-import DesktopIcon from '@patternfly/react-icons/dist/esm/icons/desktop-icon';
+import RhUiKeyIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-key-icon';
+import RhUiDesktopIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-desktop-icon';
 
 export const ListIcons: React.FunctionComponent = () => (
   <List isPlain>
     <ListItem icon={<RhUiLearnFillIcon />}>First</ListItem>
-    <ListItem icon={<KeyIcon />}>Second</ListItem>
-    <ListItem icon={<DesktopIcon />}>Third</ListItem>
+    <ListItem icon={<RhUiKeyIcon />}>Second</ListItem>
+    <ListItem icon={<RhUiDesktopIcon />}>Third</ListItem>
   </List>
 );

package/src/components/List/examples/ListLargeIcons.tsx

@@ -1,12 +1,12 @@
 import { List, ListItem } from '@patternfly/react-core';
 import RhUiLearnFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-learn-fill-icon';
-import KeyIcon from '@patternfly/react-icons/dist/esm/icons/key-icon';
-import DesktopIcon from '@patternfly/react-icons/dist/esm/icons/desktop-icon';
+import RhUiKeyIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-key-icon';
+import RhUiDesktopIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-desktop-icon';
 
 export const ListLargeIcons: React.FunctionComponent = () => (
   <List isPlain iconSize="large">
     <ListItem icon={<RhUiLearnFillIcon />}>First</ListItem>
-    <ListItem icon={<KeyIcon />}>Second</ListItem>
-    <ListItem icon={<DesktopIcon />}>Third</ListItem>
+    <ListItem icon={<RhUiKeyIcon />}>Second</ListItem>
+    <ListItem icon={<RhUiDesktopIcon />}>Third</ListItem>
   </List>
 );

package/src/components/LoginPage/LoginForm.tsx

@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { Form, FormGroup, ActionGroup, FormHelperText } from '../Form';
+import { Form, FormGroup, FormHelperText } from '../Form';
 import { TextInput } from '../TextInput';
 import { Button } from '../Button';
 import { Checkbox } from '../Checkbox';
@@ -147,11 +147,11 @@ export const LoginForm: React.FunctionComponent<LoginFormProps> = ({
           />
         </FormGroup>
       )}
-      <ActionGroup>
+      <FormGroup isActionGroup>
         <Button variant="primary" type="submit" onClick={onLoginButtonClick} isBlock isDisabled={isLoginButtonDisabled}>
           {loginButtonLabel}
         </Button>
-      </ActionGroup>
+      </FormGroup>
     </Form>
   );
 };

package/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap

@@ -4,10 +4,16 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
 <DocumentFragment>
   <form
     class="pf-v6-c-form"
+    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-:r1t:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -38,7 +44,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r17:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r20:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-username-id"
@@ -52,6 +58,9 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r21:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -82,7 +91,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r1a:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r24:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-password-id"
@@ -96,6 +105,9 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r25:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-control"
@@ -106,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-:r1d:"
+            data-ouia-component-id="OUIA-Generated-Checkbox-:r28:"
             data-ouia-component-type="PF6/Checkbox"
             data-ouia-safe="true"
             id="pf-login-remember-me-id"
@@ -123,27 +135,26 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
     </div>
     <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"
     >
       <div
         class="pf-v6-c-form__group-control"
       >
-        <div
-          class="pf-v6-c-form__actions"
+        <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"
         >
-          <button
-            class="pf-v6-c-button pf-m-primary pf-m-block"
-            data-ouia-component-id="OUIA-Generated-Button-primary-:r1e:"
-            data-ouia-component-type="PF6/Button"
-            data-ouia-safe="true"
-            type="submit"
+          <span
+            class="pf-v6-c-button__text"
           >
-            <span
-              class="pf-v6-c-button__text"
-            >
-              Log In
-            </span>
-          </button>
-        </div>
+            Log In
+          </span>
+        </button>
       </div>
     </div>
   </form>
@@ -154,10 +165,16 @@ exports[`LoginForm LoginForm with show password 1`] = `
 <DocumentFragment>
   <form
     class="pf-v6-c-form"
+    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-:r2d:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -188,7 +205,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r1h:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r2g:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-username-id"
@@ -202,6 +219,9 @@ exports[`LoginForm LoginForm with show password 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r2h:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -238,7 +258,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
             >
               <input
                 aria-invalid="false"
-                data-ouia-component-id="OUIA-Generated-TextInputBase-:r1k:"
+                data-ouia-component-id="OUIA-Generated-TextInputBase-:r2k:"
                 data-ouia-component-type="PF6/TextInput"
                 data-ouia-safe="true"
                 id="pf-login-password-id"
@@ -255,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-:r1l:"
+              data-ouia-component-id="OUIA-Generated-Button-control-:r2l:"
               data-ouia-component-type="PF6/Button"
               data-ouia-safe="true"
               type="button"
@@ -284,27 +304,26 @@ exports[`LoginForm LoginForm with show password 1`] = `
     </div>
     <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"
     >
       <div
         class="pf-v6-c-form__group-control"
       >
-        <div
-          class="pf-v6-c-form__actions"
+        <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"
         >
-          <button
-            class="pf-v6-c-button pf-m-primary pf-m-block"
-            data-ouia-component-id="OUIA-Generated-Button-primary-:r1m:"
-            data-ouia-component-type="PF6/Button"
-            data-ouia-safe="true"
-            type="submit"
+          <span
+            class="pf-v6-c-button__text"
           >
-            <span
-              class="pf-v6-c-button__text"
-            >
-              Log In
-            </span>
-          </button>
-        </div>
+            Log In
+          </span>
+        </button>
       </div>
     </div>
   </form>
@@ -315,10 +334,16 @@ exports[`LoginForm should render Login form 1`] = `
 <DocumentFragment>
   <form
     class="pf-v6-c-form"
+    data-ouia-component-id="OUIA-Generated-Form-:r0:"
+    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-:r1:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -349,7 +374,7 @@ exports[`LoginForm should render Login form 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r2:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r4:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-username-id"
@@ -363,6 +388,9 @@ exports[`LoginForm should render Login form 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r5:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -393,7 +421,7 @@ exports[`LoginForm should render Login form 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r5:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r8:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-password-id"
@@ -407,27 +435,26 @@ exports[`LoginForm should render Login form 1`] = `
     </div>
     <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"
     >
       <div
         class="pf-v6-c-form__group-control"
       >
-        <div
-          class="pf-v6-c-form__actions"
+        <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"
         >
-          <button
-            class="pf-v6-c-button pf-m-primary pf-m-block"
-            data-ouia-component-id="OUIA-Generated-Button-primary-:r6:"
-            data-ouia-component-type="PF6/Button"
-            data-ouia-safe="true"
-            type="submit"
+          <span
+            class="pf-v6-c-button__text"
           >
-            <span
-              class="pf-v6-c-button__text"
-            >
-              Log In
-            </span>
-          </button>
-        </div>
+            Log In
+          </span>
+        </button>
       </div>
     </div>
   </form>

package/src/components/LoginPage/examples/LoginPageLanguageSelect.tsx

@@ -82,6 +82,7 @@ export const LoginPageLanguageSelect: React.FunctionComponent = () => {
       aria-label="Select Language"
       toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
         <MenuToggle
+          aria-haspopup="listbox"
           ref={toggleRef}
           onClick={() => setIsHeaderUtilsOpen(!isHeaderUtilsOpen)}
           isExpanded={isHeaderUtilsOpen}

package/src/components/Menu/MenuItem.tsx

@@ -7,7 +7,7 @@ import leftOffset from '@patternfly/react-tokens/dist/esm/c_menu_m_flyout__menu_
 import RhMicronsExternalLinkIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-external-link-icon';
 import RhMicronsCaretLeftIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-left-icon';
 import RhMicronsCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-right-icon';
-import CheckIcon from '@patternfly/react-icons/dist/esm/icons/check-icon';
+import RhMicronsCheckmarkIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-checkmark-icon';
 import { Checkbox } from '../Checkbox';
 import { MenuContext, MenuItemContext } from './MenuContext';
 import { MenuItemAction } from './MenuItemAction';
@@ -399,7 +399,7 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
           )}
           {getIsSelected() && (
             <span className={css(styles.menuItemSelectIcon)}>
-              <CheckIcon />
+              <RhMicronsCheckmarkIcon />
             </span>
           )}
         </span>