Merge branch 'master' into renovate/jsdom-27.x

Author: Janpot

docs/next.config.ts

@@ -92,6 +92,10 @@ export default withDocsInfra({
 
           // for 3rd party packages with dependencies in this repository
           '@mui/material$': path.resolve(workspaceRoot, 'packages/mui-material/src/index.js'),
+          '@mui/material/package.json': path.resolve(
+            workspaceRoot,
+            'packages/mui-material/package.json',
+          ),
           '@mui/material': path.resolve(workspaceRoot, 'packages/mui-material/src'),
 
           '@mui/docs': path.resolve(workspaceRoot, 'packages/mui-docs/src'),
@@ -102,10 +106,15 @@ export default withDocsInfra({
           '@mui/icons-material': path.resolve(workspaceRoot, 'packages/mui-icons-material/lib/esm'),
           '@mui/lab': path.resolve(workspaceRoot, 'packages/mui-lab/src'),
           '@mui/styled-engine': path.resolve(workspaceRoot, 'packages/mui-styled-engine/src'),
+          '@mui/system/package.json': path.resolve(
+            workspaceRoot,
+            'packages/mui-system/package.json',
+          ),
           '@mui/system': path.resolve(workspaceRoot, 'packages/mui-system/src'),
           '@mui/private-theming': path.resolve(workspaceRoot, 'packages/mui-private-theming/src'),
           '@mui/utils': path.resolve(workspaceRoot, 'packages/mui-utils/src'),
           '@mui/material-nextjs': path.resolve(workspaceRoot, 'packages/mui-material-nextjs/src'),
+          '@mui/joy/package.json': path.resolve(workspaceRoot, 'packages/mui-joy/package.json'),
           '@mui/joy': path.resolve(workspaceRoot, 'packages/mui-joy/src'),
         },
         extensions: [

netlify.toml

@@ -9,5 +9,5 @@
   NODE_VERSION = "22.18"
   PNPM_FLAGS = "--frozen-lockfile"
 
-[[plugins]]
-  package = "@mui/internal-netlify-cache"
+# [[plugins]]
+#   package = "@mui/internal-netlify-cache"

package.json

@@ -17,7 +17,7 @@
     "release:changelog": "node scripts/releaseChangelog.mjs",
     "release:pack": "tsx scripts/releasePack.mts",
     "docs:api": "rimraf --glob ./docs/pages/**/api-docs ./docs/pages/**/api && pnpm docs:api:build",
-    "docs:api:build": "tsx ./scripts/buidApiDocs/index.ts",
+    "docs:api:build": "tsx ./scripts/buildApiDocs/index.ts",
     "docs:llms:build": "rimraf --glob ./docs/public/material-ui/ && tsx ./scripts/buildLlmsDocs/index.ts --projectSettings ./packages/api-docs-builder-core/materialUi/projectSettings.ts",
     "docs:build": "pnpm docs:llms:build && pnpm --filter docs build",
     "docs:build-sw": "pnpm --filter docs build-sw",

packages/mui-material/src/Autocomplete/Autocomplete.test.js

@@ -3683,6 +3683,49 @@ describe('<Autocomplete />', () => {
 
       expect(view.container.querySelector(`.${chipClasses.root}`)).to.have.text('0');
     });
+
+    it('should not throw error on pressing ArrowLeft key with no value in single value rendering', () => {
+      render(
+        <Autocomplete
+          options={['one', 'two', 'three']}
+          renderValue={(value, getItemProps) => {
+            return value ? <Chip label={value} {...getItemProps()} /> : null;
+          }}
+          renderInput={(params) => <TextField {...params} autoFocus />}
+        />,
+      );
+
+      const textbox = screen.getByRole('combobox');
+
+      expect(() => {
+        fireEvent.keyDown(textbox, { key: 'ArrowLeft' });
+      }).not.to.throw();
+
+      expect(textbox).toHaveFocus();
+    });
+
+    it('should not throw error on pressing ArrowLeft key with input text but no value in single value rendering', () => {
+      render(
+        <Autocomplete
+          options={['one', 'two', 'three']}
+          renderValue={(value, getItemProps) => {
+            return value ? <Chip label={value} {...getItemProps()} /> : null;
+          }}
+          renderInput={(params) => <TextField {...params} autoFocus />}
+        />,
+      );
+
+      const textbox = screen.getByRole('combobox');
+
+      fireEvent.change(textbox, { target: { value: 'on' } });
+
+      expect(() => {
+        fireEvent.keyDown(textbox, { key: 'ArrowLeft' });
+      }).not.to.throw();
+
+      expect(textbox).to.have.property('value', 'on');
+      expect(textbox).toHaveFocus();
+    });
   });
 
   it('should not shrink the input label when value is an empty array in multiple mode using renderValue', () => {

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

@@ -853,7 +853,7 @@ function useAutocomplete(props) {
           handleOpen(event);
           break;
         case 'ArrowLeft':
-          if (!multiple && renderValue) {
+          if (!multiple && renderValue && value != null) {
             focusItem(0);
           } else {
             handleFocusItem(event, 'previous');

scripts/buidApiDocs/index.ts renamed to scripts/buildApiDocs/index.ts

@@ -264,7 +264,14 @@ function findNonComponentMarkdownFiles(
       pathname.startsWith('/material-ui/') &&
       !ignoredPaths.some((ignored) => pathname.startsWith(ignored))
     ) {
-      const page = allMarkdownFiles.find((p) => p.pathname === parsedPathname);
+      // Match by filename basename to avoid pathname collisions when multiple files
+      // exist in the same directory (e.g., upgrade-to-v7.md and upgrade-to-native-color.md)
+      const lastSegment = pathname.split('/').filter(Boolean).pop();
+      const page = allMarkdownFiles.find((p) => {
+        const fileBasename = path.basename(p.filename).replace(/\.mdx?$/, '');
+        // p.pathname already has the parent path (from findPagesMarkdown which strips the filename)
+        return fileBasename === lastSegment && p.pathname === parsedPathname;
+      });
 
       if (page) {
         files.push({

scripts/buidApiDocs/tsconfig.json renamed to scripts/buildApiDocs/tsconfig.json

@@ -13,7 +13,6 @@
     "allowSyntheticDefaultImports": true,
     "noErrorTruncation": false,
     "allowJs": true,
-    "baseUrl": ".",
     "paths": {
       "@mui/material": ["./packages/mui-material/src"],
       "@mui/material/package.json": ["./packages/mui-material/package.json"],