Skip to content

Commit

Permalink
Merge branch 'next' into fix-autocomplete-to-remove-react18.3-key-spr…
Browse files Browse the repository at this point in the history
…ead-warning

Signed-off-by: Diego Andai <diego@mui.com>
  • Loading branch information
DiegoAndai committed May 8, 2024
2 parents 604fead + d8a5f53 commit ceeb9fd
Show file tree
Hide file tree
Showing 248 changed files with 5,044 additions and 2,325 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ jobs:
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
- run: pnpm install
- run: pnpm build:ci
env:
NODE_OPTIONS: --max_old_space_size=4096
- run: pnpm release:changelog
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
48 changes: 48 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,53 @@
# [Versions](https://mui.com/versions/)

## v6.0.0-alpha.6

<!-- generated comparing v6.0.0-alpha.5..next -->

_May 8, 2024_

A big thanks to the 10 contributors who made this release possible. Here are some highlights ✨:

### `@mui/material@6.0.0-alpha.6`

- [Chip] Add colorDefault class to chipClasses (#42067) @sai6855
- Migrate components to support CSS extraction (#42001) @siriwatknp
- [SpeedDial] Deprecate TransitionComponent (#40698) @harry-whorlow

### `@mui/codemod@6.0.0-alpha.6`

- Add `theme-v6` migration (#42056) @siriwatknp

### `@mui/icons-material@6.0.0-alpha.6`

- Add the Emergency icon (#42080) @danilo-leal

### Docs

- [autocomplete] Fix duplicate autocomplete id (#42086) @oliviertassinari
- Fix SEO redirection issues @oliviertassinari
- [material-ui] Fix broken link (#42142) @aarongarciah
- [material-ui][docs] Fix link on the Sync page (#42088) @danilo-leal

### Core

- [blog] Shorten title to fit @oliviertassinari
- [blog] Update Sync post OG image (#42114) @danilo-leal
- [blog] A few tweaks in introducing-sync-plugin (#42092) @oliviertassinari
- [code-infra] Add canary release scripts (#41949) @michaldudak
- [code-infra] Move ComponentLinkHeader to @mui/docs (#42061) @Janpot
- [code-infra] Bump node image used by CI in docker (#42079) @LukasTy
- [core] Restrict import path with ESLint (#41970) @oliviertassinari
- [docs-infra] Add design and formatting improvements (#42063) @danilo-leal
- [docs-infra] Fix HTML structure violations (#42085) @oliviertassinari
- [website] Componentize a few Careers page sections (#42102) @danilo-leal
- [website] Refine the InfoCard design (#42116) @danilo-leal
- [website] Fix home page slider's track position (#42141) @aarongarciah
- [website] Closing the survey @oliviertassinari
- [website] Remove Survey banner from website and Core docs (#42104) @joserodolfofreitas

All contributors of this release in alphabetical order: @aarongarciah, @danilo-leal, @harry-whorlow, @Janpot, @joserodolfofreitas, @LukasTy, @michaldudak, @oliviertassinari, @sai6855, @siriwatknp

## v6.0.0-alpha.5

<!-- generated comparing v6.0.0-alpha.4..next -->
Expand Down
27 changes: 27 additions & 0 deletions apps/pigment-css-next-app/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,13 @@ theme.getColorSchemeSelector = (colorScheme) => {
return `@media (prefers-color-scheme: ${colorScheme})`;
};

function innerNoop() {
return null;
}
function outerNoop() {
return innerNoop;
}

/**
* @type {PigmentOptions}
*/
Expand All @@ -104,6 +111,26 @@ const pigmentOptions = {
transformLibraries: ['local-ui-lib'],
sourceMap: true,
displayName: true,
overrideContext: (context) => {
if (!context.$RefreshSig$) {
context.$RefreshSig$ = outerNoop;
}
return {
...context,
require: (id) => {
if (id === '@mui/styled-engine' || id === '@mui/styled-engine-sc') {
return {
__esModule: true,
default: () => () => () => null,
internal_processStyles: () => {},
keyframes: () => '',
css: () => '',
};
}
return context.require(id);
},
};
},
};

/** @type {import('next').NextConfig} */
Expand Down
4 changes: 2 additions & 2 deletions apps/pigment-css-next-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"clean": "rimraf .next"
},
"dependencies": {
"@pigment-css/react": "^0.0.9",
"@pigment-css/react": "^0.0.10",
"@mui/utils": "workspace:^",
"@mui/base": "workspace:^",
"@mui/lab": "workspace:^",
Expand All @@ -24,7 +24,7 @@
"next": "latest"
},
"devDependencies": {
"@pigment-css/nextjs-plugin": "^0.0.9",
"@pigment-css/nextjs-plugin": "^0.0.10",
"@types/node": "^20.5.7",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.3.0",
Expand Down
1 change: 0 additions & 1 deletion docs/data/joy/components/autocomplete/CountrySelect.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import Typography from '@mui/joy/Typography';
export default function CountrySelect() {
return (
<Autocomplete
id="country-select-demo"
placeholder="Choose a country"
slotProps={{
input: {
Expand Down
1 change: 0 additions & 1 deletion docs/data/joy/components/autocomplete/CountrySelect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import Typography from '@mui/joy/Typography';
export default function CountrySelect() {
return (
<Autocomplete
id="country-select-demo"
placeholder="Choose a country"
slotProps={{
input: {
Expand Down
1 change: 0 additions & 1 deletion docs/data/joy/components/autocomplete/CustomTags.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import Close from '@mui/icons-material/Close';
export default function CustomTags() {
return (
<Autocomplete
id="tags-default"
multiple
placeholder="Favorites"
options={top100Films}
Expand Down
1 change: 0 additions & 1 deletion docs/data/joy/components/autocomplete/CustomTags.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import Close from '@mui/icons-material/Close';
export default function CustomTags() {
return (
<Autocomplete
id="tags-default"
multiple
placeholder="Favorites"
options={top100Films}
Expand Down
1 change: 0 additions & 1 deletion docs/data/material/components/autocomplete/Asynchronous.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ export default function Asynchronous() {

return (
<Autocomplete
id="asynchronous-demo"
sx={{ width: 300 }}
open={open}
onOpen={() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ export default function Asynchronous() {

return (
<Autocomplete
id="asynchronous-demo"
sx={{ width: 300 }}
open={open}
onOpen={() => {
Expand Down
1 change: 0 additions & 1 deletion docs/data/material/components/autocomplete/ComboBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export default function ComboBox() {
return (
<Autocomplete
disablePortal
id="combo-box-demo"
options={top100Films}
sx={{ width: 300 }}
renderInput={(params) => <TextField {...params} label="Movie" />}
Expand Down
1 change: 0 additions & 1 deletion docs/data/material/components/autocomplete/ComboBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export default function ComboBox() {
return (
<Autocomplete
disablePortal
id="combo-box-demo"
options={top100Films}
sx={{ width: 300 }}
renderInput={(params) => <TextField {...params} label="Movie" />}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Autocomplete
disablePortal
id="combo-box-demo"
options={top100Films}
sx={{ width: 300 }}
renderInput={(params) => <TextField {...params} label="Movie" />}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Autocomplete from '@mui/material/Autocomplete';
export default function DisabledOptions() {
return (
<Autocomplete
id="disabled-options-demo"
options={timeSlots}
getOptionDisabled={(option) =>
option === timeSlots[0] || option === timeSlots[2]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import Autocomplete from '@mui/material/Autocomplete';
export default function DisabledOptions() {
return (
<Autocomplete
id="disabled-options-demo"
options={timeSlots}
getOptionDisabled={(option) =>
option === timeSlots[0] || option === timeSlots[2]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Autocomplete
id="disabled-options-demo"
options={timeSlots}
getOptionDisabled={(option) =>
option === timeSlots[0] || option === timeSlots[2]
Expand Down
1 change: 0 additions & 1 deletion docs/data/material/components/autocomplete/Filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ const filterOptions = createFilterOptions({
export default function Filter() {
return (
<Autocomplete
id="filter-demo"
options={top100Films}
getOptionLabel={(option) => option.title}
filterOptions={filterOptions}
Expand Down
1 change: 0 additions & 1 deletion docs/data/material/components/autocomplete/Filter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ const filterOptions = createFilterOptions({
export default function Filter() {
return (
<Autocomplete
id="filter-demo"
options={top100Films}
getOptionLabel={(option) => option.title}
filterOptions={filterOptions}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Autocomplete
id="filter-demo"
options={top100Films}
getOptionLabel={(option) => option.title}
filterOptions={filterOptions}
Expand Down
4 changes: 3 additions & 1 deletion docs/data/material/components/autocomplete/GitHubLabel.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ export default function GitHubLabel() {
setPendingValue(newValue);
}}
disableCloseOnSelect
PopperComponent={PopperComponent}
renderTags={() => null}
noOptionsText="No labels"
renderOption={(props, option, { selected }) => (
Expand Down Expand Up @@ -255,6 +254,9 @@ export default function GitHubLabel() {
placeholder="Filter labels"
/>
)}
slots={{
popper: PopperComponent,
}}
/>
</div>
</ClickAwayListener>
Expand Down
4 changes: 3 additions & 1 deletion docs/data/material/components/autocomplete/GitHubLabel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ export default function GitHubLabel() {
setPendingValue(newValue);
}}
disableCloseOnSelect
PopperComponent={PopperComponent}
renderTags={() => null}
noOptionsText="No labels"
renderOption={(props, option, { selected }) => (
Expand Down Expand Up @@ -261,6 +260,9 @@ export default function GitHubLabel() {
placeholder="Filter labels"
/>
)}
slots={{
popper: PopperComponent,
}}
/>
</div>
</ClickAwayListener>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ function MovieSelect() {
function CountrySelect() {
return (
<Autocomplete
id="country-customized-option-demo"
options={countries}
disableCloseOnSelect
getOptionLabel={(option) =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ function MovieSelect() {
function CountrySelect() {
return (
<Autocomplete
id="country-customized-option-demo"
options={countries}
disableCloseOnSelect
getOptionLabel={(option: CountryType) =>
Expand Down
1 change: 0 additions & 1 deletion docs/data/material/components/autocomplete/GoogleMaps.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ export default function GoogleMaps() {

return (
<Autocomplete
id="google-map-demo"
sx={{ width: 300 }}
getOptionLabel={(option) =>
typeof option === 'string' ? option : option.description
Expand Down
1 change: 0 additions & 1 deletion docs/data/material/components/autocomplete/GoogleMaps.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ export default function GoogleMaps() {

return (
<Autocomplete
id="google-map-demo"
sx={{ width: 300 }}
getOptionLabel={(option) =>
typeof option === 'string' ? option : option.description
Expand Down
1 change: 0 additions & 1 deletion docs/data/material/components/autocomplete/Grouped.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export default function Grouped() {

return (
<Autocomplete
id="grouped-demo"
options={options.sort((a, b) => -b.firstLetter.localeCompare(a.firstLetter))}
groupBy={(option) => option.firstLetter}
getOptionLabel={(option) => option.title}
Expand Down
1 change: 0 additions & 1 deletion docs/data/material/components/autocomplete/Grouped.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export default function Grouped() {

return (
<Autocomplete
id="grouped-demo"
options={options.sort((a, b) => -b.firstLetter.localeCompare(a.firstLetter))}
groupBy={(option) => option.firstLetter}
getOptionLabel={(option) => option.title}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Autocomplete
id="grouped-demo"
options={options.sort((a, b) => -b.firstLetter.localeCompare(a.firstLetter))}
groupBy={(option) => option.firstLetter}
getOptionLabel={(option) => option.title}
Expand Down
1 change: 0 additions & 1 deletion docs/data/material/components/autocomplete/Highlights.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import match from 'autosuggest-highlight/match';
export default function Highlights() {
return (
<Autocomplete
id="highlights-demo"
sx={{ width: 300 }}
options={top100Films}
getOptionLabel={(option) => option.title}
Expand Down
1 change: 0 additions & 1 deletion docs/data/material/components/autocomplete/Highlights.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import match from 'autosuggest-highlight/match';
export default function Highlights() {
return (
<Autocomplete
id="highlights-demo"
sx={{ width: 300 }}
options={top100Films}
getOptionLabel={(option) => option.title}
Expand Down
1 change: 0 additions & 1 deletion docs/data/material/components/autocomplete/RenderGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export default function RenderGroup() {

return (
<Autocomplete
id="grouped-demo"
options={options.sort((a, b) => -b.firstLetter.localeCompare(a.firstLetter))}
groupBy={(option) => option.firstLetter}
getOptionLabel={(option) => option.title}
Expand Down
1 change: 0 additions & 1 deletion docs/data/material/components/autocomplete/RenderGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export default function RenderGroup() {

return (
<Autocomplete
id="grouped-demo"
options={options.sort((a, b) => -b.firstLetter.localeCompare(a.firstLetter))}
groupBy={(option) => option.firstLetter}
getOptionLabel={(option) => option.title}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Autocomplete
id="grouped-demo"
options={options.sort((a, b) => -b.firstLetter.localeCompare(a.firstLetter))}
groupBy={(option) => option.firstLetter}
getOptionLabel={(option) => option.title}
Expand Down
7 changes: 4 additions & 3 deletions docs/data/material/components/autocomplete/Virtualize.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,17 @@ const OPTIONS = Array.from(new Array(10000))
export default function Virtualize() {
return (
<Autocomplete
id="virtualize-demo"
sx={{ width: 300 }}
disableListWrap
PopperComponent={StyledPopper}
ListboxComponent={ListboxComponent}
options={OPTIONS}
groupBy={(option) => option[0].toUpperCase()}
renderInput={(params) => <TextField {...params} label="10,000 options" />}
renderOption={(props, option, state) => [props, option, state.index]}
renderGroup={(params) => params}
slots={{
popper: StyledPopper,
listbox: ListboxComponent,
}}
/>
);
}
Loading

0 comments on commit ceeb9fd

Please sign in to comment.