@mui/system 5.10.13 → 5.10.15

package/cssVars/createCssVarsProvider.js

@@ -1,44 +1,27 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DISABLE_CSS_TRANSITION = void 0;
 exports.default = createCssVarsProvider;
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
-
 var _utils = require("@mui/utils");
-
 var React = _interopRequireWildcard(require("react"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _styledEngine = require("@mui/styled-engine");
-
 var _cssVarsParser = _interopRequireDefault(require("./cssVarsParser"));
-
 var _ThemeProvider = _interopRequireDefault(require("../ThemeProvider"));
-
 var _getInitColorSchemeScript = _interopRequireWildcard(require("./getInitColorSchemeScript"));
-
 var _useCurrentColorScheme = _interopRequireDefault(require("./useCurrentColorScheme"));
-
 var _jsxRuntime = require("react/jsx-runtime");
-
 const _excluded = ["colorSchemes", "components", "cssVarPrefix"];
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 const DISABLE_CSS_TRANSITION = '*{-webkit-transition:none!important;-moz-transition:none!important;-o-transition:none!important;-ms-transition:none!important;transition:none!important}';
 exports.DISABLE_CSS_TRANSITION = DISABLE_CSS_TRANSITION;
-
 function createCssVarsProvider(options) {
   const {
     theme: defaultTheme = {},
@@ -52,23 +35,17 @@ function createCssVarsProvider(options) {
     resolveTheme,
     excludeVariablesFromRoot
   } = options;
-
   if (!defaultTheme.colorSchemes || typeof designSystemColorScheme === 'string' && !defaultTheme.colorSchemes[designSystemColorScheme] || typeof designSystemColorScheme === 'object' && !defaultTheme.colorSchemes[designSystemColorScheme == null ? void 0 : designSystemColorScheme.light] || typeof designSystemColorScheme === 'object' && !defaultTheme.colorSchemes[designSystemColorScheme == null ? void 0 : designSystemColorScheme.dark]) {
     console.error(`MUI: \`${designSystemColorScheme}\` does not exist in \`theme.colorSchemes\`.`);
   }
-
   const ColorSchemeContext = /*#__PURE__*/React.createContext(undefined);
-
   const useColorScheme = () => {
     const value = React.useContext(ColorSchemeContext);
-
     if (!value) {
       throw new Error(process.env.NODE_ENV !== "production" ? `MUI: \`useColorScheme\` must be called under <CssVarsProvider />` : (0, _utils.formatMuiErrorMessage)(19));
     }
-
     return value;
   };
-
   function CssVarsProvider({
     children,
     theme: themeProp = defaultTheme,
@@ -86,15 +63,16 @@ function createCssVarsProvider(options) {
   }) {
     const hasMounted = React.useRef(false);
     const {
-      colorSchemes = {},
-      components = {},
-      cssVarPrefix
-    } = themeProp,
-          restThemeProp = (0, _objectWithoutPropertiesLoose2.default)(themeProp, _excluded);
+        colorSchemes = {},
+        components = {},
+        cssVarPrefix
+      } = themeProp,
+      restThemeProp = (0, _objectWithoutPropertiesLoose2.default)(themeProp, _excluded);
     const allColorSchemes = Object.keys(colorSchemes);
     const defaultLightColorScheme = typeof defaultColorScheme === 'string' ? defaultColorScheme : defaultColorScheme.light;
-    const defaultDarkColorScheme = typeof defaultColorScheme === 'string' ? defaultColorScheme : defaultColorScheme.dark; // 1. Get the data about the `mode`, `colorScheme`, and setter functions.
+    const defaultDarkColorScheme = typeof defaultColorScheme === 'string' ? defaultColorScheme : defaultColorScheme.dark;
 
+    // 1. Get the data about the `mode`, `colorScheme`, and setter functions.
     const {
       mode,
       setMode,
@@ -112,35 +90,29 @@ function createCssVarsProvider(options) {
       defaultMode,
       storageWindow
     });
-
     const calculatedMode = (() => {
       if (!mode) {
         // This scope occurs on the server
         if (defaultMode === 'system') {
           return designSystemMode;
         }
-
         return defaultMode;
       }
-
       return mode;
     })();
-
     const calculatedColorScheme = (() => {
       if (!colorScheme) {
         // This scope occurs on the server
         if (calculatedMode === 'dark') {
           return defaultDarkColorScheme;
-        } // use light color scheme, if default mode is 'light' | 'system'
-
-
+        }
+        // use light color scheme, if default mode is 'light' | 'system'
         return defaultLightColorScheme;
       }
-
       return colorScheme;
-    })(); // 2. Create CSS variables and store them in objects (to be generated in stylesheets in the final step)
-
+    })();
 
+    // 2. Create CSS variables and store them in objects (to be generated in stylesheets in the final step)
     const {
       css: rootCss,
       vars: rootVars,
@@ -148,18 +120,20 @@ function createCssVarsProvider(options) {
     } = (0, _cssVarsParser.default)(restThemeProp, {
       prefix: cssVarPrefix,
       shouldSkipGeneratingVar
-    }); // 3. Start composing the theme object
+    });
 
-    let theme = (0, _extends2.default)({}, parsedTheme, {
+    // 3. Start composing the theme object
+    const theme = (0, _extends2.default)({}, parsedTheme, {
       components,
       colorSchemes,
       cssVarPrefix,
       vars: rootVars,
       getColorSchemeSelector: targetColorScheme => `[${attribute}="${targetColorScheme}"] &`
-    }); // 4. Create color CSS variables and store them in objects (to be generated in stylesheets in the final step)
+    });
+
+    // 4. Create color CSS variables and store them in objects (to be generated in stylesheets in the final step)
     //    The default color scheme stylesheet is constructed to have the least CSS specificity.
     //    The other color schemes uses selector, default as data attribute, to increase the CSS specificity so that they can override the default color scheme stylesheet.
-
     const defaultColorSchemeStyleSheet = {};
     const otherColorSchemesStyleSheet = {};
     Object.entries(colorSchemes).forEach(([key, scheme]) => {
@@ -172,28 +146,29 @@ function createCssVarsProvider(options) {
         shouldSkipGeneratingVar
       });
       theme.vars = (0, _utils.deepmerge)(theme.vars, vars);
-
       if (key === calculatedColorScheme) {
         // 4.1 Merge the selected color scheme to the theme
-        theme = (0, _extends2.default)({}, theme, parsedScheme);
-
+        Object.keys(parsedScheme).forEach(schemeKey => {
+          if (parsedScheme[schemeKey] && typeof parsedScheme[schemeKey] === 'object') {
+            // shallow merge the 1st level structure of the theme.
+            theme[schemeKey] = (0, _extends2.default)({}, theme[schemeKey], parsedScheme[schemeKey]);
+          } else {
+            theme[schemeKey] = parsedScheme[schemeKey];
+          }
+        });
         if (theme.palette) {
           theme.palette.colorScheme = key;
         }
       }
-
       const resolvedDefaultColorScheme = (() => {
         if (typeof defaultColorScheme === 'string') {
           return defaultColorScheme;
         }
-
         if (defaultMode === 'dark') {
           return defaultColorScheme.dark;
         }
-
         return defaultColorScheme.light;
       })();
-
       if (key === resolvedDefaultColorScheme) {
         if (excludeVariablesFromRoot) {
           const excludedVariables = {};
@@ -203,37 +178,36 @@ function createCssVarsProvider(options) {
           });
           defaultColorSchemeStyleSheet[`[${attribute}="${key}"]`] = excludedVariables;
         }
-
         defaultColorSchemeStyleSheet[`${colorSchemeSelector}, [${attribute}="${key}"]`] = css;
       } else {
         otherColorSchemesStyleSheet[`${colorSchemeSelector === ':root' ? '' : colorSchemeSelector}[${attribute}="${key}"]`] = css;
       }
-    }); // 5. Declaring effects
-    // 5.1 Updates the selector value to use the current color scheme which tells CSS to use the proper stylesheet.
+    });
 
+    // 5. Declaring effects
+    // 5.1 Updates the selector value to use the current color scheme which tells CSS to use the proper stylesheet.
     React.useEffect(() => {
       if (colorScheme && colorSchemeNode) {
         // attaches attribute to <html> because the css variables are attached to :root (html)
         colorSchemeNode.setAttribute(attribute, colorScheme);
       }
-    }, [colorScheme, attribute, colorSchemeNode]); // 5.2 Remove the CSS transition when color scheme changes to create instant experience.
-    // credit: https://github.com/pacocoursey/next-themes/blob/b5c2bad50de2d61ad7b52a9c5cdc801a78507d7a/index.tsx#L313
+    }, [colorScheme, attribute, colorSchemeNode]);
 
+    // 5.2 Remove the CSS transition when color scheme changes to create instant experience.
+    // credit: https://github.com/pacocoursey/next-themes/blob/b5c2bad50de2d61ad7b52a9c5cdc801a78507d7a/index.tsx#L313
     React.useEffect(() => {
       let timer;
-
       if (disableTransitionOnChange && hasMounted.current && documentNode) {
         const css = documentNode.createElement('style');
         css.appendChild(documentNode.createTextNode(DISABLE_CSS_TRANSITION));
-        documentNode.head.appendChild(css); // Force browser repaint
+        documentNode.head.appendChild(css);
 
+        // Force browser repaint
         (() => window.getComputedStyle(documentNode.body))();
-
         timer = setTimeout(() => {
           documentNode.head.removeChild(css);
         }, 1);
       }
-
       return () => {
         clearTimeout(timer);
       };
@@ -270,69 +244,56 @@ function createCssVarsProvider(options) {
       })]
     });
   }
-
   process.env.NODE_ENV !== "production" ? CssVarsProvider.propTypes = {
     /**
      * The body attribute name to attach colorScheme.
      */
     attribute: _propTypes.default.string,
-
     /**
      * The component tree.
      */
     children: _propTypes.default.node,
-
     /**
      * The node used to attach the color-scheme attribute
      */
     colorSchemeNode: _propTypes.default.any,
-
     /**
      * The CSS selector for attaching the generated custom properties
      */
     colorSchemeSelector: _propTypes.default.string,
-
     /**
      * localStorage key used to store `colorScheme`
      */
     colorSchemeStorageKey: _propTypes.default.string,
-
     /**
      * The initial color scheme used.
      */
     defaultColorScheme: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.object]),
-
     /**
      * The initial mode used.
      */
     defaultMode: _propTypes.default.string,
-
     /**
      * Disable CSS transitions when switching between modes or color schemes
      */
     disableTransitionOnChange: _propTypes.default.bool,
-
     /**
      * The document to attach the attribute to
      */
     documentNode: _propTypes.default.any,
-
     /**
      * The key in the local storage used to store current color scheme.
      */
     modeStorageKey: _propTypes.default.string,
-
     /**
      * A function to determine if the key, value should be attached as CSS Variable
      */
     shouldSkipGeneratingVar: _propTypes.default.func,
-
     /**
      * The window that attaches the 'storage' event listener
      * @default window
      */
     storageWindow: _propTypes.default.any,
-
     /**
      * The calculated theme object that will be passed through context.
      */
@@ -340,7 +301,6 @@ function createCssVarsProvider(options) {
   } : void 0;
   const defaultLightColorScheme = typeof designSystemColorScheme === 'string' ? designSystemColorScheme : designSystemColorScheme.light;
   const defaultDarkColorScheme = typeof designSystemColorScheme === 'string' ? designSystemColorScheme : designSystemColorScheme.dark;
-
   const getInitColorSchemeScript = params => (0, _getInitColorSchemeScript.default)((0, _extends2.default)({
     attribute: defaultAttribute,
     colorSchemeStorageKey: defaultColorSchemeStorageKey,
@@ -349,7 +309,6 @@ function createCssVarsProvider(options) {
     defaultDarkColorScheme,
     modeStorageKey: defaultModeStorageKey
   }, params));
-
   return {
     CssVarsProvider,
     useColorScheme,

package/cssVars/createGetCssVar.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = createGetCssVar;
-
 /**
  * The benefit of this function is to help developers get CSS var from theme without specifying the whole variable
  * and they does not need to remember the prefix (defined once).
@@ -14,20 +13,16 @@ function createGetCssVar(prefix = '') {
     if (!vars.length) {
       return '';
     }
-
     const value = vars[0];
-
     if (typeof value === 'string' && !value.match(/(#|\(|\)|(-?(\d*\.)?\d+)(px|em|%|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc))/)) {
       return `, var(--${prefix ? `${prefix}-` : ''}${value}${appendVar(...vars.slice(1))})`;
     }
-
     return `, ${value}`;
-  } // AdditionalVars makes `getCssVar` less strict, so it can be use like this `getCssVar('non-mui-variable')` without type error.
-
+  }
 
+  // AdditionalVars makes `getCssVar` less strict, so it can be use like this `getCssVar('non-mui-variable')` without type error.
   const getCssVar = (field, ...fallbacks) => {
     return `var(--${prefix ? `${prefix}-` : ''}${field}${appendVar(...fallbacks)})`;
   };
-
   return getCssVar;
 }

package/cssVars/cssVarsParser.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.assignNestedKeys = void 0;
 exports.default = cssVarsParser;
 exports.walkObjectDeep = void 0;
-
 /**
  * This function create an object from keys, value and then assign to target
  *
@@ -37,11 +36,11 @@ const assignNestedKeys = (obj, keys, value, arrayKeys = []) => {
       if (!temp[k]) {
         temp[k] = arrayKeys.includes(k) ? [] : {};
       }
-
       temp = temp[k];
     }
   });
 };
+
 /**
  *
  * @param {Object} obj : source object
@@ -53,10 +52,7 @@ const assignNestedKeys = (obj, keys, value, arrayKeys = []) => {
  * walkObjectDeep({ palette: { primary: { main: '#000000' } } }, console.log)
  * // ['palette', 'primary', 'main'] '#000000'
  */
-
-
 exports.assignNestedKeys = assignNestedKeys;
-
 const walkObjectDeep = (obj, callback, shouldSkipPaths) => {
   function recurse(object, parentKeys = [], arrayKeys = []) {
     Object.entries(object).forEach(([key, value]) => {
@@ -71,31 +67,25 @@ const walkObjectDeep = (obj, callback, shouldSkipPaths) => {
       }
     });
   }
-
   recurse(obj);
 };
-
 exports.walkObjectDeep = walkObjectDeep;
-
 const getCssValue = (keys, value) => {
   if (typeof value === 'number') {
     if (['lineHeight', 'fontWeight', 'opacity', 'zIndex'].some(prop => keys.includes(prop))) {
       // CSS property that are unitless
       return value;
     }
-
     const lastKey = keys[keys.length - 1];
-
     if (lastKey.toLowerCase().indexOf('opacity') >= 0) {
       // opacity values are unitless
       return value;
     }
-
     return `${value}px`;
   }
-
   return value;
 };
+
 /**
  * a function that parse theme and return { css, vars }
  *
@@ -119,8 +109,6 @@ const getCssValue = (keys, value) => {
  * console.log(vars) // { fontSize: 'var(--foo-fontSize)', lineHeight: 'var(--foo-lineHeight)', palette: { primary: { 500: 'var(--foo-palette-primary-500)' } } }
  * console.log(parsedTheme) // { fontSize: 12, lineHeight: 1.2, palette: { primary: { 500: 'var(--color)' } } }
  */
-
-
 function cssVarsParser(theme, options) {
   const {
     prefix,
@@ -140,10 +128,10 @@ function cssVarsParser(theme, options) {
         assignNestedKeys(vars, keys, `var(${cssVar})`, arrayKeys);
       }
     }
-
     assignNestedKeys(parsedTheme, keys, value, arrayKeys);
   }, keys => keys[0] === 'vars' // skip 'vars/*' paths
   );
+
   return {
     css,
     vars,

package/cssVars/getInitColorSchemeScript.js

@@ -5,22 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.DEFAULT_MODE_STORAGE_KEY = exports.DEFAULT_COLOR_SCHEME_STORAGE_KEY = exports.DEFAULT_ATTRIBUTE = void 0;
 exports.default = getInitColorSchemeScript;
-
 var React = _interopRequireWildcard(require("react"));
-
 var _jsxRuntime = require("react/jsx-runtime");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 const DEFAULT_MODE_STORAGE_KEY = 'mode';
 exports.DEFAULT_MODE_STORAGE_KEY = DEFAULT_MODE_STORAGE_KEY;
 const DEFAULT_COLOR_SCHEME_STORAGE_KEY = 'color-scheme';
 exports.DEFAULT_COLOR_SCHEME_STORAGE_KEY = DEFAULT_COLOR_SCHEME_STORAGE_KEY;
 const DEFAULT_ATTRIBUTE = 'data-color-scheme';
 exports.DEFAULT_ATTRIBUTE = DEFAULT_ATTRIBUTE;
-
 function getInitColorSchemeScript(options) {
   const {
     defaultMode = 'light',

package/cssVars/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -17,7 +16,5 @@ Object.defineProperty(exports, "getInitColorSchemeScript", {
     return _getInitColorSchemeScript.default;
   }
 });
-
 var _createCssVarsProvider = _interopRequireDefault(require("./createCssVarsProvider"));
-
 var _getInitColorSchemeScript = _interopRequireDefault(require("./getInitColorSchemeScript"));