Skip to content

Commit c39b78d

Browse files
Merge branch 'next' into fix-Material-Icon-search-lag
2 parents e083e60 + 0137be7 commit c39b78d

File tree

151 files changed

+1404
-994
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+1404
-994
lines changed

.eslintrc.js

+40-24
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,32 @@ const forbidCreateStylesMessage =
1313

1414
const ENABLE_REACT_COMPILER_PLUGIN = false;
1515

16+
const NO_RESTRICTED_IMPORTS_PATHS_TOP_LEVEL_PACKAGES = [
17+
{
18+
name: '@mui/material',
19+
message: OneLevelImportMessage,
20+
},
21+
{
22+
name: '@mui/lab',
23+
message: OneLevelImportMessage,
24+
},
25+
];
26+
27+
const NO_RESTRICTED_IMPORTS_PATTERNS_DEEPLY_NESTED = [
28+
{
29+
group: [
30+
'@mui/*/*/*',
31+
'@pigment-css/*/*/*',
32+
'@base_ui/*/*/*',
33+
// Allow any import depth with any internal packages
34+
'!@mui/internal-*/**',
35+
// TODO delete, @mui/docs should be @mui/internal-docs
36+
'!@mui/docs/**',
37+
],
38+
message: OneLevelImportMessage,
39+
},
40+
];
41+
1642
module.exports = {
1743
root: true, // So parent files don't get applied
1844
env: {
@@ -67,20 +93,7 @@ module.exports = {
6793
'no-restricted-imports': [
6894
'error',
6995
{
70-
patterns: [
71-
{
72-
group: [
73-
'@mui/*/*/*',
74-
'@pigment-css/*/*/*',
75-
'@base_ui/*/*/*',
76-
// Allow any import depth with any internal packages
77-
'!@mui/internal-*/**',
78-
// TODO delete, @mui/docs should be @mui/internal-docs
79-
'!@mui/docs/**',
80-
],
81-
message: OneLevelImportMessage,
82-
},
83-
],
96+
patterns: NO_RESTRICTED_IMPORTS_PATTERNS_DEEPLY_NESTED,
8497
},
8598
],
8699
'no-continue': 'off',
@@ -417,23 +430,26 @@ module.exports = {
417430
'no-bitwise': 'off',
418431
},
419432
},
433+
{
434+
files: ['docs/**/*{.ts,.tsx,.js}'],
435+
rules: {
436+
'no-restricted-imports': [
437+
'error',
438+
{
439+
paths: NO_RESTRICTED_IMPORTS_PATHS_TOP_LEVEL_PACKAGES,
440+
patterns: NO_RESTRICTED_IMPORTS_PATTERNS_DEEPLY_NESTED,
441+
},
442+
],
443+
},
444+
},
420445
{
421446
files: ['packages/*/src/**/*{.ts,.tsx,.js}'],
422447
excludedFiles: ['*.d.ts', '*.spec.ts', '*.spec.tsx'],
423448
rules: {
424449
'no-restricted-imports': [
425450
'error',
426451
{
427-
paths: [
428-
{
429-
name: '@mui/material',
430-
message: OneLevelImportMessage,
431-
},
432-
{
433-
name: '@mui/lab',
434-
message: OneLevelImportMessage,
435-
},
436-
],
452+
paths: NO_RESTRICTED_IMPORTS_PATHS_TOP_LEVEL_PACKAGES,
437453
},
438454
],
439455
// TODO: Consider setting back to `ignoreExternal: true` when the expected behavior is fixed:

CHANGELOG.md

+102
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,107 @@
11
# [Versions](https://mui.com/versions/)
22

3+
## 6.0.0-beta.5
4+
5+
<!-- generated comparing v6.0.0-beta.4..next -->
6+
7+
_Aug 8, 2024_
8+
9+
A big thanks to the 17 contributors who made this release possible. Here are some highlights ✨:
10+
11+
- Remove some deprecated props from the ListItem component (#41566) @thathva
12+
- Bumped the minimum supported version of TypeScript (#43116) @mnajdova
13+
14+
### `@mui/material@6.0.0-beta.5`
15+
16+
#### BREAKING CHANGES
17+
18+
- &#8203;<!-- 14 -->[material-ui][ListItem] Removing deprecated props (#41566) @thathva
19+
20+
`ListItem`'s props `autoFocus`, `button`, `disabled`, and `selected`, deprecated in v5, have been removed. To replace the `button` prop, use `ListItemButton` instead. The other removed props are available in the `ListItemButton` component as well.
21+
22+
```diff
23+
-<ListItem button />
24+
+<ListItemButton />
25+
```
26+
27+
Use this codemod to migrate your project to the `ListItemButton` component:
28+
29+
```bash
30+
npx @mui/codemod@next v6.0.0/list-item-button-prop <path/to/folder>
31+
```
32+
33+
As the `ListItem` no longer supports these props, the class names related to these props were removed. You should use the `listItemButtonClasses` object instead.
34+
35+
```diff
36+
-import { listItemClasses } from '@mui/material/ListItem';
37+
+import { listItemButtonClasses } from '@mui/material/ListItemButton';
38+
39+
- listItemClasses.button
40+
+ listItemButtonClasses.root
41+
42+
- listItemClasses.focusVisible
43+
+ listItemButtonClasses.focusVisible
44+
45+
- listItemClasses.disabled
46+
+ listItemButtonClasses.disabled
47+
48+
- listItemClasses.selected
49+
+ listItemButtonClasses.selected
50+
```
51+
52+
#### Changes
53+
54+
- &#8203;<!-- 36 -->[material-ui][Autocomplete] Fix default value for multiple mode getting redefined with React 19 (#43189) @DiegoAndai
55+
- &#8203;<!-- 12 -->[material-ui] Merge `CssVarsProvider` into `ThemeProvider` (#43115) @siriwatknp
56+
- &#8203;<!-- 11 -->[material-ui] Make tests compatible with React 19 (#43155) @DiegoAndai
57+
- &#8203;<!-- 10 -->[material-ui] Refine Blog template (#42825) @zanivan
58+
- &#8203;<!-- 09 -->[material-ui] Element ref access React 19 compatibility (#43132) @DiegoAndai
59+
- &#8203;<!-- 08 -->[material-ui][mui-system] Add support for version runtime checks (#43190) @DiegoAndai
60+
61+
### `@mui/material-pigment-css@6.0.0-beta.5`
62+
63+
- &#8203;<!-- 13 -->Reexport Pigment CSS from index file (#43218) @siriwatknp
64+
65+
### `@mui/codemod@6.0.0-beta.5`
66+
67+
- &#8203;<!-- 31 -->Fix codemod crash on MuiDivider property (#43125) @Janpot
68+
69+
### Docs
70+
71+
- &#8203;<!-- 37 -->Fix resolution of @mui/material-ui in docs (#43108) @Janpot
72+
- &#8203;<!-- 25 -->Refine and polish out Templates page (#43131) @zanivan
73+
- &#8203;<!-- 24 -->Fix the link test script (#43195) @alexfauquette
74+
- &#8203;<!-- 23 -->Fix alpha usage (#43194) @siriwatknp
75+
- &#8203;<!-- 22 -->Link Toolpad Core components from Material UI docs (#43036) @prakhargupta1
76+
- &#8203;<!-- 21 -->Link Toolpad core docs to the docs menu (#42952) @prakhargupta1
77+
- &#8203;<!-- 20 -->Polish migration guide (#43021) @oliviertassinari
78+
- &#8203;<!-- 19 -->Fix 404 link to migration pages @oliviertassinari
79+
- &#8203;<!-- 18 -->Support inject dynamic theme (#42879) @Vxee
80+
- &#8203;<!-- 17 -->Fix 301 @oliviertassinari
81+
- &#8203;<!-- 35 -->[blog] Announcing pricing changes Sep 2024 (#43061) @joserodolfofreitas
82+
- &#8203;<!-- 15 -->[material-ui][TextField] Remove mentions of `redux-form` from TextField documentation (#43176) @AbdurRahman2004
83+
84+
### Core
85+
86+
- &#8203;<!-- 34 -->[code-infra] Fix `@mui/internal-test-utils` `screen` export type (#43150) @LukasTy
87+
- &#8203;<!-- 33 -->[code-infra] Do not look for changes with previous commit when releasing a canary version (#43129) @michaldudak
88+
- &#8203;<!-- 32 -->[code-infra] Automate canary releases (#43066) @michaldudak
89+
- &#8203;<!-- 30 -->[core] Apply top-level eslint rule to docs and fix violations (#43126) @Janpot
90+
- &#8203;<!-- 29 -->[core] Patch styled-components to use React.JSX namespace (#43205) @aarongarciah
91+
- &#8203;<!-- 28 -->[core] Replace JSX namespace usages with React.JSX (#43204) @aarongarciah
92+
- &#8203;<!-- 27 -->[core] Remove `react-router` package from `pigment-css-vite-app` (#43201) @ZeeshanTamboli
93+
- &#8203;<!-- 26 -->[core] Remove unnecessary types packages from `@mui/internal-babel-macros` (#43193) @ZeeshanTamboli
94+
- &#8203;<!-- 16 -->[docs-infra] Move `ApiPage` to TS (#43149) @alexfauquette
95+
- &#8203;<!-- 07 -->[test] Remove unnecessary prop type check in test (#43211) @aarongarciah
96+
- &#8203;<!-- 06 -->[test] Make conformance tests work with async render function (#43156) @michaldudak
97+
- &#8203;<!-- 05 -->[typescript] Update the minimum supported version (#43116) @mnajdova
98+
- &#8203;<!-- 04 -->[website] Add icons to core page products (#43151) @zanivan
99+
- &#8203;<!-- 03 -->[website] Copyedit Docs and Product menu taglines (#43075) @samuelsycamore
100+
- &#8203;<!-- 02 -->[website] Fix wrong link in pricing table (#43141) @zanivan
101+
- &#8203;<!-- 01 -->[website] Add blog link to pricing table (#43123) @zanivan
102+
103+
All contributors of this release in alphabetical order: @aarongarciah, @AbdurRahman2004, @alexfauquette, @DiegoAndai, @Janpot, @joserodolfofreitas, @LukasTy, @michaldudak, @mnajdova, @oliviertassinari, @prakhargupta1, @samuelsycamore, @siriwatknp, @thathva, @Vxee, @zanivan, @ZeeshanTamboli
104+
3105
## 6.0.0-beta.4
4106

5107
<!-- generated comparing v6.0.0-beta.3..next -->

apps/pigment-css-next-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"react-dom": "^18.3.1"
2424
},
2525
"devDependencies": {
26-
"@pigment-css/nextjs-plugin": "0.0.18",
26+
"@pigment-css/nextjs-plugin": "0.0.20",
2727
"@types/node": "^20.5.7",
2828
"@types/react": "^18.3.3",
2929
"@types/react-dom": "^18.3.0",

apps/pigment-css-vite-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"devDependencies": {
2626
"@babel/preset-react": "^7.24.7",
2727
"@babel/preset-typescript": "^7.24.7",
28-
"@pigment-css/vite-plugin": "0.0.18",
28+
"@pigment-css/vite-plugin": "0.0.20",
2929
"@types/react": "^18.3.3",
3030
"@types/react-dom": "^18.3.0",
3131
"@vitejs/plugin-react": "^4.3.1",

docs/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This is the website of the company (MUI), the documentation of Material UI, Bas
55
To start the docs site in development mode, from the project root, run:
66

77
```bash
8-
pnpm start
8+
pnpm docs:dev
99
```
1010

1111
If you do not have pnpm installed, select your OS and follow the instructions on the [pnpm website](https://pnpm.io/installation).

docs/data/experiments/renderers/renderCountry.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@ import * as React from 'react';
22
import { useGridApiContext } from '@mui/x-data-grid';
33
// eslint-disable-next-line no-restricted-imports
44
import { COUNTRY_ISO_OPTIONS } from '@mui/x-data-grid-generator/services/static-data';
5-
import {
6-
Autocomplete,
7-
autocompleteClasses,
8-
Box,
9-
InputBase,
10-
styled,
11-
} from '@mui/material';
5+
import Autocomplete, { autocompleteClasses } from '@mui/material/Autocomplete';
6+
import Box from '@mui/material/Box';
7+
import InputBase from '@mui/material/InputBase';
8+
import { styled } from '@mui/material/styles';
129

1310
const Country = React.memo(function Country(props) {
1411
const { value } = props;

docs/data/experiments/renderers/renderEmail.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { styled } from '@mui/material';
2+
import { styled } from '@mui/material/styles';
33

44
const Link = styled('a')({
55
textOverflow: 'ellipsis',

docs/data/experiments/renderers/renderIncoterm.js

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import * as React from 'react';
2-
import {
3-
Box,
4-
ListItemIcon,
5-
ListItemText,
6-
MenuItem,
7-
Select,
8-
Tooltip,
9-
} from '@mui/material';
2+
import Box from '@mui/material/Box';
3+
import ListItemIcon from '@mui/material/ListItemIcon';
4+
import ListItemText from '@mui/material/ListItemText';
5+
import MenuItem from '@mui/material/MenuItem';
6+
import Select from '@mui/material/Select';
7+
import Tooltip from '@mui/material/Tooltip';
108
import InfoIcon from '@mui/icons-material/Info';
119
import { useGridApiContext } from '@mui/x-data-grid';
1210
// eslint-disable-next-line no-restricted-imports

docs/data/experiments/renderers/renderProgress.js

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
import * as React from 'react';
22
import clsx from 'clsx';
33
import { useGridApiContext } from '@mui/x-data-grid';
4-
import {
5-
alpha,
6-
debounce,
7-
Slider,
8-
sliderClasses,
9-
styled,
10-
Tooltip,
11-
} from '@mui/material';
4+
import Slider, { sliderClasses } from '@mui/material/Slider';
5+
import Tooltip from '@mui/material/Tooltip';
6+
import { alpha, styled } from '@mui/material/styles';
7+
import { debounce } from '@mui/material/utils';
128

139
const Center = styled('div')({
1410
height: '100%',

docs/data/experiments/renderers/renderRating.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as React from 'react';
2-
import { Box, Rating } from '@mui/material';
2+
import Box from '@mui/material/Box';
3+
import Rating from '@mui/material/Rating';
34
import { useGridApiContext } from '@mui/x-data-grid';
45

56
const RatingValue = React.memo(function RatingValue(props) {

docs/data/experiments/renderers/renderStatus.js

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import * as React from 'react';
2-
import {
3-
Chip,
4-
ListItemIcon,
5-
ListItemText,
6-
MenuItem,
7-
Select,
8-
styled,
9-
} from '@mui/material';
2+
import Chip from '@mui/material/Chip';
3+
import ListItemIcon from '@mui/material/ListItemIcon';
4+
import ListItemText from '@mui/material/ListItemText';
5+
import MenuItem from '@mui/material/MenuItem';
6+
import Select from '@mui/material/Select';
7+
import { styled } from '@mui/material/styles';
108
import ReportProblemIcon from '@mui/icons-material/ReportProblem';
119
import InfoIcon from '@mui/icons-material/Info';
1210
import AutorenewIcon from '@mui/icons-material/Autorenew';

docs/data/material/customization/dark-mode/DarkThemeWithCustomPalette.tsx

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
import * as React from 'react';
22
import Box from '@mui/material/Box';
3-
import { ThemeProvider, useTheme, createTheme } from '@mui/material/styles';
3+
import {
4+
ThemeProvider,
5+
useTheme,
6+
createTheme,
7+
PaletteMode,
8+
} from '@mui/material/styles';
49
import { amber, deepOrange, grey } from '@mui/material/colors';
5-
import { PaletteMode } from '@mui/material';
610

711
const getDesignTokens = (mode: PaletteMode) => ({
812
palette: {

docs/data/material/customization/typography/ResponsiveFontSizesChart.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
// import of a small, pure module in a private demo
33
// bundle size and module duplication is negligible
4-
/* eslint-disable-next-line no-restricted-imports */
4+
// eslint-disable-next-line no-restricted-imports
55
import { convertLength } from '@mui/material/styles/cssUtils';
66
import { createTheme, responsiveFontSizes } from '@mui/material/styles';
77
import Box from '@mui/material/Box';

docs/data/material/getting-started/templates/blog/Blog.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import Box from '@mui/material/Box';
44
import Container from '@mui/material/Container';
55
import ToggleButton from '@mui/material/ToggleButton';
66
import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
7-
import { createTheme, ThemeProvider } from '@mui/material/styles';
8-
import { PaletteMode } from '@mui/material';
7+
import { createTheme, ThemeProvider, PaletteMode } from '@mui/material/styles';
98

109
import AutoAwesomeRoundedIcon from '@mui/icons-material/AutoAwesomeRounded';
1110

docs/data/material/getting-started/templates/blog/components/AppAppBar.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
22
import PropTypes from 'prop-types';
3-
import { styled } from '@mui/material';
3+
import { styled } from '@mui/material/styles';
44
import Box from '@mui/material/Box';
55
import AppBar from '@mui/material/AppBar';
66
import Toolbar from '@mui/material/Toolbar';

docs/data/material/getting-started/templates/blog/components/AppAppBar.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { PaletteMode, styled } from '@mui/material';
2+
import { PaletteMode, styled } from '@mui/material/styles';
33
import Box from '@mui/material/Box';
44
import AppBar from '@mui/material/AppBar';
55
import Toolbar from '@mui/material/Toolbar';

docs/data/material/getting-started/templates/blog/components/Latest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import Box from '@mui/material/Box';
66
import Grid from '@mui/material/Grid2';
77
import Pagination from '@mui/material/Pagination';
88
import Typography from '@mui/material/Typography';
9-
import { styled } from '@mui/material';
9+
import { styled } from '@mui/material/styles';
1010
import NavigateNextRoundedIcon from '@mui/icons-material/NavigateNextRounded';
1111

1212
const articleInfo = [

docs/data/material/getting-started/templates/blog/components/Latest.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Box from '@mui/material/Box';
55
import Grid from '@mui/material/Grid2';
66
import Pagination from '@mui/material/Pagination';
77
import Typography from '@mui/material/Typography';
8-
import { styled } from '@mui/material';
8+
import { styled } from '@mui/material/styles';
99
import NavigateNextRoundedIcon from '@mui/icons-material/NavigateNextRounded';
1010

1111
const articleInfo = [

docs/data/material/getting-started/templates/blog/components/MainContent.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import Typography from '@mui/material/Typography';
1313
import FormControl from '@mui/material/FormControl';
1414
import InputAdornment from '@mui/material/InputAdornment';
1515
import OutlinedInput from '@mui/material/OutlinedInput';
16-
import { styled } from '@mui/material';
16+
import { styled } from '@mui/material/styles';
1717
import SearchRoundedIcon from '@mui/icons-material/SearchRounded';
1818
import RssFeedRoundedIcon from '@mui/icons-material/RssFeedRounded';
1919

0 commit comments

Comments
 (0)