From f4c0c3e1da5288cf5b1b71d295c6c8aca1edc566 Mon Sep 17 00:00:00 2001
From: Austin Sullivan <ausulliv@redhat.com>
Date: Fri, 27 Sep 2024 14:57:55 -0400
Subject: [PATCH] fix(next modal): prevent auto aria-labelledby if aria-label
 is passed

---
 .../__snapshots__/ExpandableSection.test.tsx.snap |  3 +++
 .../src/next/components/Modal/Modal.tsx           | 12 +-----------
 .../src/next/components/Modal/ModalContent.tsx    | 15 +++++----------
 .../components/Modal/__tests__/Modal.test.tsx     | 14 --------------
 .../__snapshots__/ModalContent.test.tsx.snap      |  4 ++++
 5 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/packages/react-core/src/components/ExpandableSection/__tests__/__snapshots__/ExpandableSection.test.tsx.snap b/packages/react-core/src/components/ExpandableSection/__tests__/__snapshots__/ExpandableSection.test.tsx.snap
index d87bc00aaa6..e2ea7b32446 100644
--- a/packages/react-core/src/components/ExpandableSection/__tests__/__snapshots__/ExpandableSection.test.tsx.snap
+++ b/packages/react-core/src/components/ExpandableSection/__tests__/__snapshots__/ExpandableSection.test.tsx.snap
@@ -58,6 +58,7 @@ exports[`Disclosure ExpandableSection 1`] = `
   >
     <button
       aria-controls="content-id"
+      aria-expanded="false"
       class="pf-v5-c-expandable-section__toggle"
       id="toggle-id"
       type="button"
@@ -103,6 +104,7 @@ exports[`ExpandableSection 1`] = `
   >
     <button
       aria-controls="content-id"
+      aria-expanded="false"
       class="pf-v5-c-expandable-section__toggle"
       id="toggle-id"
       type="button"
@@ -238,6 +240,7 @@ exports[`Renders Uncontrolled ExpandableSection 1`] = `
   >
     <button
       aria-controls="content-id"
+      aria-expanded="false"
       class="pf-v5-c-expandable-section__toggle"
       id="toggle-id"
       type="button"
diff --git a/packages/react-core/src/next/components/Modal/Modal.tsx b/packages/react-core/src/next/components/Modal/Modal.tsx
index 073ee8805a7..380e73b0914 100644
--- a/packages/react-core/src/next/components/Modal/Modal.tsx
+++ b/packages/react-core/src/next/components/Modal/Modal.tsx
@@ -114,12 +114,7 @@ class Modal extends React.Component<ModalProps, ModalState> {
   isEmpty = (value: string | null | undefined) => value === null || value === undefined || value === '';
 
   componentDidMount() {
-    const {
-      appendTo,
-      'aria-describedby': ariaDescribedby,
-      'aria-label': ariaLabel,
-      'aria-labelledby': ariaLabelledby
-    } = this.props;
+    const { appendTo } = this.props;
     const target: HTMLElement = this.getElement(appendTo);
     const container = document.createElement('div');
     this.setState({ container });
@@ -131,11 +126,6 @@ class Modal extends React.Component<ModalProps, ModalState> {
     } else {
       target.classList.remove(css(styles.backdropOpen));
     }
-
-    if (!ariaDescribedby && !ariaLabel && !ariaLabelledby) {
-      // eslint-disable-next-line no-console
-      console.error('Modal: Specify at least one of: aria-describedby, aria-label, aria-labelledby.');
-    }
   }
 
   componentDidUpdate() {
diff --git a/packages/react-core/src/next/components/Modal/ModalContent.tsx b/packages/react-core/src/next/components/Modal/ModalContent.tsx
index 982356aaa42..f96d53b054a 100644
--- a/packages/react-core/src/next/components/Modal/ModalContent.tsx
+++ b/packages/react-core/src/next/components/Modal/ModalContent.tsx
@@ -70,19 +70,14 @@ export const ModalContent: React.FunctionComponent<ModalContentProps> = ({
     return null;
   }
 
-  const ariaLabelledbyFormatted = (): string => {
-    const idRefList: string[] = [];
-    if (ariaLabel && boxId) {
-      idRefList.push(ariaLabel && boxId);
-    }
+  const getAriaLabelledBy = (): string | undefined => {
     if (ariaLabelledby) {
-      idRefList.push(ariaLabelledby);
+      return ariaLabelledby;
     }
-    if (idRefList.length === 0) {
+    if (ariaLabel) {
       return undefined;
-    } else {
-      return idRefList.join(' ');
     }
+    return boxId;
   };
 
   const modalBox = (
@@ -92,7 +87,7 @@ export const ModalContent: React.FunctionComponent<ModalContentProps> = ({
       position={position}
       positionOffset={positionOffset}
       aria-label={ariaLabel}
-      aria-labelledby={ariaLabelledbyFormatted()}
+      aria-labelledby={getAriaLabelledBy()}
       aria-describedby={ariaDescribedby}
       {...getOUIAProps(ModalContent.displayName, ouiaId, ouiaSafe)}
       style={
diff --git a/packages/react-core/src/next/components/Modal/__tests__/Modal.test.tsx b/packages/react-core/src/next/components/Modal/__tests__/Modal.test.tsx
index ff0e1e09f34..286b02a519a 100644
--- a/packages/react-core/src/next/components/Modal/__tests__/Modal.test.tsx
+++ b/packages/react-core/src/next/components/Modal/__tests__/Modal.test.tsx
@@ -83,20 +83,6 @@ describe('Modal', () => {
     expect(screen.queryByRole('button', { name: 'Close' })).toBeNull();
   });
 
-  test('modal generates console error when no accessible name is provided', () => {
-    const props = {
-      onClose: jest.fn(),
-      isOpen: true,
-      children: 'modal content'
-    };
-    const consoleErrorMock = jest.fn();
-    global.console = { error: consoleErrorMock } as any;
-
-    render(<Modal {...props} />);
-
-    expect(consoleErrorMock).toHaveBeenCalled();
-  });
-
   test('modal adds aria-hidden attribute to its siblings when open', () => {
     render(<ModalWithSiblings />, { container: document.body.appendChild(target) });
 
diff --git a/packages/react-core/src/next/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap b/packages/react-core/src/next/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap
index 5456c013268..27700da672d 100644
--- a/packages/react-core/src/next/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap
+++ b/packages/react-core/src/next/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap
@@ -9,6 +9,7 @@ exports[`Modal Content Test description 1`] = `
       class="pf-v5-l-bullseye"
     >
       <div
+        aria-labelledby="boxId"
         aria-modal="true"
         class="pf-v5-c-modal-box"
         data-ouia-component-type="PF5/ModalContent"
@@ -34,6 +35,7 @@ exports[`Modal Content Test isOpen 1`] = `
       class="pf-v5-l-bullseye"
     >
       <div
+        aria-labelledby="boxId"
         aria-modal="true"
         class="pf-v5-c-modal-box"
         data-ouia-component-type="PF5/ModalContent"
@@ -59,6 +61,7 @@ exports[`Modal Content Test only body 1`] = `
       class="pf-v5-l-bullseye"
     >
       <div
+        aria-labelledby="boxId"
         aria-modal="true"
         class="pf-v5-c-modal-box"
         data-ouia-component-type="PF5/ModalContent"
@@ -84,6 +87,7 @@ exports[`Modal Content Test with onclose 1`] = `
       class="pf-v5-l-bullseye"
     >
       <div
+        aria-labelledby="boxId"
         aria-modal="true"
         class="pf-v5-c-modal-box pf-m-lg"
         data-ouia-component-type="PF5/ModalContent"