Skip to content

Commit

Permalink
Showing 27 changed files with 121 additions and 186 deletions.
12 changes: 6 additions & 6 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -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",
2 changes: 1 addition & 1 deletion docs/translations/api-docs/date-pickers/date-field.json
Original file line number Diff line number Diff line change
@@ -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": {}
},
Original file line number Diff line number Diff line change
@@ -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": {}
},
Original file line number Diff line number Diff line change
@@ -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": {}
},
Original file line number Diff line number Diff line change
@@ -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": {}
},
Original file line number Diff line number Diff line change
@@ -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": {}
},
2 changes: 1 addition & 1 deletion docs/translations/api-docs/date-pickers/time-field.json
Original file line number Diff line number Diff line change
@@ -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": {}
},
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid-generator/package.json
Original file line number Diff line number Diff line change
@@ -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",
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid-premium/package.json
Original file line number Diff line number Diff line change
@@ -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",
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid-pro/package.json
Original file line number Diff line number Diff line change
@@ -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",
Original file line number Diff line number Diff line change
@@ -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' });
expect(screen.queryByRole('listbox')).to.equal(null);

resolveCallback!();
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid/package.json
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion packages/x-charts/package.json
Original file line number Diff line number Diff line change
@@ -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",
4 changes: 2 additions & 2 deletions packages/x-date-pickers-pro/package.json
Original file line number Diff line number Diff line change
@@ -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",
Original file line number Diff line number Diff line change
@@ -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']),
Original file line number Diff line number Diff line change
@@ -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']),
Original file line number Diff line number Diff line change
@@ -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']),
4 changes: 2 additions & 2 deletions packages/x-date-pickers/package.json
Original file line number Diff line number Diff line change
@@ -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",
2 changes: 1 addition & 1 deletion packages/x-date-pickers/src/DateField/DateField.tsx
Original file line number Diff line number Diff line change
@@ -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']),
Original file line number Diff line number Diff line change
@@ -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']),
2 changes: 1 addition & 1 deletion packages/x-date-pickers/src/TimeField/TimeField.tsx
Original file line number Diff line number Diff line change
@@ -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']),
2 changes: 1 addition & 1 deletion packages/x-license-pro/package.json
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions packages/x-tree-view/package.json
Original file line number Diff line number Diff line change
@@ -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",
7 changes: 4 additions & 3 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion test/e2e/index.test.ts
Original file line number Diff line number Diff line change
@@ -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',
);
});
await page.keyboard.press('Shift+Tab');
Loading

0 comments on commit faa67bb

Please sign in to comment.