@mui/material 7.0.1 → 7.1.0

package/esm/useAutocomplete/useAutocomplete.js

@@ -2,7 +2,11 @@
 
 /* eslint-disable no-constant-condition */
 import * as React from 'react';
-import { unstable_setRef as setRef, unstable_useEventCallback as useEventCallback, unstable_useControlled as useControlled, unstable_useId as useId, usePreviousProps } from '@mui/utils';
+import setRef from '@mui/utils/setRef';
+import useEventCallback from '@mui/utils/useEventCallback';
+import useControlled from '@mui/utils/useControlled';
+import useId from '@mui/utils/useId';
+import usePreviousProps from '@mui/utils/usePreviousProps';
 
 // https://stackoverflow.com/questions/990904/remove-accents-diacritics-in-a-string-in-javascript
 function stripDiacritics(string) {
@@ -47,8 +51,8 @@ const defaultFilterOptions = createFilterOptions();
 const pageSize = 5;
 const defaultIsActiveElementInListbox = listboxRef => listboxRef.current !== null && listboxRef.current.parentElement?.contains(document.activeElement);
 const MULTIPLE_DEFAULT_VALUE = [];
-function getInputValue(value, multiple, getOptionLabel) {
-  if (multiple || value == null) {
+function getInputValue(value, multiple, getOptionLabel, renderValue) {
+  if (multiple || value == null || renderValue) {
     return '';
   }
   const optionLabel = getOptionLabel(value);
@@ -95,6 +99,7 @@ function useAutocomplete(props) {
     openOnFocus = false,
     options,
     readOnly = false,
+    renderValue,
     selectOnFocus = !props.freeSolo,
     value: valueProp
   } = props;
@@ -116,13 +121,13 @@ function useAutocomplete(props) {
   const inputRef = React.useRef(null);
   const listboxRef = React.useRef(null);
   const [anchorEl, setAnchorEl] = React.useState(null);
-  const [focusedTag, setFocusedTag] = React.useState(-1);
+  const [focusedItem, setFocusedItem] = React.useState(-1);
   const defaultHighlighted = autoHighlight ? 0 : -1;
   const highlightedIndexRef = React.useRef(defaultHighlighted);
 
   // Calculate the initial inputValue on mount only.
-  // Using useRef since defaultValue doesn't need to update inputValue dynamically.
-  const initialInputValue = React.useRef(getInputValue(defaultValue, multiple, getOptionLabel)).current;
+  // useRef ensures it doesn't update dynamically with defaultValue or value props.
+  const initialInputValue = React.useRef(getInputValue(defaultValue ?? valueProp, multiple, getOptionLabel)).current;
   const [value, setValueState] = useControlled({
     controlled: valueProp,
     default: defaultValue,
@@ -142,7 +147,7 @@ function useAutocomplete(props) {
     if (!isOptionSelected && !clearOnBlur) {
       return;
     }
-    const newInputValue = getInputValue(newValue, multiple, getOptionLabel);
+    const newInputValue = getInputValue(newValue, multiple, getOptionLabel, renderValue);
     if (inputValue === newInputValue) {
       return;
     }
@@ -150,7 +155,7 @@ function useAutocomplete(props) {
     if (onInputChange) {
       onInputChange(event, newInputValue, reason);
     }
-  }, [getOptionLabel, inputValue, multiple, onInputChange, setInputValueState, clearOnBlur, value]);
+  }, [getOptionLabel, inputValue, multiple, onInputChange, setInputValueState, clearOnBlur, value, renderValue]);
   const [open, setOpenState] = useControlled({
     controlled: openProp,
     default: false,
@@ -190,21 +195,23 @@ function useAutocomplete(props) {
     resetInputValue(null, value, 'reset');
   }, [value, resetInputValue, focused, previousProps.value, freeSolo]);
   const listboxAvailable = open && filteredOptions.length > 0 && !readOnly;
-  const focusTag = useEventCallback(tagToFocus => {
-    if (tagToFocus === -1) {
+  const focusItem = useEventCallback(itemToFocus => {
+    if (itemToFocus === -1) {
       inputRef.current.focus();
     } else {
-      anchorEl.querySelector(`[data-tag-index="${tagToFocus}"]`).focus();
+      // Using `data-tag-index` for deprecated `renderTags`. Remove when `renderTags` is gone.
+      const indexType = renderValue ? 'data-item-index' : 'data-tag-index';
+      anchorEl.querySelector(`[${indexType}="${itemToFocus}"]`).focus();
     }
   });
 
-  // Ensure the focusedTag is never inconsistent
+  // Ensure the focusedItem is never inconsistent
   React.useEffect(() => {
-    if (multiple && focusedTag > value.length - 1) {
-      setFocusedTag(-1);
-      focusTag(-1);
+    if (multiple && focusedItem > value.length - 1) {
+      setFocusedItem(-1);
+      focusItem(-1);
     }
-  }, [value, multiple, focusedTag, focusTag]);
+  }, [value, multiple, focusedItem, focusItem]);
   function validOptionIndex(index, direction) {
     if (!listboxRef.current || index < 0 || index >= filteredOptions.length) {
       return -1;
@@ -529,7 +536,7 @@ function useAutocomplete(props) {
       inputRef.current.blur();
     }
   };
-  function validTagIndex(index, direction) {
+  function validItemIndex(index, direction) {
     if (index === -1) {
       return -1;
     }
@@ -539,7 +546,10 @@ function useAutocomplete(props) {
       if (direction === 'next' && nextFocus === value.length || direction === 'previous' && nextFocus === -1) {
         return -1;
       }
-      const option = anchorEl.querySelector(`[data-tag-index="${nextFocus}"]`);
+
+      // Using `data-tag-index` for deprecated `renderTags`. Remove when `renderTags` is removed.
+      const indexType = renderValue ? 'data-item-index' : 'data-tag-index';
+      const option = anchorEl.querySelector(`[${indexType}="${nextFocus}"]`);
 
       // Same logic as MenuList.js
       if (!option || !option.hasAttribute('tabindex') || option.disabled || option.getAttribute('aria-disabled') === 'true') {
@@ -549,30 +559,30 @@ function useAutocomplete(props) {
       }
     }
   }
-  const handleFocusTag = (event, direction) => {
+  const handleFocusItem = (event, direction) => {
     if (!multiple) {
       return;
     }
     if (inputValue === '') {
       handleClose(event, 'toggleInput');
     }
-    let nextTag = focusedTag;
-    if (focusedTag === -1) {
+    let nextItem = focusedItem;
+    if (focusedItem === -1) {
       if (inputValue === '' && direction === 'previous') {
-        nextTag = value.length - 1;
+        nextItem = value.length - 1;
       }
     } else {
-      nextTag += direction === 'next' ? 1 : -1;
-      if (nextTag < 0) {
-        nextTag = 0;
+      nextItem += direction === 'next' ? 1 : -1;
+      if (nextItem < 0) {
+        nextItem = 0;
       }
-      if (nextTag === value.length) {
-        nextTag = -1;
+      if (nextItem === value.length) {
+        nextItem = -1;
       }
     }
-    nextTag = validTagIndex(nextTag, direction);
-    setFocusedTag(nextTag);
-    focusTag(nextTag);
+    nextItem = validItemIndex(nextItem, direction);
+    setFocusedItem(nextItem);
+    focusItem(nextItem);
   };
   const handleClear = event => {
     ignoreFocus.current = true;
@@ -589,9 +599,9 @@ function useAutocomplete(props) {
     if (event.defaultMuiPrevented) {
       return;
     }
-    if (focusedTag !== -1 && !['ArrowLeft', 'ArrowRight'].includes(event.key)) {
-      setFocusedTag(-1);
-      focusTag(-1);
+    if (focusedItem !== -1 && !['ArrowLeft', 'ArrowRight'].includes(event.key)) {
+      setFocusedItem(-1);
+      focusItem(-1);
     }
 
     // Wait until IME is settled.
@@ -666,10 +676,18 @@ function useAutocomplete(props) {
           handleOpen(event);
           break;
         case 'ArrowLeft':
-          handleFocusTag(event, 'previous');
+          if (!multiple && renderValue) {
+            focusItem(0);
+          } else {
+            handleFocusItem(event, 'previous');
+          }
           break;
         case 'ArrowRight':
-          handleFocusTag(event, 'next');
+          if (!multiple && renderValue) {
+            focusItem(-1);
+          } else {
+            handleFocusItem(event, 'next');
+          }
           break;
         case 'Enter':
           if (highlightedIndexRef.current !== -1 && popupOpen) {
@@ -702,7 +720,7 @@ function useAutocomplete(props) {
             // Avoid the Modal to handle the event.
             event.stopPropagation();
             handleClose(event, 'escape');
-          } else if (clearOnEscape && (inputValue !== '' || multiple && value.length > 0)) {
+          } else if (clearOnEscape && (inputValue !== '' || multiple && value.length > 0 || renderValue)) {
             // Avoid Opera to exit fullscreen mode.
             event.preventDefault();
             // Avoid the Modal to handle the event.
@@ -713,24 +731,32 @@ function useAutocomplete(props) {
         case 'Backspace':
           // Remove the value on the left of the "cursor"
           if (multiple && !readOnly && inputValue === '' && value.length > 0) {
-            const index = focusedTag === -1 ? value.length - 1 : focusedTag;
+            const index = focusedItem === -1 ? value.length - 1 : focusedItem;
             const newValue = value.slice();
             newValue.splice(index, 1);
             handleValue(event, newValue, 'removeOption', {
               option: value[index]
             });
           }
+          if (!multiple && renderValue && !readOnly) {
+            setValueState(null);
+            focusItem(-1);
+          }
           break;
         case 'Delete':
           // Remove the value on the right of the "cursor"
-          if (multiple && !readOnly && inputValue === '' && value.length > 0 && focusedTag !== -1) {
-            const index = focusedTag;
+          if (multiple && !readOnly && inputValue === '' && value.length > 0 && focusedItem !== -1) {
+            const index = focusedItem;
             const newValue = value.slice();
             newValue.splice(index, 1);
             handleValue(event, newValue, 'removeOption', {
               option: value[index]
             });
           }
+          if (!multiple && renderValue && !readOnly) {
+            setValueState(null);
+            focusItem(-1);
+          }
           break;
         default:
       }
@@ -800,13 +826,18 @@ function useAutocomplete(props) {
     selectNewValue(event, filteredOptions[index], 'selectOption');
     isTouch.current = false;
   };
-  const handleTagDelete = index => event => {
+  const handleItemDelete = index => event => {
     const newValue = value.slice();
     newValue.splice(index, 1);
     handleValue(event, newValue, 'removeOption', {
       option: value[index]
     });
   };
+  const handleSingleItemDelete = event => {
+    handleValue(event, null, 'removeOption', {
+      option: value
+    });
+  };
   const handlePopupIndicator = event => {
     if (open) {
       handleClose(event, 'toggleInput');
@@ -913,11 +944,28 @@ function useAutocomplete(props) {
       type: 'button',
       onClick: handleClear
     }),
+    getItemProps: ({
+      index = 0
+    } = {}) => ({
+      ...(multiple && {
+        key: index
+      }),
+      ...(renderValue ? {
+        'data-item-index': index
+      } : {
+        'data-tag-index': index
+      }),
+      tabIndex: -1,
+      ...(!readOnly && {
+        onDelete: multiple ? handleItemDelete(index) : handleSingleItemDelete
+      })
+    }),
     getPopupIndicatorProps: () => ({
       tabIndex: -1,
       type: 'button',
       onClick: handlePopupIndicator
     }),
+    // deprecated
     getTagProps: ({
       index
     }) => ({
@@ -925,7 +973,7 @@ function useAutocomplete(props) {
       'data-tag-index': index,
       tabIndex: -1,
       ...(!readOnly && {
-        onDelete: handleTagDelete(index)
+        onDelete: handleItemDelete(index)
       })
     }),
     getListboxProps: () => ({
@@ -963,10 +1011,12 @@ function useAutocomplete(props) {
     dirty,
     expanded: popupOpen && anchorEl,
     popupOpen,
-    focused: focused || focusedTag !== -1,
+    focused: focused || focusedItem !== -1,
     anchorEl,
     setAnchorEl,
-    focusedTag,
+    focusedItem,
+    // deprecated
+    focusedTag: focusedItem,
     groupedOptions
   };
 }

package/esm/utils/index.d.ts

@@ -1,4 +1,4 @@
-export { unstable_ClassNameGenerator } from '@mui/utils';
+export { default as unstable_ClassNameGenerator } from '@mui/utils/ClassNameGenerator';
 export { default as capitalize } from "./capitalize.js";
 export { default as createChainedFunction } from "./createChainedFunction.js";
 export { default as createSvgIcon } from "./createSvgIcon.js";

package/esm/utils/index.js

@@ -1,6 +1,6 @@
 'use client';
 
-import { unstable_ClassNameGenerator as ClassNameGenerator } from '@mui/utils';
+import ClassNameGenerator from '@mui/utils/ClassNameGenerator';
 export { default as capitalize } from "./capitalize.js";
 export { default as createChainedFunction } from "./createChainedFunction.js";
 export { default as createSvgIcon } from "./createSvgIcon.js";

package/esm/utils/memoTheme.d.ts

@@ -3,5 +3,5 @@ declare const memoTheme: (styleFn: (props: {
   theme: Theme;
 }) => import("@mui/styled-engine").CSSInterpolation) => (props: {
   theme: Theme;
-}) => string | number | boolean | import("@mui/styled-engine").CSSObject | import("@mui/styled-engine").ComponentSelector | import("@mui/styled-engine").Keyframes | import("@mui/styled-engine").SerializedStyles | import("@mui/styled-engine").ArrayCSSInterpolation | null;
+}) => string | number | boolean | import("@mui/styled-engine").ComponentSelector | import("@mui/styled-engine").Keyframes | import("@mui/styled-engine").SerializedStyles | import("@mui/styled-engine").CSSObject | import("@mui/styled-engine").ArrayCSSInterpolation | null;
 export default memoTheme;

package/esm/utils/mergeSlotProps.d.ts

@@ -1,2 +1,2 @@
-import { SlotComponentProps } from '@mui/utils';
+import { SlotComponentProps } from '@mui/utils/types';
 export default function mergeSlotProps<T extends SlotComponentProps<React.ElementType, {}, {}>, K = T, U = (T extends Function ? T : K extends Function ? K : T extends undefined ? K : T)>(externalSlotProps: T | undefined, defaultSlotProps: K): U;

package/esm/utils/types.d.ts

@@ -1,7 +1,7 @@
 import { SxProps } from '@mui/system';
-import { SlotComponentProps } from '@mui/utils';
+import { SlotComponentProps } from '@mui/utils/types';
 import { Theme } from "../styles/index.js";
-export type { EventHandlers, WithOptionalOwnerState, SlotComponentProps, SlotComponentPropsWithSlotState } from '@mui/utils';
+export type { EventHandlers, WithOptionalOwnerState, SlotComponentProps, SlotComponentPropsWithSlotState } from '@mui/utils/types';
 export type SlotCommonProps = {
   component?: React.ElementType;
   sx?: SxProps<Theme>;

package/esm/version/index.js

@@ -1,6 +1,6 @@
-export const version = "7.0.1";
+export const version = "7.1.0";
 export const major = Number("7");
-export const minor = Number("0");
-export const patch = Number("1");
+export const minor = Number("1");
+export const patch = Number("0");
 export const prerelease = undefined;
 export default version;

package/generateUtilityClass/index.d.ts

@@ -1,2 +1,2 @@
-export { unstable_generateUtilityClass as default } from '@mui/utils';
-export type { GlobalStateSlot } from '@mui/utils';
+export { default } from '@mui/utils/generateUtilityClass';
+export type { GlobalStateSlot } from '@mui/utils/generateUtilityClass';

package/generateUtilityClass/index.js

@@ -1,12 +1,13 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
   get: function () {
-    return _utils.unstable_generateUtilityClass;
+    return _generateUtilityClass.default;
   }
 });
-var _utils = require("@mui/utils");
+var _generateUtilityClass = _interopRequireDefault(require("@mui/utils/generateUtilityClass"));

package/generateUtilityClasses/index.d.ts

@@ -1 +1 @@
-export { unstable_generateUtilityClasses as default } from '@mui/utils';
+export { default } from '@mui/utils/generateUtilityClasses';

package/generateUtilityClasses/index.js

@@ -1,12 +1,13 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
   get: function () {
-    return _utils.unstable_generateUtilityClasses;
+    return _generateUtilityClasses.default;
   }
 });
-var _utils = require("@mui/utils");
+var _generateUtilityClasses = _interopRequireDefault(require("@mui/utils/generateUtilityClasses"));

package/index.d.ts

@@ -37,7 +37,6 @@ StyledComponentProps<never> & {
 };
 export namespace PropTypes {
   // keeping the type structure for backwards compat
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   type Color = 'inherit' | 'primary' | 'secondary' | 'default';
 }
 
@@ -316,9 +315,10 @@ export * from "./useAutocomplete/index.js";
 export { default as GlobalStyles } from "./GlobalStyles/index.js";
 export * from "./GlobalStyles/index.js";
 export * from "./version/index.js";
-export { unstable_composeClasses } from '@mui/utils';
+export { default as unstable_composeClasses } from '@mui/utils/composeClasses';
 export { default as generateUtilityClass } from "./generateUtilityClass/index.js";
 export * from "./generateUtilityClass/index.js";
 export { default as generateUtilityClasses } from "./generateUtilityClasses/index.js";
 export { default as Unstable_TrapFocus } from "./Unstable_TrapFocus/index.js";
-export * from "./Unstable_TrapFocus/index.js";
+export * from "./Unstable_TrapFocus/index.js";
+export { default as InitColorSchemeScript } from "./InitColorSchemeScript/index.js";

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/material v7.0.1
+ * @mui/material v7.1.0
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the
@@ -150,7 +150,8 @@ var _exportNames = {
   unstable_composeClasses: true,
   generateUtilityClass: true,
   generateUtilityClasses: true,
-  Unstable_TrapFocus: true
+  Unstable_TrapFocus: true,
+  InitColorSchemeScript: true
 };
 Object.defineProperty(exports, "Accordion", {
   enumerable: true,
@@ -488,6 +489,12 @@ Object.defineProperty(exports, "ImageListItemBar", {
     return _ImageListItemBar.default;
   }
 });
+Object.defineProperty(exports, "InitColorSchemeScript", {
+  enumerable: true,
+  get: function () {
+    return _InitColorSchemeScript.default;
+  }
+});
 Object.defineProperty(exports, "Input", {
   enumerable: true,
   get: function () {
@@ -948,7 +955,7 @@ Object.defineProperty(exports, "generateUtilityClasses", {
 Object.defineProperty(exports, "unstable_composeClasses", {
   enumerable: true,
   get: function () {
-    return _utils2.unstable_composeClasses;
+    return _composeClasses.default;
   }
 });
 Object.defineProperty(exports, "useAutocomplete", {
@@ -2575,7 +2582,7 @@ Object.keys(_GlobalStyles).forEach(function (key) {
     }
   });
 });
-var _utils2 = require("@mui/utils");
+var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
 var _generateUtilityClass = _interopRequireWildcard(require("./generateUtilityClass"));
 Object.keys(_generateUtilityClass).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -2601,4 +2608,5 @@ Object.keys(_version).forEach(function (key) {
       return _version[key];
     }
   });
-});
+});
+var _InitColorSchemeScript = _interopRequireDefault(require("./InitColorSchemeScript"));

package/internal/SwitchBase.d.ts

@@ -69,7 +69,7 @@ export interface SwitchBaseProps extends StandardProps<ButtonBaseProps, 'childre
    */
   id?: string;
   /**
-   * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Attributes) applied to the `input` element.
+   * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Elements/input#attributes) applied to the `input` element.
    * @deprecated Use `slotProps.input` instead. This prop will be removed in a future major release. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
    */
   inputProps?: React.InputHTMLAttributes<HTMLInputElement>;

package/internal/SwitchBase.js

@@ -291,7 +291,7 @@ process.env.NODE_ENV !== "production" ? SwitchBase.propTypes = {
    */
   id: _propTypes.default.string,
   /**
-   * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Attributes) applied to the `input` element.
+   * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Elements/input#attributes) applied to the `input` element.
    */
   inputProps: _propTypes.default.object,
   /**

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@mui/material",
-  "version": "7.0.1",
-  "private": false,
+  "version": "7.1.0",
   "author": "MUI Team",
   "description": "Material UI is an open-source React component library that implements Google's Material Design. It's comprehensive and can be used in production out of the box.",
   "main": "./index.js",
@@ -27,18 +26,18 @@
     "url": "https://opencollective.com/mui-org"
   },
   "dependencies": {
-    "@babel/runtime": "^7.26.10",
+    "@babel/runtime": "^7.27.1",
     "@popperjs/core": "^2.11.8",
     "@types/react-transition-group": "^4.4.12",
     "clsx": "^2.1.1",
     "csstype": "^3.1.3",
     "prop-types": "^15.8.1",
-    "react-is": "^19.0.0",
+    "react-is": "^19.1.0",
     "react-transition-group": "^4.4.5",
-    "@mui/core-downloads-tracker": "^7.0.1",
-    "@mui/types": "^7.4.0",
-    "@mui/system": "^7.0.1",
-    "@mui/utils": "^7.0.1"
+    "@mui/system": "^7.1.0",
+    "@mui/utils": "^7.1.0",
+    "@mui/types": "^7.4.2",
+    "@mui/core-downloads-tracker": "^7.1.0"
   },
   "peerDependencies": {
     "@emotion/react": "^11.5.0",
@@ -46,7 +45,7 @@
     "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
     "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
     "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0",
-    "@mui/material-pigment-css": "^7.0.1"
+    "@mui/material-pigment-css": "^7.1.0"
   },
   "peerDependenciesMeta": {
     "@types/react": {
@@ -80,10 +79,6 @@
       "import": {
         "types": "./esm/index.d.ts",
         "default": "./esm/index.js"
-      },
-      "mui-modern": {
-        "types": "./modern/index.d.ts",
-        "default": "./modern/index.js"
       }
     },
     "./*": {
@@ -94,10 +89,6 @@
       "import": {
         "types": "./esm/*/index.d.ts",
         "default": "./esm/*/index.js"
-      },
-      "mui-modern": {
-        "types": "./modern/*/index.d.ts",
-        "default": "./modern/*/index.js"
       }
     },
     "./esm": null,
@@ -110,10 +101,6 @@
       "import": {
         "types": "./esm/ButtonBase/TouchRipple.d.ts",
         "default": "./esm/ButtonBase/TouchRipple.js"
-      },
-      "mui-modern": {
-        "types": "./modern/ButtonBase/TouchRipple.d.ts",
-        "default": "./modern/ButtonBase/TouchRipple.js"
       }
     }
   },
@@ -129,6 +116,7 @@
       ]
     }
   },
+  "private": false,
   "module": "./esm/index.js",
   "types": "./index.d.ts"
 }

package/styles/ThemeProvider.js

@@ -16,27 +16,27 @@ function ThemeProvider({
   theme,
   ...props
 }) {
-  if (typeof theme === 'function') {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ThemeProviderNoVars.default, {
-      theme: theme,
-      ...props
-    });
-  }
-  const muiTheme = _identifier.default in theme ? theme[_identifier.default] : theme;
-  if (!('colorSchemes' in muiTheme)) {
-    if (!('vars' in muiTheme)) {
-      // For non-CSS variables themes, set `vars` to null to prevent theme inheritance from the upper theme.
-      // The example use case is the docs demo that uses ThemeProvider to customize the theme while the upper theme is using CSS variables.
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ThemeProviderNoVars.default, {
-        theme: {
+  const noVarsTheme = React.useMemo(() => {
+    if (typeof theme === 'function') {
+      return theme;
+    }
+    const muiTheme = _identifier.default in theme ? theme[_identifier.default] : theme;
+    if (!('colorSchemes' in muiTheme)) {
+      if (!('vars' in muiTheme)) {
+        // For non-CSS variables themes, set `vars` to null to prevent theme inheritance from the upper theme.
+        // The example use case is the docs demo that uses ThemeProvider to customize the theme while the upper theme is using CSS variables.
+        return {
           ...theme,
           vars: null
-        },
-        ...props
-      });
+        };
+      }
+      return theme;
     }
+    return null;
+  }, [theme]);
+  if (noVarsTheme) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ThemeProviderNoVars.default, {
-      theme: theme,
+      theme: noVarsTheme,
       ...props
     });
   }

package/styles/createThemeNoVars.d.ts

@@ -49,7 +49,7 @@ export interface BaseTheme extends SystemTheme {
 export {};
 type CssVarsProperties = CssThemeVariables extends {
   enabled: true;
-} ? Pick<CssVarsTheme, 'applyStyles' | 'colorSchemes' | 'colorSchemeSelector' | 'rootSelector' | 'cssVarPrefix' | 'defaultColorScheme' | 'getCssVar' | 'getColorSchemeSelector' | 'generateThemeVars' | 'generateStyleSheets' | 'generateSpacing' | 'shouldSkipGeneratingVar' | 'vars'> : {};
+} ? Pick<CssVarsTheme, 'applyStyles' | 'colorSchemes' | 'colorSchemeSelector' | 'rootSelector' | 'cssVarPrefix' | 'defaultColorScheme' | 'getCssVar' | 'getColorSchemeSelector' | 'generateThemeVars' | 'generateStyleSheets' | 'generateSpacing' | 'shouldSkipGeneratingVar' | 'vars'> : Partial<Pick<CssVarsTheme, 'vars'>>;
 
 /**
  * Our [TypeScript guide on theme customization](https://mui.com/material-ui/guides/typescript/#customization-of-theme) explains in detail how you would add custom properties.