Merge remote-tracking branch 'upstream/master' into eslint-deny-e

mui · Oct 4, 2024 · 85fa97d · 85fa97d
2 parents 59093fd + 978a438
commit 85fa97d
Show file tree

Hide file tree

Showing 186 changed files with 3,667 additions and 1,155 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -29,11 +29,10 @@ default-job: &default-job
       type: string
       default: << pipeline.parameters.e2e-base-url >>
   environment:
-    # Keep in sync with "Save playwright cache"
-    PLAYWRIGHT_BROWSERS_PATH: /tmp/pw-browsers
     # expose it globally otherwise we have to thread it from each job to the install command
     BROWSERSTACK_FORCE: << pipeline.parameters.browserstack-force >>
     REACT_VERSION: << parameters.react-version >>
+    COREPACK_ENABLE_DOWNLOAD_PROMPT: '0'
   working_directory: /tmp/mui
   docker:
     - image: cimg/node:20.17
@@ -64,24 +63,15 @@ commands:
           steps:
             - run:
                 name: Install pnpm package manager
-                command: |
-                  corepack enable
-            - run:
-                name: Prepare playwright hash
-                command: pnpm list --json --filter playwright > /tmp/playwright_info.json
-            - store_artifacts:
-                name: Debug playwright hash
-                path: /tmp/playwright_info.json
-            - restore_cache:
-                name: Restore playwright cache
-                keys:
-                  - v6-playwright-{{ arch }}-{{ checksum "/tmp/playwright_info.json" }}
+                command: corepack enable
       - when:
           condition:
             not: << parameters.browsers >>
           steps:
-            # See https://stackoverflow.com/a/73411601
-            - run: corepack enable --install-directory ~/bin
+            - run:
+                name: Install pnpm package manager
+                # See https://stackoverflow.com/a/73411601
+                command: corepack enable --install-directory ~/bin
 
       - run:
           name: View install environment
@@ -107,20 +97,6 @@ commands:
                 name: Install @mui/material@next
                 command: pnpm use-material-ui-v6
 
-      - when:
-          condition: << parameters.browsers >>
-          steps:
-            - run:
-                name: Install playwright browsers
-                command: npx playwright install --with-deps
-            - save_cache:
-                name: Save playwright cache
-                key: v6-playwright-{{ arch }}-{{ checksum "/tmp/playwright_info.json" }}
-                paths:
-                  # Keep path in sync with "PLAYWRIGHT_BROWSERS_PATH"
-                  # Can't use environment variables for `save_cache` paths (tested in https://app.circleci.com/pipelines/github/mui/material-ui/37813/workflows/5b1e207f-ac8b-44e7-9ba4-d0f9a01f5c55/jobs/223370)
-                  - /tmp/pw-browsers
-
 jobs:
   checkout:
     <<: *default-job
@@ -239,8 +215,6 @@ jobs:
     <<: *default-job
     docker:
       - image: mcr.microsoft.com/playwright:v1.44.1-focal
-        environment:
-          NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
       - checkout
       - install_js:
@@ -272,8 +246,6 @@ jobs:
     <<: *default-job
     docker:
       - image: mcr.microsoft.com/playwright:v1.44.1-focal
-        environment:
-          NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
       - checkout
       - install_js:
@@ -285,8 +257,6 @@ jobs:
     <<: *default-job
     docker:
       - image: mcr.microsoft.com/playwright:v1.44.1-focal
-        environment:
-          NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
       - checkout
       - install_js:
@@ -300,8 +270,6 @@ jobs:
     <<: *default-job
     docker:
       - image: mcr.microsoft.com/playwright:v1.44.1-focal
-        environment:
-          NODE_ENV: development # Needed if playwright is in `devDependencies`
     steps:
       - checkout
       - install_js:

diff --git a/.github/workflows/cherry-pick-master-to-v6.yml b/.github/workflows/cherry-pick-master-to-v6.yml
@@ -18,7 +18,7 @@ jobs:
     if: ${{ contains(github.event.pull_request.labels.*.name, 'needs cherry-pick') && github.event.pull_request.merged == true }}
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           fetch-depth: 0
       - name: Cherry pick and create the new PR

diff --git a/.github/workflows/cherry-pick-next-to-master.yml b/.github/workflows/cherry-pick-next-to-master.yml
@@ -18,7 +18,7 @@ jobs:
     if: ${{ contains(github.event.pull_request.labels.*.name, 'needs cherry-pick') && github.event.pull_request.merged == true }}
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           fetch-depth: 0
       - name: Cherry pick and create the new PR

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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
+        uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
         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@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
+        uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
diff --git a/.github/workflows/codspeed.yml b/.github/workflows/codspeed.yml
@@ -34,12 +34,12 @@ jobs:
           (github.event_name == 'pull_request' && github.event.action != 'labeled' && contains(github.event.pull_request.labels.*.name, 'component: charts'))
       }}
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
         with:
           run_install: false
       - name: Use Node.js 20.x
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
           node-version: 20
           cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies

diff --git a/.github/workflows/l10n.yml b/.github/workflows/l10n.yml
@@ -17,12 +17,12 @@ jobs:
       issues: write
     steps:
       - run: echo "${{ github.actor }}"
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
         with:
           run_install: false
       - name: Use Node.js 20.x
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
           node-version: 20
           cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.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@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
+        uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/support-stackoverflow.yml b/.github/workflows/support-stackoverflow.yml
@@ -24,8 +24,7 @@ jobs:
           issue-comment: |
             👋 Thanks for using this project!
 
-            We use GitHub issues as a bug and feature requests tracker, however,
-            this issue appears to be a support request.
+            We use GitHub issues as a bug and feature requests tracker, however, this issue appears to be a support request.
 
             For support with MUI X please check out https://mui.com/x/introduction/support/. Thanks!
 

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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - uses: errata-ai/vale-action@38bf078c328061f59879b347ca344a718a736018 # v2.1.0
         continue-on-error: true # GitHub Action flag needed until https://github.com/errata-ai/vale-action/issues/89 is fixed
         with:

diff --git a/docs/data/data-grid/column-menu/ColumnMenuGridReferencesNoSnap.js b/docs/data/data-grid/column-menu/ColumnMenuGridReferencesNoSnap.js
@@ -137,14 +137,8 @@ const rows = [
 
 export default function ColumnMenuGridReferencesNoSnap() {
   return (
-    <div style={{ width: '100%' }}>
-      <DataGridPremium
-        columns={columns}
-        rows={rows}
-        disableColumnMenu
-        autoHeight
-        hideFooter
-      />
+    <div style={{ display: 'flex', flexDirection: 'column', width: '100%' }}>
+      <DataGridPremium columns={columns} rows={rows} disableColumnMenu hideFooter />
     </div>
   );
 }
diff --git a/docs/data/data-grid/column-menu/ColumnMenuGridReferencesNoSnap.tsx b/docs/data/data-grid/column-menu/ColumnMenuGridReferencesNoSnap.tsx
@@ -143,14 +143,8 @@ const rows = [
 
 export default function ColumnMenuGridReferencesNoSnap() {
   return (
-    <div style={{ width: '100%' }}>
-      <DataGridPremium
-        columns={columns}
-        rows={rows}
-        disableColumnMenu
-        autoHeight
-        hideFooter
-      />
+    <div style={{ display: 'flex', flexDirection: 'column', width: '100%' }}>
+      <DataGridPremium columns={columns} rows={rows} disableColumnMenu hideFooter />
     </div>
   );
 }
diff --git a/docs/data/data-grid/column-menu/ColumnMenuGridReferencesNoSnap.tsx.preview b/docs/data/data-grid/column-menu/ColumnMenuGridReferencesNoSnap.tsx.preview
@@ -1,7 +1 @@
-<DataGridPremium
-  columns={columns}
-  rows={rows}
-  disableColumnMenu
-  autoHeight
-  hideFooter
-/>
+<DataGridPremium columns={columns} rows={rows} disableColumnMenu hideFooter />
diff --git a/docs/data/data-grid/column-ordering/column-ordering.md b/docs/data/data-grid/column-ordering/column-ordering.md
@@ -6,6 +6,13 @@ title: Data Grid - Column ordering
 
 <p class="description">Drag and drop your columns to reorder them.</p>
 
+:::warning
+There is [a known issue with Firefox v129](https://github.com/mui/mui-x/issues/14263) that impacts this feature.
+Reordering does not work on that specific version of Firefox because the value for `event.dataTransfer` is `null` which results in an error.
+
+You must upgrade to Firefox v130 or higher to avoid this issue.
+:::
+
 By default, columns are ordered according to the order they are included in the `columns` array.
 
 By default, `DataGridPro` allows all column reordering by dragging the header cells and moving them left or right.

diff --git a/docs/data/data-grid/column-spanning/ColumnSpanningDerived.js b/docs/data/data-grid/column-spanning/ColumnSpanningDerived.js
@@ -137,6 +137,9 @@ const columns = [
 ];
 
 const rootStyles = {
+  display: 'flex',
+  flexDirection: 'column',
+  height: 'fit-content',
   width: '100%',
   '& .Maths': {
     backgroundColor: 'rgba(157, 255, 118, 0.49)',
@@ -172,7 +175,6 @@ export default function ColumnSpanningDerived() {
             left: ['day'],
           },
         }}
-        autoHeight
         disableRowSelectionOnClick
         hideFooter
         showCellVerticalBorder

diff --git a/docs/data/data-grid/column-spanning/ColumnSpanningDerived.tsx b/docs/data/data-grid/column-spanning/ColumnSpanningDerived.tsx
@@ -148,6 +148,9 @@ const columns: GridColDef<Row>[] = [
 ];
 
 const rootStyles = {
+  display: 'flex',
+  flexDirection: 'column',
+  height: 'fit-content',
   width: '100%',
   '& .Maths': {
     backgroundColor: 'rgba(157, 255, 118, 0.49)',
@@ -183,7 +186,6 @@ export default function ColumnSpanningDerived() {
             left: ['day'],
           },
         }}
-        autoHeight
         disableRowSelectionOnClick
         hideFooter
         showCellVerticalBorder

diff --git a/docs/data/data-grid/column-spanning/ColumnSpanningDerived.tsx.preview b/docs/data/data-grid/column-spanning/ColumnSpanningDerived.tsx.preview
@@ -6,7 +6,6 @@
       left: ['day'],
     },
   }}
-  autoHeight
   disableRowSelectionOnClick
   hideFooter
   showCellVerticalBorder

diff --git a/docs/data/data-grid/column-spanning/ColumnSpanningFunction.js b/docs/data/data-grid/column-spanning/ColumnSpanningFunction.js
@@ -95,14 +95,15 @@ export default function ColumnSpanningFunction() {
   return (
     <Box
       sx={{
+        display: 'flex',
+        flexDirection: 'column',
         width: '100%',
         '& .bold': {
           fontWeight: 600,
         },
       }}
     >
       <DataGrid
-        autoHeight
         disableColumnFilter
         disableRowSelectionOnClick
         hideFooter

diff --git a/docs/data/data-grid/column-spanning/ColumnSpanningFunction.tsx b/docs/data/data-grid/column-spanning/ColumnSpanningFunction.tsx
@@ -118,14 +118,15 @@ export default function ColumnSpanningFunction() {
   return (
     <Box
       sx={{
+        display: 'flex',
+        flexDirection: 'column',
         width: '100%',
         '& .bold': {
           fontWeight: 600,
         },
       }}
     >
       <DataGrid
-        autoHeight
         disableColumnFilter
         disableRowSelectionOnClick
         hideFooter

diff --git a/docs/data/data-grid/column-spanning/ColumnSpanningFunction.tsx.preview b/docs/data/data-grid/column-spanning/ColumnSpanningFunction.tsx.preview
@@ -1,5 +1,4 @@
 <DataGrid
-  autoHeight
   disableColumnFilter
   disableRowSelectionOnClick
   hideFooter

diff --git a/docs/data/data-grid/column-spanning/ColumnSpanningNumber.js b/docs/data/data-grid/column-spanning/ColumnSpanningNumber.js
@@ -2,7 +2,6 @@ import * as React from 'react';
 import { DataGrid } from '@mui/x-data-grid';
 
 const other = {
-  autoHeight: true,
   showCellVerticalBorder: true,
   showColumnVerticalBorder: true,
 };
@@ -14,7 +13,14 @@ const rows = [
 
 export default function ColumnSpanningNumber() {
   return (
-    <div style={{ width: '100%' }}>
+    <div
+      style={{
+        width: '100%',
+        display: 'flex',
+        flexDirection: 'column',
+        height: 'fit-content',
+      }}
+    >
       <DataGrid
         columns={[
           { field: 'username', colSpan: 2, hideable: false },

diff --git a/docs/data/data-grid/column-spanning/ColumnSpanningNumber.tsx b/docs/data/data-grid/column-spanning/ColumnSpanningNumber.tsx
@@ -2,7 +2,6 @@ import * as React from 'react';
 import { DataGrid } from '@mui/x-data-grid';
 
 const other = {
-  autoHeight: true,
   showCellVerticalBorder: true,
   showColumnVerticalBorder: true,
 };
@@ -14,7 +13,14 @@ const rows = [
 
 export default function ColumnSpanningNumber() {
   return (
-    <div style={{ width: '100%' }}>
+    <div
+      style={{
+        width: '100%',
+        display: 'flex',
+        flexDirection: 'column',
+        height: 'fit-content',
+      }}
+    >
       <DataGrid
         columns={[
           { field: 'username', colSpan: 2, hideable: false },