@mui/material 5.6.2 → 5.7.0

package/node/styles/experimental_extendTheme.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defaultOpacity = exports.default = void 0;
+exports.default = extendTheme;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
@@ -17,35 +17,24 @@ var _system = require("@mui/system");
 
 var _createTheme = _interopRequireDefault(require("./createTheme"));
 
-var _createPalette = _interopRequireDefault(require("./createPalette"));
-
-const _excluded = ["colorSchemes", "opacity"],
+const _excluded = ["colorSchemes"],
       _excluded2 = ["palette"];
-const defaultOpacity = {
-  active: 0.54,
-  hover: 0.04,
-  selected: 0.08,
-  disabled: 0.26,
-  focus: 0.12
-};
-exports.defaultOpacity = defaultOpacity;
-
-function createTheme(options = {}, ...args) {
-  var _colorSchemesInput$li, _colorSchemesInput$da;
+
+function extendTheme(options = {}, ...args) {
+  var _colorSchemesInput$li, _colorSchemesInput$da, _colorSchemesInput$li2, _colorSchemesInput$da2;
 
   const {
-    colorSchemes: colorSchemesInput = {},
-    opacity: opacityInput = {}
+    colorSchemes: colorSchemesInput = {}
   } = options,
-        input = (0, _objectWithoutPropertiesLoose2.default)(options, _excluded); // eslint-disable-next-line prefer-const
+        input = (0, _objectWithoutPropertiesLoose2.default)(options, _excluded);
 
-  let _createThemeWithoutVa = (0, _createTheme.default)((0, _extends2.default)({}, input, colorSchemesInput.light && {
+  const _createThemeWithoutVa = (0, _createTheme.default)((0, _extends2.default)({}, input, colorSchemesInput.light && {
     palette: (_colorSchemesInput$li = colorSchemesInput.light) == null ? void 0 : _colorSchemesInput$li.palette
   })),
-      {
+        {
     palette: lightPalette
   } = _createThemeWithoutVa,
-      muiTheme = (0, _objectWithoutPropertiesLoose2.default)(_createThemeWithoutVa, _excluded2);
+        muiTheme = (0, _objectWithoutPropertiesLoose2.default)(_createThemeWithoutVa, _excluded2);
 
   const {
     palette: darkPalette
@@ -54,17 +43,46 @@ function createTheme(options = {}, ...args) {
       mode: 'dark'
     }, (_colorSchemesInput$da = colorSchemesInput.dark) == null ? void 0 : _colorSchemesInput$da.palette)
   });
-  colorSchemesInput.light = {
-    palette: lightPalette
-  };
-  colorSchemesInput.dark = {
-    palette: darkPalette
-  };
-  const colorSchemes = {};
-  Object.keys(colorSchemesInput).forEach(key => {
-    const palette = (0, _createPalette.default)(colorSchemesInput[key].palette);
+  let theme = (0, _extends2.default)({}, muiTheme, {
+    colorSchemes: (0, _extends2.default)({}, colorSchemesInput, {
+      light: (0, _extends2.default)({}, colorSchemesInput.light, {
+        palette: lightPalette,
+        opacity: (0, _extends2.default)({
+          placeholder: 0.42,
+          inputTouchBottomLine: 0.42
+        }, (_colorSchemesInput$li2 = colorSchemesInput.light) == null ? void 0 : _colorSchemesInput$li2.opacity)
+      }),
+      dark: (0, _extends2.default)({}, colorSchemesInput.dark, {
+        palette: darkPalette,
+        opacity: (0, _extends2.default)({
+          placeholder: 0.5,
+          inputTouchBottomLine: 0.7
+        }, (_colorSchemesInput$da2 = colorSchemesInput.dark) == null ? void 0 : _colorSchemesInput$da2.opacity)
+      })
+    })
+  });
+  Object.keys(theme.colorSchemes).forEach(key => {
+    const palette = theme.colorSchemes[key].palette; // attach black & white channels to common node
+
+    if (key === 'dark') {
+      palette.common.background = palette.common.background || '#000';
+      palette.common.onBackground = palette.common.onBackground || '#fff';
+    } else {
+      palette.common.background = palette.common.background || '#fff';
+      palette.common.onBackground = palette.common.onBackground || '#000';
+    }
+
+    palette.common.backgroundChannel = (0, _system.colorChannel)(palette.common.background);
+    palette.common.onBackgroundChannel = (0, _system.colorChannel)(palette.common.onBackground);
+    palette.dividerChannel = (0, _system.colorChannel)(palette.divider); // special token for Tooltip
+    // TODO: consider adding `main`, and `light` to palette.grey to make it consistent.
+
+    if (!palette.grey.dark) {
+      palette.grey.dark = palette.grey[700];
+    }
+
     Object.keys(palette).forEach(color => {
-      const colors = palette[color];
+      const colors = palette[color]; // Color palettes: primary, secondary, error, info, success, and warning
 
       if (colors.main) {
         palette[color].mainChannel = (0, _system.colorChannel)(colors.main);
@@ -78,6 +96,11 @@ function createTheme(options = {}, ...args) {
         palette[color].darkChannel = (0, _system.colorChannel)(colors.dark);
       }
 
+      if (colors.contrastText) {
+        palette[color].contrastTextChannel = (0, _system.colorChannel)(colors.contrastText);
+      } // Text colors: text.primary, text.secondary
+
+
       if (colors.primary) {
         palette[color].primaryChannel = (0, _system.colorChannel)(colors.primary);
       }
@@ -85,21 +108,8 @@ function createTheme(options = {}, ...args) {
       if (colors.secondary) {
         palette[color].secondaryChannel = (0, _system.colorChannel)(colors.secondary);
       }
-
-      if (colors.disabled) {
-        palette[color].disabledChannel = (0, _system.colorChannel)(colors.disabled);
-      }
     });
-    colorSchemes[key] = {
-      palette
-    };
   });
-  const opacity = (0, _extends2.default)({}, defaultOpacity, opacityInput);
-  muiTheme.colorSchemes = colorSchemes;
-  muiTheme.opacity = opacity;
-  muiTheme = args.reduce((acc, argument) => (0, _utils.deepmerge)(acc, argument), muiTheme);
-  return muiTheme;
-}
-
-var _default = createTheme;
-exports.default = _default;
+  theme = args.reduce((acc, argument) => (0, _utils.deepmerge)(acc, argument), theme);
+  return theme;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/material",
-  "version": "5.6.2",
+  "version": "5.7.0",
   "private": false,
   "author": "MUI Team",
   "description": "React components that implement Google's Material Design.",
@@ -46,15 +46,16 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.17.2",
-    "@mui/base": "5.0.0-alpha.77",
-    "@mui/system": "^5.6.2",
+    "@mui/base": "5.0.0-alpha.80",
+    "@mui/private-classnames": "^5.7.0",
+    "@mui/system": "^5.7.0",
     "@mui/types": "^7.1.3",
-    "@mui/utils": "^5.6.1",
+    "@mui/utils": "^5.7.0",
     "@types/react-transition-group": "^4.4.4",
     "clsx": "^1.1.1",
     "csstype": "^3.0.11",
     "hoist-non-react-statics": "^3.3.2",
-    "prop-types": "^15.7.2",
+    "prop-types": "^15.8.1",
     "react-is": "^17.0.2",
     "react-transition-group": "^4.4.2"
   },

package/styles/ThemeProvider.d.ts

@@ -10,7 +10,7 @@ export interface ThemeProviderProps<Theme = DefaultTheme> {
  * It should preferably be used at **the root of your component tree**.
  * API:
  *
- * - [ThemeProvider API](/material-ui/customization/theming/#themeprovider)
+ * - [ThemeProvider API](https://mui.com/material-ui/customization/theming/#themeprovider)
  */
 export default function ThemeProvider<T = DefaultTheme>(
   props: ThemeProviderProps<T>,

package/styles/createPalette.d.ts

@@ -102,10 +102,16 @@ export interface Channels {
   mainChannel: string;
   lightChannel: string;
   darkChannel: string;
+  contrastTextChannel: string;
 }
 
 export interface PaletteWithChannels {
-  common: CommonColors;
+  common: CommonColors & {
+    background: string;
+    onBackground: string;
+    backgroundChannel: string;
+    onBackgroundChannel: string;
+  };
   mode: PaletteMode;
   contrastThreshold: number;
   tonalOffset: PaletteTonalOffset;
@@ -115,9 +121,10 @@ export interface PaletteWithChannels {
   warning: PaletteColor & Channels;
   info: PaletteColor & Channels;
   success: PaletteColor & Channels;
-  grey: Color;
+  grey: Color & { darkChannel: string };
   text: TypeText & { primaryChannel: string; secondaryChannel: string; disabledChannel: string };
   divider: TypeDivider;
+  dividerChannel: TypeDivider;
   action: TypeAction & { disabledChannel: string };
   background: TypeBackground;
   getContrastText: (background: string) => string;

package/styles/createPalette.js

@@ -278,7 +278,8 @@ const theme2 = createTheme({ palette: {
 
   const paletteOutput = deepmerge(_extends({
     // A collection of common colors.
-    common,
+    common: _extends({}, common),
+    // prevent mutable object.
     // The palette mode, can be light or dark.
     mode,
     // The colors used to represent primary interface elements for a user.

package/styles/experimental_extendTheme.d.ts

@@ -34,41 +34,38 @@ export type ExtendedColorScheme = OverridableStringUnion<never, ColorSchemeOverr
  */
 export type SupportedColorScheme = DefaultColorScheme | ExtendedColorScheme;
 
+export interface Opacity {
+  placeholder: number;
+  inputTouchBottomLine: number;
+}
+
 export interface ThemeOptions extends Omit<SystemThemeOptions, 'zIndex'> {
   mixins?: MixinsOptions;
   components?: Components<BaseTheme>;
-  // palette?: PaletteOptions;
-  colorSchemes?: Record<SupportedColorScheme, { palette: PaletteOptions }>;
+  colorSchemes?: Record<
+    SupportedColorScheme,
+    {
+      palette?: PaletteOptions;
+      opacity?: Partial<Opacity>;
+    }
+  >;
   shadows?: Shadows;
   transitions?: TransitionsOptions;
   typography?: TypographyOptions | ((palette: Palette) => TypographyOptions);
   zIndex?: ZIndexOptions;
   unstable_strictMode?: boolean;
-  opacity?: {
-    active?: number;
-    hover?: number;
-    selected?: number;
-    disabled?: number;
-    focus?: number;
-  };
 }
 
 interface BaseTheme extends SystemTheme {
   mixins: Mixins;
   palette: Palette;
+  opacity: Opacity;
   shadows: Shadows;
   transitions: Transitions;
   typography: Typography;
   zIndex: ZIndex;
   unstable_strictMode?: boolean;
   colorSchemes: Record<string, { palette: Palette }>;
-  opacity: {
-    active: number;
-    hover: number;
-    selected: number;
-    disabled: number;
-    focus: number;
-  };
 }
 
 // shut off automatic exporting for the `BaseTheme` above

package/styles/experimental_extendTheme.js

@@ -1,36 +1,25 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["colorSchemes", "opacity"],
+const _excluded = ["colorSchemes"],
       _excluded2 = ["palette"];
 import { deepmerge } from '@mui/utils';
 import { colorChannel } from '@mui/system';
 import createThemeWithoutVars from './createTheme';
-import createPalette from './createPalette';
-export const defaultOpacity = {
-  active: 0.54,
-  hover: 0.04,
-  selected: 0.08,
-  disabled: 0.26,
-  focus: 0.12
-};
-
-function createTheme(options = {}, ...args) {
-  var _colorSchemesInput$li, _colorSchemesInput$da;
+export default function extendTheme(options = {}, ...args) {
+  var _colorSchemesInput$li, _colorSchemesInput$da, _colorSchemesInput$li2, _colorSchemesInput$da2;
 
   const {
-    colorSchemes: colorSchemesInput = {},
-    opacity: opacityInput = {}
+    colorSchemes: colorSchemesInput = {}
   } = options,
-        input = _objectWithoutPropertiesLoose(options, _excluded); // eslint-disable-next-line prefer-const
+        input = _objectWithoutPropertiesLoose(options, _excluded);
 
-
-  let _createThemeWithoutVa = createThemeWithoutVars(_extends({}, input, colorSchemesInput.light && {
+  const _createThemeWithoutVa = createThemeWithoutVars(_extends({}, input, colorSchemesInput.light && {
     palette: (_colorSchemesInput$li = colorSchemesInput.light) == null ? void 0 : _colorSchemesInput$li.palette
   })),
-      {
+        {
     palette: lightPalette
   } = _createThemeWithoutVa,
-      muiTheme = _objectWithoutPropertiesLoose(_createThemeWithoutVa, _excluded2);
+        muiTheme = _objectWithoutPropertiesLoose(_createThemeWithoutVa, _excluded2);
 
   const {
     palette: darkPalette
@@ -39,17 +28,48 @@ function createTheme(options = {}, ...args) {
       mode: 'dark'
     }, (_colorSchemesInput$da = colorSchemesInput.dark) == null ? void 0 : _colorSchemesInput$da.palette)
   });
-  colorSchemesInput.light = {
-    palette: lightPalette
-  };
-  colorSchemesInput.dark = {
-    palette: darkPalette
-  };
-  const colorSchemes = {};
-  Object.keys(colorSchemesInput).forEach(key => {
-    const palette = createPalette(colorSchemesInput[key].palette);
+
+  let theme = _extends({}, muiTheme, {
+    colorSchemes: _extends({}, colorSchemesInput, {
+      light: _extends({}, colorSchemesInput.light, {
+        palette: lightPalette,
+        opacity: _extends({
+          placeholder: 0.42,
+          inputTouchBottomLine: 0.42
+        }, (_colorSchemesInput$li2 = colorSchemesInput.light) == null ? void 0 : _colorSchemesInput$li2.opacity)
+      }),
+      dark: _extends({}, colorSchemesInput.dark, {
+        palette: darkPalette,
+        opacity: _extends({
+          placeholder: 0.5,
+          inputTouchBottomLine: 0.7
+        }, (_colorSchemesInput$da2 = colorSchemesInput.dark) == null ? void 0 : _colorSchemesInput$da2.opacity)
+      })
+    })
+  });
+
+  Object.keys(theme.colorSchemes).forEach(key => {
+    const palette = theme.colorSchemes[key].palette; // attach black & white channels to common node
+
+    if (key === 'dark') {
+      palette.common.background = palette.common.background || '#000';
+      palette.common.onBackground = palette.common.onBackground || '#fff';
+    } else {
+      palette.common.background = palette.common.background || '#fff';
+      palette.common.onBackground = palette.common.onBackground || '#000';
+    }
+
+    palette.common.backgroundChannel = colorChannel(palette.common.background);
+    palette.common.onBackgroundChannel = colorChannel(palette.common.onBackground);
+    palette.dividerChannel = colorChannel(palette.divider); // special token for Tooltip
+    // TODO: consider adding `main`, and `light` to palette.grey to make it consistent.
+
+    if (!palette.grey.dark) {
+      palette.grey.dark = palette.grey[700];
+    }
+
     Object.keys(palette).forEach(color => {
-      const colors = palette[color];
+      const colors = palette[color]; // Color palettes: primary, secondary, error, info, success, and warning
 
       if (colors.main) {
         palette[color].mainChannel = colorChannel(colors.main);
@@ -63,6 +83,11 @@ function createTheme(options = {}, ...args) {
         palette[color].darkChannel = colorChannel(colors.dark);
       }
 
+      if (colors.contrastText) {
+        palette[color].contrastTextChannel = colorChannel(colors.contrastText);
+      } // Text colors: text.primary, text.secondary
+
+
       if (colors.primary) {
         palette[color].primaryChannel = colorChannel(colors.primary);
       }
@@ -70,22 +95,8 @@ function createTheme(options = {}, ...args) {
       if (colors.secondary) {
         palette[color].secondaryChannel = colorChannel(colors.secondary);
       }
-
-      if (colors.disabled) {
-        palette[color].disabledChannel = colorChannel(colors.disabled);
-      }
     });
-    colorSchemes[key] = {
-      palette
-    };
   });
-
-  const opacity = _extends({}, defaultOpacity, opacityInput);
-
-  muiTheme.colorSchemes = colorSchemes;
-  muiTheme.opacity = opacity;
-  muiTheme = args.reduce((acc, argument) => deepmerge(acc, argument), muiTheme);
-  return muiTheme;
-}
-
-export default createTheme;
+  theme = args.reduce((acc, argument) => deepmerge(acc, argument), theme);
+  return theme;
+}

package/transitions/index.d.ts

@@ -1 +1 @@
-export * from './transition';
+export * from './transition';

package/transitions/transition.d.ts

@@ -1,13 +1,13 @@
-import { TransitionProps as _TransitionProps, TransitionActions } from 'react-transition-group/Transition';
-import * as React from 'react';
-export declare type TransitionHandlerKeys = 'onEnter' | 'onEntering' | 'onEntered' | 'onExit' | 'onExiting' | 'onExited';
-export declare type TransitionHandlerProps = Pick<_TransitionProps, TransitionHandlerKeys>;
-export interface EasingProps {
-    easing: string | {
-        enter?: string;
-        exit?: string;
-    };
-}
-export declare type TransitionKeys = 'in' | 'mountOnEnter' | 'unmountOnExit' | 'timeout' | 'easing' | 'addEndListener' | TransitionHandlerKeys;
-export interface TransitionProps extends TransitionActions, Partial<Pick<_TransitionProps & EasingProps, TransitionKeys>>, React.HTMLAttributes<HTMLElement> {
-}
+import { TransitionProps as _TransitionProps, TransitionActions } from 'react-transition-group/Transition';
+import * as React from 'react';
+export declare type TransitionHandlerKeys = 'onEnter' | 'onEntering' | 'onEntered' | 'onExit' | 'onExiting' | 'onExited';
+export declare type TransitionHandlerProps = Pick<_TransitionProps, TransitionHandlerKeys>;
+export interface EasingProps {
+    easing: string | {
+        enter?: string;
+        exit?: string;
+    };
+}
+export declare type TransitionKeys = 'in' | 'mountOnEnter' | 'unmountOnExit' | 'timeout' | 'easing' | 'addEndListener' | TransitionHandlerKeys;
+export interface TransitionProps extends TransitionActions, Partial<Pick<_TransitionProps & EasingProps, TransitionKeys>>, React.HTMLAttributes<HTMLElement> {
+}

package/transitions/utils.d.ts

@@ -1,23 +1,23 @@
-import * as React from 'react';
-export declare const reflow: (node: Element) => number;
-interface ComponentProps {
-    easing: string | {
-        enter?: string;
-        exit?: string;
-    } | undefined;
-    style: React.CSSProperties | undefined;
-    timeout: number | {
-        enter?: number;
-        exit?: number;
-    };
-}
-interface Options {
-    mode: 'enter' | 'exit';
-}
-interface TransitionProps {
-    duration: string | number;
-    easing: string | undefined;
-    delay: string | undefined;
-}
-export declare function getTransitionProps(props: ComponentProps, options: Options): TransitionProps;
-export {};
+import * as React from 'react';
+export declare const reflow: (node: Element) => number;
+interface ComponentProps {
+    easing: string | {
+        enter?: string;
+        exit?: string;
+    } | undefined;
+    style: React.CSSProperties | undefined;
+    timeout: number | {
+        enter?: number;
+        exit?: number;
+    };
+}
+interface Options {
+    mode: 'enter' | 'exit';
+}
+interface TransitionProps {
+    duration: string | number;
+    easing: string | undefined;
+    delay: string | undefined;
+}
+export declare function getTransitionProps(props: ComponentProps, options: Options): TransitionProps;
+export {};