From a07f18029a5532de310f234392c18664817f0dce Mon Sep 17 00:00:00 2001 From: Chris Van Emmerik Date: Tue, 31 Dec 2019 04:14:23 -0700 Subject: [PATCH] [Autocomplete] Fix disabled + multiple combination support (#19041) --- docs/src/pages/components/autocomplete/FixedTags.js | 2 +- docs/src/pages/components/autocomplete/FixedTags.tsx | 2 +- packages/material-ui-lab/src/Autocomplete/Autocomplete.js | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/src/pages/components/autocomplete/FixedTags.js b/docs/src/pages/components/autocomplete/FixedTags.js index 3039b4801afc52..a76eaaa5a4bcd6 100644 --- a/docs/src/pages/components/autocomplete/FixedTags.js +++ b/docs/src/pages/components/autocomplete/FixedTags.js @@ -14,7 +14,7 @@ export default function FixedTags() { defaultValue={[top100Films[6], top100Films[13]]} renderTags={(value, getTagProps) => value.map((option, index) => ( - + )) } style={{ width: 500 }} diff --git a/docs/src/pages/components/autocomplete/FixedTags.tsx b/docs/src/pages/components/autocomplete/FixedTags.tsx index d655dc23f56606..be3aca0eaae2be 100644 --- a/docs/src/pages/components/autocomplete/FixedTags.tsx +++ b/docs/src/pages/components/autocomplete/FixedTags.tsx @@ -14,7 +14,7 @@ export default function FixedTags() { defaultValue={[top100Films[6], top100Films[13]]} renderTags={(value: FilmOptionType[], getTagProps) => value.map((option: FilmOptionType, index: number) => ( - + )) } style={{ width: 500 }} diff --git a/packages/material-ui-lab/src/Autocomplete/Autocomplete.js b/packages/material-ui-lab/src/Autocomplete/Autocomplete.js index 0e8021b84ad31b..e32135663bff74 100644 --- a/packages/material-ui-lab/src/Autocomplete/Autocomplete.js +++ b/packages/material-ui-lab/src/Autocomplete/Autocomplete.js @@ -302,6 +302,7 @@ const Autocomplete = React.forwardRef(function Autocomplete(props, ref) { className: clsx(classes.tag, { [classes.tagSizeSmall]: size === 'small', }), + disabled, ...getTagProps(params), });