Skip to content

Commit 9a5b9ee

Browse files
zanivanzanivan
committed
Merge branch 'master' into sign-in-side-bg-fix
2 parents 770686a + ff61ec3 commit 9a5b9ee

27 files changed

+296
-188
lines changed

‎.circleci/config.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ commands:
7575
node scripts/useReactVersion.mjs
7676
# log a patch for maintainers who want to check out this change
7777
git --no-pager diff HEAD
78+
7879
- when:
7980
condition: << parameters.browsers >>
8081
steps:
@@ -93,6 +94,13 @@ commands:
9394
name: Restore playwright cache
9495
keys:
9596
- v6-playwright-{{ arch }}-{{ checksum "/tmp/playwright_info.json" }}
97+
- when:
98+
condition:
99+
not: << parameters.browsers >>
100+
steps:
101+
# See https://stackoverflow.com/a/73411601
102+
- run: corepack enable --install-directory ~/bin
103+
96104
- run:
97105
name: View install environment
98106
command: |

‎docs/data/about/teamMembers.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,5 +331,13 @@
331331
"locationCountry": "nl",
332332
"about": "♟️ Chess, 🛠️ Small DIY projects and learning about space 🌌",
333333
"github": "arminmeh"
334+
},
335+
{
336+
"name": "Alejandra Thomas",
337+
"title": "Content Engineer",
338+
"location": "New York, US",
339+
"locationCountry": "us",
340+
"about": "Books 📚, long coffee walks ☕️, and my cat 🐈‍⬛",
341+
"github": "alelthomas"
334342
}
335343
]

‎docs/data/material/components/autocomplete/CheckboxesTags.js‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,20 @@ export default function CheckboxesTags() {
1616
options={top100Films}
1717
disableCloseOnSelect
1818
getOptionLabel={(option) => option.title}
19-
renderOption={(props, option, { selected }) => (
20-
<li {...props}>
21-
<Checkbox
22-
icon={icon}
23-
checkedIcon={checkedIcon}
24-
style={{ marginRight: 8 }}
25-
checked={selected}
26-
/>
27-
{option.title}
28-
</li>
29-
)}
19+
renderOption={(props, option, { selected }) => {
20+
const { key, ...optionProps } = props;
21+
return (
22+
<li key={key} {...optionProps}>
23+
<Checkbox
24+
icon={icon}
25+
checkedIcon={checkedIcon}
26+
style={{ marginRight: 8 }}
27+
checked={selected}
28+
/>
29+
{option.title}
30+
</li>
31+
);
32+
}}
3033
style={{ width: 500 }}
3134
renderInput={(params) => (
3235
<TextField {...params} label="Checkboxes" placeholder="Favorites" />

‎docs/data/material/components/autocomplete/CheckboxesTags.tsx‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,20 @@ export default function CheckboxesTags() {
1616
options={top100Films}
1717
disableCloseOnSelect
1818
getOptionLabel={(option) => option.title}
19-
renderOption={(props, option, { selected }) => (
20-
<li {...props}>
21-
<Checkbox
22-
icon={icon}
23-
checkedIcon={checkedIcon}
24-
style={{ marginRight: 8 }}
25-
checked={selected}
26-
/>
27-
{option.title}
28-
</li>
29-
)}
19+
renderOption={(props, option, { selected }) => {
20+
const { key, ...optionProps } = props;
21+
return (
22+
<li key={key} {...optionProps}>
23+
<Checkbox
24+
icon={icon}
25+
checkedIcon={checkedIcon}
26+
style={{ marginRight: 8 }}
27+
checked={selected}
28+
/>
29+
{option.title}
30+
</li>
31+
);
32+
}}
3033
style={{ width: 500 }}
3134
renderInput={(params) => (
3235
<TextField {...params} label="Checkboxes" placeholder="Favorites" />

‎docs/data/material/components/autocomplete/CountrySelect.js‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,26 @@ export default function CountrySelect() {
1111
options={countries}
1212
autoHighlight
1313
getOptionLabel={(option) => option.label}
14-
renderOption={(props, option) => (
15-
<Box component="li" sx={{ '& > img': { mr: 2, flexShrink: 0 } }} {...props}>
16-
<img
17-
loading="lazy"
18-
width="20"
19-
srcSet={`https://flagcdn.com/w40/${option.code.toLowerCase()}.png 2x`}
20-
src={`https://flagcdn.com/w20/${option.code.toLowerCase()}.png`}
21-
alt=""
22-
/>
23-
{option.label} ({option.code}) +{option.phone}
24-
</Box>
25-
)}
14+
renderOption={(props, option) => {
15+
const { key, ...optionProps } = props;
16+
return (
17+
<Box
18+
key={key}
19+
component="li"
20+
sx={{ '& > img': { mr: 2, flexShrink: 0 } }}
21+
{...optionProps}
22+
>
23+
<img
24+
loading="lazy"
25+
width="20"
26+
srcSet={`https://flagcdn.com/w40/${option.code.toLowerCase()}.png 2x`}
27+
src={`https://flagcdn.com/w20/${option.code.toLowerCase()}.png`}
28+
alt=""
29+
/>
30+
{option.label} ({option.code}) +{option.phone}
31+
</Box>
32+
);
33+
}}
2634
renderInput={(params) => (
2735
<TextField
2836
{...params}

‎docs/data/material/components/autocomplete/CountrySelect.tsx‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,26 @@ export default function CountrySelect() {
1111
options={countries}
1212
autoHighlight
1313
getOptionLabel={(option) => option.label}
14-
renderOption={(props, option) => (
15-
<Box component="li" sx={{ '& > img': { mr: 2, flexShrink: 0 } }} {...props}>
16-
<img
17-
loading="lazy"
18-
width="20"
19-
srcSet={`https://flagcdn.com/w40/${option.code.toLowerCase()}.png 2x`}
20-
src={`https://flagcdn.com/w20/${option.code.toLowerCase()}.png`}
21-
alt=""
22-
/>
23-
{option.label} ({option.code}) +{option.phone}
24-
</Box>
25-
)}
14+
renderOption={(props, option) => {
15+
const { key, ...optionProps } = props;
16+
return (
17+
<Box
18+
key={key}
19+
component="li"
20+
sx={{ '& > img': { mr: 2, flexShrink: 0 } }}
21+
{...optionProps}
22+
>
23+
<img
24+
loading="lazy"
25+
width="20"
26+
srcSet={`https://flagcdn.com/w40/${option.code.toLowerCase()}.png 2x`}
27+
src={`https://flagcdn.com/w20/${option.code.toLowerCase()}.png`}
28+
alt=""
29+
/>
30+
{option.label} ({option.code}) +{option.phone}
31+
</Box>
32+
);
33+
}}
2634
renderInput={(params) => (
2735
<TextField
2836
{...params}

‎docs/data/material/components/autocomplete/FreeSoloCreateOption.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,14 @@ export default function FreeSoloCreateOption() {
5656
// Regular option
5757
return option.title;
5858
}}
59-
renderOption={(props, option) => <li {...props}>{option.title}</li>}
59+
renderOption={(props, option) => {
60+
const { key, ...optionProps } = props;
61+
return (
62+
<li key={key} {...optionProps}>
63+
{option.title}
64+
</li>
65+
);
66+
}}
6067
sx={{ width: 300 }}
6168
freeSolo
6269
renderInput={(params) => (

‎docs/data/material/components/autocomplete/FreeSoloCreateOption.tsx‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,14 @@ export default function FreeSoloCreateOption() {
5656
// Regular option
5757
return option.title;
5858
}}
59-
renderOption={(props, option) => <li {...props}>{option.title}</li>}
59+
renderOption={(props, option) => {
60+
const { key, ...optionProps } = props;
61+
return (
62+
<li key={key} {...optionProps}>
63+
{option.title}
64+
</li>
65+
);
66+
}}
6067
sx={{ width: 300 }}
6168
freeSolo
6269
renderInput={(params) => (

‎docs/data/material/components/autocomplete/FreeSoloCreateOptionDialog.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,14 @@ export default function FreeSoloCreateOptionDialog() {
8787
selectOnFocus
8888
clearOnBlur
8989
handleHomeEndKeys
90-
renderOption={(props, option) => <li {...props}>{option.title}</li>}
90+
renderOption={(props, option) => {
91+
const { key, ...optionProps } = props;
92+
return (
93+
<li key={key} {...optionProps}>
94+
{option.title}
95+
</li>
96+
);
97+
}}
9198
sx={{ width: 300 }}
9299
freeSolo
93100
renderInput={(params) => <TextField {...params} label="Free solo dialog" />}

‎docs/data/material/components/autocomplete/FreeSoloCreateOptionDialog.tsx‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,14 @@ export default function FreeSoloCreateOptionDialog() {
8787
selectOnFocus
8888
clearOnBlur
8989
handleHomeEndKeys
90-
renderOption={(props, option) => <li {...props}>{option.title}</li>}
90+
renderOption={(props, option) => {
91+
const { key, ...optionProps } = props;
92+
return (
93+
<li key={key} {...optionProps}>
94+
{option.title}
95+
</li>
96+
);
97+
}}
9198
sx={{ width: 300 }}
9299
freeSolo
93100
renderInput={(params) => <TextField {...params} label="Free solo dialog" />}

0 commit comments

Comments
 (0)