Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
28ea5aa
Bump vite to 3.2.10 [SECURITY] (#41761)
renovate[bot] Apr 4, 2024
6d0f4f2
[blog] Fix typo in MUI X v7 announcement post (#41773)
levigunz Apr 4, 2024
4d99e04
[core] Remove Base UI mentions from issues templates (#41733)
danilo-leal Apr 4, 2024
d6b1f64
[pigment-css][docs] Fix git diff formatting
oliviertassinari Apr 4, 2024
fc623b4
[base-ui][website] Page <title> should have no dots
oliviertassinari Apr 4, 2024
f5a40ab
[docs] Drop IE 11 official support (#41611)
iammminzzy Apr 5, 2024
9cc4984
6.0.0-alpha.1 (#41749)
siriwatknp Apr 5, 2024
dd0b68f
[material-ui][Autocomplete] Prevent start adornment from causing inpu…
TahaRhidouani Apr 5, 2024
2ed5db5
[material-ui][Autocomplete] Prevent start adornment from causing inpu…
TahaRhidouani Apr 5, 2024
d7f518b
[material-ui][Autocomplete] Fix build
TahaRhidouani Apr 5, 2024
6265175
[material-ui][Autocomplete] Fix build
TahaRhidouani Apr 5, 2024
95ddaf8
[material-ui][Autocomplete] Fix use case for multiple
TahaRhidouani Apr 5, 2024
59c9214
Merge branch 'autocomplete-startadornment-patch' of github.com:TahaRh…
TahaRhidouani Apr 5, 2024
958eab1
[material-ui][Autocomplete] Fix flicker due to hover state
TahaRhidouani Apr 5, 2024
2c4402f
[material-ui][Autocomplete] Fix focused logic & add tests
TahaRhidouani Apr 5, 2024
fbfff90
[material-ui][Autocomplete] Prettify code
TahaRhidouani Apr 6, 2024
09d1210
Merge branch 'next' into autocomplete-startadornment-patch
ZeeshanTamboli Apr 26, 2024
4ac0187
[material-ui][Autocomplete] address PR comments
TahaRhidouani Apr 26, 2024
4df7fb5
[material-ui][Autocomplete] forgot to regenerate docs
TahaRhidouani Apr 26, 2024
468ddb8
[material-ui][Autocomplete] undo vs code import reorg & remove unnece…
TahaRhidouani Apr 29, 2024
39e6635
Merge branch 'next' of github.com:TahaRhidouani/material-ui into auto…
TahaRhidouani Apr 29, 2024
1bc732e
[material-ui][Autocomplete] address PR comments & add test
TahaRhidouani May 1, 2024
b886b6a
[material-ui][Autocomplete] tweaks to the test
TahaRhidouani May 3, 2024
db62d3b
Merge branch 'next' into autocomplete-startadornment-patch
ZeeshanTamboli May 3, 2024
6c105d3
Merge branch 'autocomplete-startadornment-patch' of https://github.co…
ZeeshanTamboli May 3, 2024
9ff8ee0
prettier
ZeeshanTamboli May 3, 2024
20c213b
tweak test
ZeeshanTamboli May 4, 2024
b7dbce0
Merge branch 'next' into autocomplete-startadornment-patch
ZeeshanTamboli May 4, 2024
71c4d33
Merge branch 'next' into autocomplete-startadornment-patch
ZeeshanTamboli May 8, 2024
ea24fe2
remove multiple
ZeeshanTamboli May 8, 2024
dc9a257
add visual regression test
ZeeshanTamboli May 8, 2024
c8fb9dc
remove diff
ZeeshanTamboli May 8, 2024
1eb8a3d
prettier
ZeeshanTamboli May 8, 2024
881ce56
Merge branch 'next' into autocomplete-startadornment-patch
ZeeshanTamboli May 9, 2024
b958bea
remove unnecessary props from Autocomplete in the visual regression test
ZeeshanTamboli May 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 25 additions & 10 deletions packages/mui-material/src/Autocomplete/Autocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,21 +87,11 @@ const AutocompleteRoot = styled('div', {
];
},
})({
[`&.${autocompleteClasses.focused} .${autocompleteClasses.clearIndicator}`]: {
visibility: 'visible',
},
/* Avoid double tap issue on iOS */
'@media (pointer: fine)': {
[`&:hover .${autocompleteClasses.clearIndicator}`]: {
visibility: 'visible',
},
},
[`& .${autocompleteClasses.tag}`]: {
margin: 3,
maxWidth: 'calc(100% - 6px)',
},
[`& .${autocompleteClasses.inputRoot}`]: {
flexWrap: 'wrap',
[`.${autocompleteClasses.hasPopupIcon}&, .${autocompleteClasses.hasClearIcon}&`]: {
paddingRight: 26 + 4,
},
Expand All @@ -113,6 +103,23 @@ const AutocompleteRoot = styled('div', {
minWidth: 30,
},
},
[`&.${autocompleteClasses.focused}`]: {
[`& .${autocompleteClasses.clearIndicator}`]: {
visibility: 'visible',
},
[`& .${autocompleteClasses.input}`]: {
minWidth: 0,
},
},
/* Avoid double tap issue on iOS */
'@media (pointer: fine)': {
[`&:hover .${autocompleteClasses.clearIndicator}`]: {
visibility: 'visible',
},
[`&:hover .${autocompleteClasses.input}`]: {
minWidth: 0,
},
},
[`& .${inputClasses.root}`]: {
paddingBottom: 1,
'& .MuiInput-input': {
Expand Down Expand Up @@ -215,6 +222,14 @@ const AutocompleteRoot = styled('div', {
},
},
},
{
props: { multiple: true },
style: {
[`& .${autocompleteClasses.inputRoot}`]: {
flexWrap: 'wrap',
},
},
},
],
});

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import * as React from 'react';
import Autocomplete from '@mui/material/Autocomplete';
import SvgIcon from '@mui/material/SvgIcon';
import TextField from '@mui/material/TextField';

const movies = [
{
label: 'The Lord of the Rings: The Two Towers',
year: 2002,
},
];

export default function SmallAutocompleteWithStartAdornment() {
return (
<Autocomplete
options={movies}
value={movies[0]}
sx={{ width: 120, mt: 2 }}
renderInput={(params) => (
<TextField
{...params}
label="Autocomplete"
InputProps={{
...params.InputProps,
startAdornment: (
<SvgIcon>
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
strokeWidth={1.5}
stroke="currentColor"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
d="M4.5 12a7.5 7.5 0 0015 0m-15 0a7.5 7.5 0 1115 0m-15 0H3m16.5 0H21m-1.5 0H12m-8.457 3.077l1.41-.513m14.095-5.13l1.41-.513M5.106 17.785l1.15-.964m11.49-9.642l1.149-.964M7.501 19.795l.75-1.3m7.5-12.99l.75-1.3m-6.063 16.658l.26-1.477m2.605-14.772l.26-1.477m0 17.726l-.26-1.477M10.698 4.614l-.26-1.477M16.5 19.794l-.75-1.299M7.5 4.205L12 12m6.894 5.785l-1.149-.964M6.256 7.178l-1.15-.964m15.352 8.864l-1.41-.513M4.954 9.435l-1.41-.514M12.002 12l-3.75 6.495"
/>
</svg>
</SvgIcon>
),
}}
/>
)}
/>
);
}