Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump MUI Core #10604

Merged
merged 7 commits into from
Oct 19, 2023
Merged

Bump MUI Core #10604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7a63fc8
Bump MUI Core
renovate[bot] Oct 19, 2023
ebe8e30
Add `@mui/lab` to renovate group and alphabetically reorder items
LukasTy Oct 19, 2023
93bc307
Manually bump lab
LukasTy Oct 19, 2023
e5b13a4
proptypes
LukasTy Oct 19, 2023
af2ea87
docs:api
LukasTy Oct 19, 2023
32a5efc
Use `combobox` role as `Select` has changed it
LukasTy Oct 19, 2023
91b0e8b
Remove `name` as it's not available on `combobox`
LukasTy Oct 19, 2023
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
12 changes: 6 additions & 6 deletions docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
"@emotion/react": "^11.11.1",
"@emotion/server": "^11.11.0",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.14.11",
"@mui/joy": "^5.0.0-beta.8",
"@mui/lab": "^5.0.0-alpha.147",
"@mui/material": "^5.14.11",
"@mui/styles": "^5.14.11",
"@mui/utils": "^5.14.11",
"@mui/icons-material": "^5.14.14",
"@mui/joy": "^5.0.0-beta.11",
"@mui/lab": "^5.0.0-alpha.149",
"@mui/material": "^5.14.14",
"@mui/styles": "^5.14.14",
"@mui/utils": "^5.14.14",
"@react-spring/web": "^9.7.3",
"@trendmicro/react-interpolate": "^0.5.5",
"@types/lodash": "^4.14.199",
Expand Down
2 changes: 1 addition & 1 deletion docs/translations/api-docs/date-pickers/date-field.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"typeDescriptions": {}
},
"color": {
"description": "The color of the component. It supports both default and custom theme colors, which can be added as shown in the <a href=\"https://mui.com/material-ui/customization/palette/#adding-new-colors\">palette customization guide</a>.",
"description": "The color of the component. It supports both default and custom theme colors, which can be added as shown in the <a href=\"https://mui.com/material-ui/customization/palette/#custom-colors\">palette customization guide</a>.",
"deprecated": "",
"typeDescriptions": {}
},
Expand Down
2 changes: 1 addition & 1 deletion docs/translations/api-docs/date-pickers/date-time-field.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"typeDescriptions": {}
},
"color": {
"description": "The color of the component. It supports both default and custom theme colors, which can be added as shown in the <a href=\"https://mui.com/material-ui/customization/palette/#adding-new-colors\">palette customization guide</a>.",
"description": "The color of the component. It supports both default and custom theme colors, which can be added as shown in the <a href=\"https://mui.com/material-ui/customization/palette/#custom-colors\">palette customization guide</a>.",
"deprecated": "",
"typeDescriptions": {}
},
Expand Down
2 changes: 1 addition & 1 deletion docs/translations/api-docs/date-pickers/single-input-date-range-field.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"typeDescriptions": {}
},
"color": {
"description": "The color of the component. It supports both default and custom theme colors, which can be added as shown in the <a href=\"https://mui.com/material-ui/customization/palette/#adding-new-colors\">palette customization guide</a>.",
"description": "The color of the component. It supports both default and custom theme colors, which can be added as shown in the <a href=\"https://mui.com/material-ui/customization/palette/#custom-colors\">palette customization guide</a>.",
"deprecated": "",
"typeDescriptions": {}
},
Expand Down
2 changes: 1 addition & 1 deletion docs/translations/api-docs/date-pickers/single-input-date-time-range-field.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"typeDescriptions": {}
},
"color": {
"description": "The color of the component. It supports both default and custom theme colors, which can be added as shown in the <a href=\"https://mui.com/material-ui/customization/palette/#adding-new-colors\">palette customization guide</a>.",
"description": "The color of the component. It supports both default and custom theme colors, which can be added as shown in the <a href=\"https://mui.com/material-ui/customization/palette/#custom-colors\">palette customization guide</a>.",
"deprecated": "",
"typeDescriptions": {}
},
Expand Down
2 changes: 1 addition & 1 deletion docs/translations/api-docs/date-pickers/single-input-time-range-field.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"typeDescriptions": {}
},
"color": {
"description": "The color of the component. It supports both default and custom theme colors, which can be added as shown in the <a href=\"https://mui.com/material-ui/customization/palette/#adding-new-colors\">palette customization guide</a>.",
"description": "The color of the component. It supports both default and custom theme colors, which can be added as shown in the <a href=\"https://mui.com/material-ui/customization/palette/#custom-colors\">palette customization guide</a>.",
"deprecated": "",
"typeDescriptions": {}
},
Expand Down
2 changes: 1 addition & 1 deletion docs/translations/api-docs/date-pickers/time-field.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"typeDescriptions": {}
},
"color": {
"description": "The color of the component. It supports both default and custom theme colors, which can be added as shown in the <a href=\"https://mui.com/material-ui/customization/palette/#adding-new-colors\">palette customization guide</a>.",
"description": "The color of the component. It supports both default and custom theme colors, which can be added as shown in the <a href=\"https://mui.com/material-ui/customization/palette/#custom-colors\">palette customization guide</a>.",
"deprecated": "",
"typeDescriptions": {}
},
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mnajdova/enzyme-adapter-react-18": "^0.2.0",
"@mui/icons-material": "^5.14.11",
"@mui/material": "^5.14.11",
"@mui/icons-material": "^5.14.14",
"@mui/material": "^5.14.14",
"@mui/monorepo": "https://github.com/mui/material-ui.git#master",
"@mui/utils": "^5.14.11",
"@mui/utils": "^5.14.14",
"@next/eslint-plugin-next": "^13.5.4",
"@octokit/plugin-retry": "^6.0.1",
"@octokit/rest": "^20.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid-generator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"dependencies": {
"@babel/runtime": "^7.23.1",
"@mui/base": "^5.0.0-beta.17",
"@mui/base": "^5.0.0-beta.20",
"@mui/x-data-grid-premium": "6.16.2",
"chance": "^1.1.11",
"clsx": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid-premium/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"dependencies": {
"@babel/runtime": "^7.23.1",
"@mui/utils": "^5.14.11",
"@mui/utils": "^5.14.14",
"@mui/x-data-grid": "6.16.2",
"@mui/x-data-grid-pro": "6.16.2",
"@mui/x-license-pro": "6.10.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid-pro/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"dependencies": {
"@babel/runtime": "^7.23.1",
"@mui/utils": "^5.14.11",
"@mui/utils": "^5.14.14",
"@mui/x-data-grid": "6.16.2",
"@mui/x-license-pro": "6.10.2",
"@types/format-util": "^1.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid-pro/src/tests/editComponents.DataGridPro.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ describe('<DataGridPro /> - Edit components', () => {
userEvent.mousePress(screen.queryAllByRole('option')[1]);
clock.runToLast();
expect(screen.queryByRole('listbox')).to.equal(null);
fireEvent.keyDown(screen.getByRole('button', { name: 'Adidas' }), { key: 'Enter' });
fireEvent.keyDown(screen.getByRole('combobox'), { key: 'Enter' });
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mui/xgrid this solves https://app.circleci.com/pipelines/github/mui/mui-x/45749/workflows/9c314f13-57ea-433a-8816-783e8ff7510f/jobs/262589
Select is no longer a button, but a combobox and name no longer work in such cases.
The component (Select) might be missing some information to expose it, but in any case, there is only one combobox, thus, omitting the explicit name in this case seems like a decent compromise. 🤔

expect(screen.queryByRole('listbox')).to.equal(null);

resolveCallback!();
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
"dependencies": {
"@babel/runtime": "^7.23.1",
"@mui/utils": "^5.14.11",
"@mui/utils": "^5.14.14",
"clsx": "^2.0.0",
"prop-types": "^15.8.1",
"reselect": "^4.1.8"
Expand Down
2 changes: 1 addition & 1 deletion packages/x-charts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"dependencies": {
"@babel/runtime": "^7.23.1",
"@mui/base": "^5.0.0-beta.17",
"@mui/base": "^5.0.0-beta.20",
"@react-spring/rafz": "^9.7.3",
"@react-spring/web": "^9.7.3",
"clsx": "^2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/x-date-pickers-pro/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
},
"dependencies": {
"@babel/runtime": "^7.23.1",
"@mui/base": "^5.0.0-beta.17",
"@mui/utils": "^5.14.11",
"@mui/base": "^5.0.0-beta.20",
"@mui/utils": "^5.14.14",
"@mui/x-date-pickers": "6.16.2",
"@mui/x-license-pro": "6.10.2",
"clsx": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/x-date-pickers-pro/src/SingleInputDateRangeField/SingleInputDateRangeField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ SingleInputDateRangeField.propTypes = {
/**
* The color of the component.
* It supports both default and custom theme colors, which can be added as shown in the
* [palette customization guide](https://mui.com/material-ui/customization/palette/#adding-new-colors).
* [palette customization guide](https://mui.com/material-ui/customization/palette/#custom-colors).
* @default 'primary'
*/
color: PropTypes.oneOf(['error', 'info', 'primary', 'secondary', 'success', 'warning']),
Expand Down
2 changes: 1 addition & 1 deletion ...es/x-date-pickers-pro/src/SingleInputDateTimeRangeField/SingleInputDateTimeRangeField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ SingleInputDateTimeRangeField.propTypes = {
/**
* The color of the component.
* It supports both default and custom theme colors, which can be added as shown in the
* [palette customization guide](https://mui.com/material-ui/customization/palette/#adding-new-colors).
* [palette customization guide](https://mui.com/material-ui/customization/palette/#custom-colors).
* @default 'primary'
*/
color: PropTypes.oneOf(['error', 'info', 'primary', 'secondary', 'success', 'warning']),
Expand Down
2 changes: 1 addition & 1 deletion packages/x-date-pickers-pro/src/SingleInputTimeRangeField/SingleInputTimeRangeField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ SingleInputTimeRangeField.propTypes = {
/**
* The color of the component.
* It supports both default and custom theme colors, which can be added as shown in the
* [palette customization guide](https://mui.com/material-ui/customization/palette/#adding-new-colors).
* [palette customization guide](https://mui.com/material-ui/customization/palette/#custom-colors).
* @default 'primary'
*/
color: PropTypes.oneOf(['error', 'info', 'primary', 'secondary', 'success', 'warning']),
Expand Down
4 changes: 2 additions & 2 deletions packages/x-date-pickers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
},
"dependencies": {
"@babel/runtime": "^7.23.1",
"@mui/base": "^5.0.0-beta.17",
"@mui/utils": "^5.14.11",
"@mui/base": "^5.0.0-beta.20",
"@mui/utils": "^5.14.14",
"@types/react-transition-group": "^4.4.7",
"clsx": "^2.0.0",
"prop-types": "^15.8.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/x-date-pickers/src/DateField/DateField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ DateField.propTypes = {
/**
* The color of the component.
* It supports both default and custom theme colors, which can be added as shown in the
* [palette customization guide](https://mui.com/material-ui/customization/palette/#adding-new-colors).
* [palette customization guide](https://mui.com/material-ui/customization/palette/#custom-colors).
* @default 'primary'
*/
color: PropTypes.oneOf(['error', 'info', 'primary', 'secondary', 'success', 'warning']),
Expand Down
2 changes: 1 addition & 1 deletion packages/x-date-pickers/src/DateTimeField/DateTimeField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ DateTimeField.propTypes = {
/**
* The color of the component.
* It supports both default and custom theme colors, which can be added as shown in the
* [palette customization guide](https://mui.com/material-ui/customization/palette/#adding-new-colors).
* [palette customization guide](https://mui.com/material-ui/customization/palette/#custom-colors).
* @default 'primary'
*/
color: PropTypes.oneOf(['error', 'info', 'primary', 'secondary', 'success', 'warning']),
Expand Down
2 changes: 1 addition & 1 deletion packages/x-date-pickers/src/TimeField/TimeField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ TimeField.propTypes = {
/**
* The color of the component.
* It supports both default and custom theme colors, which can be added as shown in the
* [palette customization guide](https://mui.com/material-ui/customization/palette/#adding-new-colors).
* [palette customization guide](https://mui.com/material-ui/customization/palette/#custom-colors).
* @default 'primary'
*/
color: PropTypes.oneOf(['error', 'info', 'primary', 'secondary', 'success', 'warning']),
Expand Down
2 changes: 1 addition & 1 deletion packages/x-license-pro/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"dependencies": {
"@babel/runtime": "^7.23.1",
"@mui/utils": "^5.14.11"
"@mui/utils": "^5.14.14"
},
"peerDependencies": {
"react": "^17.0.0 || ^18.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/x-tree-view/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
},
"dependencies": {
"@babel/runtime": "^7.23.1",
"@mui/base": "^5.0.0-beta.17",
"@mui/utils": "^5.14.11",
"@mui/base": "^5.0.0-beta.20",
"@mui/utils": "^5.14.14",
"@types/react-transition-group": "^4.4.7",
"clsx": "^2.0.0",
"prop-types": "^15.8.1",
Expand Down
7 changes: 4 additions & 3 deletions renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,11 @@
{
"groupName": "MUI Core",
"matchPackageNames": [
"@mui/material",
"@mui/joy",
"@mui/icons-material",
"@mui/base",
"@mui/icons-material",
"@mui/joy",
"@mui/lab",
"@mui/material",
"@mui/styles",
"@mui/system",
"@mui/utils"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ async function initializeEnvironment(
await waitFor(async () => {
expect(await page.evaluate(() => document.activeElement?.textContent)).to.equal('100');
expect(await page.evaluate(() => document.activeElement?.getAttribute('role'))).to.equal(
'button',
'combobox',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The role of the Select component has been changed from button to combobox with mui/material-ui#38785
cc @mui/xgrid

);
});
await page.keyboard.press('Shift+Tab');
Expand Down
Loading