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

package/src/components/Modal/__tests__/ModalContent.test.tsx

@@ -1,4 +1,4 @@
-import { render, screen } from '@testing-library/react';
+import { act, render, screen } from '@testing-library/react';
 
 import { ModalContent } from '../ModalContent';
 
@@ -59,3 +59,77 @@ test('Modal content can add id to focus trap correctly for use with dropdowns',
     'pf-v6-l-bullseye'
   );
 });
+
+test('Modal content is hidden from assistive technologies during its closing animation', () => {
+  const { rerender } = render(
+    <ModalContent isOpen hasAnimations backdropId="backdropId" {...modalContentProps}>
+      This is a ModalBox header
+    </ModalContent>
+  );
+  const backdrop = document.getElementById('backdropId');
+
+  expect(backdrop).not.toHaveAttribute('aria-hidden');
+
+  rerender(
+    <ModalContent isOpen={false} hasAnimations backdropId="backdropId" {...modalContentProps}>
+      This is a ModalBox header
+    </ModalContent>
+  );
+  expect(backdrop).toHaveAttribute('aria-hidden', 'true');
+
+  rerender(
+    <ModalContent isOpen hasAnimations backdropId="backdropId" {...modalContentProps}>
+      This is a ModalBox header
+    </ModalContent>
+  );
+  expect(backdrop).not.toHaveAttribute('aria-hidden');
+});
+
+test('Modal content unmounts if its closing transition does not end', () => {
+  jest.useFakeTimers();
+  try {
+    const { rerender } = render(
+      <ModalContent isOpen hasAnimations backdropId="backdropId" {...modalContentProps}>
+        This is a ModalBox header
+      </ModalContent>
+    );
+
+    rerender(
+      <ModalContent isOpen={false} hasAnimations backdropId="backdropId" {...modalContentProps}>
+        This is a ModalBox header
+      </ModalContent>
+    );
+    expect(document.getElementById('backdropId')).toBeInTheDocument();
+
+    act(() => jest.runOnlyPendingTimers());
+    expect(document.getElementById('backdropId')).not.toBeInTheDocument();
+  } finally {
+    jest.useRealTimers();
+  }
+});
+
+test('Modal content remains mounted during close when reduced motion is preferred', () => {
+  const matchMedia = window.matchMedia;
+  window.matchMedia = jest.fn().mockReturnValue({ matches: true } as MediaQueryList);
+  jest.useFakeTimers();
+  try {
+    const { rerender } = render(
+      <ModalContent isOpen hasAnimations backdropId="backdropId" {...modalContentProps}>
+        This is a ModalBox header
+      </ModalContent>
+    );
+
+    rerender(
+      <ModalContent isOpen={false} hasAnimations backdropId="backdropId" {...modalContentProps}>
+        This is a ModalBox header
+      </ModalContent>
+    );
+    expect(document.getElementById('backdropId')).toBeInTheDocument();
+
+    act(() => jest.runOnlyPendingTimers());
+    expect(document.getElementById('backdropId')).not.toBeInTheDocument();
+  } finally {
+    jest.useRealTimers();
+    window.matchMedia = matchMedia;
+  }
+});

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

@@ -7,11 +7,15 @@ ouia: true
 ---
 
 import { Fragment, useRef, useState } from 'react';
-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';
 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';
 
+When using the Modal component, it is recommended to control it via the `isOpen` property rather than conditionally rendering the Modal.
+
+Conditional rendering can potentially lead to unforeseen issues, especially with animations enabled.
+
 ## Examples
 
 ### Basic modals
@@ -154,3 +158,11 @@ To customize which element inside the modal receives focus when initially opened
 ```ts file="./ModalCustomFocus.tsx"
 
 ```
+
+### Non animated modal
+
+To explicitly disable animations, set the `hasAnimations` property to `false` on the modal.
+
+```ts file="./ModalNotAnimated.tsx"
+
+```

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/ModalNotAnimated.tsx

@@ -0,0 +1,44 @@
+import { Fragment, useState } from 'react';
+import { Button, Modal, ModalHeader, ModalBody, ModalFooter, ModalVariant } from '@patternfly/react-core';
+
+export const ModalNotAnimated: React.FunctionComponent = () => {
+  const [isModalOpen, setIsModalOpen] = useState(false);
+
+  const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
+    setIsModalOpen((prevIsModalOpen) => !prevIsModalOpen);
+  };
+
+  return (
+    <Fragment>
+      <Button variant="primary" onClick={handleModalToggle}>
+        Show no animations modal
+      </Button>
+      <Modal
+        hasAnimations={false}
+        variant={ModalVariant.large}
+        isOpen={isModalOpen}
+        onClose={handleModalToggle}
+        aria-labelledby="modal-not-animated-label"
+        aria-describedby="modal-not-animated-description"
+        elementToFocus="#modal-not-animated-confirm-button"
+      >
+        <ModalHeader title="Not Animated Modal Header" labelId="modal-not-animated-label" />
+        <ModalBody id="modal-not-animated-description">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore
+          magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+          consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
+          pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
+          est laborum.
+        </ModalBody>
+        <ModalFooter>
+          <Button id="modal-not-animated-confirm-button" key="confirm" variant="primary" onClick={handleModalToggle}>
+            Confirm
+          </Button>
+          <Button key="cancel" variant="link" onClick={handleModalToggle}>
+            Cancel
+          </Button>
+        </ModalFooter>
+      </Modal>
+    </Fragment>
+  );
+};

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"

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

@@ -14,24 +14,12 @@ exports[`MultipleFileUploadStatusItem renders custom aria labels 1`] = `
         fill="currentColor"
         height="1em"
         role="img"
+        viewBox="0 0 32 32"
         width="1em"
       >
-        <svg
-          class="pf-v6-icon-default"
-          viewBox="0 0 384 512"
-        >
-          <path
-            d="M224 136V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm160-14.1v6.1H256V0h6.1c6.4 0 12.5 2.5 17 7l97.9 98c4.5 4.5 7 10.6 7 16.9z"
-          />
-        </svg>
-        <svg
-          class="pf-v6-icon-rh-ui"
-          viewBox="0 0 32 32"
-        >
-          <path
-            d="M26.5 1H12a1.001 1.001 0 0 0-.708.294L4.294 8.292A1.001 1.001 0 0 0 4 9v20.5c0 .827.673 1.5 1.5 1.5h21c.827 0 1.5-.673 1.5-1.5v-27c0-.827-.673-1.5-1.5-1.5ZM11 4.414V8H7.414L11 4.414ZM26 29H6V10h5.5c.827 0 1.5-.673 1.5-1.5V3h13v26Z"
-          />
-        </svg>
+        <path
+          d="M4.275 8.875a.738.738 0 0 1 .195-.405l7-7a.738.738 0 0 1 .405-.195v7.6h-7.6ZM26.5 1.25H14.125V9.5c0 .896-.729 1.625-1.625 1.625H4.25V29.5c0 .689.561 1.25 1.25 1.25h21c.689 0 1.25-.561 1.25-1.25v-27c0-.689-.561-1.25-1.25-1.25Z"
+        />
       </svg>
     </div>
     <div
@@ -45,6 +33,8 @@ exports[`MultipleFileUploadStatusItem renders custom aria labels 1`] = `
       </div>
       <div
         class="pf-v6-c-progress"
+        data-ouia-component-type="PF6/Progress"
+        data-ouia-safe="true"
         id="test-progress-id"
       >
         <div
@@ -145,24 +135,12 @@ exports[`MultipleFileUploadStatusItem renders custom class names 1`] = `
         fill="currentColor"
         height="1em"
         role="img"
+        viewBox="0 0 32 32"
         width="1em"
       >
-        <svg
-          class="pf-v6-icon-default"
-          viewBox="0 0 384 512"
-        >
-          <path
-            d="M224 136V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm160-14.1v6.1H256V0h6.1c6.4 0 12.5 2.5 17 7l97.9 98c4.5 4.5 7 10.6 7 16.9z"
-          />
-        </svg>
-        <svg
-          class="pf-v6-icon-rh-ui"
-          viewBox="0 0 32 32"
-        >
-          <path
-            d="M26.5 1H12a1.001 1.001 0 0 0-.708.294L4.294 8.292A1.001 1.001 0 0 0 4 9v20.5c0 .827.673 1.5 1.5 1.5h21c.827 0 1.5-.673 1.5-1.5v-27c0-.827-.673-1.5-1.5-1.5ZM11 4.414V8H7.414L11 4.414ZM26 29H6V10h5.5c.827 0 1.5-.673 1.5-1.5V3h13v26Z"
-          />
-        </svg>
+        <path
+          d="M4.275 8.875a.738.738 0 0 1 .195-.405l7-7a.738.738 0 0 1 .405-.195v7.6h-7.6ZM26.5 1.25H14.125V9.5c0 .896-.729 1.625-1.625 1.625H4.25V29.5c0 .689.561 1.25 1.25 1.25h21c.689 0 1.25-.561 1.25-1.25v-27c0-.689-.561-1.25-1.25-1.25Z"
+        />
       </svg>
     </div>
     <div
@@ -176,6 +154,8 @@ exports[`MultipleFileUploadStatusItem renders custom class names 1`] = `
       </div>
       <div
         class="pf-v6-c-progress"
+        data-ouia-component-type="PF6/Progress"
+        data-ouia-safe="true"
         id="test-progress-id"
       >
         <div
@@ -273,11 +253,11 @@ exports[`MultipleFileUploadStatusItem renders custom file name/size/icon/progres
         fill="currentColor"
         height="1em"
         role="img"
-        viewBox="0 0 384 512"
+        viewBox="0 0 32 32"
         width="1em"
       >
         <path
-          d="M384 121.941V128H256V0h6.059a24 24 0 0 1 16.97 7.029l97.941 97.941a24.002 24.002 0 0 1 7.03 16.971zM248 160c-13.2 0-24-10.8-24-24V0H24C10.745 0 0 10.745 0 24v464c0 13.255 10.745 24 24 24h336c13.255 0 24-10.745 24-24V160H248zm-135.455 16c26.51 0 48 21.49 48 48s-21.49 48-48 48-48-21.49-48-48 21.491-48 48-48zm208 240h-256l.485-48.485L104.545 328c4.686-4.686 11.799-4.201 16.485.485L160.545 368 264.06 264.485c4.686-4.686 12.284-4.686 16.971 0L320.545 304v112z"
+          d="M29.5 3h-27C1.673 3 1 3.673 1 4.5v23c0 .827.673 1.5 1.5 1.5h27c.827 0 1.5-.673 1.5-1.5v-23c0-.827-.673-1.5-1.5-1.5ZM21 7c1.654 0 3 1.346 3 3s-1.346 3-3 3-3-1.346-3-3 1.346-3 3-3Zm7 17.75c0 .689-.561 1.25-1.25 1.25H5.25C4.561 26 4 25.439 4 24.75V18c0-.266.105-.52.293-.707l4.823-4.823a1.279 1.279 0 0 1 1.768 0L18 19.586l3.116-3.116a1.279 1.279 0 0 1 1.768 0l4.823 4.823A.997.997 0 0 1 28 22v2.75Z"
         />
       </svg>
     </div>
@@ -292,6 +272,8 @@ exports[`MultipleFileUploadStatusItem renders custom file name/size/icon/progres
       </div>
       <div
         class="pf-v6-c-progress"
+        data-ouia-component-type="PF6/Progress"
+        data-ouia-safe="true"
         id="test-progress-id"
       >
         <div
@@ -391,11 +373,11 @@ exports[`MultipleFileUploadStatusItem renders custom function progressAriaLiveMe
         fill="currentColor"
         height="1em"
         role="img"
-        viewBox="0 0 384 512"
+        viewBox="0 0 32 32"
         width="1em"
       >
         <path
-          d="M384 121.941V128H256V0h6.059a24 24 0 0 1 16.97 7.029l97.941 97.941a24.002 24.002 0 0 1 7.03 16.971zM248 160c-13.2 0-24-10.8-24-24V0H24C10.745 0 0 10.745 0 24v464c0 13.255 10.745 24 24 24h336c13.255 0 24-10.745 24-24V160H248zm-135.455 16c26.51 0 48 21.49 48 48s-21.49 48-48 48-48-21.49-48-48 21.491-48 48-48zm208 240h-256l.485-48.485L104.545 328c4.686-4.686 11.799-4.201 16.485.485L160.545 368 264.06 264.485c4.686-4.686 12.284-4.686 16.971 0L320.545 304v112z"
+          d="M29.5 3h-27C1.673 3 1 3.673 1 4.5v23c0 .827.673 1.5 1.5 1.5h27c.827 0 1.5-.673 1.5-1.5v-23c0-.827-.673-1.5-1.5-1.5ZM21 7c1.654 0 3 1.346 3 3s-1.346 3-3 3-3-1.346-3-3 1.346-3 3-3Zm7 17.75c0 .689-.561 1.25-1.25 1.25H5.25C4.561 26 4 25.439 4 24.75V18c0-.266.105-.52.293-.707l4.823-4.823a1.279 1.279 0 0 1 1.768 0L18 19.586l3.116-3.116a1.279 1.279 0 0 1 1.768 0l4.823 4.823A.997.997 0 0 1 28 22v2.75Z"
         />
       </svg>
     </div>
@@ -410,6 +392,8 @@ exports[`MultipleFileUploadStatusItem renders custom function progressAriaLiveMe
       </div>
       <div
         class="pf-v6-c-progress"
+        data-ouia-component-type="PF6/Progress"
+        data-ouia-safe="true"
         id="test-progress-id"
       >
         <div
@@ -509,24 +493,12 @@ exports[`MultipleFileUploadStatusItem renders custom progress value/variant when
         fill="currentColor"
         height="1em"
         role="img"
+        viewBox="0 0 32 32"
         width="1em"
       >
-        <svg
-          class="pf-v6-icon-default"
-          viewBox="0 0 384 512"
-        >
-          <path
-            d="M224 136V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm160-14.1v6.1H256V0h6.1c6.4 0 12.5 2.5 17 7l97.9 98c4.5 4.5 7 10.6 7 16.9z"
-          />
-        </svg>
-        <svg
-          class="pf-v6-icon-rh-ui"
-          viewBox="0 0 32 32"
-        >
-          <path
-            d="M26.5 1H12a1.001 1.001 0 0 0-.708.294L4.294 8.292A1.001 1.001 0 0 0 4 9v20.5c0 .827.673 1.5 1.5 1.5h21c.827 0 1.5-.673 1.5-1.5v-27c0-.827-.673-1.5-1.5-1.5ZM11 4.414V8H7.414L11 4.414ZM26 29H6V10h5.5c.827 0 1.5-.673 1.5-1.5V3h13v26Z"
-          />
-        </svg>
+        <path
+          d="M4.275 8.875a.738.738 0 0 1 .195-.405l7-7a.738.738 0 0 1 .405-.195v7.6h-7.6ZM26.5 1.25H14.125V9.5c0 .896-.729 1.625-1.625 1.625H4.25V29.5c0 .689.561 1.25 1.25 1.25h21c.689 0 1.25-.561 1.25-1.25v-27c0-.689-.561-1.25-1.25-1.25Z"
+        />
       </svg>
     </div>
     <div
@@ -540,6 +512,8 @@ exports[`MultipleFileUploadStatusItem renders custom progress value/variant when
       </div>
       <div
         class="pf-v6-c-progress pf-m-warning"
+        data-ouia-component-type="PF6/Progress"
+        data-ouia-safe="true"
         id="test-progress-id"
       >
         <div
@@ -656,24 +630,12 @@ exports[`MultipleFileUploadStatusItem renders expected values from a passed file
         fill="currentColor"
         height="1em"
         role="img"
+        viewBox="0 0 32 32"
         width="1em"
       >
-        <svg
-          class="pf-v6-icon-default"
-          viewBox="0 0 384 512"
-        >
-          <path
-            d="M224 136V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm160-14.1v6.1H256V0h6.1c6.4 0 12.5 2.5 17 7l97.9 98c4.5 4.5 7 10.6 7 16.9z"
-          />
-        </svg>
-        <svg
-          class="pf-v6-icon-rh-ui"
-          viewBox="0 0 32 32"
-        >
-          <path
-            d="M26.5 1H12a1.001 1.001 0 0 0-.708.294L4.294 8.292A1.001 1.001 0 0 0 4 9v20.5c0 .827.673 1.5 1.5 1.5h21c.827 0 1.5-.673 1.5-1.5v-27c0-.827-.673-1.5-1.5-1.5ZM11 4.414V8H7.414L11 4.414ZM26 29H6V10h5.5c.827 0 1.5-.673 1.5-1.5V3h13v26Z"
-          />
-        </svg>
+        <path
+          d="M4.275 8.875a.738.738 0 0 1 .195-.405l7-7a.738.738 0 0 1 .405-.195v7.6h-7.6ZM26.5 1.25H14.125V9.5c0 .896-.729 1.625-1.625 1.625H4.25V29.5c0 .689.561 1.25 1.25 1.25h21c.689 0 1.25-.561 1.25-1.25v-27c0-.689-.561-1.25-1.25-1.25Z"
+        />
       </svg>
     </div>
     <div
@@ -687,6 +649,8 @@ exports[`MultipleFileUploadStatusItem renders expected values from a passed file
       </div>
       <div
         class="pf-v6-c-progress"
+        data-ouia-component-type="PF6/Progress"
+        data-ouia-safe="true"
         id="test-progress-id"
       >
         <div
@@ -786,24 +750,12 @@ exports[`MultipleFileUploadStatusItem renders with expected class names 1`] = `
         fill="currentColor"
         height="1em"
         role="img"
+        viewBox="0 0 32 32"
         width="1em"
       >
-        <svg
-          class="pf-v6-icon-default"
-          viewBox="0 0 384 512"
-        >
-          <path
-            d="M224 136V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm160-14.1v6.1H256V0h6.1c6.4 0 12.5 2.5 17 7l97.9 98c4.5 4.5 7 10.6 7 16.9z"
-          />
-        </svg>
-        <svg
-          class="pf-v6-icon-rh-ui"
-          viewBox="0 0 32 32"
-        >
-          <path
-            d="M26.5 1H12a1.001 1.001 0 0 0-.708.294L4.294 8.292A1.001 1.001 0 0 0 4 9v20.5c0 .827.673 1.5 1.5 1.5h21c.827 0 1.5-.673 1.5-1.5v-27c0-.827-.673-1.5-1.5-1.5ZM11 4.414V8H7.414L11 4.414ZM26 29H6V10h5.5c.827 0 1.5-.673 1.5-1.5V3h13v26Z"
-          />
-        </svg>
+        <path
+          d="M4.275 8.875a.738.738 0 0 1 .195-.405l7-7a.738.738 0 0 1 .405-.195v7.6h-7.6ZM26.5 1.25H14.125V9.5c0 .896-.729 1.625-1.625 1.625H4.25V29.5c0 .689.561 1.25 1.25 1.25h21c.689 0 1.25-.561 1.25-1.25v-27c0-.689-.561-1.25-1.25-1.25Z"
+        />
       </svg>
     </div>
     <div
@@ -817,6 +769,8 @@ exports[`MultipleFileUploadStatusItem renders with expected class names 1`] = `
       </div>
       <div
         class="pf-v6-c-progress"
+        data-ouia-component-type="PF6/Progress"
+        data-ouia-safe="true"
         id="test-progress-id"
       >
         <div
@@ -914,11 +868,11 @@ exports[`MultipleFileUploadStatusItem rendersdefault progressAriaLiveMessage whe
         fill="currentColor"
         height="1em"
         role="img"
-        viewBox="0 0 384 512"
+        viewBox="0 0 32 32"
         width="1em"
       >
         <path
-          d="M384 121.941V128H256V0h6.059a24 24 0 0 1 16.97 7.029l97.941 97.941a24.002 24.002 0 0 1 7.03 16.971zM248 160c-13.2 0-24-10.8-24-24V0H24C10.745 0 0 10.745 0 24v464c0 13.255 10.745 24 24 24h336c13.255 0 24-10.745 24-24V160H248zm-135.455 16c26.51 0 48 21.49 48 48s-21.49 48-48 48-48-21.49-48-48 21.491-48 48-48zm208 240h-256l.485-48.485L104.545 328c4.686-4.686 11.799-4.201 16.485.485L160.545 368 264.06 264.485c4.686-4.686 12.284-4.686 16.971 0L320.545 304v112z"
+          d="M29.5 3h-27C1.673 3 1 3.673 1 4.5v23c0 .827.673 1.5 1.5 1.5h27c.827 0 1.5-.673 1.5-1.5v-23c0-.827-.673-1.5-1.5-1.5ZM21 7c1.654 0 3 1.346 3 3s-1.346 3-3 3-3-1.346-3-3 1.346-3 3-3Zm7 17.75c0 .689-.561 1.25-1.25 1.25H5.25C4.561 26 4 25.439 4 24.75V18c0-.266.105-.52.293-.707l4.823-4.823a1.279 1.279 0 0 1 1.768 0L18 19.586l3.116-3.116a1.279 1.279 0 0 1 1.768 0l4.823 4.823A.997.997 0 0 1 28 22v2.75Z"
         />
       </svg>
     </div>
@@ -933,6 +887,8 @@ exports[`MultipleFileUploadStatusItem rendersdefault progressAriaLiveMessage whe
       </div>
       <div
         class="pf-v6-c-progress"
+        data-ouia-component-type="PF6/Progress"
+        data-ouia-safe="true"
         id="test-progress-id"
       >
         <div

package/src/components/MultipleFileUpload/examples/MultipleFileUpload.md

@@ -8,7 +8,7 @@ propComponents:
 ---
 
 import { useEffect, useState } from 'react';
-import UploadIcon from '@patternfly/react-icons/dist/esm/icons/upload-icon';
+import RhUiUploadIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-upload-icon';
 
 Multiple file upload is able to:
 

package/src/components/MultipleFileUpload/examples/MultipleFileUploadBasic.tsx

@@ -9,7 +9,7 @@ import {
   HelperTextItem,
   DropEvent
 } from '@patternfly/react-core';
-import UploadIcon from '@patternfly/react-icons/dist/esm/icons/upload-icon';
+import RhUiUploadIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-upload-icon';
 
 interface readFile {
   fileName: string;
@@ -124,7 +124,7 @@ export const MultipleFileUploadBasic: React.FunctionComponent = () => {
         isHorizontal={isHorizontal}
       >
         <MultipleFileUploadMain
-          titleIcon={<UploadIcon />}
+          titleIcon={<RhUiUploadIcon />}
           titleText="Drag and drop files here"
           titleTextSeparator="or"
           infoText="Accepted file types: JPEG, Doc, PDF, PNG"

package/src/components/Nav/NavExpandable.tsx

@@ -7,6 +7,8 @@ import { PageSidebarContext } from '../Page/PageSidebar';
 import { PickOptional } from '../../helpers/typeUtils';
 import { getOUIAProps, OUIAProps } from '../../helpers';
 import { SSRSafeIds } from '../../helpers/SSRSafeIds/SSRSafeIds';
+import { IS_INERT } from '../../helpers/inert';
+import RhUiEllipsisHorizontalFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-ellipsis-horizontal-fill-icon';
 
 export interface NavExpandableProps
   extends Omit<React.DetailedHTMLProps<React.LiHTMLAttributes<HTMLLIElement>, HTMLLIElement>, 'title'>, OUIAProps {
@@ -16,6 +18,8 @@ export interface NavExpandableProps
   srText?: string;
   /** Boolean to pragmatically expand or collapse section */
   isExpanded?: boolean;
+  /** Adds an expandable icon to indicate the section is expandable */
+  hasExpandableIcon?: boolean;
   /** Anything that can be rendered inside of the expandable list */
   children?: React.ReactNode;
   /** Additional classes added to the container */
@@ -49,7 +53,8 @@ class NavExpandable extends Component<NavExpandableProps, NavExpandableState> {
     className: '',
     groupId: null as string,
     isActive: false,
-    id: ''
+    id: '',
+    hasExpandableIcon: false
   };
 
   state = {
@@ -99,6 +104,7 @@ class NavExpandable extends Component<NavExpandableProps, NavExpandableState> {
       id,
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       isExpanded,
+      hasExpandableIcon,
       buttonProps,
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       onExpand,
@@ -136,7 +142,12 @@ class NavExpandable extends Component<NavExpandableProps, NavExpandableState> {
                         {...buttonProps}
                       >
                         {icon && <span className={css(styles.navLinkIcon)}>{icon}</span>}
-                        {typeof title !== 'string' ? <span className={css(styles.navLinkText)}>{title}</span> : title}
+                        {hasExpandableIcon && (
+                          <span className={css(styles.navLinkExpandableIcon)}>
+                            <RhUiEllipsisHorizontalFillIcon />
+                          </span>
+                        )}
+                        <span className={css(styles.navLinkText)}>{title}</span>
                         <span className={css(styles.navToggle)}>
                           <span className={css(styles.navToggleIcon)}>
                             <RhMicronsCaretDownIcon />
@@ -149,7 +160,7 @@ class NavExpandable extends Component<NavExpandableProps, NavExpandableState> {
                     className={css(styles.navSubnav)}
                     aria-labelledby={navId}
                     hidden={expandedState ? null : true}
-                    {...(!expandedState && { inert: '' })}
+                    {...(!expandedState && { inert: IS_INERT })}
                   >
                     {srText && (
                       <h2 className="pf-v6-screen-reader" id={navId}>