Merge branch 'master' into menu

mui · Aug 2, 2024 · c66dcb1 · c66dcb1
2 parents 0472563 + f6effde
commit c66dcb1
Show file tree

Hide file tree

Showing 8 changed files with 582 additions and 439 deletions.
diff --git a/docs/.link-check-errors.txt b/docs/.link-check-errors.txt
@@ -1,2 +1,8 @@
 Broken links found by `pnpm docs:link-check` that exist:
 
+- https://mui.com/material-ui/customization/css-theme-variables/configuration/#advanced-configuration
+- https://mui.com/material-ui/customization/css-theme-variables/configuration/#changing-variable-prefixes
+- https://mui.com/material-ui/customization/theme-components/#creating-new-component-variants
+- https://mui.com/material-ui/customization/theme-components/#overrides-based-on-props
+- https://mui.com/material-ui/migrating-to-v6/
+- https://mui.com/material-ui/react-grid2/#whats-changed
diff --git a/docs/package.json b/docs/package.json
@@ -24,17 +24,17 @@
     "@emotion/react": "^11.11.4",
     "@emotion/server": "^11.11.0",
     "@emotion/styled": "^11.11.5",
-    "@mui/docs": "6.0.0-beta.2",
-    "@mui/icons-material": "6.0.0-beta.2",
+    "@mui/docs": "6.0.0-beta.4",
+    "@mui/icons-material": "6.0.0-beta.4",
     "@mui/internal-markdown": "^1.0.8",
-    "@mui/internal-scripts": "^1.0.13",
+    "@mui/internal-scripts": "^1.0.14",
     "@mui/joy": "5.0.0-beta.48",
-    "@mui/material": "6.0.0-beta.2",
-    "@mui/material-nextjs": "6.0.0-alpha.14",
-    "@mui/styles": "6.0.0-beta.2",
-    "@mui/system": "6.0.0-beta.1",
+    "@mui/material": "6.0.0-beta.4",
+    "@mui/material-nextjs": "6.0.0-beta.4",
+    "@mui/styles": "6.0.0-beta.4",
+    "@mui/system": "6.0.0-beta.4",
     "@mui/types": "7.2.15",
-    "@mui/utils": "6.0.0-beta.1",
+    "@mui/utils": "6.0.0-beta.4",
     "@react-spring/web": "^9.7.4",
     "autoprefixer": "^10.4.19",
     "autosuggest-highlight": "^3.3.4",
@@ -58,10 +58,10 @@
     "postcss": "^8.4.40",
     "postcss-import": "^16.1.0",
     "prop-types": "^15.8.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "react-draggable": "^4.4.6",
-    "react-is": "^18.2.0",
+    "react-is": "^18.3.1",
     "react-router-dom": "^6.23.1",
     "react-runner": "^1.0.5",
     "react-simple-code-editor": "^0.13.1",
@@ -76,7 +76,7 @@
     "@babel/plugin-transform-react-constant-elements": "^7.25.1",
     "@babel/preset-typescript": "^7.24.7",
     "@mui/internal-docs-utils": "^1.0.8",
-    "@mui/internal-test-utils": "1.0.5",
+    "@mui/internal-test-utils": "1.0.6",
     "@types/autosuggest-highlight": "^3.2.3",
     "@types/chai": "^4.3.16",
     "@types/node": "^18.19.42",

diff --git a/package.json b/package.json
@@ -78,11 +78,11 @@
     "@babel/register": "^7.24.6",
     "@mui/internal-docs-utils": "^1.0.8",
     "@mui/internal-markdown": "^1.0.8",
-    "@mui/internal-scripts": "^1.0.13",
-    "@mui/internal-test-utils": "1.0.5",
-    "@mui/material": "6.0.0-beta.2",
-    "@mui/monorepo": "github:mui/material-ui#v6.0.0-beta.2",
-    "@mui/utils": "6.0.0-beta.1",
+    "@mui/internal-scripts": "^1.0.14",
+    "@mui/internal-test-utils": "1.0.6",
+    "@mui/material": "6.0.0-beta.4",
+    "@mui/monorepo": "github:mui/material-ui#v6.0.0-beta.4",
+    "@mui/utils": "6.0.0-beta.4",
     "@next/eslint-plugin-next": "^14.2.5",
     "@octokit/rest": "^20.1.1",
     "@playwright/test": "1.45.3",

diff --git a/packages/mui-base/package.json b/packages/mui-base/package.json
@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "@mui/internal-babel-macros": "^1.0.1",
-    "@mui/internal-test-utils": "1.0.5",
+    "@mui/internal-test-utils": "1.0.6",
     "@testing-library/react": "^15.0.7",
     "@testing-library/user-event": "^14.5.2",
     "@types/chai": "^4.3.16",
@@ -61,8 +61,8 @@
     "chai": "^4.4.1",
     "fast-glob": "^3.3.2",
     "lodash": "^4.17.21",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "sinon": "^17.0.1",
     "typescript": "^5.4.5"
   },

diff --git a/packages/mui-base/src/legacy/useAutocomplete/useAutocomplete.test.js b/packages/mui-base/src/legacy/useAutocomplete/useAutocomplete.test.js
@@ -263,9 +263,9 @@ describe('useAutocomplete', () => {
           {groupedOptions.length > 0 ? (
             <ul {...getListboxProps()}>
               {groupedOptions.map((option, index) => {
-                const { key, ...other } = getOptionProps({ option, index });
+                const { key, ...optionProps } = getOptionProps({ option, index });
                 return (
-                  <li key={key} {...other}>
+                  <li key={key} {...optionProps}>
                     {option}
                   </li>
                 );
@@ -277,52 +277,28 @@ describe('useAutocomplete', () => {
     }
 
     const node16ErrorMessage =
-      "TypeError: Cannot read properties of null (reading 'removeAttribute')";
-    const olderNodeErrorMessage = "TypeError: Cannot read property 'removeAttribute' of null";
+      "Error: Uncaught [TypeError: Cannot read properties of null (reading 'removeAttribute')]";
+    const olderNodeErrorMessage =
+      "Error: Uncaught [TypeError: Cannot read property 'removeAttribute' of null]";
 
     const nodeVersion = Number(process.versions.node.split('.')[0]);
     const errorMessage = nodeVersion >= 16 ? node16ErrorMessage : olderNodeErrorMessage;
 
-    const wrappedErrorMessage = `Error: Uncaught [${errorMessage}]`;
-
-    const react17ErrorMessages = [
-      wrappedErrorMessage,
-      'MUI: Unable to find the input element.',
-      wrappedErrorMessage,
-      'The above error occurred in the <ul> component',
-      'The above error occurred in the <Test> component',
-    ];
-
-    const react182ErrorMessages = [
-      wrappedErrorMessage,
+    const devErrorMessages = [
+      errorMessage,
       'MUI: Unable to find the input element.',
-      wrappedErrorMessage,
+      errorMessage,
       // strict effects runs effects twice
-      'MUI: Unable to find the input element.',
-      wrappedErrorMessage,
+      React.version.startsWith('18') && 'MUI: Unable to find the input element.',
+      React.version.startsWith('18') && errorMessage,
       'The above error occurred in the <ul> component',
+      React.version.startsWith('16') && 'The above error occurred in the <ul> component',
       'The above error occurred in the <Test> component',
       // strict effects runs effects twice
-      'The above error occurred in the <Test> component',
-    ];
-
-    const react183ErrorMessages = [
-      'MUI: Unable to find the input element.',
-      'MUI: Unable to find the input element.',
-      errorMessage,
-      errorMessage,
-      errorMessage,
+      React.version.startsWith('18') && 'The above error occurred in the <Test> component',
+      React.version.startsWith('16') && 'The above error occurred in the <Test> component',
     ];
 
-    let devErrorMessages;
-    if (React.version.startsWith('18.3')) {
-      devErrorMessages = react183ErrorMessages;
-    } else if (React.version.startsWith('18')) {
-      devErrorMessages = react182ErrorMessages;
-    } else {
-      devErrorMessages = react17ErrorMessages;
-    }
-
     expect(() => {
       render(
         <ErrorBoundary>