Merge upstream

mui · Mar 28, 2023 · 82e64d7 · 82e64d7
2 parents 1580684 + df56fd0
commit 82e64d7
Show file tree

Hide file tree

Showing 226 changed files with 1,032 additions and 853 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -189,7 +189,7 @@ jobs:
   test_browser:
     <<: *defaults
     docker:
-      - image: mcr.microsoft.com/playwright:v1.29.2-focal
+      - image: mcr.microsoft.com/playwright:v1.32.0-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -220,7 +220,7 @@ jobs:
   test_e2e:
     <<: *defaults
     docker:
-      - image: mcr.microsoft.com/playwright:v1.29.2-focal
+      - image: mcr.microsoft.com/playwright:v1.32.0-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -233,7 +233,7 @@ jobs:
   test_e2e_website:
     <<: *defaults
     docker:
-      - image: mcr.microsoft.com/playwright:v1.29.2-focal
+      - image: mcr.microsoft.com/playwright:v1.32.0-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -248,7 +248,7 @@ jobs:
   test_regressions:
     <<: *defaults
     docker:
-      - image: mcr.microsoft.com/playwright:v1.29.2-focal
+      - image: mcr.microsoft.com/playwright:v1.32.0-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
@@ -264,7 +264,7 @@ jobs:
   test_performance:
     <<: *defaults
     docker:
-      - image: mcr.microsoft.com/playwright:v1.29.2-focal
+      - image: mcr.microsoft.com/playwright:v1.32.0-focal
         environment:
           NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -16,10 +16,10 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
+        uses: github/codeql-action/init@67a35a08586135a9573f4327e904ecbf517a882d # v2.2.8
         with:
           languages: typescript
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -29,4 +29,4 @@ jobs:
           # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
           # queries: security-extended,security-and-quality
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
+        uses: github/codeql-action/analyze@67a35a08586135a9573f4327e904ecbf517a882d # v2.2.8
diff --git a/.github/workflows/l10n.yml b/.github/workflows/l10n.yml
@@ -17,7 +17,7 @@ jobs:
       issues: write
     steps:
       - run: echo "${{ github.actor }}"
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+      - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
       - name: Use Node.js 14.x
         uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
         with:

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
         with:
           persist-credentials: false
 
@@ -44,6 +44,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
+        uses: github/codeql-action/upload-sarif@67a35a08586135a9573f4327e904ecbf517a882d # v2.2.8
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/vale-action.yml b/.github/workflows/vale-action.yml
@@ -12,7 +12,7 @@ jobs:
       contents: read
       pull-requests: write
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+      - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
       - uses: errata-ai/vale-action@c4213d4de3d5f718b8497bd86161531c78992084 # v2.0.1
         with:
           reporter: github-pr-review

diff --git a/benchmark/package.json b/benchmark/package.json
@@ -17,7 +17,7 @@
     "css-loader": "^6.7.3",
     "html-webpack-plugin": "^5.5.0",
     "mui-plus": "^0.0.15",
-    "playwright": "^1.29.2",
+    "playwright": "^1.32.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-spring": "^9.2.4",

diff --git a/docs/data/data-grid/column-menu/AddNewColumnMenuGrid.js b/docs/data/data-grid/column-menu/AddNewColumnMenuGrid.js
@@ -22,11 +22,11 @@ function CustomColumnMenu(props) {
   return (
     <GridColumnMenu
       {...props}
-      components={{
+      slots={{
         // Add new item
         ColumnMenuUserItem: CustomUserItem,
       }}
-      componentsProps={{
+      slotProps={{
         columnMenuUserItem: {
           // set `displayOrder` for new item
           displayOrder: 15,

diff --git a/docs/data/data-grid/column-menu/AddNewColumnMenuGrid.tsx b/docs/data/data-grid/column-menu/AddNewColumnMenuGrid.tsx
@@ -27,11 +27,11 @@ function CustomColumnMenu(props: GridColumnMenuProps) {
   return (
     <GridColumnMenu
       {...props}
-      components={{
+      slots={{
         // Add new item
         ColumnMenuUserItem: CustomUserItem,
       }}
-      componentsProps={{
+      slotProps={{
         columnMenuUserItem: {
           // set `displayOrder` for new item
           displayOrder: 15,

diff --git a/docs/data/data-grid/column-menu/ColumnMenuGridReferencesNoSnap.js b/docs/data/data-grid/column-menu/ColumnMenuGridReferencesNoSnap.js
@@ -79,7 +79,7 @@ ComponentTag.propTypes = {
 const columns = [
   {
     field: 'slot',
-    headerName: 'Component',
+    headerName: 'Slot',
     width: 240,
     renderCell: (params) => (
       <ComponentTag value={params.value} plan={params.row.plan} />
@@ -97,42 +97,42 @@ const columns = [
 const rows = [
   {
     id: 1,
-    slot: 'ColumnMenuSortItem',
+    slot: 'columnMenuSortItem',
     defaultComponent: 'GridColumnMenuSortItem',
     displayOrder: 10,
     plan: 'Community',
   },
   {
     id: 3,
-    slot: 'ColumnMenuFilterItem',
+    slot: 'columnMenuFilterItem',
     defaultComponent: 'GridColumnMenuFilterItem',
     displayOrder: 20,
     plan: 'Community',
   },
   {
     id: 7,
-    slot: 'ColumnMenuColumnsItem',
+    slot: 'columnMenuColumnsItem',
     defaultComponent: 'GridColumnMenuColumnsItem',
     displayOrder: 30,
     plan: 'Community',
   },
   {
     id: 9,
-    slot: 'ColumnMenuPinningItem',
+    slot: 'columnMenuPinningItem',
     defaultComponent: 'GridColumnMenuPinningItem',
     displayOrder: 15,
     plan: 'Pro',
   },
   {
     id: 11,
-    slot: 'ColumnMenuAggregationItem',
+    slot: 'columnMenuAggregationItem',
     defaultComponent: 'GridColumnMenuAggregationItem',
     displayOrder: 23,
     plan: 'Premium',
   },
   {
     id: 13,
-    slot: 'ColumnMenuGroupingItem',
+    slot: 'columnMenuGroupingItem',
     defaultComponent: 'GridColumnMenuGroupingItem',
     displayOrder: 27,
     plan: 'Premium',

diff --git a/docs/data/data-grid/column-menu/ColumnMenuGridReferencesNoSnap.tsx b/docs/data/data-grid/column-menu/ColumnMenuGridReferencesNoSnap.tsx
@@ -69,7 +69,7 @@ function ComponentTag(props: { value?: string; plan?: string }) {
 const columns = [
   {
     field: 'slot',
-    headerName: 'Component',
+    headerName: 'Slot',
     width: 240,
     renderCell: (params: GridRenderCellParams<any, string>) => (
       <ComponentTag value={params.value} plan={params.row.plan} />
@@ -89,42 +89,42 @@ const columns = [
 const rows = [
   {
     id: 1,
-    slot: 'ColumnMenuSortItem',
+    slot: 'columnMenuSortItem',
     defaultComponent: 'GridColumnMenuSortItem',
     displayOrder: 10,
     plan: 'Community',
   },
   {
     id: 3,
-    slot: 'ColumnMenuFilterItem',
+    slot: 'columnMenuFilterItem',
     defaultComponent: 'GridColumnMenuFilterItem',
     displayOrder: 20,
     plan: 'Community',
   },
   {
     id: 7,
-    slot: 'ColumnMenuColumnsItem',
+    slot: 'columnMenuColumnsItem',
     defaultComponent: 'GridColumnMenuColumnsItem',
     displayOrder: 30,
     plan: 'Community',
   },
   {
     id: 9,
-    slot: 'ColumnMenuPinningItem',
+    slot: 'columnMenuPinningItem',
     defaultComponent: 'GridColumnMenuPinningItem',
     displayOrder: 15,
     plan: 'Pro',
   },
   {
     id: 11,
-    slot: 'ColumnMenuAggregationItem',
+    slot: 'columnMenuAggregationItem',
     defaultComponent: 'GridColumnMenuAggregationItem',
     displayOrder: 23,
     plan: 'Premium',
   },
   {
     id: 13,
-    slot: 'ColumnMenuGroupingItem',
+    slot: 'columnMenuGroupingItem',
     defaultComponent: 'GridColumnMenuGroupingItem',
     displayOrder: 27,
     plan: 'Premium',

diff --git a/docs/data/data-grid/column-menu/HideColumnMenuGrid.js b/docs/data/data-grid/column-menu/HideColumnMenuGrid.js
@@ -6,9 +6,9 @@ function CustomColumnMenu(props) {
   return (
     <GridColumnMenu
       {...props}
-      components={{
-        // Hide `ColumnMenuColumnsItem`
-        ColumnMenuColumnsItem: null,
+      slots={{
+        // Hide `columnMenuColumnsItem`
+        columnMenuColumnsItem: null,
       }}
     />
   );

diff --git a/docs/data/data-grid/column-menu/HideColumnMenuGrid.tsx b/docs/data/data-grid/column-menu/HideColumnMenuGrid.tsx
@@ -6,9 +6,9 @@ function CustomColumnMenu(props: GridColumnMenuProps) {
   return (
     <GridColumnMenu
       {...props}
-      components={{
-        // Hide `ColumnMenuColumnsItem`
-        ColumnMenuColumnsItem: null,
+      slots={{
+        // Hide `columnMenuColumnsItem`
+        columnMenuColumnsItem: null,
       }}
     />
   );

diff --git a/docs/data/data-grid/column-menu/OverrideColumnMenuGrid.js b/docs/data/data-grid/column-menu/OverrideColumnMenuGrid.js
@@ -37,9 +37,9 @@ function CustomColumnMenu(props) {
   return (
     <GridColumnMenu
       {...props}
-      components={{
-        // Override slot for `ColumnMenuFilterItem`
-        ColumnMenuFilterItem: CustomFilterItem,
+      slots={{
+        // Override slot for `columnMenuFilterItem`
+        columnMenuFilterItem: CustomFilterItem,
       }}
     />
   );

diff --git a/docs/data/data-grid/column-menu/OverrideColumnMenuGrid.tsx b/docs/data/data-grid/column-menu/OverrideColumnMenuGrid.tsx
@@ -36,9 +36,9 @@ function CustomColumnMenu(props: GridColumnMenuProps) {
   return (
     <GridColumnMenu
       {...props}
-      components={{
-        // Override slot for `ColumnMenuFilterItem`
-        ColumnMenuFilterItem: CustomFilterItem,
+      slots={{
+        // Override slot for `columnMenuFilterItem`
+        columnMenuFilterItem: CustomFilterItem,
       }}
     />
   );

diff --git a/docs/data/data-grid/column-menu/ReorderColumnMenuGrid.js b/docs/data/data-grid/column-menu/ReorderColumnMenuGrid.js
@@ -6,7 +6,7 @@ function CustomColumnMenu(props) {
   return (
     <GridColumnMenu
       {...props}
-      componentsProps={{
+      slotProps={{
         // Swap positions of filter and sort items
         columnMenuFilterItem: {
           displayOrder: 0, // Previously `10`

diff --git a/docs/data/data-grid/column-menu/ReorderColumnMenuGrid.tsx b/docs/data/data-grid/column-menu/ReorderColumnMenuGrid.tsx
@@ -6,7 +6,7 @@ function CustomColumnMenu(props: GridColumnMenuProps) {
   return (
     <GridColumnMenu
       {...props}
-      componentsProps={{
+      slotProps={{
         // Swap positions of filter and sort items
         columnMenuFilterItem: {
           displayOrder: 0, // Previously `10`