Merge branch 'next' of https://github.com/mui/material-ui into fix-sp…

…eedDial-tooltip-mui#41067

.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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           fetch-depth: 0
       - name: Cherry pick and create the new PR

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - run: echo "${{ github.actor }}"
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           # fetch all tags which are required for `pnpm release:changelog`
           fetch-depth: 0

.github/workflows/codeql.yml

@@ -16,10 +16,10 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
+        uses: github/codeql-action/init@c7f9125735019aa87cfc361530512d50ea439c71 # v3.25.1
         with:
           languages: typescript
           config-file: ./.github/codeql/codeql-config.yml
@@ -30,4 +30,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@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
+        uses: github/codeql-action/analyze@c7f9125735019aa87cfc361530512d50ea439c71 # v3.25.1

.github/workflows/scorecards.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           persist-credentials: false
 
@@ -43,6 +43,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
+        uses: github/codeql-action/upload-sarif@c7f9125735019aa87cfc361530512d50ea439c71 # v3.25.1
         with:
           sarif_file: results.sarif

.github/workflows/vale-action.yml

@@ -12,7 +12,7 @@ jobs:
       contents: read
       pull-requests: write
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - 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:

benchmark/package.json

@@ -36,6 +36,6 @@
     "styled-components": "^6.1.8",
     "styled-system": "^5.1.5",
     "theme-ui": "^0.16.2",
-    "webpack": "^5.90.3"
+    "webpack": "^5.91.0"
   }
 }

docs/data/docs-infra/pages.ts

@@ -7,7 +7,7 @@ const pages: readonly MuiPage[] = [
     children: [
       { pathname: '/experiments/docs/headers' },
       { pathname: '/experiments/docs/markdown' },
-      { pathname: '/experiments/docs/og-card' },
+      { pathname: '/experiments/docs/og-card', title: 'OG Image' },
     ],
   },
   {
@@ -22,7 +22,7 @@ const pages: readonly MuiPage[] = [
   },
   {
     pathname: '/experiments/docs/main-parent',
-    title: 'Main parent',
+    title: 'Test: pages.js',
     children: [
       {
         pathname: '/experiments/docs/first-level-child-1',
@@ -53,11 +53,46 @@ const pages: readonly MuiPage[] = [
           },
         ],
       },
+      {
+        pathname: '/experiments/docs/first-level-child-3',
+        title: 'Pro plan',
+        plan: 'pro',
+      },
+      {
+        pathname: '/experiments/docs/first-level-child-4',
+        title: 'New feature',
+        newFeature: true,
+      },
+      {
+        pathname: '/experiments/docs/first-level-child-5',
+        title: 'Planned feature',
+        planned: true,
+      },
+      {
+        pathname: '/experiments/docs/first-level-child-6',
+        title: 'Unstable feature',
+        unstable: true,
+      },
+      {
+        pathname: '/experiments/docs/first-level-child-7',
+        title: 'Beta feature',
+        beta: true,
+      },
+      {
+        pathname: '/experiments/docs/first-level-child-8',
+        title: 'Legacy feature',
+        legacy: true,
+      },
+      {
+        pathname: '/experiments/docs/first-level-child-9',
+        title: 'OverflowWithLongApiComponent',
+        plan: 'pro',
+      },
     ],
   },
   {
     pathname: '/x/react-data-grid-group',
-    title: 'Data Grid',
+    title: 'Test: Data Grid e2e',
     children: [
       { pathname: '/x/react-data-grid', title: 'Overview' },
       { pathname: '/x/react-data-grid/demo' },
@@ -169,7 +204,7 @@ const pages: readonly MuiPage[] = [
   },
   {
     pathname: '/x/migration-group',
-    title: 'Migration',
+    title: 'Test: Migration',
     children: [
       {
         pathname: '/x/migration-v6',

docs/pages/_document.js

@@ -162,6 +162,7 @@ export default class MyDocument extends Document {
                 marginBottom: '0.08em',
                 backgroundSize: 'contain',
                 backgroundRepeat: 'no-repeat',
+                flexShrink: 0,
               },
               '.plan-pro': {
                 backgroundImage: 'url(/static/x/pro.svg)',

docs/pages/experiments/docs/og-card.md

@@ -1,11 +1,6 @@
----
-title: OG card generation
-cardDescription: A quick overview of available options.
----
+# OG Image
 
-# OG card
-
-<p class="description">How the docs platform generate Open Graph card images</p>
+<p class="description">How the docs platform generate Open Graph card images.</p>
 
 ## The edge function
 

package.json

@@ -90,7 +90,7 @@
     "google-auth-library": "^9.8.0"
   },
   "devDependencies": {
-    "@argos-ci/core": "^1.5.5",
+    "@argos-ci/core": "^2.1.0",
     "@babel/cli": "^7.24.1",
     "@babel/core": "^7.24.4",
     "@babel/node": "^7.23.9",
@@ -187,7 +187,7 @@
     "tsup": "^8.0.2",
     "tsx": "^4.7.2",
     "typescript": "^5.4.5",
-    "webpack": "^5.90.3",
+    "webpack": "^5.91.0",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "^5.1.4",
     "yargs": "^17.7.2"

packages/mui-material/src/Typography/Typography.js

@@ -134,9 +134,9 @@ const Typography = React.forwardRef(function Typography(inProps, ref) {
     <TypographyRoot
       as={Component}
       ref={ref}
-      ownerState={ownerState}
       className={clsx(classes.root, className)}
       {...other}
+      ownerState={ownerState}
     />
   );
 });

packages/mui-material/src/styles/experimental_extendTheme.test.js

@@ -258,7 +258,7 @@ describe('experimental_extendTheme', () => {
 
       expect(theme.colorSchemes.dark.overlays[0]).to.equal(undefined);
       expect(theme.colorSchemes.dark.overlays[24]).to.equal(
-        'linear-gradient(rgba(255 255 255 / 0.16), rgba(255 255 255 / 0.16))',
+        'linear-gradient(rgba(255 255 255 / 0.165), rgba(255 255 255 / 0.165))',
       );
     });
 

packages/mui-material/src/styles/getOverlayAlpha.ts

@@ -1,12 +1,10 @@
 // Inspired by https://github.com/material-components/material-components-ios/blob/bca36107405594d5b7b16265a5b0ed698f85a5ee/components/Elevation/src/UIColor%2BMaterialElevation.m#L61
-const getOverlayAlpha = (elevation: number) => {
+export default function getOverlayAlpha(elevation: number): number {
   let alphaValue;
   if (elevation < 1) {
     alphaValue = 5.11916 * elevation ** 2;
   } else {
     alphaValue = 4.5 * Math.log(elevation + 1) + 2;
   }
-  return (alphaValue / 100).toFixed(2);
-};
-
-export default getOverlayAlpha;
+  return Math.round(alphaValue * 10) / 1000;
+}