@mui/system 5.2.0 → 5.2.4

package/esm/sx/sx.js

@@ -0,0 +1,12 @@
+import styleFunctionSx from '../styleFunctionSx';
+
+function sx(styles) {
+  return ({
+    theme
+  }) => styleFunctionSx({
+    sx: styles,
+    theme
+  });
+}
+
+export default sx;

package/esm/useThemeProps/getThemeProps.js

@@ -1,6 +1,4 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
-
-/* eslint-disable no-restricted-syntax */
+import { internal_resolveProps as resolveProps } from '@mui/utils';
 export default function getThemeProps(params) {
   const {
     theme,
@@ -12,18 +10,5 @@ export default function getThemeProps(params) {
     return props;
   }
 
-  const output = _extends({}, props); // Resolve default props, code borrow from React source.
-  // https://github.com/facebook/react/blob/15a8f031838a553e41c0b66eb1bcf1da8448104d/packages/react/src/ReactElement.js#L221
-
-
-  const defaultProps = theme.components[name].defaultProps;
-  let propName;
-
-  for (propName in defaultProps) {
-    if (output[propName] === undefined) {
-      output[propName] = defaultProps[propName];
-    }
-  }
-
-  return output;
+  return resolveProps(theme.components[name].defaultProps, props);
 }

package/index.d.ts

@@ -121,6 +121,8 @@ export {
 } from './styleFunctionSx';
 export * from './styleFunctionSx';
 
+export { default as experimental_sx } from './sx';
+
 export { default as Box } from './Box';
 export * from './Box';
 

package/index.js

@@ -1,4 +1,4 @@
-/** @license MUI v5.2.0
+/** @license MUI v5.2.4
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -34,6 +34,7 @@ var _exportNames = {
   typography: true,
   unstable_styleFunctionSx: true,
   unstable_extendSxProp: true,
+  experimental_sx: true,
   unstable_getThemeValue: true,
   Box: true,
   createBox: true,
@@ -134,6 +135,12 @@ Object.defineProperty(exports, "display", {
     return _display.default;
   }
 });
+Object.defineProperty(exports, "experimental_sx", {
+  enumerable: true,
+  get: function () {
+    return _sx.default;
+  }
+});
 Object.defineProperty(exports, "flexbox", {
   enumerable: true,
   get: function () {
@@ -405,6 +412,8 @@ Object.keys(_typography).forEach(function (key) {
 
 var _styleFunctionSx = _interopRequireWildcard(require("./styleFunctionSx"));
 
+var _sx = _interopRequireDefault(require("./sx"));
+
 var _getThemeValue = _interopRequireDefault(require("./getThemeValue"));
 
 var _Box = _interopRequireDefault(require("./Box"));

package/index.spec.d.ts

@@ -1 +1 @@
-export {};
+export {};

package/legacy/createTheme/createBreakpoints.js

@@ -49,6 +49,21 @@ export default function createBreakpoints(breakpoints) {
     return up(key);
   }
 
+  function not(key) {
+    // handle first and last key separately, for better readability
+    var keyIndex = keys.indexOf(key);
+
+    if (keyIndex === 0) {
+      return up(keys[1]);
+    }
+
+    if (keyIndex === keys.length - 1) {
+      return down(keys[keyIndex]);
+    }
+
+    return between(key, keys[keys.indexOf(key) + 1]).replace('@media', '@media not all and');
+  }
+
   return _extends({
     keys: keys,
     values: values,
@@ -56,6 +71,7 @@ export default function createBreakpoints(breakpoints) {
     down: down,
     between: between,
     only: only,
+    not: not,
     unit: unit
   }, other);
 }

package/legacy/cssVars/createCssVarsProvider.js

@@ -7,21 +7,32 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { GlobalStyles } from '@mui/styled-engine';
 import { deepmerge } from '@mui/utils';
+import createSpacing from '../createTheme/createSpacing';
+import createBreakpoints from '../createTheme/createBreakpoints';
 import cssVarsParser from './cssVarsParser';
 import ThemeProvider from '../ThemeProvider';
 import getInitColorSchemeScript, { DEFAULT_ATTRIBUTE, DEFAULT_MODE_STORAGE_KEY } from './getInitColorSchemeScript';
 import useCurrentColorScheme from './useCurrentColorScheme';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+export var DISABLE_CSS_TRANSITION = '*{-webkit-transition:none!important;-moz-transition:none!important;-o-transition:none!important;-ms-transition:none!important;transition:none!important}';
 export default function createCssVarsProvider(options) {
+  var _baseTheme$breakpoint;
+
   var _options$theme = options.theme,
       baseTheme = _options$theme === void 0 ? {} : _options$theme,
       _options$defaultMode = options.defaultMode,
       desisgnSystemMode = _options$defaultMode === void 0 ? 'light' : _options$defaultMode,
       designSystemColorScheme = options.defaultColorScheme,
+      _options$disableTrans = options.disableTransitionOnChange,
+      disableTransitionOnChange = _options$disableTrans === void 0 ? false : _options$disableTrans,
+      _options$enableColorS = options.enableColorScheme,
+      enableColorScheme = _options$enableColorS === void 0 ? true : _options$enableColorS,
       _options$prefix = options.prefix,
       designSystemPrefix = _options$prefix === void 0 ? '' : _options$prefix,
       shouldSkipGeneratingVar = options.shouldSkipGeneratingVar;
+  var systemSpacing = createSpacing(baseTheme.spacing);
+  var systemBreakpoints = createBreakpoints((_baseTheme$breakpoint = baseTheme.breakpoints) != null ? _baseTheme$breakpoint : {});
 
   if (!baseTheme.colorSchemes || typeof designSystemColorScheme === 'string' && !baseTheme.colorSchemes[designSystemColorScheme] || _typeof(designSystemColorScheme) === 'object' && !baseTheme.colorSchemes[designSystemColorScheme == null ? void 0 : designSystemColorScheme.light] || _typeof(designSystemColorScheme) === 'object' && !baseTheme.colorSchemes[designSystemColorScheme == null ? void 0 : designSystemColorScheme.dark]) {
     console.error("MUI: `".concat(designSystemColorScheme, "` does not exist in `theme.colorSchemes`."));
@@ -53,16 +64,27 @@ export default function createCssVarsProvider(options) {
         defaultMode = _ref$defaultMode === void 0 ? desisgnSystemMode : _ref$defaultMode,
         _ref$defaultColorSche = _ref.defaultColorScheme,
         defaultColorScheme = _ref$defaultColorSche === void 0 ? designSystemColorScheme : _ref$defaultColorSche;
+    // make sure that baseTheme is always independent of each <CssVarsProvider /> call.
+    // JSON.parse(JSON.stringify(...)) is okay to be used as long as the baseTheme is a plain object.
+    var clonedBaseTheme = React.useMemo(function () {
+      return JSON.parse(JSON.stringify(baseTheme));
+    }, []);
 
-    var _baseTheme$colorSchem = baseTheme.colorSchemes,
-        baseColorSchemes = _baseTheme$colorSchem === void 0 ? {} : _baseTheme$colorSchem,
-        restBaseTheme = _objectWithoutProperties(baseTheme, ["colorSchemes"]);
+    var _clonedBaseTheme$colo = clonedBaseTheme.colorSchemes,
+        baseColorSchemes = _clonedBaseTheme$colo === void 0 ? {} : _clonedBaseTheme$colo,
+        restBaseTheme = _objectWithoutProperties(clonedBaseTheme, ["colorSchemes"]);
 
     var _themeProp$colorSchem = themeProp.colorSchemes,
         colorSchemesProp = _themeProp$colorSchem === void 0 ? {} : _themeProp$colorSchem,
         restThemeProp = _objectWithoutProperties(themeProp, ["colorSchemes"]);
 
-    var mergedTheme = deepmerge(restBaseTheme, restThemeProp);
+    var hasMounted = React.useRef(false); // eslint-disable-next-line prefer-const
+
+    var _deepmerge = deepmerge(restBaseTheme, restThemeProp),
+        _deepmerge$components = _deepmerge.components,
+        components = _deepmerge$components === void 0 ? {} : _deepmerge$components,
+        mergedTheme = _objectWithoutProperties(_deepmerge, ["components"]);
+
     var colorSchemes = deepmerge(baseColorSchemes, colorSchemesProp);
     var allColorSchemes = Object.keys(colorSchemes);
     var defaultLightColorScheme = typeof defaultColorScheme === 'string' ? defaultColorScheme : defaultColorScheme.light;
@@ -77,6 +99,7 @@ export default function createCssVarsProvider(options) {
     }),
         mode = _useCurrentColorSchem.mode,
         setMode = _useCurrentColorSchem.setMode,
+        systemMode = _useCurrentColorSchem.systemMode,
         lightColorScheme = _useCurrentColorSchem.lightColorScheme,
         darkColorScheme = _useCurrentColorSchem.darkColorScheme,
         colorScheme = _useCurrentColorSchem.colorScheme,
@@ -105,8 +128,11 @@ export default function createCssVarsProvider(options) {
         rootVars = _cssVarsParser.vars;
 
     mergedTheme = _extends({}, mergedTheme, colorSchemes[resolvedColorScheme], {
+      components: components,
       colorSchemes: colorSchemes,
-      vars: rootVars
+      vars: rootVars,
+      spacing: themeProp.spacing ? createSpacing(themeProp.spacing) : systemSpacing,
+      breakpoints: themeProp.breakpoints ? createBreakpoints(themeProp.breakpoints) : systemBreakpoints
     });
     var styleSheet = {};
     Object.entries(colorSchemes).forEach(function (_ref2) {
@@ -144,9 +170,55 @@ export default function createCssVarsProvider(options) {
     });
     React.useEffect(function () {
       if (colorScheme) {
-        document.body.setAttribute(attribute, colorScheme);
+        // attaches attribute to <html> because the css variables are attached to :root (html)
+        document.documentElement.setAttribute(attribute, colorScheme);
       }
     }, [colorScheme, attribute]);
+    React.useEffect(function () {
+      if (!mode || !enableColorScheme) {
+        return undefined;
+      }
+
+      var priorColorScheme = document.documentElement.style.getPropertyValue('color-scheme'); // `color-scheme` tells browser to render built-in elements according to its value: `light` or `dark`
+
+      if (mode === 'system') {
+        document.documentElement.style.setProperty('color-scheme', systemMode);
+      } else {
+        document.documentElement.style.setProperty('color-scheme', mode);
+      }
+
+      return function () {
+        document.documentElement.style.setProperty('color-scheme', priorColorScheme);
+      };
+    }, [mode, systemMode]);
+    React.useEffect(function () {
+      var timer;
+
+      if (disableTransitionOnChange && hasMounted.current) {
+        // credit: https://github.com/pacocoursey/next-themes/blob/b5c2bad50de2d61ad7b52a9c5cdc801a78507d7a/index.tsx#L313
+        var css = document.createElement('style');
+        css.appendChild(document.createTextNode(DISABLE_CSS_TRANSITION));
+        document.head.appendChild(css); // Force browser repaint
+
+        (function () {
+          return window.getComputedStyle(document.body);
+        })();
+
+        timer = setTimeout(function () {
+          document.head.removeChild(css);
+        }, 1);
+      }
+
+      return function () {
+        clearTimeout(timer);
+      };
+    }, [colorScheme]);
+    React.useEffect(function () {
+      hasMounted.current = true;
+      return function () {
+        hasMounted.current = false;
+      };
+    }, []);
     return /*#__PURE__*/_jsxs(ColorSchemeContext.Provider, {
       value: {
         mode: mode,
@@ -177,7 +249,7 @@ export default function createCssVarsProvider(options) {
     attribute: PropTypes.string,
 
     /**
-     * Your component tree.
+     * The component tree.
      */
     children: PropTypes.node,
 
@@ -197,7 +269,7 @@ export default function createCssVarsProvider(options) {
     modeStorageKey: PropTypes.string,
 
     /**
-     * css variable prefix
+     * CSS variable prefix.
      */
     prefix: PropTypes.string,
 

package/legacy/cssVars/cssVarsParser.js

@@ -49,7 +49,7 @@ export var assignNestedKeys = function assignNestedKeys(obj, keys, value) {
  * // ['palette', 'primary', 'main'] '#000000'
  */
 
-export var walkObjectDeep = function walkObjectDeep(obj, callback) {
+export var walkObjectDeep = function walkObjectDeep(obj, callback, shouldSkipPaths) {
   function recurse(object) {
     var parentKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
     Object.entries(object).forEach(function (_ref) {
@@ -57,11 +57,13 @@ export var walkObjectDeep = function walkObjectDeep(obj, callback) {
           key = _ref2[0],
           value = _ref2[1];
 
-      if (value !== undefined && value !== null) {
-        if (_typeof(value) === 'object' && Object.keys(value).length > 0) {
-          recurse(value, [].concat(_toConsumableArray(parentKeys), [key]));
-        } else {
-          callback([].concat(_toConsumableArray(parentKeys), [key]), value, object);
+      if (!shouldSkipPaths || shouldSkipPaths && !shouldSkipPaths([].concat(_toConsumableArray(parentKeys), [key]))) {
+        if (value !== undefined && value !== null) {
+          if (_typeof(value) === 'object' && Object.keys(value).length > 0) {
+            recurse(value, [].concat(_toConsumableArray(parentKeys), [key]));
+          } else {
+            callback([].concat(_toConsumableArray(parentKeys), [key]), value, object);
+          }
         }
       }
     });
@@ -75,7 +77,7 @@ var getCssValue = function getCssValue(keys, value) {
     if (['lineHeight', 'fontWeight', 'opacity', 'zIndex'].some(function (prop) {
       return keys.includes(prop);
     })) {
-      // css property that are unitless
+      // CSS property that are unitless
       return value;
     }
 
@@ -113,10 +115,6 @@ var getCssValue = function getCssValue(keys, value) {
 
 
 export default function cssVarsParser(theme, options) {
-  var clonedTheme = _extends({}, theme);
-
-  delete clonedTheme.vars; // remove 'vars' from the structure
-
   var _ref3 = options || {},
       prefix = _ref3.prefix,
       _ref3$basePrefix = _ref3.basePrefix,
@@ -125,13 +123,18 @@ export default function cssVarsParser(theme, options) {
 
   var css = {};
   var vars = {};
-  walkObjectDeep(clonedTheme, function (keys, val, scope) {
+  walkObjectDeep(theme, function (keys, val, scope) {
     if (typeof val === 'string' || typeof val === 'number') {
       var _value = val;
 
       if (typeof _value === 'string' && _value.startsWith('var')) {
         // replace the value of the `scope` object with the prefix or remove basePrefix from the value
-        _value = prefix ? _value.replace(basePrefix, prefix) : _value.replace("".concat(basePrefix, "-"), ''); // scope is the deepest object in the tree, keys is the theme path keys
+        if (!basePrefix && prefix) {
+          _value = _value.replace(/var\(--/g, "var(--".concat(prefix, "-"));
+        } else {
+          _value = prefix ? _value.replace(new RegExp(basePrefix, 'g'), prefix) : _value.replace(new RegExp("".concat(basePrefix, "-"), 'g'), '');
+        } // scope is the deepest object in the tree, keys is the theme path keys
+
 
         scope[keys.slice(-1)[0]] = _value;
       }
@@ -145,7 +148,10 @@ export default function cssVarsParser(theme, options) {
         assignNestedKeys(vars, keys, "var(".concat(cssVar, ")"));
       }
     }
-  });
+  }, function (keys) {
+    return keys[0] === 'vars';
+  } // skip 'vars/*' paths
+  );
   return {
     css: css,
     vars: vars

package/legacy/cssVars/getInitColorSchemeScript.js

@@ -20,7 +20,7 @@ export default function getInitColorSchemeScript(options) {
   return /*#__PURE__*/_jsx("script", {
     // eslint-disable-next-line react/no-danger
     dangerouslySetInnerHTML: {
-      __html: "(function() { try {\n        var mode = localStorage.getItem('".concat(modeStorageKey, "');\n        var colorScheme = '';\n        if (mode === 'system' || (!mode && !!").concat(enableSystem, ")) {\n          // handle system mode\n          var mql = window.matchMedia('(prefers-color-scheme: dark)');\n          if (mql.matches) {\n            colorScheme = localStorage.getItem('").concat(colorSchemeStorageKey, "-dark') || '").concat(defaultDarkColorScheme, "';\n          } else {\n            colorScheme = localStorage.getItem('").concat(colorSchemeStorageKey, "-light') || '").concat(defaultLightColorScheme, "';\n          }\n        }\n        if (mode === 'light') {\n          colorScheme = localStorage.getItem('").concat(colorSchemeStorageKey, "-light') || '").concat(defaultLightColorScheme, "';\n        }\n        if (mode === 'dark') {\n          colorScheme = localStorage.getItem('").concat(colorSchemeStorageKey, "-dark') || '").concat(defaultDarkColorScheme, "';\n        }\n        if (colorScheme) {\n          document.body.setAttribute('").concat(attribute, "', colorScheme);\n        }\n      } catch (e) {} })();")
+      __html: "(function() { try {\n        var mode = localStorage.getItem('".concat(modeStorageKey, "');\n        var colorScheme = '';\n        if (mode === 'system' || (!mode && !!").concat(enableSystem, ")) {\n          // handle system mode\n          var mql = window.matchMedia('(prefers-color-scheme: dark)');\n          if (mql.matches) {\n            colorScheme = localStorage.getItem('").concat(colorSchemeStorageKey, "-dark') || '").concat(defaultDarkColorScheme, "';\n          } else {\n            colorScheme = localStorage.getItem('").concat(colorSchemeStorageKey, "-light') || '").concat(defaultLightColorScheme, "';\n          }\n        }\n        if (mode === 'light') {\n          colorScheme = localStorage.getItem('").concat(colorSchemeStorageKey, "-light') || '").concat(defaultLightColorScheme, "';\n        }\n        if (mode === 'dark') {\n          colorScheme = localStorage.getItem('").concat(colorSchemeStorageKey, "-dark') || '").concat(defaultDarkColorScheme, "';\n        }\n        if (colorScheme) {\n          document.documentElement.setAttribute('").concat(attribute, "', colorScheme);\n        }\n      } catch (e) {} })();")
     }
   });
 }

package/legacy/index.js

@@ -1,4 +1,4 @@
-/** @license MUI v5.2.0
+/** @license MUI v5.2.4
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -27,6 +27,7 @@ export { default as style, getPath } from './style';
 export { default as typography } from './typography';
 export * from './typography';
 export { default as unstable_styleFunctionSx, extendSxProp as unstable_extendSxProp } from './styleFunctionSx';
+export { default as experimental_sx } from './sx';
 export { default as unstable_getThemeValue } from './getThemeValue';
 export { default as Box } from './Box';
 export { default as createBox } from './createBox';

package/legacy/sx/index.js

@@ -0,0 +1 @@
+export { default } from './sx';

package/legacy/sx/sx.js

@@ -0,0 +1,13 @@
+import styleFunctionSx from '../styleFunctionSx';
+
+function sx(styles) {
+  return function (_ref) {
+    var theme = _ref.theme;
+    return styleFunctionSx({
+      sx: styles,
+      theme: theme
+    });
+  };
+}
+
+export default sx;

package/legacy/useThemeProps/getThemeProps.js

@@ -1,6 +1,4 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
-
-/* eslint-disable no-restricted-syntax */
+import { internal_resolveProps as resolveProps } from '@mui/utils';
 export default function getThemeProps(params) {
   var theme = params.theme,
       name = params.name,
@@ -10,18 +8,5 @@ export default function getThemeProps(params) {
     return props;
   }
 
-  var output = _extends({}, props); // Resolve default props, code borrow from React source.
-  // https://github.com/facebook/react/blob/15a8f031838a553e41c0b66eb1bcf1da8448104d/packages/react/src/ReactElement.js#L221
-
-
-  var defaultProps = theme.components[name].defaultProps;
-  var propName;
-
-  for (propName in defaultProps) {
-    if (output[propName] === undefined) {
-      output[propName] = defaultProps[propName];
-    }
-  }
-
-  return output;
+  return resolveProps(theme.components[name].defaultProps, props);
 }

package/modern/createTheme/createBreakpoints.js

@@ -51,6 +51,21 @@ export default function createBreakpoints(breakpoints) {
     return up(key);
   }
 
+  function not(key) {
+    // handle first and last key separately, for better readability
+    const keyIndex = keys.indexOf(key);
+
+    if (keyIndex === 0) {
+      return up(keys[1]);
+    }
+
+    if (keyIndex === keys.length - 1) {
+      return down(keys[keyIndex]);
+    }
+
+    return between(key, keys[keys.indexOf(key) + 1]).replace('@media', '@media not all and');
+  }
+
   return _extends({
     keys,
     values,
@@ -58,6 +73,7 @@ export default function createBreakpoints(breakpoints) {
     down,
     between,
     only,
+    not,
     unit
   }, other);
 }

package/modern/cssVars/createCssVarsProvider.js

@@ -2,25 +2,33 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import { formatMuiErrorMessage as _formatMuiErrorMessage } from "@mui/utils";
 const _excluded = ["colorSchemes"],
-      _excluded2 = ["colorSchemes"];
+      _excluded2 = ["colorSchemes"],
+      _excluded3 = ["components"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { GlobalStyles } from '@mui/styled-engine';
 import { deepmerge } from '@mui/utils';
+import createSpacing from '../createTheme/createSpacing';
+import createBreakpoints from '../createTheme/createBreakpoints';
 import cssVarsParser from './cssVarsParser';
 import ThemeProvider from '../ThemeProvider';
 import getInitColorSchemeScript, { DEFAULT_ATTRIBUTE, DEFAULT_MODE_STORAGE_KEY } from './getInitColorSchemeScript';
 import useCurrentColorScheme from './useCurrentColorScheme';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+export const DISABLE_CSS_TRANSITION = '*{-webkit-transition:none!important;-moz-transition:none!important;-o-transition:none!important;-ms-transition:none!important;transition:none!important}';
 export default function createCssVarsProvider(options) {
   const {
     theme: baseTheme = {},
     defaultMode: desisgnSystemMode = 'light',
     defaultColorScheme: designSystemColorScheme,
+    disableTransitionOnChange = false,
+    enableColorScheme = true,
     prefix: designSystemPrefix = '',
     shouldSkipGeneratingVar
   } = options;
+  const systemSpacing = createSpacing(baseTheme.spacing);
+  const systemBreakpoints = createBreakpoints(baseTheme.breakpoints ?? {});
 
   if (!baseTheme.colorSchemes || typeof designSystemColorScheme === 'string' && !baseTheme.colorSchemes[designSystemColorScheme] || typeof designSystemColorScheme === 'object' && !baseTheme.colorSchemes[designSystemColorScheme?.light] || typeof designSystemColorScheme === 'object' && !baseTheme.colorSchemes[designSystemColorScheme?.dark]) {
     console.error(`MUI: \`${designSystemColorScheme}\` does not exist in \`theme.colorSchemes\`.`);
@@ -47,17 +55,28 @@ export default function createCssVarsProvider(options) {
     defaultMode = desisgnSystemMode,
     defaultColorScheme = designSystemColorScheme
   }) {
+    // make sure that baseTheme is always independent of each <CssVarsProvider /> call.
+    // JSON.parse(JSON.stringify(...)) is okay to be used as long as the baseTheme is a plain object.
+    const clonedBaseTheme = React.useMemo(() => JSON.parse(JSON.stringify(baseTheme)), []);
+
     const {
       colorSchemes: baseColorSchemes = {}
-    } = baseTheme,
-          restBaseTheme = _objectWithoutPropertiesLoose(baseTheme, _excluded);
+    } = clonedBaseTheme,
+          restBaseTheme = _objectWithoutPropertiesLoose(clonedBaseTheme, _excluded);
 
     const {
       colorSchemes: colorSchemesProp = {}
     } = themeProp,
           restThemeProp = _objectWithoutPropertiesLoose(themeProp, _excluded2);
 
-    let mergedTheme = deepmerge(restBaseTheme, restThemeProp);
+    const hasMounted = React.useRef(false); // eslint-disable-next-line prefer-const
+
+    let _deepmerge = deepmerge(restBaseTheme, restThemeProp),
+        {
+      components = {}
+    } = _deepmerge,
+        mergedTheme = _objectWithoutPropertiesLoose(_deepmerge, _excluded3);
+
     const colorSchemes = deepmerge(baseColorSchemes, colorSchemesProp);
     const allColorSchemes = Object.keys(colorSchemes);
     const defaultLightColorScheme = typeof defaultColorScheme === 'string' ? defaultColorScheme : defaultColorScheme.light;
@@ -65,6 +84,7 @@ export default function createCssVarsProvider(options) {
     const {
       mode,
       setMode,
+      systemMode,
       lightColorScheme,
       darkColorScheme,
       colorScheme,
@@ -100,8 +120,11 @@ export default function createCssVarsProvider(options) {
       shouldSkipGeneratingVar
     });
     mergedTheme = _extends({}, mergedTheme, colorSchemes[resolvedColorScheme], {
+      components,
       colorSchemes,
-      vars: rootVars
+      vars: rootVars,
+      spacing: themeProp.spacing ? createSpacing(themeProp.spacing) : systemSpacing,
+      breakpoints: themeProp.breakpoints ? createBreakpoints(themeProp.breakpoints) : systemBreakpoints
     });
     const styleSheet = {};
     Object.entries(colorSchemes).forEach(([key, scheme]) => {
@@ -135,9 +158,53 @@ export default function createCssVarsProvider(options) {
     });
     React.useEffect(() => {
       if (colorScheme) {
-        document.body.setAttribute(attribute, colorScheme);
+        // attaches attribute to <html> because the css variables are attached to :root (html)
+        document.documentElement.setAttribute(attribute, colorScheme);
       }
     }, [colorScheme, attribute]);
+    React.useEffect(() => {
+      if (!mode || !enableColorScheme) {
+        return undefined;
+      }
+
+      const priorColorScheme = document.documentElement.style.getPropertyValue('color-scheme'); // `color-scheme` tells browser to render built-in elements according to its value: `light` or `dark`
+
+      if (mode === 'system') {
+        document.documentElement.style.setProperty('color-scheme', systemMode);
+      } else {
+        document.documentElement.style.setProperty('color-scheme', mode);
+      }
+
+      return () => {
+        document.documentElement.style.setProperty('color-scheme', priorColorScheme);
+      };
+    }, [mode, systemMode]);
+    React.useEffect(() => {
+      let timer;
+
+      if (disableTransitionOnChange && hasMounted.current) {
+        // credit: https://github.com/pacocoursey/next-themes/blob/b5c2bad50de2d61ad7b52a9c5cdc801a78507d7a/index.tsx#L313
+        const css = document.createElement('style');
+        css.appendChild(document.createTextNode(DISABLE_CSS_TRANSITION));
+        document.head.appendChild(css); // Force browser repaint
+
+        (() => window.getComputedStyle(document.body))();
+
+        timer = setTimeout(() => {
+          document.head.removeChild(css);
+        }, 1);
+      }
+
+      return () => {
+        clearTimeout(timer);
+      };
+    }, [colorScheme]);
+    React.useEffect(() => {
+      hasMounted.current = true;
+      return () => {
+        hasMounted.current = false;
+      };
+    }, []);
     return /*#__PURE__*/_jsxs(ColorSchemeContext.Provider, {
       value: {
         mode,
@@ -168,7 +235,7 @@ export default function createCssVarsProvider(options) {
     attribute: PropTypes.string,
 
     /**
-     * Your component tree.
+     * The component tree.
      */
     children: PropTypes.node,
 
@@ -188,7 +255,7 @@ export default function createCssVarsProvider(options) {
     modeStorageKey: PropTypes.string,
 
     /**
-     * css variable prefix
+     * CSS variable prefix.
      */
     prefix: PropTypes.string,