Merge branch 'next' into renovate/eslint-plugin-import-2.x

Signed-off-by: Flavien DELANGLE <[email protected]>
mui · Dec 19, 2023 · afcc70e · afcc70e
2 parents c55e459 + 58246d3
commit afcc70e
Show file tree

Hide file tree

Showing 51 changed files with 513 additions and 332 deletions.
diff --git a/.github/workflows/cherry-pick-next-to-master.yml b/.github/workflows/cherry-pick-next-to-master.yml
@@ -1,5 +1,5 @@
 on:
-  pull_request:
+  pull_request_target:
     branches:
       - next
     types: ['closed']
@@ -21,8 +21,8 @@ jobs:
         uses: carloscastrojumo/[email protected]
         with:
           branch: master
-          token: ${{ secrets.GITHUB_TOKEN }}
           body: 'Cherry-pick of #{old_pull_request_id}'
+          cherry-pick-branch: ${{ format('cherry-pick-{0}', github.event.number) }}
           labels: |
             cherry-pick
 env:

diff --git a/docs/data/charts-component-api-pages.ts b/docs/data/charts-component-api-pages.ts
@@ -14,6 +14,7 @@ export default [
   { pathname: '/x/api/charts/charts-item-tooltip-content', title: 'ChartsItemTooltipContent' },
   { pathname: '/x/api/charts/charts-legend', title: 'ChartsLegend' },
   { pathname: '/x/api/charts/charts-reference-line', title: 'ChartsReferenceLine' },
+  { pathname: '/x/api/charts/charts-text', title: 'ChartsText' },
   { pathname: '/x/api/charts/charts-tooltip', title: 'ChartsTooltip' },
   { pathname: '/x/api/charts/charts-voronoi-handler', title: 'ChartsVoronoiHandler' },
   { pathname: '/x/api/charts/charts-x-axis', title: 'ChartsXAxis' },

diff --git a/docs/data/date-pickers/date-picker/FormPropsDatePickers.js b/docs/data/date-pickers/date-picker/FormPropsDatePickers.js
@@ -7,10 +7,10 @@ import { DatePicker } from '@mui/x-date-pickers/DatePicker';
 export default function FormPropsDatePickers() {
   return (
     <LocalizationProvider dateAdapter={AdapterDayjs}>
-      <DemoContainer components={['DatePicker', 'DatePicker']}>
+      <DemoContainer components={['DatePicker', 'DatePicker', 'DatePicker']}>
         <DatePicker label="disabled" disabled />
         <DatePicker label="readOnly" readOnly />
-        <DatePicker label="name" name="date_picker" />
+        <DatePicker label="name" name="startDate" />
       </DemoContainer>
     </LocalizationProvider>
   );

diff --git a/docs/data/date-pickers/date-picker/FormPropsDatePickers.tsx b/docs/data/date-pickers/date-picker/FormPropsDatePickers.tsx
@@ -7,10 +7,10 @@ import { DatePicker } from '@mui/x-date-pickers/DatePicker';
 export default function FormPropsDatePickers() {
   return (
     <LocalizationProvider dateAdapter={AdapterDayjs}>
-      <DemoContainer components={['DatePicker', 'DatePicker']}>
+      <DemoContainer components={['DatePicker', 'DatePicker', 'DatePicker']}>
         <DatePicker label="disabled" disabled />
         <DatePicker label="readOnly" readOnly />
-        <DatePicker label="name" name="date_picker" />
+        <DatePicker label="name" name="startDate" />
       </DemoContainer>
     </LocalizationProvider>
   );

diff --git a/docs/data/date-pickers/date-picker/FormPropsDatePickers.tsx.preview b/docs/data/date-pickers/date-picker/FormPropsDatePickers.tsx.preview
@@ -1,3 +1,3 @@
 <DatePicker label="disabled" disabled />
 <DatePicker label="readOnly" readOnly />
-<DatePicker label="name" name="date_picker" />
+<DatePicker label="name" name="startDate" />
diff --git a/docs/data/date-pickers/date-range-picker/SingleInputDateRangePicker.js b/docs/data/date-pickers/date-range-picker/SingleInputDateRangePicker.js
@@ -9,7 +9,10 @@ export default function SingleInputDateRangePicker() {
   return (
     <LocalizationProvider dateAdapter={AdapterDayjs}>
       <DemoContainer components={['SingleInputDateRangeField']}>
-        <DateRangePicker slots={{ field: SingleInputDateRangeField }} />
+        <DateRangePicker
+          slots={{ field: SingleInputDateRangeField }}
+          name="allowedRange"
+        />
       </DemoContainer>
     </LocalizationProvider>
   );

diff --git a/docs/data/date-pickers/date-range-picker/SingleInputDateRangePicker.tsx b/docs/data/date-pickers/date-range-picker/SingleInputDateRangePicker.tsx
@@ -9,7 +9,10 @@ export default function SingleInputDateRangePicker() {
   return (
     <LocalizationProvider dateAdapter={AdapterDayjs}>
       <DemoContainer components={['SingleInputDateRangeField']}>
-        <DateRangePicker slots={{ field: SingleInputDateRangeField }} />
+        <DateRangePicker
+          slots={{ field: SingleInputDateRangeField }}
+          name="allowedRange"
+        />
       </DemoContainer>
     </LocalizationProvider>
   );

diff --git a/docs/data/date-pickers/date-range-picker/SingleInputDateRangePicker.tsx.preview b/docs/data/date-pickers/date-range-picker/SingleInputDateRangePicker.tsx.preview
@@ -1 +1,4 @@
-<DateRangePicker slots={{ field: SingleInputDateRangeField }} />
+<DateRangePicker
+  slots={{ field: SingleInputDateRangeField }}
+  name="allowedRange"
+/>
diff --git a/docs/data/date-pickers/date-range-picker/date-range-picker.md b/docs/data/date-pickers/date-range-picker/date-range-picker.md
@@ -83,7 +83,8 @@ This prop will be ignored on the mobile picker.
 
 ### Use a single input field
 
-You can pass the `SingleInputDateRangeField` component to the Date Range Picker to use it for keyboard editing:
+You can pass the `SingleInputDateRangeField` component to the Date Range Picker to use it for keyboard editing.
+In such case the Picker component can pass the `name` prop to the input.
 
 {{"demo": "SingleInputDateRangePicker.js"}}
 

diff --git a/docs/data/date-pickers/date-time-picker/FormPropsDateTimePickers.js b/docs/data/date-pickers/date-time-picker/FormPropsDateTimePickers.js
@@ -7,10 +7,12 @@ import { DateTimePicker } from '@mui/x-date-pickers/DateTimePicker';
 export default function FormPropsDateTimePickers() {
   return (
     <LocalizationProvider dateAdapter={AdapterDayjs}>
-      <DemoContainer components={['DateTimePicker', 'DateTimePicker']}>
+      <DemoContainer
+        components={['DateTimePicker', 'DateTimePicker', 'DateTimePicker']}
+      >
         <DateTimePicker label="disabled" disabled />
         <DateTimePicker label="readOnly" readOnly />
-        <DateTimePicker label="name" name="date_time_picker" />
+        <DateTimePicker label="name" name="startDateTime" />
       </DemoContainer>
     </LocalizationProvider>
   );

diff --git a/docs/data/date-pickers/date-time-picker/FormPropsDateTimePickers.tsx b/docs/data/date-pickers/date-time-picker/FormPropsDateTimePickers.tsx
@@ -7,10 +7,12 @@ import { DateTimePicker } from '@mui/x-date-pickers/DateTimePicker';
 export default function FormPropsDateTimePickers() {
   return (
     <LocalizationProvider dateAdapter={AdapterDayjs}>
-      <DemoContainer components={['DateTimePicker', 'DateTimePicker']}>
+      <DemoContainer
+        components={['DateTimePicker', 'DateTimePicker', 'DateTimePicker']}
+      >
         <DateTimePicker label="disabled" disabled />
         <DateTimePicker label="readOnly" readOnly />
-        <DateTimePicker label="name" name="date_time_picker" />
+        <DateTimePicker label="name" name="startDateTime" />
       </DemoContainer>
     </LocalizationProvider>
   );

diff --git a/docs/data/date-pickers/date-time-picker/FormPropsDateTimePickers.tsx.preview b/docs/data/date-pickers/date-time-picker/FormPropsDateTimePickers.tsx.preview
@@ -1,3 +1,3 @@
 <DateTimePicker label="disabled" disabled />
 <DateTimePicker label="readOnly" readOnly />
-<DateTimePicker label="name" name="date_time_picker" />
+<DateTimePicker label="name" name="startDateTime" />
diff --git a/docs/data/date-pickers/localization/data.json b/docs/data/date-pickers/localization/data.json
@@ -203,7 +203,7 @@
     "languageTag": "ru-RU",
     "importName": "ruRU",
     "localeName": "Russian",
-    "missingKeysCount": 2,
+    "missingKeysCount": 1,
     "totalKeysCount": 37,
     "githubLink": "https://github.com/mui/mui-x/blob/master/packages/x-date-pickers/src/locales/ruRU.ts"
   },

diff --git a/docs/data/date-pickers/time-picker/FormPropsTimePickers.js b/docs/data/date-pickers/time-picker/FormPropsTimePickers.js
@@ -7,10 +7,10 @@ import { TimePicker } from '@mui/x-date-pickers/TimePicker';
 export default function FormPropsTimePickers() {
   return (
     <LocalizationProvider dateAdapter={AdapterDayjs}>
-      <DemoContainer components={['TimePicker', 'TimePicker']}>
+      <DemoContainer components={['TimePicker', 'TimePicker', 'TimePicker']}>
         <TimePicker label="disabled" disabled />
         <TimePicker label="readOnly" readOnly />
-        <TimePicker label="name" name="time_picker" />
+        <TimePicker label="name" name="startTime" />
       </DemoContainer>
     </LocalizationProvider>
   );

diff --git a/docs/data/date-pickers/time-picker/FormPropsTimePickers.tsx b/docs/data/date-pickers/time-picker/FormPropsTimePickers.tsx
@@ -7,10 +7,10 @@ import { TimePicker } from '@mui/x-date-pickers/TimePicker';
 export default function FormPropsTimePickers() {
   return (
     <LocalizationProvider dateAdapter={AdapterDayjs}>
-      <DemoContainer components={['TimePicker', 'TimePicker']}>
+      <DemoContainer components={['TimePicker', 'TimePicker', 'TimePicker']}>
         <TimePicker label="disabled" disabled />
         <TimePicker label="readOnly" readOnly />
-        <TimePicker label="name" name="time_picker" />
+        <TimePicker label="name" name="startTime" />
       </DemoContainer>
     </LocalizationProvider>
   );

diff --git a/docs/data/date-pickers/time-picker/FormPropsTimePickers.tsx.preview b/docs/data/date-pickers/time-picker/FormPropsTimePickers.tsx.preview
@@ -1,3 +1,3 @@
 <TimePicker label="disabled" disabled />
 <TimePicker label="readOnly" readOnly />
-<TimePicker label="name" name="time_picker" />
+<TimePicker label="name" name="startTime" />
diff --git a/docs/package.json b/docs/package.json
@@ -27,12 +27,12 @@
     "@emotion/react": "^11.11.1",
     "@emotion/server": "^11.11.0",
     "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.14.19",
-    "@mui/joy": "^5.0.0-beta.17",
-    "@mui/lab": "^5.0.0-alpha.155",
-    "@mui/material": "^5.14.20",
-    "@mui/styles": "^5.14.20",
-    "@mui/utils": "^5.14.20",
+    "@mui/icons-material": "^5.15.0",
+    "@mui/joy": "^5.0.0-beta.18",
+    "@mui/lab": "^5.0.0-alpha.156",
+    "@mui/material": "^5.15.0",
+    "@mui/styles": "^5.15.0",
+    "@mui/utils": "^5.15.0",
     "@react-spring/web": "^9.7.3",
     "@trendmicro/react-interpolate": "^0.5.5",
     "@types/lodash": "^4.14.202",
@@ -76,10 +76,10 @@
     "react": "^18.2.0",
     "react-docgen": "^5.4.3",
     "react-dom": "^18.2.0",
-    "react-hook-form": "^7.49.0",
+    "react-hook-form": "^7.49.2",
     "react-is": "^18.2.0",
-    "react-router": "^6.20.1",
-    "react-router-dom": "^6.20.1",
+    "react-router": "^6.21.0",
+    "react-router-dom": "^6.21.0",
     "react-runner": "^1.0.3",
     "react-simple-code-editor": "^0.13.1",
     "recast": "^0.23.4",

diff --git a/docs/pages/x/api/charts/charts-text.js b/docs/pages/x/api/charts/charts-text.js
@@ -0,0 +1,23 @@
+import * as React from 'react';
+import ApiPage from 'docs/src/modules/components/ApiPage';
+import mapApiPageTranslations from 'docs/src/modules/utils/mapApiPageTranslations';
+import jsonPageContent from './charts-text.json';
+
+export default function Page(props) {
+  const { descriptions, pageContent } = props;
+  return <ApiPage descriptions={descriptions} pageContent={pageContent} />;
+}
+
+Page.getInitialProps = () => {
+  const req = require.context(
+    'docsx/translations/api-docs/charts',
+    false,
+    /\.\/charts-text(-[a-z]{2})?\.json$/,
+  );
+  const descriptions = mapApiPageTranslations(req);
+
+  return {
+    descriptions,
+    pageContent: jsonPageContent,
+  };
+};
diff --git a/docs/pages/x/api/charts/charts-text.json b/docs/pages/x/api/charts/charts-text.json
@@ -0,0 +1,17 @@
+{
+  "props": {
+    "text": { "type": { "name": "string" }, "required": true },
+    "lineHeight": { "type": { "name": "number" } },
+    "needsComputation": { "type": { "name": "bool" } },
+    "style": { "type": { "name": "object" } }
+  },
+  "slots": [],
+  "name": "ChartsText",
+  "imports": [
+    "import { ChartsText } from '@mui/x-charts/ChartsText';",
+    "import { ChartsText } from '@mui/x-charts';"
+  ],
+  "styles": { "classes": [], "globalClasses": {}, "name": "MuiChartsText" },
+  "filename": "/packages/x-charts/src/ChartsText/ChartsText.tsx",
+  "demos": "<ul></ul>"
+}
diff --git a/docs/translations/api-docs/charts/charts-text.json b/docs/translations/api-docs/charts/charts-text.json
@@ -0,0 +1,23 @@
+{
+  "componentDescription": "Helper component to manage multiline text in SVG",
+  "propDescriptions": {
+    "lineHeight": {
+      "description": "Height of a text line (in <code>em</code>).",
+      "deprecated": "",
+      "typeDescriptions": {}
+    },
+    "needsComputation": {
+      "description": "If <code>true</code>, the line width is computed.",
+      "deprecated": "",
+      "typeDescriptions": {}
+    },
+    "style": {
+      "description": "Style applied to text elements.",
+      "deprecated": "",
+      "typeDescriptions": {}
+    },
+    "text": { "description": "Text displayed.", "deprecated": "", "typeDescriptions": {} }
+  },
+  "classDescriptions": {},
+  "slotDescriptions": {}
+}
diff --git a/package.json b/package.json
@@ -82,10 +82,10 @@
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@mnajdova/enzyme-adapter-react-18": "^0.2.0",
-    "@mui/icons-material": "^5.14.19",
-    "@mui/material": "^5.14.20",
+    "@mui/icons-material": "^5.15.0",
+    "@mui/material": "^5.15.0",
     "@mui/monorepo": "https://github.com/mui/material-ui.git#master",
-    "@mui/utils": "^5.14.20",
+    "@mui/utils": "^5.15.0",
     "@next/eslint-plugin-next": "^14.0.4",
     "@octokit/plugin-retry": "^6.0.1",
     "@octokit/rest": "^20.0.2",
@@ -104,8 +104,8 @@
     "@types/requestidlecallback": "^0.3.7",
     "@types/sinon": "^10.0.20",
     "@types/yargs": "^17.0.32",
-    "@typescript-eslint/eslint-plugin": "^6.13.2",
-    "@typescript-eslint/parser": "^6.13.2",
+    "@typescript-eslint/eslint-plugin": "^6.15.0",
+    "@typescript-eslint/parser": "^6.15.0",
     "axe-core": "4.8.2",
     "babel-loader": "^9.1.3",
     "babel-plugin-istanbul": "^6.1.1",
@@ -122,14 +122,14 @@
     "cross-env": "^7.0.3",
     "danger": "^11.3.1",
     "enzyme": "^3.11.0",
-    "eslint": "^8.55.0",
+    "eslint": "^8.56.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.1.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-webpack": "^0.13.8",
     "eslint-plugin-filenames": "^1.3.2",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsdoc": "^46.9.0",
+    "eslint-plugin-jsdoc": "^46.9.1",
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-mocha": "^10.2.0",
     "eslint-plugin-prettier": "^5.0.1",

diff --git a/packages/eslint-plugin-material-ui/package.json b/packages/eslint-plugin-material-ui/package.json
@@ -5,9 +5,9 @@
   "description": "Custom eslint rules for MUI X.",
   "main": "src/index.js",
   "devDependencies": {
-    "@types/eslint": "^8.44.8",
+    "@types/eslint": "^8.44.9",
     "@typescript-eslint/experimental-utils": "^5.62.0",
-    "@typescript-eslint/parser": "^6.13.2"
+    "@typescript-eslint/parser": "^6.15.0"
   },
   "scripts": {
     "test": "cd ../../ && cross-env NODE_ENV=test mocha 'packages/eslint-plugin-material-ui/**/*.test.js' --timeout 3000"

diff --git a/packages/grid/x-data-grid-generator/package.json b/packages/grid/x-data-grid-generator/package.json
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "@mui/base": "^5.0.0-beta.26",
+    "@mui/base": "^5.0.0-beta.27",
     "@mui/x-data-grid-premium": "7.0.0-alpha.5",
     "chance": "^1.1.11",
     "clsx": "^2.0.0",

diff --git a/packages/grid/x-data-grid-premium/package.json b/packages/grid/x-data-grid-premium/package.json
@@ -44,8 +44,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "@mui/system": "^5.14.20",
-    "@mui/utils": "^5.14.20",
+    "@mui/system": "^5.15.0",
+    "@mui/utils": "^5.15.0",
     "@mui/x-data-grid": "7.0.0-alpha.5",
     "@mui/x-data-grid-pro": "7.0.0-alpha.5",
     "@mui/x-license-pro": "7.0.0-alpha.1",

diff --git a/packages/grid/x-data-grid-pro/package.json b/packages/grid/x-data-grid-pro/package.json
@@ -44,8 +44,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "@mui/system": "^5.14.20",
-    "@mui/utils": "^5.14.20",
+    "@mui/system": "^5.15.0",
+    "@mui/utils": "^5.15.0",
     "@mui/x-data-grid": "7.0.0-alpha.5",
     "@mui/x-license-pro": "7.0.0-alpha.1",
     "@types/format-util": "^1.0.4",

diff --git a/packages/grid/x-data-grid/package.json b/packages/grid/x-data-grid/package.json
@@ -48,8 +48,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "@mui/system": "^5.14.20",
-    "@mui/utils": "^5.14.20",
+    "@mui/system": "^5.15.0",
+    "@mui/utils": "^5.15.0",
     "clsx": "^2.0.0",
     "prop-types": "^15.8.1",
     "reselect": "^4.1.8"

diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json
@@ -40,9 +40,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.23.5",
-    "@mui/base": "^5.0.0-beta.26",
-    "@mui/system": "^5.14.20",
-    "@mui/utils": "^5.14.20",
+    "@mui/base": "^5.0.0-beta.27",
+    "@mui/system": "^5.15.0",
+    "@mui/utils": "^5.15.0",
     "@react-spring/rafz": "^9.7.3",
     "@react-spring/web": "^9.7.3",
     "clsx": "^2.0.0",