Merge branch 'master' into menu-components

samuelsycamore · Jan 7, 2025 · b11ca42 · b11ca42
2 parents f3b507a + 0221d17
commit b11ca42
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 39 deletions.
diff --git a/docs/src/components/home/DesignKits.tsx b/docs/src/components/home/DesignKits.tsx
@@ -66,7 +66,7 @@ const Anchor = styled('a')(({ theme }) => [
 
 const DesignToolLink = React.forwardRef<
   HTMLAnchorElement,
-  React.PropsWithChildren<{ brand: 'figma' | 'sketch' | 'adobexd' }>
+  React.PropsWithChildren<{ brand: 'figma' | 'sketch' }>
 >(function DesignToolLink(props, ref) {
   const { brand, ...other } = props;
   return (
@@ -79,8 +79,6 @@ const DesignToolLink = React.forwardRef<
             'https://mui.com/store/items/figma-react/?utm_source=marketing&utm_medium=referral&utm_campaign=home-products',
           sketch:
             'https://mui.com/store/items/sketch-react/?utm_source=marketing&utm_medium=referral&utm_campaign=home-products',
-          adobexd:
-            'https://mui.com/store/items/adobe-xd-react/?utm_source=marketing&utm_medium=referral&utm_campaign=home-products',
         }[brand]
       }
       target="_blank"
@@ -91,7 +89,7 @@ const DesignToolLink = React.forwardRef<
 
 const DesignToolLogo = React.forwardRef<
   HTMLImageElement,
-  { brand: 'figma' | 'sketch' | 'adobexd' } & AvatarProps
+  { brand: 'figma' | 'sketch' } & AvatarProps
 >(function DesignToolLogo({ brand, ...props }, ref) {
   return (
     <Box
@@ -197,7 +195,7 @@ export function DesignKitImagesSet2({
 }
 
 export function DesignKitTools({ disableLink, ...props }: { disableLink?: boolean } & BoxProps) {
-  function renderTool(brand: 'figma' | 'sketch' | 'adobexd') {
+  function renderTool(brand: 'figma' | 'sketch') {
     if (disableLink) {
       return <DesignToolLogo brand={brand} />;
     }
@@ -229,7 +227,6 @@ export function DesignKitTools({ disableLink, ...props }: { disableLink?: boolea
     >
       <FadeDelay delay={200}>{renderTool('figma')}</FadeDelay>
       <FadeDelay delay={400}>{renderTool('sketch')}</FadeDelay>
-      <FadeDelay delay={600}>{renderTool('adobexd')}</FadeDelay>
     </Box>
   );
 }

diff --git a/docs/src/modules/components/AdobeXDIcon.js b/docs/src/modules/components/AdobeXDIcon.js
diff --git a/packages/mui-docs/src/svgIcons/AdobeXDIcon.tsx b/packages/mui-docs/src/svgIcons/AdobeXDIcon.tsx
diff --git a/packages/mui-material/src/Select/Select.test.js b/packages/mui-material/src/Select/Select.test.js
@@ -517,6 +517,11 @@ describe('<Select />', () => {
       expect(getByRole('combobox', { hidden: true })).to.have.attribute('aria-controls', listboxId);
     });
 
+    it('does not set aria-controls when closed', () => {
+      const { getByRole } = render(<Select open={false} value="" />);
+      expect(getByRole('combobox', { hidden: true })).to.not.have.attribute('aria-controls');
+    });
+
     specify('the listbox is focusable', async () => {
       const { getByRole } = render(<Select open value="" />);
 

diff --git a/packages/mui-material/src/Select/SelectInput.js b/packages/mui-material/src/Select/SelectInput.js
@@ -497,7 +497,7 @@ const SelectInput = React.forwardRef(function SelectInput(props, ref) {
         ref={handleDisplayRef}
         tabIndex={tabIndex}
         role="combobox"
-        aria-controls={listboxId}
+        aria-controls={open ? listboxId : undefined}
         aria-disabled={disabled ? 'true' : undefined}
         aria-expanded={open ? 'true' : 'false'}
         aria-haspopup="listbox"