@mui/material 7.0.0-beta.3 → 7.0.0-beta.4

package/modern/styles/adaptV4Theme.d.ts

@@ -1,7 +1,7 @@
 import { BreakpointsOptions, ShapeOptions, SpacingOptions } from '@mui/system';
 import { MixinsOptions } from "./createMixins.js";
 import { Palette, PaletteOptions } from "./createPalette.js";
-import { TypographyOptions } from "./createTypography.js";
+import { TypographyVariantsOptions } from "./createTypography.js";
 import { Shadows } from "./shadows.js";
 import { TransitionsOptions } from "./createTransitions.js";
 import { ZIndexOptions } from "./zIndex.js";
@@ -21,7 +21,7 @@ export interface DeprecatedThemeOptions {
   shadows?: Shadows;
   spacing?: SpacingOptions;
   transitions?: TransitionsOptions;
-  typography?: TypographyOptions | ((palette: Palette) => TypographyOptions);
+  typography?: TypographyVariantsOptions | ((palette: Palette) => TypographyVariantsOptions);
   variants?: ComponentsVariants;
   zIndex?: ZIndexOptions;
   unstable_strictMode?: boolean;

package/modern/styles/createThemeNoVars.d.ts

@@ -1,7 +1,7 @@
 import { ThemeOptions as SystemThemeOptions, Theme as SystemTheme, SxProps, CSSObject, SxConfig } from '@mui/system';
 import { Mixins, MixinsOptions } from "./createMixins.js";
 import { Palette, PaletteOptions } from "./createPalette.js";
-import { Typography, TypographyOptions } from "./createTypography.js";
+import { TypographyVariants, TypographyVariantsOptions } from "./createTypography.js";
 import { Shadows } from "./shadows.js";
 import { Transitions, TransitionsOptions } from "./createTransitions.js";
 import { ZIndex, ZIndexOptions } from "./zIndex.js";
@@ -28,7 +28,7 @@ export interface ThemeOptions extends Omit<SystemThemeOptions, 'zIndex'>, CssVar
   palette?: PaletteOptions;
   shadows?: Shadows;
   transitions?: TransitionsOptions;
-  typography?: TypographyOptions | ((palette: Palette) => TypographyOptions);
+  typography?: TypographyVariantsOptions | ((palette: Palette) => TypographyVariantsOptions);
   zIndex?: ZIndexOptions;
   unstable_strictMode?: boolean;
   unstable_sxConfig?: SxConfig;
@@ -40,7 +40,7 @@ export interface BaseTheme extends SystemTheme {
   } ? CssVarsPalette : {});
   shadows: Shadows;
   transitions: Transitions;
-  typography: Typography;
+  typography: TypographyVariants;
   zIndex: ZIndex;
   unstable_strictMode?: boolean;
 }

package/modern/styles/createTypography.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as CSS from 'csstype';
 import { Palette } from "./createPalette.js";
-export type Variant = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'subtitle1' | 'subtitle2' | 'body1' | 'body2' | 'caption' | 'button' | 'overline';
+export type TypographyVariant = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'subtitle1' | 'subtitle2' | 'body1' | 'body2' | 'caption' | 'button' | 'overline';
 export interface FontStyle {
   fontFamily: React.CSSProperties['fontFamily'];
   fontSize: number;
@@ -45,6 +45,6 @@ export interface TypographyStyleOptions extends TypographyStyle {}
 export interface TypographyUtils {
   pxToRem: (px: number) => string;
 }
-export interface Typography extends Record<Variant, TypographyStyle>, FontStyle, TypographyUtils {}
-export interface TypographyOptions extends Partial<Record<Variant, TypographyStyleOptions> & FontStyleOptions> {}
-export default function createTypography(palette: Palette, typography: TypographyOptions | ((palette: Palette) => TypographyOptions)): Typography;
+export interface TypographyVariants extends Record<TypographyVariant, TypographyStyle>, FontStyle, TypographyUtils {}
+export interface TypographyVariantsOptions extends Partial<Record<TypographyVariant, TypographyStyleOptions> & FontStyleOptions> {}
+export default function createTypography(palette: Palette, typography: TypographyVariantsOptions | ((palette: Palette) => TypographyVariantsOptions)): TypographyVariants;

package/modern/styles/index.d.ts

@@ -6,7 +6,7 @@ export { ZIndex } from "./zIndex.js";
 export { CommonColors, Palette, PaletteColor, PaletteColorOptions, PaletteOptions, SimplePaletteColorOptions, TypeText, TypeAction, TypeBackground, PaletteMode, Color } from "./createPalette.js";
 export { default as createColorScheme } from "./createColorScheme.js";
 export { default as createStyles } from "./createStyles.js";
-export { Typography as TypographyVariants, TypographyOptions as TypographyVariantsOptions, TypographyStyle, Variant as TypographyVariant } from "./createTypography.js";
+export { TypographyVariants, TypographyVariantsOptions, TypographyStyle, TypographyVariant } from "./createTypography.js";
 export { default as responsiveFontSizes } from "./responsiveFontSizes.js";
 export { Duration, Easing, Transitions, TransitionsOptions, duration, easing } from "./createTransitions.js";
 export { Mixins } from "./createMixins.js";

package/modern/styles/responsiveFontSizes.d.ts

@@ -1,11 +1,11 @@
 import { Breakpoint } from '@mui/system';
-import { Typography } from "./createTypography.js";
+import { TypographyVariants } from "./createTypography.js";
 export interface ResponsiveFontSizesOptions {
   breakpoints?: Breakpoint[];
   disableAlign?: boolean;
   factor?: number;
-  variants?: Array<keyof Typography>;
+  variants?: Array<keyof TypographyVariants>;
 }
 export default function responsiveFontSizes<T extends {
-  typography: Typography;
+  typography: TypographyVariants;
 }>(theme: T, options?: ResponsiveFontSizesOptions): T;

package/modern/useScrollTrigger/useScrollTrigger.d.ts

@@ -1,6 +1,6 @@
 export interface UseScrollTriggerOptions {
   disableHysteresis?: boolean;
-  target?: Node | Window;
+  target?: Node | Window | null;
   threshold?: number;
 }
 export default function useScrollTrigger(options?: UseScrollTriggerOptions): boolean;

package/modern/useScrollTrigger/useScrollTrigger.js

@@ -29,6 +29,9 @@ export default function useScrollTrigger(options = {}) {
   const store = React.useRef();
   const [trigger, setTrigger] = React.useState(() => getTrigger(store, other));
   React.useEffect(() => {
+    if (target === null) {
+      return setTrigger(false);
+    }
     const handleScroll = () => {
       setTrigger(getTrigger(store, {
         target,

package/modern/version/index.js

@@ -1,6 +1,6 @@
-export const version = "7.0.0-beta.3";
+export const version = "7.0.0-beta.4";
 export const major = Number("7");
 export const minor = Number("0");
 export const patch = Number("0");
-export const prerelease = "beta.3";
+export const prerelease = "beta.4";
 export default version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/material",
-  "version": "7.0.0-beta.3",
+  "version": "7.0.0-beta.4",
   "private": false,
   "author": "MUI Team",
   "description": "Material UI is an open-source React component library that implements Google's Material Design. It's comprehensive and can be used in production out of the box.",
@@ -35,10 +35,10 @@
     "prop-types": "^15.8.1",
     "react-is": "^19.0.0",
     "react-transition-group": "^4.4.5",
-    "@mui/system": "7.0.0-beta.3",
-    "@mui/types": "^7.2.23",
-    "@mui/utils": "7.0.0-beta.3",
-    "@mui/core-downloads-tracker": "^7.0.0-beta.3"
+    "@mui/types": "^7.3.0",
+    "@mui/utils": "7.0.0-beta.4",
+    "@mui/system": "7.0.0-beta.4",
+    "@mui/core-downloads-tracker": "^7.0.0-beta.4"
   },
   "peerDependencies": {
     "@emotion/react": "^11.5.0",
@@ -46,7 +46,7 @@
     "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
     "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
     "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0",
-    "@mui/material-pigment-css": "7.0.0-beta.3"
+    "@mui/material-pigment-css": "7.0.0-beta.4"
   },
   "peerDependenciesMeta": {
     "@types/react": {

package/styles/ThemeProvider.d.ts

@@ -21,6 +21,12 @@ type ThemeProviderCssVariablesProps = CssThemeVariables extends {
    * @default false
    */
   disableStyleSheetGeneration?: boolean;
+  /**
+   * If `true`, theme values are recalculated when the mode changes.
+   * The `theme.colorSchemes.{mode}.*` nodes will be shallow merged to the top-level of the theme.
+   * @default false
+   */
+  forceThemeRerender?: boolean;
 } : {};
 export interface ThemeProviderProps<Theme = DefaultTheme> extends ThemeProviderCssVariablesProps {
   children?: React.ReactNode;

package/styles/ThemeProvider.js

@@ -24,6 +24,17 @@ function ThemeProvider({
   }
   const muiTheme = _identifier.default in theme ? theme[_identifier.default] : theme;
   if (!('colorSchemes' in muiTheme)) {
+    if (!('vars' in muiTheme)) {
+      // For non-CSS variables themes, set `vars` to null to prevent theme inheritance from the upper theme.
+      // The example use case is the docs demo that uses ThemeProvider to customize the theme while the upper theme is using CSS variables.
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ThemeProviderNoVars.default, {
+        theme: {
+          ...theme,
+          vars: null
+        },
+        ...props
+      });
+    }
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ThemeProviderNoVars.default, {
       theme: theme,
       ...props

package/styles/adaptV4Theme.d.ts

@@ -1,7 +1,7 @@
 import { BreakpointsOptions, ShapeOptions, SpacingOptions } from '@mui/system';
 import { MixinsOptions } from "./createMixins.js";
 import { Palette, PaletteOptions } from "./createPalette.js";
-import { TypographyOptions } from "./createTypography.js";
+import { TypographyVariantsOptions } from "./createTypography.js";
 import { Shadows } from "./shadows.js";
 import { TransitionsOptions } from "./createTransitions.js";
 import { ZIndexOptions } from "./zIndex.js";
@@ -21,7 +21,7 @@ export interface DeprecatedThemeOptions {
   shadows?: Shadows;
   spacing?: SpacingOptions;
   transitions?: TransitionsOptions;
-  typography?: TypographyOptions | ((palette: Palette) => TypographyOptions);
+  typography?: TypographyVariantsOptions | ((palette: Palette) => TypographyVariantsOptions);
   variants?: ComponentsVariants;
   zIndex?: ZIndexOptions;
   unstable_strictMode?: boolean;

package/styles/createThemeNoVars.d.ts

@@ -1,7 +1,7 @@
 import { ThemeOptions as SystemThemeOptions, Theme as SystemTheme, SxProps, CSSObject, SxConfig } from '@mui/system';
 import { Mixins, MixinsOptions } from "./createMixins.js";
 import { Palette, PaletteOptions } from "./createPalette.js";
-import { Typography, TypographyOptions } from "./createTypography.js";
+import { TypographyVariants, TypographyVariantsOptions } from "./createTypography.js";
 import { Shadows } from "./shadows.js";
 import { Transitions, TransitionsOptions } from "./createTransitions.js";
 import { ZIndex, ZIndexOptions } from "./zIndex.js";
@@ -28,7 +28,7 @@ export interface ThemeOptions extends Omit<SystemThemeOptions, 'zIndex'>, CssVar
   palette?: PaletteOptions;
   shadows?: Shadows;
   transitions?: TransitionsOptions;
-  typography?: TypographyOptions | ((palette: Palette) => TypographyOptions);
+  typography?: TypographyVariantsOptions | ((palette: Palette) => TypographyVariantsOptions);
   zIndex?: ZIndexOptions;
   unstable_strictMode?: boolean;
   unstable_sxConfig?: SxConfig;
@@ -40,7 +40,7 @@ export interface BaseTheme extends SystemTheme {
   } ? CssVarsPalette : {});
   shadows: Shadows;
   transitions: Transitions;
-  typography: Typography;
+  typography: TypographyVariants;
   zIndex: ZIndex;
   unstable_strictMode?: boolean;
 }

package/styles/createTypography.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as CSS from 'csstype';
 import { Palette } from "./createPalette.js";
-export type Variant = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'subtitle1' | 'subtitle2' | 'body1' | 'body2' | 'caption' | 'button' | 'overline';
+export type TypographyVariant = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'subtitle1' | 'subtitle2' | 'body1' | 'body2' | 'caption' | 'button' | 'overline';
 export interface FontStyle {
   fontFamily: React.CSSProperties['fontFamily'];
   fontSize: number;
@@ -45,6 +45,6 @@ export interface TypographyStyleOptions extends TypographyStyle {}
 export interface TypographyUtils {
   pxToRem: (px: number) => string;
 }
-export interface Typography extends Record<Variant, TypographyStyle>, FontStyle, TypographyUtils {}
-export interface TypographyOptions extends Partial<Record<Variant, TypographyStyleOptions> & FontStyleOptions> {}
-export default function createTypography(palette: Palette, typography: TypographyOptions | ((palette: Palette) => TypographyOptions)): Typography;
+export interface TypographyVariants extends Record<TypographyVariant, TypographyStyle>, FontStyle, TypographyUtils {}
+export interface TypographyVariantsOptions extends Partial<Record<TypographyVariant, TypographyStyleOptions> & FontStyleOptions> {}
+export default function createTypography(palette: Palette, typography: TypographyVariantsOptions | ((palette: Palette) => TypographyVariantsOptions)): TypographyVariants;

package/styles/index.d.ts

@@ -6,7 +6,7 @@ export { ZIndex } from "./zIndex.js";
 export { CommonColors, Palette, PaletteColor, PaletteColorOptions, PaletteOptions, SimplePaletteColorOptions, TypeText, TypeAction, TypeBackground, PaletteMode, Color } from "./createPalette.js";
 export { default as createColorScheme } from "./createColorScheme.js";
 export { default as createStyles } from "./createStyles.js";
-export { Typography as TypographyVariants, TypographyOptions as TypographyVariantsOptions, TypographyStyle, Variant as TypographyVariant } from "./createTypography.js";
+export { TypographyVariants, TypographyVariantsOptions, TypographyStyle, TypographyVariant } from "./createTypography.js";
 export { default as responsiveFontSizes } from "./responsiveFontSizes.js";
 export { Duration, Easing, Transitions, TransitionsOptions, duration, easing } from "./createTransitions.js";
 export { Mixins } from "./createMixins.js";

package/styles/responsiveFontSizes.d.ts

@@ -1,11 +1,11 @@
 import { Breakpoint } from '@mui/system';
-import { Typography } from "./createTypography.js";
+import { TypographyVariants } from "./createTypography.js";
 export interface ResponsiveFontSizesOptions {
   breakpoints?: Breakpoint[];
   disableAlign?: boolean;
   factor?: number;
-  variants?: Array<keyof Typography>;
+  variants?: Array<keyof TypographyVariants>;
 }
 export default function responsiveFontSizes<T extends {
-  typography: Typography;
+  typography: TypographyVariants;
 }>(theme: T, options?: ResponsiveFontSizesOptions): T;