@mui/system 5.11.16 → 5.12.1

package/Stack/Stack.js

@@ -11,6 +11,7 @@ var _createStack = _interopRequireDefault(require("./createStack"));
  *
  * Demos:
  *
+ * - [Stack (Joy UI)](https://mui.com/joy/react-stack/)
  * - [Stack (Material UI)](https://mui.com/material-ui/react-stack/)
  * - [Stack (MUI System)](https://mui.com/system/react-stack/)
  *
@@ -55,7 +56,7 @@ process.env.NODE_ENV !== "production" ? Stack.propTypes /* remove-proptypes */ =
   /**
    * If `true`, the CSS flexbox `gap` is used instead of applying `margin` to children.
    *
-   * While CSS `gap` removes the [known limitations](https://mui.com/joy-ui/react-stack#limitations),
+   * While CSS `gap` removes the [known limitations](https://mui.com/joy-ui/react-stack/#limitations),
    * it is not fully supported in some browsers. We recommend checking https://caniuse.com/?search=flex%20gap before using this flag.
    *
    * To enable this flag globally, follow the theme's default props configuration.

package/Stack/StackProps.d.ts

@@ -1,53 +1,53 @@
-import * as React from 'react';
-import { OverrideProps } from '@mui/types';
-import { ResponsiveStyleValue, SxProps } from '../styleFunctionSx';
-import { SystemProps } from '../Box';
-import { Theme } from '../createTheme';
-export interface StackBaseProps {
-    /**
-     * The content of the component.
-     */
-    children?: React.ReactNode;
-    /**
-     * Defines the `flex-direction` style property.
-     * It is applied for all screen sizes.
-     * @default 'column'
-     */
-    direction?: ResponsiveStyleValue<'row' | 'row-reverse' | 'column' | 'column-reverse'>;
-    /**
-     * Defines the space between immediate children.
-     * @default 0
-     */
-    spacing?: ResponsiveStyleValue<number | string>;
-    /**
-     * Add an element between each child.
-     */
-    divider?: React.ReactNode;
-    /**
-     * If `true`, the CSS flexbox `gap` is used instead of applying `margin` to children.
-     *
-     * While CSS `gap` removes the [known limitations](https://mui.com/joy-ui/react-stack#limitations),
-     * it is not fully supported in some browsers. We recommend checking https://caniuse.com/?search=flex%20gap before using this flag.
-     *
-     * To enable this flag globally, follow the theme's default props configuration.
-     * @default false
-     */
-    useFlexGap?: boolean;
-}
-export interface StackTypeMap<P = {}, D extends React.ElementType = 'div'> {
-    props: P & StackBaseProps & {
-        /**
-         * The system prop, which allows defining system overrides as well as additional CSS styles.
-         */
-        sx?: SxProps<Theme>;
-    } & SystemProps<Theme>;
-    defaultComponent: D;
-}
-export type StackProps<D extends React.ElementType = StackTypeMap['defaultComponent'], P = {
-    component?: React.ElementType;
-}> = OverrideProps<StackTypeMap<P, D>, D>;
-export interface StackOwnerState {
-    direction: StackProps['direction'];
-    spacing: StackProps['spacing'];
-    useFlexGap: boolean;
-}
+import * as React from 'react';
+import { OverrideProps } from '@mui/types';
+import { ResponsiveStyleValue, SxProps } from '../styleFunctionSx';
+import { SystemProps } from '../Box';
+import { Theme } from '../createTheme';
+export interface StackBaseProps {
+    /**
+     * The content of the component.
+     */
+    children?: React.ReactNode;
+    /**
+     * Defines the `flex-direction` style property.
+     * It is applied for all screen sizes.
+     * @default 'column'
+     */
+    direction?: ResponsiveStyleValue<'row' | 'row-reverse' | 'column' | 'column-reverse'>;
+    /**
+     * Defines the space between immediate children.
+     * @default 0
+     */
+    spacing?: ResponsiveStyleValue<number | string>;
+    /**
+     * Add an element between each child.
+     */
+    divider?: React.ReactNode;
+    /**
+     * If `true`, the CSS flexbox `gap` is used instead of applying `margin` to children.
+     *
+     * While CSS `gap` removes the [known limitations](https://mui.com/joy-ui/react-stack/#limitations),
+     * it is not fully supported in some browsers. We recommend checking https://caniuse.com/?search=flex%20gap before using this flag.
+     *
+     * To enable this flag globally, follow the theme's default props configuration.
+     * @default false
+     */
+    useFlexGap?: boolean;
+}
+export interface StackTypeMap<P = {}, D extends React.ElementType = 'div'> {
+    props: P & StackBaseProps & {
+        /**
+         * The system prop, which allows defining system overrides as well as additional CSS styles.
+         */
+        sx?: SxProps<Theme>;
+    } & SystemProps<Theme>;
+    defaultComponent: D;
+}
+export type StackProps<D extends React.ElementType = StackTypeMap['defaultComponent'], P = {
+    component?: React.ElementType;
+}> = OverrideProps<StackTypeMap<P, D>, D>;
+export interface StackOwnerState {
+    direction: StackProps['direction'];
+    spacing: StackProps['spacing'];
+    useFlexGap: boolean;
+}

package/Stack/createStack.d.ts

@@ -1,21 +1,21 @@
-import * as React from 'react';
-import { OverridableComponent } from '@mui/types';
-import { StackTypeMap, StackOwnerState } from './StackProps';
-import { Breakpoints } from '../createTheme/createBreakpoints';
-import { Spacing } from '../createTheme/createSpacing';
-interface StyleFunctionProps {
-    theme: {
-        breakpoints: Breakpoints;
-        spacing: Spacing;
-    };
-    ownerState: StackOwnerState;
-}
-declare const defaultCreateStyledComponent: import("@mui/styled-engine").CreateStyledComponent<import("../createStyled").MUIStyledCommonProps<any>, Pick<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, keyof React.ClassAttributes<HTMLDivElement> | keyof React.HTMLAttributes<HTMLDivElement>>, {}, any>;
-declare function useThemePropsDefault<T extends {}>(props: T): T & {};
-export declare const style: ({ ownerState, theme }: StyleFunctionProps) => any;
-export default function createStack(options?: {
-    createStyledComponent?: typeof defaultCreateStyledComponent;
-    useThemeProps?: typeof useThemePropsDefault;
-    componentName?: string;
-}): OverridableComponent<StackTypeMap<{}, "div">>;
-export {};
+import * as React from 'react';
+import { OverridableComponent } from '@mui/types';
+import { StackTypeMap, StackOwnerState } from './StackProps';
+import { Breakpoints } from '../createTheme/createBreakpoints';
+import { Spacing } from '../createTheme/createSpacing';
+interface StyleFunctionProps {
+    theme: {
+        breakpoints: Breakpoints;
+        spacing: Spacing;
+    };
+    ownerState: StackOwnerState;
+}
+declare const defaultCreateStyledComponent: import("@mui/styled-engine").CreateStyledComponent<import("../createStyled").MUIStyledCommonProps<any>, Pick<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, keyof React.ClassAttributes<HTMLDivElement> | keyof React.HTMLAttributes<HTMLDivElement>>, {}, any>;
+declare function useThemePropsDefault<T extends {}>(props: T): T & {};
+export declare const style: ({ ownerState, theme }: StyleFunctionProps) => any;
+export default function createStack(options?: {
+    createStyledComponent?: typeof defaultCreateStyledComponent;
+    useThemeProps?: typeof useThemePropsDefault;
+    componentName?: string;
+}): OverridableComponent<StackTypeMap<{}, "div">>;
+export {};

package/Stack/index.d.ts

@@ -1,5 +1,5 @@
-export { default } from './Stack';
-export { default as createStack } from './createStack';
-export * from './StackProps';
-export { default as stackClasses } from './stackClasses';
-export * from './stackClasses';
+export { default } from './Stack';
+export { default as createStack } from './createStack';
+export * from './StackProps';
+export { default as stackClasses } from './stackClasses';
+export * from './stackClasses';

package/Stack/stackClasses.d.ts

@@ -1,8 +1,8 @@
-export interface StackClasses {
-    /** Styles applied to the root element. */
-    root: string;
-}
-export type StackClassKey = keyof StackClasses;
-export declare function getStackUtilityClass(slot: string): string;
-declare const stackClasses: StackClasses;
-export default stackClasses;
+export interface StackClasses {
+    /** Styles applied to the root element. */
+    root: string;
+}
+export type StackClassKey = keyof StackClasses;
+export declare function getStackUtilityClass(slot: string): string;
+declare const stackClasses: StackClasses;
+export default stackClasses;

package/ThemeProvider/ThemeProvider.d.ts

@@ -5,6 +5,10 @@ export interface ThemeProviderProps<Theme = DefaultTheme> {
    * Your component tree.
    */
   children?: React.ReactNode;
+  /**
+   * The design system's unique id for getting the corresponded theme when there are multiple design systems.
+   */
+  themeId?: string;
   /**
    * A theme object. You can provide a function to extend the outer theme.
    */

package/ThemeProvider/ThemeProvider.js

@@ -5,42 +5,64 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _privateTheming = require("@mui/private-theming");
 var _utils = require("@mui/utils");
 var _styledEngine = require("@mui/styled-engine");
-var _useTheme = _interopRequireDefault(require("../useTheme"));
+var _useThemeWithoutDefault = _interopRequireDefault(require("../useThemeWithoutDefault"));
 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 EMPTY_THEME = {};
-function InnerThemeProvider(props) {
-  const theme = (0, _useTheme.default)();
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_styledEngine.ThemeContext.Provider, {
-    value: typeof theme === 'object' ? theme : EMPTY_THEME,
-    children: props.children
-  });
+function useThemeScoping(themeId, upperTheme, localTheme, isPrivate = false) {
+  return React.useMemo(() => {
+    const resolvedTheme = themeId ? upperTheme[themeId] || upperTheme : upperTheme;
+    if (typeof localTheme === 'function') {
+      const mergedTheme = localTheme(resolvedTheme);
+      const result = themeId ? (0, _extends2.default)({}, upperTheme, {
+        [themeId]: mergedTheme
+      }) : mergedTheme;
+      // must return a function for the private theme to NOT merge with the upper theme.
+      // see the test case "use provided theme from a callback" in ThemeProvider.test.js
+      if (isPrivate) {
+        return () => result;
+      }
+      return result;
+    }
+    return themeId ? (0, _extends2.default)({}, upperTheme, {
+      [themeId]: localTheme
+    }) : (0, _extends2.default)({}, upperTheme, localTheme);
+  }, [themeId, upperTheme, localTheme, isPrivate]);
 }
-process.env.NODE_ENV !== "production" ? InnerThemeProvider.propTypes = {
-  /**
-   * Your component tree.
-   */
-  children: _propTypes.default.node
-} : void 0;
 
 /**
  * This component makes the `theme` available down the React tree.
  * It should preferably be used at **the root of your component tree**.
+ *
+ * <ThemeProvider theme={theme}> // existing use case
+ * <ThemeProvider theme={{ id: theme }}> // theme scoping
  */
 function ThemeProvider(props) {
   const {
     children,
-    theme: localTheme
+    theme: localTheme,
+    themeId
   } = props;
+  const upperTheme = (0, _useThemeWithoutDefault.default)(EMPTY_THEME);
+  const upperPrivateTheme = (0, _privateTheming.useTheme)() || EMPTY_THEME;
+  if (process.env.NODE_ENV !== 'production') {
+    if (upperTheme === null && typeof localTheme === 'function' || themeId && upperTheme && !upperTheme[themeId] && typeof localTheme === 'function') {
+      console.error(['MUI: You are providing a theme function prop to the ThemeProvider component:', '<ThemeProvider theme={outerTheme => outerTheme} />', '', 'However, no outer theme is present.', 'Make sure a theme is already injected higher in the React tree ' + 'or provide a theme object.'].join('\n'));
+    }
+  }
+  const engineTheme = useThemeScoping(themeId, upperTheme, localTheme);
+  const privateTheme = useThemeScoping(themeId, upperPrivateTheme, localTheme, true);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_privateTheming.ThemeProvider, {
-    theme: localTheme,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(InnerThemeProvider, {
+    theme: privateTheme,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_styledEngine.ThemeContext.Provider, {
+      value: engineTheme,
       children: children
     })
   });
@@ -57,7 +79,11 @@ process.env.NODE_ENV !== "production" ? ThemeProvider.propTypes /* remove-propty
   /**
    * A theme object. You can provide a function to extend the outer theme.
    */
-  theme: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]).isRequired
+  theme: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]).isRequired,
+  /**
+   * The design system's unique id for getting the corresponded theme when there are multiple design systems.
+   */
+  themeId: _propTypes.default.string
 } : void 0;
 if (process.env.NODE_ENV !== 'production') {
   process.env.NODE_ENV !== "production" ? ThemeProvider.propTypes = (0, _utils.exactProp)(ThemeProvider.propTypes) : void 0;

package/Unstable_Grid/Grid.d.ts

@@ -1,12 +1,12 @@
-/**
- *
- * Demos:
- *
- * - [Grid (Material UI)](https://mui.com/material-ui/react-grid/)
- *
- * API:
- *
- * - [Grid API](https://mui.com/system/api/grid/)
- */
-declare const Grid: import("@mui/types").OverridableComponent<import("./GridProps").GridTypeMap<{}, "div">>;
-export default Grid;
+/**
+ *
+ * Demos:
+ *
+ * - [Grid (Material UI)](https://mui.com/material-ui/react-grid/)
+ *
+ * API:
+ *
+ * - [Grid API](https://mui.com/system/api/grid/)
+ */
+declare const Grid: import("@mui/types").OverridableComponent<import("./GridProps").GridTypeMap<{}, "div">>;
+export default Grid;