@mui/system 5.10.13 → 5.10.15

package/esm/cssVars/createCssVarsProvider.js

@@ -26,23 +26,17 @@ export default 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 />` : _formatMuiErrorMessage(19));
     }
-
     return value;
   };
-
   function CssVarsProvider({
     children,
     theme: themeProp = defaultTheme,
@@ -59,18 +53,17 @@ export default function createCssVarsProvider(options) {
     shouldSkipGeneratingVar = designSystemShouldSkipGeneratingVar
   }) {
     const hasMounted = React.useRef(false);
-
     const {
-      colorSchemes = {},
-      components = {},
-      cssVarPrefix
-    } = themeProp,
-          restThemeProp = _objectWithoutPropertiesLoose(themeProp, _excluded);
-
+        colorSchemes = {},
+        components = {},
+        cssVarPrefix
+      } = themeProp,
+      restThemeProp = _objectWithoutPropertiesLoose(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,
@@ -88,35 +81,29 @@ export default 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,
@@ -124,19 +111,20 @@ export default function createCssVarsProvider(options) {
     } = cssVarsParser(restThemeProp, {
       prefix: cssVarPrefix,
       shouldSkipGeneratingVar
-    }); // 3. Start composing the theme object
+    });
 
-    let theme = _extends({}, parsedTheme, {
+    // 3. Start composing the theme object
+    const theme = _extends({}, 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]) => {
@@ -149,28 +137,29 @@ export default function createCssVarsProvider(options) {
         shouldSkipGeneratingVar
       });
       theme.vars = deepmerge(theme.vars, vars);
-
       if (key === calculatedColorScheme) {
         // 4.1 Merge the selected color scheme to the theme
-        theme = _extends({}, 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] = _extends({}, 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 = {};
@@ -180,37 +169,36 @@ export default 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);
       };
@@ -247,69 +235,56 @@ export default function createCssVarsProvider(options) {
       })]
     });
   }
-
   process.env.NODE_ENV !== "production" ? CssVarsProvider.propTypes = {
     /**
      * The body attribute name to attach colorScheme.
      */
     attribute: PropTypes.string,
-
     /**
      * The component tree.
      */
     children: PropTypes.node,
-
     /**
      * The node used to attach the color-scheme attribute
      */
     colorSchemeNode: PropTypes.any,
-
     /**
      * The CSS selector for attaching the generated custom properties
      */
     colorSchemeSelector: PropTypes.string,
-
     /**
      * localStorage key used to store `colorScheme`
      */
     colorSchemeStorageKey: PropTypes.string,
-
     /**
      * The initial color scheme used.
      */
     defaultColorScheme: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
-
     /**
      * The initial mode used.
      */
     defaultMode: PropTypes.string,
-
     /**
      * Disable CSS transitions when switching between modes or color schemes
      */
     disableTransitionOnChange: PropTypes.bool,
-
     /**
      * The document to attach the attribute to
      */
     documentNode: PropTypes.any,
-
     /**
      * The key in the local storage used to store current color scheme.
      */
     modeStorageKey: PropTypes.string,
-
     /**
      * A function to determine if the key, value should be attached as CSS Variable
      */
     shouldSkipGeneratingVar: PropTypes.func,
-
     /**
      * The window that attaches the 'storage' event listener
      * @default window
      */
     storageWindow: PropTypes.any,
-
     /**
      * The calculated theme object that will be passed through context.
      */
@@ -317,7 +292,6 @@ export default function createCssVarsProvider(options) {
   } : void 0;
   const defaultLightColorScheme = typeof designSystemColorScheme === 'string' ? designSystemColorScheme : designSystemColorScheme.light;
   const defaultDarkColorScheme = typeof designSystemColorScheme === 'string' ? designSystemColorScheme : designSystemColorScheme.dark;
-
   const getInitColorSchemeScript = params => systemGetInitColorSchemeScript(_extends({
     attribute: defaultAttribute,
     colorSchemeStorageKey: defaultColorSchemeStorageKey,
@@ -326,7 +300,6 @@ export default function createCssVarsProvider(options) {
     defaultDarkColorScheme,
     modeStorageKey: defaultModeStorageKey
   }, params));
-
   return {
     CssVarsProvider,
     useColorScheme,

package/esm/cssVars/createGetCssVar.js

@@ -7,20 +7,16 @@ export default 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/esm/cssVars/cssVarsParser.js

@@ -28,11 +28,11 @@ export const assignNestedKeys = (obj, keys, value, arrayKeys = []) => {
       if (!temp[k]) {
         temp[k] = arrayKeys.includes(k) ? [] : {};
       }
-
       temp = temp[k];
     }
   });
 };
+
 /**
  *
  * @param {Object} obj : source object
@@ -44,7 +44,6 @@ export const assignNestedKeys = (obj, keys, value, arrayKeys = []) => {
  * walkObjectDeep({ palette: { primary: { main: '#000000' } } }, console.log)
  * // ['palette', 'primary', 'main'] '#000000'
  */
-
 export const walkObjectDeep = (obj, callback, shouldSkipPaths) => {
   function recurse(object, parentKeys = [], arrayKeys = []) {
     Object.entries(object).forEach(([key, value]) => {
@@ -59,29 +58,24 @@ export const walkObjectDeep = (obj, callback, shouldSkipPaths) => {
       }
     });
   }
-
   recurse(obj);
 };
-
 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 }
  *
@@ -105,8 +99,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)' } } }
  */
-
-
 export default function cssVarsParser(theme, options) {
   const {
     prefix,
@@ -126,10 +118,10 @@ export default 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/esm/cssVars/useCurrentColorScheme.js

@@ -4,63 +4,49 @@ import { DEFAULT_MODE_STORAGE_KEY, DEFAULT_COLOR_SCHEME_STORAGE_KEY } from './ge
 export function getSystemMode(mode) {
   if (typeof window !== 'undefined' && mode === 'system') {
     const mql = window.matchMedia('(prefers-color-scheme: dark)');
-
     if (mql.matches) {
       return 'dark';
     }
-
     return 'light';
   }
-
   return undefined;
 }
-
 function processState(state, callback) {
   if (state.mode === 'light' || state.mode === 'system' && state.systemMode === 'light') {
     return callback('light');
   }
-
   if (state.mode === 'dark' || state.mode === 'system' && state.systemMode === 'dark') {
     return callback('dark');
   }
-
   return undefined;
 }
-
 export function getColorScheme(state) {
   return processState(state, mode => {
     if (mode === 'light') {
       return state.lightColorScheme;
     }
-
     if (mode === 'dark') {
       return state.darkColorScheme;
     }
-
     return undefined;
   });
 }
-
 function initializeValue(key, defaultValue) {
   if (typeof window === 'undefined') {
     return undefined;
   }
-
   let value;
-
   try {
     value = localStorage.getItem(key) || undefined;
-
     if (!value) {
       // the first time that user enters the site.
       localStorage.setItem(key, defaultValue);
     }
-  } catch (e) {// Unsupported
+  } catch (e) {
+    // Unsupported
   }
-
   return value || defaultValue;
 }
-
 export default function useCurrentColorScheme(options) {
   const {
     defaultMode = 'light',
@@ -90,14 +76,12 @@ export default function useCurrentColorScheme(options) {
         // do nothing if mode does not change
         return currentState;
       }
-
       const newMode = !mode ? defaultMode : mode;
-
       try {
         localStorage.setItem(modeStorageKey, newMode);
-      } catch (e) {// Unsupported
+      } catch (e) {
+        // Unsupported
       }
-
       return _extends({}, currentState, {
         mode: newMode,
         systemMode: getSystemMode(newMode)
@@ -110,9 +94,9 @@ export default function useCurrentColorScheme(options) {
         try {
           localStorage.setItem(`${colorSchemeStorageKey}-light`, defaultLightColorScheme);
           localStorage.setItem(`${colorSchemeStorageKey}-dark`, defaultDarkColorScheme);
-        } catch (e) {// Unsupported
+        } catch (e) {
+          // Unsupported
         }
-
         return _extends({}, currentState, {
           lightColorScheme: defaultLightColorScheme,
           darkColorScheme: defaultDarkColorScheme
@@ -124,17 +108,15 @@ export default function useCurrentColorScheme(options) {
       } else {
         setState(currentState => {
           const newState = _extends({}, currentState);
-
           processState(currentState, mode => {
             try {
               localStorage.setItem(`${colorSchemeStorageKey}-${mode}`, value);
-            } catch (e) {// Unsupported
+            } catch (e) {
+              // Unsupported
             }
-
             if (mode === 'light') {
               newState.lightColorScheme = value;
             }
-
             if (mode === 'dark') {
               newState.darkColorScheme = value;
             }
@@ -145,36 +127,32 @@ export default function useCurrentColorScheme(options) {
     } else {
       setState(currentState => {
         const newState = _extends({}, currentState);
-
         const newLightColorScheme = value.light === null ? defaultLightColorScheme : value.light;
         const newDarkColorScheme = value.dark === null ? defaultDarkColorScheme : value.dark;
-
         if (newLightColorScheme) {
           if (!joinedColorSchemes.includes(newLightColorScheme)) {
             console.error(`\`${newLightColorScheme}\` does not exist in \`theme.colorSchemes\`.`);
           } else {
             newState.lightColorScheme = newLightColorScheme;
-
             try {
               localStorage.setItem(`${colorSchemeStorageKey}-light`, newLightColorScheme);
-            } catch (error) {// Unsupported
+            } catch (error) {
+              // Unsupported
             }
           }
         }
-
         if (newDarkColorScheme) {
           if (!joinedColorSchemes.includes(newDarkColorScheme)) {
             console.error(`\`${newDarkColorScheme}\` does not exist in \`theme.colorSchemes\`.`);
           } else {
             newState.darkColorScheme = newDarkColorScheme;
-
             try {
               localStorage.setItem(`${colorSchemeStorageKey}-dark`, newDarkColorScheme);
-            } catch (error) {// Unsupported
+            } catch (error) {
+              // Unsupported
             }
           }
         }
-
         return newState;
       });
     }
@@ -185,25 +163,27 @@ export default function useCurrentColorScheme(options) {
         systemMode: e != null && e.matches ? 'dark' : 'light'
       }));
     }
-  }, [state.mode]); // Ref hack to avoid adding handleMediaQuery as a dep
+  }, [state.mode]);
 
+  // Ref hack to avoid adding handleMediaQuery as a dep
   const mediaListener = React.useRef(handleMediaQuery);
   mediaListener.current = handleMediaQuery;
   React.useEffect(() => {
-    const handler = (...args) => mediaListener.current(...args); // Always listen to System preference
+    const handler = (...args) => mediaListener.current(...args);
 
+    // Always listen to System preference
+    const media = window.matchMedia('(prefers-color-scheme: dark)');
 
-    const media = window.matchMedia('(prefers-color-scheme: dark)'); // Intentionally use deprecated listener methods to support iOS & old browsers
-
+    // Intentionally use deprecated listener methods to support iOS & old browsers
     media.addListener(handler);
     handler(media);
     return () => media.removeListener(handler);
-  }, []); // Handle when localStorage has changed
+  }, []);
 
+  // Handle when localStorage has changed
   React.useEffect(() => {
     const handleStorage = event => {
       const value = event.newValue;
-
       if (typeof event.key === 'string' && event.key.startsWith(colorSchemeStorageKey) && (!value || joinedColorSchemes.match(value))) {
         // If the key is deleted, value will be null then reset color scheme to the default one.
         if (event.key.endsWith('light')) {
@@ -211,25 +191,21 @@ export default function useCurrentColorScheme(options) {
             light: value
           });
         }
-
         if (event.key.endsWith('dark')) {
           setColorScheme({
             dark: value
           });
         }
       }
-
       if (event.key === modeStorageKey && (!value || ['light', 'dark', 'system'].includes(value))) {
         setMode(value || defaultMode);
       }
     };
-
     if (storageWindow) {
       // For syncing color-scheme changes between iframes
       storageWindow.addEventListener('storage', handleStorage);
       return () => storageWindow.removeEventListener('storage', handleStorage);
     }
-
     return undefined;
   }, [setColorScheme, setMode, modeStorageKey, colorSchemeStorageKey, joinedColorSchemes, defaultMode, storageWindow]);
   return _extends({}, state, {

package/esm/getThemeValue.js

@@ -38,7 +38,6 @@ export const propToStyleFunction = Object.keys(filterPropsMapping).reduce((acc,
   });
   return acc;
 }, {});
-
 function getThemeValue(prop, value, theme) {
   const inputProps = {
     [prop]: value,
@@ -49,5 +48,4 @@ function getThemeValue(prop, value, theme) {
     [prop]: value
   };
 }
-
 export default getThemeValue;

package/esm/index.js

@@ -18,7 +18,7 @@ export { default as sizing } from './sizing';
 export * from './sizing';
 export { default as spacing } from './spacing';
 export * from './spacing';
-export { default as style, getPath } from './style';
+export { default as style, getPath, getStyleValue } from './style';
 export { default as typography } from './typography';
 export * from './typography';
 export { default as unstable_styleFunctionSx, unstable_createStyleFunctionSx, extendSxProp as unstable_extendSxProp } from './styleFunctionSx';
@@ -40,10 +40,10 @@ export * from './colorManipulator';
 export { default as ThemeProvider } from './ThemeProvider';
 export { default as unstable_createCssVarsProvider } from './cssVars/createCssVarsProvider';
 export { default as unstable_createGetCssVar } from './cssVars/createGetCssVar';
-/** ----------------- */
+export { default as responsivePropType } from './responsivePropType';
 
+/** ----------------- */
 /** Layout components */
-
 export { default as createContainer } from './Container/createContainer';
 export { default as Container } from './Container';
 export * from './Container';

package/esm/memoize.js

@@ -4,7 +4,6 @@ export default function memoize(fn) {
     if (cache[arg] === undefined) {
       cache[arg] = fn(arg);
     }
-
     return cache[arg];
   };
 }

package/esm/merge.js

@@ -1,13 +1,10 @@
 import { deepmerge } from '@mui/utils';
-
 function merge(acc, item) {
   if (!item) {
     return acc;
   }
-
   return deepmerge(acc, item, {
     clone: false // No need to clone deep, it's way faster.
-
   });
 }
 

package/esm/palette.js

@@ -1,14 +1,11 @@
 import style from './style';
 import compose from './compose';
-
 function transform(value, userValue) {
   if (userValue === 'grey') {
     return userValue;
   }
-
   return value;
 }
-
 export const color = style({
   prop: 'color',
   themeKey: 'palette',