From 5bd4ccefebed53cb3d76aedd290fadddb3bf65ed Mon Sep 17 00:00:00 2001
From: Olivier Tassinari <olivier.tassinari@gmail.com>
Date: Fri, 26 Feb 2021 19:00:04 +0100
Subject: [PATCH] [Autocomplete] Fix ListboxComponent slot regression (#25102)

---
 docs/src/pages/components/autocomplete/Virtualize.js  | 2 +-
 docs/src/pages/components/autocomplete/Virtualize.tsx | 2 +-
 packages/material-ui/src/Autocomplete/Autocomplete.js | 7 ++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/docs/src/pages/components/autocomplete/Virtualize.js b/docs/src/pages/components/autocomplete/Virtualize.js
index 152c9d8bc142d2..205e44db573d29 100644
--- a/docs/src/pages/components/autocomplete/Virtualize.js
+++ b/docs/src/pages/components/autocomplete/Virtualize.js
@@ -6,7 +6,7 @@ import useMediaQuery from '@material-ui/core/useMediaQuery';
 import ListSubheader from '@material-ui/core/ListSubheader';
 import { useTheme, makeStyles } from '@material-ui/core/styles';
 import { VariableSizeList } from 'react-window';
-import { Typography } from '@material-ui/core';
+import Typography from '@material-ui/core/Typography';
 
 const LISTBOX_PADDING = 8; // px
 
diff --git a/docs/src/pages/components/autocomplete/Virtualize.tsx b/docs/src/pages/components/autocomplete/Virtualize.tsx
index a3d24b957e214a..d708dc87b908fc 100644
--- a/docs/src/pages/components/autocomplete/Virtualize.tsx
+++ b/docs/src/pages/components/autocomplete/Virtualize.tsx
@@ -7,7 +7,7 @@ import useMediaQuery from '@material-ui/core/useMediaQuery';
 import ListSubheader from '@material-ui/core/ListSubheader';
 import { useTheme, makeStyles } from '@material-ui/core/styles';
 import { VariableSizeList, ListChildComponentProps } from 'react-window';
-import { Typography } from '@material-ui/core';
+import Typography from '@material-ui/core/Typography';
 
 const LISTBOX_PADDING = 8; // px
 
diff --git a/packages/material-ui/src/Autocomplete/Autocomplete.js b/packages/material-ui/src/Autocomplete/Autocomplete.js
index 709c1c50863af5..af79f454717be3 100644
--- a/packages/material-ui/src/Autocomplete/Autocomplete.js
+++ b/packages/material-ui/src/Autocomplete/Autocomplete.js
@@ -551,11 +551,7 @@ const Autocomplete = React.forwardRef(function Autocomplete(inProps, ref) {
       >
         {params.group}
       </AutocompleteGroupLabel>
-      <AutocompleteGroupUl
-        as={ListboxComponent}
-        className={classes.groupUl}
-        styleProps={styleProps}
-      >
+      <AutocompleteGroupUl className={classes.groupUl} styleProps={styleProps}>
         {params.children}
       </AutocompleteGroupUl>
     </li>
@@ -654,6 +650,7 @@ const Autocomplete = React.forwardRef(function Autocomplete(inProps, ref) {
             ) : null}
             {groupedOptions.length > 0 ? (
               <AutocompleteListbox
+                as={ListboxComponent}
                 className={classes.listbox}
                 styleProps={styleProps}
                 {...getListboxProps()}