@patternfly/react-core 6.6.0-prerelease.9 → 6.6.1-prerelease.0

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

@@ -4,6 +4,7 @@ exports[`Old Snapshot tests - remove when refactoring passes additional classes
 <DocumentFragment>
   <button
     aria-expanded="false"
+    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle test-class"
     data-ouia-component-id="OUIA-Generated-MenuToggle-:r3:"
     data-ouia-component-type="PF6/MenuToggle"
@@ -31,7 +32,7 @@ exports[`Old Snapshot tests - remove when refactoring passes additional classes
           width="1em"
         >
           <path
-            d="M18.71 5.29a.996.996 0 0 0-1.41 0l-7.29 7.29-7.3-7.29a.987.987 0 0 0-1.41-.02.987.987 0 0 0-.02 1.41l.02.02 7.65 7.65c.29.29.68.44 1.06.44s.77-.15 1.06-.44l7.65-7.65a.996.996 0 0 0 0-1.41Z"
+            d="m17.65 8.76-6.674 5.72a1.496 1.496 0 0 1-.976.365c-.347 0-.694-.122-.978-.366l-6.673-5.72A1 1 0 0 1 3 7h14a1 1 0 0 1 .65 1.76Z"
           />
         </svg>
       </span>
@@ -44,6 +45,7 @@ exports[`Old Snapshot tests - remove when refactoring renders successfully 1`] =
 <DocumentFragment>
   <button
     aria-expanded="false"
+    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle"
     data-ouia-component-id="OUIA-Generated-MenuToggle-:r1:"
     data-ouia-component-type="PF6/MenuToggle"
@@ -71,7 +73,7 @@ exports[`Old Snapshot tests - remove when refactoring renders successfully 1`] =
           width="1em"
         >
           <path
-            d="M18.71 5.29a.996.996 0 0 0-1.41 0l-7.29 7.29-7.3-7.29a.987.987 0 0 0-1.41-.02.987.987 0 0 0-.02 1.41l.02.02 7.65 7.65c.29.29.68.44 1.06.44s.77-.15 1.06-.44l7.65-7.65a.996.996 0 0 0 0-1.41Z"
+            d="m17.65 8.76-6.674 5.72a1.496 1.496 0 0 1-.976.365c-.347 0-.694-.122-.978-.366l-6.673-5.72A1 1 0 0 1 3 7h14a1 1 0 0 1 .65 1.76Z"
           />
         </svg>
       </span>
@@ -84,6 +86,7 @@ exports[`Old Snapshot tests - remove when refactoring shows badge 1`] = `
 <DocumentFragment>
   <button
     aria-expanded="false"
+    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle"
     data-ouia-component-id="OUIA-Generated-MenuToggle-:rh:"
     data-ouia-component-type="PF6/MenuToggle"
@@ -120,7 +123,7 @@ exports[`Old Snapshot tests - remove when refactoring shows badge 1`] = `
           width="1em"
         >
           <path
-            d="M18.71 5.29a.996.996 0 0 0-1.41 0l-7.29 7.29-7.3-7.29a.987.987 0 0 0-1.41-.02.987.987 0 0 0-.02 1.41l.02.02 7.65 7.65c.29.29.68.44 1.06.44s.77-.15 1.06-.44l7.65-7.65a.996.996 0 0 0 0-1.41Z"
+            d="m17.65 8.76-6.674 5.72a1.496 1.496 0 0 1-.976.365c-.347 0-.694-.122-.978-.366l-6.673-5.72A1 1 0 0 1 3 7h14a1 1 0 0 1 .65 1.76Z"
           />
         </svg>
       </span>
@@ -133,6 +136,7 @@ exports[`Old Snapshot tests - remove when refactoring shows icon 1`] = `
 <DocumentFragment>
   <button
     aria-expanded="false"
+    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle"
     data-ouia-component-id="OUIA-Generated-MenuToggle-:rf:"
     data-ouia-component-type="PF6/MenuToggle"
@@ -177,7 +181,7 @@ exports[`Old Snapshot tests - remove when refactoring shows icon 1`] = `
           width="1em"
         >
           <path
-            d="M18.71 5.29a.996.996 0 0 0-1.41 0l-7.29 7.29-7.3-7.29a.987.987 0 0 0-1.41-.02.987.987 0 0 0-.02 1.41l.02.02 7.65 7.65c.29.29.68.44 1.06.44s.77-.15 1.06-.44l7.65-7.65a.996.996 0 0 0 0-1.41Z"
+            d="m17.65 8.76-6.674 5.72a1.496 1.496 0 0 1-.976.365c-.347 0-.694-.122-.978-.366l-6.673-5.72A1 1 0 0 1 3 7h14a1 1 0 0 1 .65 1.76Z"
           />
         </svg>
       </span>
@@ -190,6 +194,7 @@ exports[`Old Snapshot tests - remove when refactoring shows isDisabled 1`] = `
 <DocumentFragment>
   <button
     aria-expanded="false"
+    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle pf-m-disabled"
     data-ouia-component-id="OUIA-Generated-MenuToggle-:r7:"
     data-ouia-component-type="PF6/MenuToggle"
@@ -218,7 +223,7 @@ exports[`Old Snapshot tests - remove when refactoring shows isDisabled 1`] = `
           width="1em"
         >
           <path
-            d="M18.71 5.29a.996.996 0 0 0-1.41 0l-7.29 7.29-7.3-7.29a.987.987 0 0 0-1.41-.02.987.987 0 0 0-.02 1.41l.02.02 7.65 7.65c.29.29.68.44 1.06.44s.77-.15 1.06-.44l7.65-7.65a.996.996 0 0 0 0-1.41Z"
+            d="m17.65 8.76-6.674 5.72a1.496 1.496 0 0 1-.976.365c-.347 0-.694-.122-.978-.366l-6.673-5.72A1 1 0 0 1 3 7h14a1 1 0 0 1 .65 1.76Z"
           />
         </svg>
       </span>
@@ -231,6 +236,7 @@ exports[`Old Snapshot tests - remove when refactoring shows isExpanded 1`] = `
 <DocumentFragment>
   <button
     aria-expanded="true"
+    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle pf-m-expanded"
     data-ouia-component-id="OUIA-Generated-MenuToggle-:r5:"
     data-ouia-component-type="PF6/MenuToggle"
@@ -258,7 +264,7 @@ exports[`Old Snapshot tests - remove when refactoring shows isExpanded 1`] = `
           width="1em"
         >
           <path
-            d="M18.71 5.29a.996.996 0 0 0-1.41 0l-7.29 7.29-7.3-7.29a.987.987 0 0 0-1.41-.02.987.987 0 0 0-.02 1.41l.02.02 7.65 7.65c.29.29.68.44 1.06.44s.77-.15 1.06-.44l7.65-7.65a.996.996 0 0 0 0-1.41Z"
+            d="m17.65 8.76-6.674 5.72a1.496 1.496 0 0 1-.976.365c-.347 0-.694-.122-.978-.366l-6.673-5.72A1 1 0 0 1 3 7h14a1 1 0 0 1 .65 1.76Z"
           />
         </svg>
       </span>
@@ -271,6 +277,7 @@ exports[`Old Snapshot tests - remove when refactoring shows isPlain 1`] = `
 <DocumentFragment>
   <button
     aria-expanded="false"
+    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle pf-m-plain"
     data-ouia-component-id="OUIA-Generated-MenuToggle-plain-:rb:"
     data-ouia-component-type="PF6/MenuToggle"
@@ -302,6 +309,7 @@ exports[`Old Snapshot tests - remove when refactoring shows isPrimary 1`] = `
 <DocumentFragment>
   <button
     aria-expanded="false"
+    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle pf-m-primary"
     data-ouia-component-id="OUIA-Generated-MenuToggle-primary-:r9:"
     data-ouia-component-type="PF6/MenuToggle"
@@ -329,7 +337,7 @@ exports[`Old Snapshot tests - remove when refactoring shows isPrimary 1`] = `
           width="1em"
         >
           <path
-            d="M18.71 5.29a.996.996 0 0 0-1.41 0l-7.29 7.29-7.3-7.29a.987.987 0 0 0-1.41-.02.987.987 0 0 0-.02 1.41l.02.02 7.65 7.65c.29.29.68.44 1.06.44s.77-.15 1.06-.44l7.65-7.65a.996.996 0 0 0 0-1.41Z"
+            d="m17.65 8.76-6.674 5.72a1.496 1.496 0 0 1-.976.365c-.347 0-.694-.122-.978-.366l-6.673-5.72A1 1 0 0 1 3 7h14a1 1 0 0 1 .65 1.76Z"
           />
         </svg>
       </span>
@@ -342,6 +350,7 @@ exports[`Old Snapshot tests - remove when refactoring shows plain text 1`] = `
 <DocumentFragment>
   <button
     aria-expanded="false"
+    aria-haspopup="menu"
     class="pf-v6-c-menu-toggle pf-m-plain pf-m-text"
     data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-:rd:"
     data-ouia-component-type="PF6/MenuToggle"
@@ -369,7 +378,7 @@ exports[`Old Snapshot tests - remove when refactoring shows plain text 1`] = `
           width="1em"
         >
           <path
-            d="M18.71 5.29a.996.996 0 0 0-1.41 0l-7.29 7.29-7.3-7.29a.987.987 0 0 0-1.41-.02.987.987 0 0 0-.02 1.41l.02.02 7.65 7.65c.29.29.68.44 1.06.44s.77-.15 1.06-.44l7.65-7.65a.996.996 0 0 0 0-1.41Z"
+            d="m17.65 8.76-6.674 5.72a1.496 1.496 0 0 1-.976.365c-.347 0-.694-.122-.978-.366l-6.673-5.72A1 1 0 0 1 3 7h14a1 1 0 0 1 .65 1.76Z"
           />
         </svg>
       </span>

package/src/components/MenuToggle/examples/MenuToggle.md

@@ -8,8 +8,8 @@ propComponents: ['MenuToggle', 'MenuToggleAction', 'MenuToggleCheckbox']
 
 import { Fragment, useState } from 'react';
 import './MenuToggle.css'
-import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon';
 import RhUiEllipsisVerticalFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-ellipsis-vertical-fill-icon';
+import RhUiAddIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-add-icon';
 import imgAvatar from '@patternfly/react-core/src/components/assets/avatarImg.svg';
 import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon';
 
@@ -65,7 +65,7 @@ To create a "settings" menu toggle that will animate on hover and focus, you can
 
 ### Custom icons
 
-To add a recognizable icon to a menu toggle, use the `icon` property. The following example adds a `PlusIcon` to the toggle.
+To add a recognizable icon to a menu toggle, use the `icon` property. The following example adds an `RhUiAddIcon` to the toggle.
 
 For most basic icons, it is recommended to wrap it inside our [icon component](/components/icon).
 

package/src/components/MenuToggle/examples/MenuToggleAvatarText.tsx

@@ -4,11 +4,13 @@ import imgAvatar from '@patternfly/react-core/src/components/assets/avatarImg.sv
 
 export const MenuToggleAvatarText: React.FunctionComponent = () => (
   <Fragment>
-    <MenuToggle icon={<Avatar src={imgAvatar} alt="avatar" />}>Ned Username</MenuToggle>{' '}
-    <MenuToggle icon={<Avatar src={imgAvatar} alt="avatar" />} isExpanded>
+    <MenuToggle aria-haspopup={false} icon={<Avatar src={imgAvatar} alt="avatar" size="sm" />}>
       Ned Username
     </MenuToggle>{' '}
-    <MenuToggle icon={<Avatar src={imgAvatar} alt="avatar" />} isDisabled>
+    <MenuToggle aria-haspopup={false} icon={<Avatar src={imgAvatar} alt="avatar" size="sm" />} isExpanded>
+      Ned Username
+    </MenuToggle>{' '}
+    <MenuToggle aria-haspopup={false} icon={<Avatar src={imgAvatar} alt="avatar" size="sm" />} isDisabled>
       Ned Username
     </MenuToggle>
   </Fragment>

package/src/components/MenuToggle/examples/MenuToggleBadge.tsx

@@ -3,7 +3,13 @@ import { MenuToggle, Badge } from '@patternfly/react-core';
 
 export const MenuToggleBadge: React.FunctionComponent = () => (
   <Fragment>
-    <MenuToggle badge={<Badge>4 selected</Badge>}>Count</MenuToggle>
-    <MenuToggle variant="plainText" badge={<Badge screenReaderText="additional items">4</Badge>} />
+    <MenuToggle aria-haspopup={false} badge={<Badge>4 selected</Badge>}>
+      Count
+    </MenuToggle>
+    <MenuToggle
+      aria-haspopup={false}
+      variant="plainText"
+      badge={<Badge screenReaderText="additional items">4</Badge>}
+    />
   </Fragment>
 );

package/src/components/MenuToggle/examples/MenuToggleCollapsed.tsx

@@ -1,3 +1,5 @@
 import { MenuToggle } from '@patternfly/react-core';
 
-export const MenuToggleCollapsed: React.FunctionComponent = () => <MenuToggle>Collapsed</MenuToggle>;
+export const MenuToggleCollapsed: React.FunctionComponent = () => (
+  <MenuToggle aria-haspopup={false}>Collapsed</MenuToggle>
+);

package/src/components/MenuToggle/examples/MenuToggleCustomIcon.tsx

@@ -1,16 +1,16 @@
 import { Fragment } from 'react';
 import { MenuToggle } from '@patternfly/react-core';
-import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon';
+import RhUiAddIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-add-icon';
 
 export const MenuToggleCustomIcon: React.FC = () => (
   <Fragment>
-    <MenuToggle icon={<PlusIcon />} variant="primary">
+    <MenuToggle aria-haspopup={false} icon={<RhUiAddIcon />} variant="primary">
       Icon
     </MenuToggle>{' '}
-    <MenuToggle icon={<PlusIcon />} variant="secondary">
+    <MenuToggle aria-haspopup={false} icon={<RhUiAddIcon />} variant="secondary">
       Icon
     </MenuToggle>{' '}
-    <MenuToggle icon={<PlusIcon />} variant="secondary" isDisabled>
+    <MenuToggle aria-haspopup={false} icon={<RhUiAddIcon />} variant="secondary" isDisabled>
       Icon
     </MenuToggle>
   </Fragment>

package/src/components/MenuToggle/examples/MenuToggleDisabled.tsx

@@ -1,3 +1,7 @@
 import { MenuToggle } from '@patternfly/react-core';
 
-export const MenuToggleDisabled: React.FunctionComponent = () => <MenuToggle isDisabled>Disabled</MenuToggle>;
+export const MenuToggleDisabled: React.FunctionComponent = () => (
+  <MenuToggle aria-haspopup={false} isDisabled>
+    Disabled
+  </MenuToggle>
+);

package/src/components/MenuToggle/examples/MenuToggleExpanded.tsx

@@ -1,3 +1,7 @@
 import { MenuToggle } from '@patternfly/react-core';
 
-export const MenuToggleExpanded: React.FunctionComponent = () => <MenuToggle isExpanded>Expanded</MenuToggle>;
+export const MenuToggleExpanded: React.FunctionComponent = () => (
+  <MenuToggle aria-haspopup={false} isExpanded>
+    Expanded
+  </MenuToggle>
+);

package/src/components/MenuToggle/examples/MenuToggleFullHeight.tsx

@@ -2,7 +2,7 @@ import { MenuToggle } from '@patternfly/react-core';
 
 export const MenuToggleFullHeight: React.FunctionComponent = () => (
   <div style={{ height: '80px' }}>
-    <MenuToggle isFullHeight aria-label="Full height menu toggle">
+    <MenuToggle aria-haspopup={false} isFullHeight aria-label="Full height menu toggle">
       Full height
     </MenuToggle>
   </div>

package/src/components/MenuToggle/examples/MenuToggleFullWidth.tsx

@@ -1,7 +1,7 @@
 import { MenuToggle } from '@patternfly/react-core';
 
 export const MenuToggleFullWidth: React.FunctionComponent = () => (
-  <MenuToggle isFullWidth aria-label="Full width menu toggle">
+  <MenuToggle aria-haspopup={false} isFullWidth aria-label="Full width menu toggle">
     Full width
   </MenuToggle>
 );

package/src/components/MenuToggle/examples/MenuToggleInForm.tsx

@@ -1,7 +1,7 @@
 import { MenuToggle } from '@patternfly/react-core';
 
 export const MenuToggleInForm = (): JSX.Element => (
-  <MenuToggle isInForm aria-label="Menu toggle in a form">
+  <MenuToggle aria-haspopup={false} isInForm aria-label="Menu toggle in a form">
     In form
   </MenuToggle>
 );

package/src/components/MenuToggle/examples/MenuTogglePlaceholder.tsx

@@ -1,5 +1,7 @@
 import { MenuToggle } from '@patternfly/react-core';
 
 export const MenuTogglePlaceholder: React.FunctionComponent = () => (
-  <MenuToggle isPlaceholder>Placeholder text</MenuToggle>
+  <MenuToggle aria-haspopup={false} isPlaceholder>
+    Placeholder text
+  </MenuToggle>
 );

package/src/components/MenuToggle/examples/MenuTogglePlainCircle.tsx

@@ -4,8 +4,15 @@ import RhUiEllipsisVerticalFillIcon from '@patternfly/react-icons/dist/esm/icons
 
 export const MenuTogglePlainCircle: React.FunctionComponent = () => (
   <Fragment>
-    <MenuToggle isCircle icon={<RhUiEllipsisVerticalFillIcon />} variant="plain" aria-label="plain circle kebab" />{' '}
     <MenuToggle
+      aria-haspopup={false}
+      isCircle
+      icon={<RhUiEllipsisVerticalFillIcon />}
+      variant="plain"
+      aria-label="plain circle kebab"
+    />{' '}
+    <MenuToggle
+      aria-haspopup={false}
       isCircle
       icon={<RhUiEllipsisVerticalFillIcon />}
       variant="plain"
@@ -13,6 +20,7 @@ export const MenuTogglePlainCircle: React.FunctionComponent = () => (
       aria-label="plain circle expanded kebab"
     />{' '}
     <MenuToggle
+      aria-haspopup={false}
       isCircle
       icon={<RhUiEllipsisVerticalFillIcon />}
       variant="plain"

package/src/components/MenuToggle/examples/MenuTogglePlainIcon.tsx

@@ -4,8 +4,25 @@ import RhUiEllipsisVerticalFillIcon from '@patternfly/react-icons/dist/esm/icons
 
 export const MenuTogglePlainIcon: React.FunctionComponent = () => (
   <Fragment>
-    <MenuToggle icon={<RhUiEllipsisVerticalFillIcon />} variant="plain" aria-label="plain kebab" />{' '}
-    <MenuToggle icon={<RhUiEllipsisVerticalFillIcon />} variant="plain" isExpanded aria-label="plain expanded kebab" />{' '}
-    <MenuToggle icon={<RhUiEllipsisVerticalFillIcon />} variant="plain" isDisabled aria-label="disabled plain kebab" />
+    <MenuToggle
+      aria-haspopup={false}
+      icon={<RhUiEllipsisVerticalFillIcon />}
+      variant="plain"
+      aria-label="plain kebab"
+    />{' '}
+    <MenuToggle
+      aria-haspopup={false}
+      icon={<RhUiEllipsisVerticalFillIcon />}
+      variant="plain"
+      isExpanded
+      aria-label="plain expanded kebab"
+    />{' '}
+    <MenuToggle
+      aria-haspopup={false}
+      icon={<RhUiEllipsisVerticalFillIcon />}
+      variant="plain"
+      isDisabled
+      aria-label="disabled plain kebab"
+    />
   </Fragment>
 );

package/src/components/MenuToggle/examples/MenuTogglePlainTextLabel.tsx

@@ -3,13 +3,13 @@ import { MenuToggle } from '@patternfly/react-core';
 
 export const MenuTogglePlainTextLabel: React.FunctionComponent = () => (
   <Fragment>
-    <MenuToggle variant="plainText" isDisabled aria-label="Disabled plain menu toggle">
+    <MenuToggle aria-haspopup={false} variant="plainText" isDisabled aria-label="Disabled plain menu toggle">
       Disabled
     </MenuToggle>{' '}
-    <MenuToggle variant="plainText" aria-label="Plain menu toggle">
+    <MenuToggle aria-haspopup={false} variant="plainText" aria-label="Plain menu toggle">
       Custom text
     </MenuToggle>{' '}
-    <MenuToggle variant="plainText" isExpanded aria-label="Expanded plain menu toggle">
+    <MenuToggle aria-haspopup={false} variant="plainText" isExpanded aria-label="Expanded plain menu toggle">
       Custom text (expanded)
     </MenuToggle>
   </Fragment>

package/src/components/MenuToggle/examples/MenuToggleSettings.tsx

@@ -3,6 +3,9 @@ import { MenuToggle } from '@patternfly/react-core';
 
 export const MenuToggleSettings: React.FunctionComponent = () => (
   <Fragment>
-    <MenuToggle isSettings>Settings</MenuToggle> <MenuToggle isSettings variant="plain" aria-label="Settings" />
+    <MenuToggle aria-haspopup={false} isSettings>
+      Settings
+    </MenuToggle>{' '}
+    <MenuToggle aria-haspopup={false} isSettings variant="plain" aria-label="Settings" />
   </Fragment>
 );

package/src/components/MenuToggle/examples/MenuToggleSmall.tsx

@@ -1,3 +1,7 @@
 import { MenuToggle } from '@patternfly/react-core';
 
-export const MenuToggleSmall: React.FunctionComponent = () => <MenuToggle size="sm">Small toggle</MenuToggle>;
+export const MenuToggleSmall: React.FunctionComponent = () => (
+  <MenuToggle aria-haspopup={false} size="sm">
+    Small toggle
+  </MenuToggle>
+);

package/src/components/MenuToggle/examples/MenuToggleStatus.tsx

@@ -3,16 +3,22 @@ import { MenuToggle, HelperText, HelperTextItem } from '@patternfly/react-core';
 
 export const MenuToggleStatus: React.FunctionComponent = () => (
   <Fragment>
-    <MenuToggle status="success">Success</MenuToggle>
+    <MenuToggle aria-haspopup={false} status="success">
+      Success
+    </MenuToggle>
     <br />
     <br />
-    <MenuToggle status="warning">Warning</MenuToggle>
+    <MenuToggle aria-haspopup={false} status="warning">
+      Warning
+    </MenuToggle>
     <HelperText>
       <HelperTextItem variant="warning">Warning text that explains the issue.</HelperTextItem>
     </HelperText>
     <br />
     <br />
-    <MenuToggle status="danger">Danger</MenuToggle>
+    <MenuToggle aria-haspopup={false} status="danger">
+      Danger
+    </MenuToggle>
     <HelperText>
       <HelperTextItem variant="error">Danger text that explains the issue.</HelperTextItem>
     </HelperText>

package/src/components/MenuToggle/examples/MenuToggleTypeahead.tsx

@@ -16,7 +16,7 @@ export const MenuToggleTypeahead: React.FunctionComponent = () => {
   };
 
   return (
-    <MenuToggle variant="typeahead" isFullWidth aria-label="Typeahead menu toggle">
+    <MenuToggle aria-haspopup={false} variant="typeahead" isFullWidth aria-label="Typeahead menu toggle">
       <TextInputGroup isPlain>
         <TextInputGroupMain
           value={inputValue}

package/src/components/MenuToggle/examples/MenuToggleVariantStyles.tsx

@@ -3,11 +3,13 @@ import { MenuToggle } from '@patternfly/react-core';
 
 export const MenuToggleVariantStyles: React.FunctionComponent = () => (
   <Fragment>
-    <MenuToggle variant="primary">Collapsed</MenuToggle>{' '}
-    <MenuToggle variant="primary" isExpanded>
+    <MenuToggle aria-haspopup={false} variant="primary">
+      Collapsed
+    </MenuToggle>{' '}
+    <MenuToggle aria-haspopup={false} variant="primary" isExpanded>
       Expanded
     </MenuToggle>{' '}
-    <MenuToggle variant="primary" isDisabled>
+    <MenuToggle aria-haspopup={false} variant="primary" isDisabled>
       Disabled
     </MenuToggle>
   </Fragment>

package/src/components/Modal/Modal.tsx

@@ -111,7 +111,8 @@ class Modal extends Component<ModalProps, ModalState> {
     const target: HTMLElement = this.getElement(appendTo);
     const bodyChildren = target.children;
     for (const child of Array.from(bodyChildren)) {
-      if (child.id !== this.backdropId) {
+      const isPopperElement = child.hasAttribute('data-popper-placement');
+      if (child.id !== this.backdropId && !isPopperElement) {
         hide ? child.setAttribute('aria-hidden', '' + hide) : child.removeAttribute('aria-hidden');
       }
     }

package/src/components/Modal/examples/Modal.md

@@ -7,10 +7,9 @@ ouia: true
 ---
 
 import { Fragment, useRef, useState } from 'react';
-import WarningTriangleIcon from '@patternfly/react-icons/dist/esm/icons/warning-triangle-icon';
-import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon';
+import RhUiWarningIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-warning-icon';
 import RhUiAttentionBellFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-attention-bell-fill-icon';
-import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';
+import RhUiQuestionMarkCircleIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-question-mark-circle-icon';
 import formStyles from '@patternfly/react-styles/css/components/Form/form';
 
 ## Examples

package/src/components/Modal/examples/ModalCustomHeader.tsx

@@ -12,7 +12,7 @@ import {
   Flex
 } from '@patternfly/react-core';
 
-import WarningTriangleIcon from '@patternfly/react-icons/dist/esm/icons/warning-triangle-icon';
+import RhUiWarningIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-warning-icon';
 
 export const ModalCustomHeaderFooter: React.FunctionComponent = () => {
   const [isModalOpen, setIsModalOpen] = useState(false);
@@ -55,7 +55,7 @@ export const ModalCustomHeaderFooter: React.FunctionComponent = () => {
         <ModalFooter>
           <Title headingLevel="h4" size={TitleSizes.md}>
             <Flex spaceItems={{ default: 'spaceItemsSm' }}>
-              <WarningTriangleIcon />
+              <RhUiWarningIcon />
               <span>Custom modal footer.</span>
             </Flex>
           </Title>

package/src/components/Modal/examples/ModalWithHelp.tsx

@@ -1,6 +1,6 @@
 import { Fragment, useState } from 'react';
 import { Button, Modal, ModalBody, ModalFooter, ModalHeader, Popover } from '@patternfly/react-core';
-import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';
+import RhUiQuestionMarkCircleIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-question-mark-circle-icon';
 
 export const ModalWithHelp: React.FunctionComponent = () => {
   const [isModalOpen, setIsModalOpen] = useState(false);
@@ -35,7 +35,7 @@ export const ModalWithHelp: React.FunctionComponent = () => {
               }
               footerContent="Popover Footer"
             >
-              <Button variant="plain" aria-label="Help" icon={<HelpIcon />} />
+              <Button variant="plain" aria-label="Help" icon={<RhUiQuestionMarkCircleIcon />} />
             </Popover>
           }
         />

package/src/components/MultipleFileUpload/MultipleFileUploadStatus.tsx

@@ -5,7 +5,7 @@ import { ExpandableSection } from '../ExpandableSection';
 import { useSSRSafeId } from '../../helpers';
 import RhUiInProgressIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-in-progress-icon';
 import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-check-circle-fill-icon';
-import TimesCircleIcon from '@patternfly/react-icons/dist/esm/icons/times-circle-icon';
+import RhUiCloseCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-close-circle-fill-icon';
 
 /** Acts as an expandable container for all uploaded file statuses.
  * An optional text and/or icon can also be passed into this sub-component.
@@ -41,7 +41,7 @@ export const MultipleFileUploadStatus: React.FunctionComponent<MultipleFileUploa
   useEffect(() => {
     switch (statusToggleIcon) {
       case 'danger':
-        setIcon(<TimesCircleIcon />);
+        setIcon(<RhUiCloseCircleFillIcon />);
         break;
       case 'success':
         setIcon(<RhUiCheckCircleFillIcon />);

package/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx

@@ -3,7 +3,7 @@ import styles from '@patternfly/react-styles/css/components/MultipleFileUpload/m
 import { css } from '@patternfly/react-styles';
 import { Progress } from '../Progress';
 import { Button } from '../Button';
-import FileIcon from '@patternfly/react-icons/dist/esm/icons/file-icon';
+import RhUiDocumentFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-document-fill-icon';
 import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon';
 
 /** Automatically reads an uploaded file to render a visual representation of it, including
@@ -149,7 +149,7 @@ export const MultipleFileUploadStatusItem: React.FunctionComponent<MultipleFileU
 
   return (
     <li className={css(styles.multipleFileUploadStatusItem, className)} {...props}>
-      <div className={styles.multipleFileUploadStatusItemIcon}>{fileIcon || <FileIcon />}</div>
+      <div className={styles.multipleFileUploadStatusItemIcon}>{fileIcon || <RhUiDocumentFillIcon />}</div>
       <div className={styles.multipleFileUploadStatusItemMain}>
         <div className="pf-v6-screen-reader" aria-live="polite">
           {progressAriaLiveMessage &&

package/src/components/MultipleFileUpload/__tests__/MultipleFileUploadStatusItem.test.tsx

@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 
 import { MultipleFileUploadStatusItem } from '../MultipleFileUploadStatusItem';
-import FileImageIcon from '@patternfly/react-icons/dist/esm/icons/file-image-icon';
+import RhUiImageFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-image-fill-icon';
 
 describe('MultipleFileUploadStatusItem', () => {
   test('renders with expected class names', () => {
@@ -26,7 +26,7 @@ describe('MultipleFileUploadStatusItem', () => {
     const { asFragment } = render(
       <MultipleFileUploadStatusItem
         file={testFile}
-        fileIcon={<FileImageIcon />}
+        fileIcon={<RhUiImageFillIcon />}
         fileName="testCustomFileName.txt"
         fileSize={42}
         progressId="test-progress-id"
@@ -42,7 +42,7 @@ describe('MultipleFileUploadStatusItem', () => {
     const { asFragment } = render(
       <MultipleFileUploadStatusItem
         file={testFile}
-        fileIcon={<FileImageIcon />}
+        fileIcon={<RhUiImageFillIcon />}
         fileName="testCustomFileName.txt"
         fileSize={42}
         progressId="test-progress-id"
@@ -58,7 +58,7 @@ describe('MultipleFileUploadStatusItem', () => {
     const { asFragment } = render(
       <MultipleFileUploadStatusItem
         file={testFile}
-        fileIcon={<FileImageIcon />}
+        fileIcon={<RhUiImageFillIcon />}
         fileName="testCustomFileName.txt"
         fileSize={42}
         progressId="test-progress-id"

package/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatus.test.tsx.snap

@@ -7,6 +7,8 @@ exports[`MultipleFileUploadStatus renders custom class names 1`] = `
   >
     <div
       class="pf-v6-c-expandable-section pf-m-expanded"
+      data-ouia-component-type="PF6/ExpandableSection"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-expandable-section__toggle"
@@ -83,6 +85,8 @@ exports[`MultipleFileUploadStatus renders status toggle icon 1`] = `
   >
     <div
       class="pf-v6-c-expandable-section pf-m-expanded"
+      data-ouia-component-type="PF6/ExpandableSection"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-expandable-section__toggle"
@@ -173,6 +177,8 @@ exports[`MultipleFileUploadStatus renders status toggle text 1`] = `
   >
     <div
       class="pf-v6-c-expandable-section pf-m-expanded"
+      data-ouia-component-type="PF6/ExpandableSection"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-expandable-section__toggle"
@@ -251,6 +257,8 @@ exports[`MultipleFileUploadStatus renders with expected class names 1`] = `
   >
     <div
       class="pf-v6-c-expandable-section pf-m-expanded"
+      data-ouia-component-type="PF6/ExpandableSection"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-expandable-section__toggle"