updated as per review comments

cerner · Oct 26, 2023 · 7cb2fd3 · 7cb2fd3
1 parent f8779db
commit 7cb2fd3
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 17 deletions.
diff --git a/packages/terra-dropdown-button/src/DropdownButton.jsx b/packages/terra-dropdown-button/src/DropdownButton.jsx
@@ -189,11 +189,6 @@ class DropdownButton extends React.Component {
 
     const dropDownMenuId = uuidv4();
     const dropDownMenuListId = `dropdown-menu-list-${dropDownMenuId}`;
-    let dropDownMenuButtonId = `dropdown-menu-button-${dropDownMenuId}`;
-    if (modifiedButtonAttrs && modifiedButtonAttrs.id) {
-      dropDownMenuButtonId = modifiedButtonAttrs.id;
-      delete modifiedButtonAttrs.id;
-    }
 
     return (
       <DropdownButtonBase
@@ -208,7 +203,6 @@ class DropdownButton extends React.Component {
         buttonRef={this.getButtonNode}
         getSelectedOptionText={this.getSelectedOptionText}
         menuId={dropDownMenuListId}
-        buttonId={dropDownMenuButtonId}
       >
         <button
           {...modifiedButtonAttrs}
@@ -224,7 +218,6 @@ class DropdownButton extends React.Component {
           aria-expanded={isOpen}
           aria-label={buttonAriaLabel}
           aria-haspopup="true"
-          id={dropDownMenuButtonId}
           aria-controls={dropDownMenuListId}
           onBlur={this.handleBlur}
         >

diff --git a/packages/terra-dropdown-button/src/_Dropdown.jsx b/packages/terra-dropdown-button/src/_Dropdown.jsx
@@ -44,7 +44,7 @@ const Dropdown = ({
   requestClose, isOpen, targetRef, children, width, refCallback, buttonRef, getSelectedOptionText, ...customProps
 }) => {
   const buttonFocused = useRef(false);
-  const { menuId, buttonId } = customProps;
+  const { menuId } = customProps;
   useEffect(() => {
     // added this change to bring focus back to button when dropdown list is closed.
     if (buttonFocused.current && buttonRef) {
@@ -78,7 +78,6 @@ const Dropdown = ({
             refCallback={refCallback}
             getSelectedOptionText={getSelectedOptionText}
             menuId={menuId}
-            buttonId={buttonId}
           >
             {children}
           </DropdownList>

diff --git a/packages/terra-dropdown-button/src/_DropdownButtonBase.jsx b/packages/terra-dropdown-button/src/_DropdownButtonBase.jsx
@@ -124,7 +124,6 @@ class DropdownButtonBase extends React.Component {
           refCallback={refCallback}
           getSelectedOptionText={getSelectedOptionText}
           menuId={customProps.menuId}
-          buttonId={customProps.buttonId}
         >
           {items}
         </Dropdown>

diff --git a/packages/terra-dropdown-button/src/_DropdownList.jsx b/packages/terra-dropdown-button/src/_DropdownList.jsx
@@ -227,7 +227,6 @@ class DropdownList extends React.Component {
         onKeyUp={this.handleKeyUp}
         role="menu"
         id={customProps.menuId}
-        aria-labelledby={customProps.buttonId}
       >
         {this.cloneChildren()}
       </ul>

diff --git a/packages/terra-dropdown-button/tests/jest/DropdownButton.test.jsx b/packages/terra-dropdown-button/tests/jest/DropdownButton.test.jsx
@@ -103,8 +103,6 @@ describe('Dropdown Button', () => {
         </DropdownButton>
       </ThemeContextProvider>,
     );
-    const dropDownButtonId = wrapper.find('#dropDown');
-    expect(dropDownButtonId.exists()).toBe(true);
     expect(wrapper).toMatchSnapshot();
   });
 

diff --git a/packages/terra-dropdown-button/tests/jest/__snapshots__/DropdownButton.test.jsx.snap b/packages/terra-dropdown-button/tests/jest/__snapshots__/DropdownButton.test.jsx.snap
@@ -76,7 +76,6 @@ exports[`Dropdown Button correctly applies the theme context className 1`] = `
       variant="neutral"
     >
       <DropdownButtonBase
-        buttonId="dropdown-menu-button-00000000-0000-0000-0000-000000000000"
         buttonRef={[Function]}
         getSelectedOptionText={[Function]}
         id="dropDown"
@@ -95,7 +94,6 @@ exports[`Dropdown Button correctly applies the theme context className 1`] = `
         requestClose={[Function]}
       >
         <div
-          buttonId="dropdown-menu-button-00000000-0000-0000-0000-000000000000"
           className="dropdown-button-base orion-fusion-theme"
           id="dropDown"
           menuId="dropdown-menu-list-00000000-0000-0000-0000-000000000000"
@@ -108,7 +106,6 @@ exports[`Dropdown Button correctly applies the theme context className 1`] = `
             aria-label="Primary Option"
             className="dropdown-button neutral orion-fusion-theme"
             disabled={false}
-            id="dropdown-menu-button-00000000-0000-0000-0000-000000000000"
             onBlur={[Function]}
             onClick={[Function]}
             onKeyDown={[Function]}
@@ -125,7 +122,6 @@ exports[`Dropdown Button correctly applies the theme context className 1`] = `
             />
           </button>
           <Dropdown
-            buttonId="dropdown-menu-button-00000000-0000-0000-0000-000000000000"
             buttonRef={[Function]}
             getSelectedOptionText={[Function]}
             isOpen={false}