@mui/material 7.0.0-beta.3 → 7.0.0-rc.0

package/modern/TextField/TextField.js

@@ -160,6 +160,25 @@ const TextField = /*#__PURE__*/React.forwardRef(function TextField(inProps, ref)
     }
     inputAdditionalProps['aria-describedby'] = undefined;
   }
+  const [RootSlot, rootProps] = useSlot('root', {
+    elementType: TextFieldRoot,
+    shouldForwardComponentProp: true,
+    externalForwardedProps: {
+      ...externalForwardedProps,
+      ...other
+    },
+    ownerState,
+    className: clsx(classes.root, className),
+    ref,
+    additionalProps: {
+      disabled,
+      error,
+      fullWidth,
+      required,
+      color,
+      variant
+    }
+  });
   const [InputSlot, inputProps] = useSlot('input', {
     elementType: InputComponent,
     externalForwardedProps,
@@ -211,17 +230,8 @@ const TextField = /*#__PURE__*/React.forwardRef(function TextField(inProps, ref)
     },
     ...inputProps
   });
-  return /*#__PURE__*/_jsxs(TextFieldRoot, {
-    className: clsx(classes.root, className),
-    disabled: disabled,
-    error: error,
-    fullWidth: fullWidth,
-    ref: ref,
-    required: required,
-    color: color,
-    variant: variant,
-    ownerState: ownerState,
-    ...other,
+  return /*#__PURE__*/_jsxs(RootSlot, {
+    ...rootProps,
     children: [label != null && label !== '' && /*#__PURE__*/_jsx(InputLabelSlot, {
       htmlFor: id,
       id: inputLabelId,
@@ -423,6 +433,7 @@ process.env.NODE_ENV !== "production" ? TextField.propTypes /* remove-proptypes
     htmlInput: PropTypes.elementType,
     input: PropTypes.elementType,
     inputLabel: PropTypes.elementType,
+    root: PropTypes.elementType,
     select: PropTypes.elementType
   }),
   /**

package/modern/TextareaAutosize/TextareaAutosize.js

@@ -2,7 +2,7 @@
 
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import { unstable_debounce as debounce, unstable_useForkRef as useForkRef, unstable_useEnhancedEffect as useEnhancedEffect, unstable_ownerWindow as ownerWindow } from '@mui/utils';
+import { unstable_debounce as debounce, unstable_useForkRef as useForkRef, unstable_useEnhancedEffect as useEnhancedEffect, unstable_useEventCallback as useEventCallback, unstable_ownerWindow as ownerWindow } from '@mui/utils';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 function getStyleValue(value) {
   return parseInt(value, 10) || 0;
@@ -112,6 +112,15 @@ const TextareaAutosize = /*#__PURE__*/React.forwardRef(function TextareaAutosize
       overflowing
     };
   }, [maxRows, minRows, props.placeholder]);
+  const didHeightChange = useEventCallback(() => {
+    const textarea = textareaRef.current;
+    const textareaStyles = calculateTextareaStyles();
+    if (!textarea || !textareaStyles || isEmpty(textareaStyles)) {
+      return false;
+    }
+    const outerHeightStyle = textareaStyles.outerHeightStyle;
+    return heightRef.current != null && heightRef.current !== outerHeightStyle;
+  });
   const syncHeight = React.useCallback(() => {
     const textarea = textareaRef.current;
     const textareaStyles = calculateTextareaStyles();
@@ -127,37 +136,39 @@ const TextareaAutosize = /*#__PURE__*/React.forwardRef(function TextareaAutosize
   }, [calculateTextareaStyles]);
   const frameRef = React.useRef(-1);
   useEnhancedEffect(() => {
-    const debounceHandleResize = debounce(() => syncHeight());
+    const debouncedHandleResize = debounce(syncHeight);
     const textarea = textareaRef?.current;
     if (!textarea) {
       return undefined;
     }
     const containerWindow = ownerWindow(textarea);
-    containerWindow.addEventListener('resize', debounceHandleResize);
+    containerWindow.addEventListener('resize', debouncedHandleResize);
     let resizeObserver;
     if (typeof ResizeObserver !== 'undefined') {
       resizeObserver = new ResizeObserver(() => {
-        // avoid "ResizeObserver loop completed with undelivered notifications" error
-        // by temporarily unobserving the textarea element while manipulating the height
-        // and reobserving one frame later
-        resizeObserver.unobserve(textarea);
-        cancelAnimationFrame(frameRef.current);
-        syncHeight();
-        frameRef.current = requestAnimationFrame(() => {
-          resizeObserver.observe(textarea);
-        });
+        if (didHeightChange()) {
+          // avoid "ResizeObserver loop completed with undelivered notifications" error
+          // by temporarily unobserving the textarea element while manipulating the height
+          // and reobserving one frame later
+          resizeObserver.unobserve(textarea);
+          cancelAnimationFrame(frameRef.current);
+          syncHeight();
+          frameRef.current = requestAnimationFrame(() => {
+            resizeObserver.observe(textarea);
+          });
+        }
       });
       resizeObserver.observe(textarea);
     }
     return () => {
-      debounceHandleResize.clear();
+      debouncedHandleResize.clear();
       cancelAnimationFrame(frameRef.current);
-      containerWindow.removeEventListener('resize', debounceHandleResize);
+      containerWindow.removeEventListener('resize', debouncedHandleResize);
       if (resizeObserver) {
         resizeObserver.disconnect();
       }
     };
-  }, [calculateTextareaStyles, syncHeight]);
+  }, [calculateTextareaStyles, syncHeight, didHeightChange]);
   useEnhancedEffect(() => {
     syncHeight();
   });

package/modern/Tooltip/Tooltip.d.ts

@@ -178,7 +178,7 @@ export interface TooltipProps extends StandardProps<React.HTMLAttributes<HTMLDiv
    * Tooltip placement.
    * @default 'bottom'
    */
-  placement?: 'bottom-end' | 'bottom-start' | 'bottom' | 'left-end' | 'left-start' | 'left' | 'right-end' | 'right-start' | 'right' | 'top-end' | 'top-start' | 'top';
+  placement?: PopperProps['placement'];
   /**
    * The component used for the popper.
    * @deprecated use the `slots.popper` prop instead. This prop will be removed in v7. See [Migrating from deprecated APIs](https://mui.com/material-ui/migration/migrating-from-deprecated-apis/) for more details.

package/modern/Tooltip/Tooltip.js

@@ -841,7 +841,7 @@ process.env.NODE_ENV !== "production" ? Tooltip.propTypes /* remove-proptypes */
    * Tooltip placement.
    * @default 'bottom'
    */
-  placement: PropTypes.oneOf(['bottom-end', 'bottom-start', 'bottom', 'left-end', 'left-start', 'left', 'right-end', 'right-start', 'right', 'top-end', 'top-start', 'top']),
+  placement: PropTypes.oneOf(['auto-end', 'auto-start', 'auto', 'bottom-end', 'bottom-start', 'bottom', 'left-end', 'left-start', 'left', 'right-end', 'right-start', 'right', 'top-end', 'top-start', 'top']),
   /**
    * The component used for the popper.
    * @deprecated use the `slots.popper` prop instead. This prop will be removed in v7. See [Migrating from deprecated APIs](https://mui.com/material-ui/migration/migrating-from-deprecated-apis/) for more details.

package/modern/Typography/Typography.d.ts

@@ -3,7 +3,7 @@ import { OverridableStringUnion } from '@mui/types';
 import { SxProps, SystemProps } from '@mui/system';
 import { Theme, TypeText } from "../styles/index.js";
 import { OverrideProps, OverridableComponent } from "../OverridableComponent/index.js";
-import { Variant } from "../styles/createTypography.js";
+import { TypographyVariant } from "../styles/createTypography.js";
 import { TypographyClasses } from "./typographyClasses.js";
 export interface TypographyPropsVariantOverrides {}
 export interface TypographyPropsColorOverrides {}
@@ -54,7 +54,7 @@ export interface TypographyOwnProps extends Omit<SystemProps<Theme>, 'color'> {
    * Applies the theme typography styles.
    * @default 'body1'
    */
-  variant?: OverridableStringUnion<Variant | 'inherit', TypographyPropsVariantOverrides>;
+  variant?: OverridableStringUnion<TypographyVariant | 'inherit', TypographyPropsVariantOverrides>;
   /**
    * The component maps the variant prop to a range of different HTML element types.
    * For instance, subtitle1 to `<h6>`.
@@ -74,7 +74,7 @@ export interface TypographyOwnProps extends Omit<SystemProps<Theme>, 'color'> {
    *   inherit: 'p',
    * }
    */
-  variantMapping?: Partial<Record<OverridableStringUnion<Variant | 'inherit', TypographyPropsVariantOverrides>, string>>;
+  variantMapping?: Partial<Record<OverridableStringUnion<TypographyVariant | 'inherit', TypographyPropsVariantOverrides>, string>>;
 }
 export interface TypographyTypeMap<AdditionalProps = {}, RootComponent extends React.ElementType = 'span'> {
   props: AdditionalProps & TypographyOwnProps;

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/material v7.0.0-beta.3
+ * @mui/material v7.0.0-rc.0
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/modern/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/modern/styles/ThemeProvider.js

@@ -17,6 +17,17 @@ export default function ThemeProvider({
   }
   const muiTheme = THEME_ID in theme ? theme[THEME_ID] : 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__*/_jsx(ThemeProviderNoVars, {
+        theme: {
+          ...theme,
+          vars: null
+        },
+        ...props
+      });
+    }
     return /*#__PURE__*/_jsx(ThemeProviderNoVars, {
       theme: theme,
       ...props

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/createPalette.js

@@ -1,4 +1,4 @@
-import _formatMuiErrorMessage from "@mui/utils/formatMuiErrorMessage";
+import _formatErrorMessage from "@mui/utils/formatMuiErrorMessage";
 import deepmerge from '@mui/utils/deepmerge';
 import { darken, getContrastRatio, lighten } from '@mui/system/colorManipulator';
 import common from "../colors/common.js";
@@ -218,10 +218,10 @@ export default function createPalette(palette) {
       color.main = color[mainShade];
     }
     if (!color.hasOwnProperty('main')) {
-      throw new Error(process.env.NODE_ENV !== "production" ? `MUI: The color${name ? ` (${name})` : ''} provided to augmentColor(color) is invalid.\n` + `The color object needs to have a \`main\` property or a \`${mainShade}\` property.` : _formatMuiErrorMessage(11, name ? ` (${name})` : '', mainShade));
+      throw new Error(process.env.NODE_ENV !== "production" ? `MUI: The color${name ? ` (${name})` : ''} provided to augmentColor(color) is invalid.\n` + `The color object needs to have a \`main\` property or a \`${mainShade}\` property.` : _formatErrorMessage(11, name ? ` (${name})` : '', mainShade));
     }
     if (typeof color.main !== 'string') {
-      throw new Error(process.env.NODE_ENV !== "production" ? `MUI: The color${name ? ` (${name})` : ''} provided to augmentColor(color) is invalid.\n` + `\`color.main\` should be a string, but \`${JSON.stringify(color.main)}\` was provided instead.\n` + '\n' + 'Did you intend to use one of the following approaches?\n' + '\n' + 'import { green } from "@mui/material/colors";\n' + '\n' + 'const theme1 = createTheme({ palette: {\n' + '  primary: green,\n' + '} });\n' + '\n' + 'const theme2 = createTheme({ palette: {\n' + '  primary: { main: green[500] },\n' + '} });' : _formatMuiErrorMessage(12, name ? ` (${name})` : '', JSON.stringify(color.main)));
+      throw new Error(process.env.NODE_ENV !== "production" ? `MUI: The color${name ? ` (${name})` : ''} provided to augmentColor(color) is invalid.\n` + `\`color.main\` should be a string, but \`${JSON.stringify(color.main)}\` was provided instead.\n` + '\n' + 'Did you intend to use one of the following approaches?\n' + '\n' + 'import { green } from "@mui/material/colors";\n' + '\n' + 'const theme1 = createTheme({ palette: {\n' + '  primary: green,\n' + '} });\n' + '\n' + 'const theme2 = createTheme({ palette: {\n' + '  primary: { main: green[500] },\n' + '} });' : _formatErrorMessage(12, name ? ` (${name})` : '', JSON.stringify(color.main)));
     }
     addLightOrDark(color, 'light', lightShade, tonalOffset);
     addLightOrDark(color, 'dark', darkShade, tonalOffset);

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/createThemeNoVars.js

@@ -1,4 +1,4 @@
-import _formatMuiErrorMessage from "@mui/utils/formatMuiErrorMessage";
+import _formatErrorMessage from "@mui/utils/formatMuiErrorMessage";
 import deepmerge from '@mui/utils/deepmerge';
 import styleFunctionSx, { unstable_defaultSxConfig as defaultSxConfig } from '@mui/system/styleFunctionSx';
 import systemCreateTheme from '@mui/system/createTheme';
@@ -27,7 +27,7 @@ function createThemeNoVars(options = {}, ...args) {
   options.generateThemeVars === undefined) {
     throw new Error(process.env.NODE_ENV !== "production" ? 'MUI: `vars` is a private field used for CSS variables support.\n' +
     // #host-reference
-    'Please use another name or follow the [docs](https://mui.com/material-ui/customization/css-theme-variables/usage/) to enable the feature.' : _formatMuiErrorMessage(20));
+    'Please use another name or follow the [docs](https://mui.com/material-ui/customization/css-theme-variables/usage/) to enable the feature.' : _formatErrorMessage(20));
   }
   const palette = createPalette(paletteInput);
   const systemTheme = systemCreateTheme(options);

package/modern/styles/createThemeWithVars.js

@@ -1,4 +1,4 @@
-import _formatMuiErrorMessage from "@mui/utils/formatMuiErrorMessage";
+import _formatErrorMessage from "@mui/utils/formatMuiErrorMessage";
 import deepmerge from '@mui/utils/deepmerge';
 import { unstable_createGetCssVar as systemCreateGetCssVar, createSpacing } from '@mui/system';
 import { createUnarySpacing } from '@mui/system/spacing';
@@ -131,7 +131,7 @@ export default function createThemeWithVars(options = {}, ...args) {
     defaultScheme = true;
   }
   if (!defaultScheme) {
-    throw new Error(process.env.NODE_ENV !== "production" ? `MUI: The \`colorSchemes.${defaultColorScheme}\` option is either missing or invalid.` : _formatMuiErrorMessage(21, defaultColorScheme));
+    throw new Error(process.env.NODE_ENV !== "production" ? `MUI: The \`colorSchemes.${defaultColorScheme}\` option is either missing or invalid.` : _formatErrorMessage(21, defaultColorScheme));
   }
 
   // Create the palette for the default color scheme, either `light`, `dark`, or custom color scheme.

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/index.js

@@ -1,4 +1,4 @@
-import _formatMuiErrorMessage from "@mui/utils/formatMuiErrorMessage";
+import _formatErrorMessage from "@mui/utils/formatMuiErrorMessage";
 export { default as THEME_ID } from "./identifier.js";
 export { default as adaptV4Theme } from "./adaptV4Theme.js";
 export { hexToRgb, rgbToHex, hslToRgb, decomposeColor, recomposeColor, getContrastRatio, getLuminance, emphasize, alpha, darken, lighten, css, keyframes } from '@mui/system';
@@ -6,7 +6,7 @@ export { unstable_createBreakpoints } from '@mui/system/createBreakpoints';
 // TODO: Remove this function in v6.
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export function experimental_sx() {
-  throw new Error(process.env.NODE_ENV !== "production" ? 'MUI: The `experimental_sx` has been moved to `theme.unstable_sx`.' + 'For more details, see https://github.com/mui/material-ui/pull/35150.' : _formatMuiErrorMessage(19));
+  throw new Error(process.env.NODE_ENV !== "production" ? 'MUI: The `experimental_sx` has been moved to `theme.unstable_sx`.' + 'For more details, see https://github.com/mui/material-ui/pull/35150.' : _formatErrorMessage(19));
 }
 export { default as createTheme } from "./createTheme.js";
 export { default as unstable_createMuiStrictModeTheme } from "./createMuiStrictModeTheme.js";

package/modern/styles/makeStyles.js

@@ -1,4 +1,4 @@
-import _formatMuiErrorMessage from "@mui/utils/formatMuiErrorMessage";
+import _formatErrorMessage from "@mui/utils/formatMuiErrorMessage";
 export default function makeStyles() {
-  throw new Error(process.env.NODE_ENV !== "production" ? 'MUI: makeStyles is no longer exported from @mui/material/styles.\n' + 'You have to import it from @mui/styles.\n' + 'See https://mui.com/r/migration-v4/#mui-material-styles for more details.' : _formatMuiErrorMessage(14));
+  throw new Error(process.env.NODE_ENV !== "production" ? 'MUI: makeStyles is no longer exported from @mui/material/styles.\n' + 'You have to import it from @mui/styles.\n' + 'See https://mui.com/r/migration-v4/#mui-material-styles for more details.' : _formatErrorMessage(14));
 }

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/styles/responsiveFontSizes.js

@@ -1,4 +1,4 @@
-import _formatMuiErrorMessage from "@mui/utils/formatMuiErrorMessage";
+import _formatErrorMessage from "@mui/utils/formatMuiErrorMessage";
 import { isUnitless, convertLength, responsiveProperty, alignProperty, fontGrid } from "./cssUtils.js";
 export default function responsiveFontSizes(themeInput, options = {}) {
   const {
@@ -34,7 +34,7 @@ export default function responsiveFontSizes(themeInput, options = {}) {
       lineHeight
     } = style;
     if (!isUnitless(lineHeight) && !disableAlign) {
-      throw new Error(process.env.NODE_ENV !== "production" ? 'MUI: Unsupported non-unitless line height with grid alignment.\n' + 'Use unitless line heights instead.' : _formatMuiErrorMessage(6));
+      throw new Error(process.env.NODE_ENV !== "production" ? 'MUI: Unsupported non-unitless line height with grid alignment.\n' + 'Use unitless line heights instead.' : _formatErrorMessage(6));
     }
     if (!isUnitless(lineHeight)) {
       // make it unitless

package/modern/styles/withStyles.js

@@ -1,4 +1,4 @@
-import _formatMuiErrorMessage from "@mui/utils/formatMuiErrorMessage";
+import _formatErrorMessage from "@mui/utils/formatMuiErrorMessage";
 export default function withStyles() {
-  throw new Error(process.env.NODE_ENV !== "production" ? 'MUI: withStyles is no longer exported from @mui/material/styles.\n' + 'You have to import it from @mui/styles.\n' + 'See https://mui.com/r/migration-v4/#mui-material-styles for more details.' : _formatMuiErrorMessage(15));
+  throw new Error(process.env.NODE_ENV !== "production" ? 'MUI: withStyles is no longer exported from @mui/material/styles.\n' + 'You have to import it from @mui/styles.\n' + 'See https://mui.com/r/migration-v4/#mui-material-styles for more details.' : _formatErrorMessage(15));
 }

package/modern/styles/withTheme.js

@@ -1,4 +1,4 @@
-import _formatMuiErrorMessage from "@mui/utils/formatMuiErrorMessage";
+import _formatErrorMessage from "@mui/utils/formatMuiErrorMessage";
 export default function withTheme() {
-  throw new Error(process.env.NODE_ENV !== "production" ? 'MUI: withTheme is no longer exported from @mui/material/styles.\n' + 'You have to import it from @mui/styles.\n' + 'See https://mui.com/r/migration-v4/#mui-material-styles for more details.' : _formatMuiErrorMessage(16));
+  throw new Error(process.env.NODE_ENV !== "production" ? 'MUI: withTheme is no longer exported from @mui/material/styles.\n' + 'You have to import it from @mui/styles.\n' + 'See https://mui.com/r/migration-v4/#mui-material-styles for more details.' : _formatErrorMessage(16));
 }

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/utils/mergeSlotProps.js

@@ -1,8 +1,29 @@
 import clsx from 'clsx';
+
+// Brought from [Base UI](https://github.com/mui/base-ui/blob/master/packages/react/src/merge-props/mergeProps.ts#L119)
+// Use it directly from Base UI once it's a package dependency.
+function isEventHandler(key, value) {
+  // This approach is more efficient than using a regex.
+  const thirdCharCode = key.charCodeAt(2);
+  return key[0] === 'o' && key[1] === 'n' && thirdCharCode >= 65 /* A */ && thirdCharCode <= 90 /* Z */ && typeof value === 'function';
+}
 export default function mergeSlotProps(externalSlotProps, defaultSlotProps) {
   if (!externalSlotProps) {
     return defaultSlotProps;
   }
+  function extractHandlers(externalSlotPropsValue, defaultSlotPropsValue) {
+    const handlers = {};
+    Object.keys(defaultSlotPropsValue).forEach(key => {
+      if (isEventHandler(key, defaultSlotPropsValue[key]) && typeof externalSlotPropsValue[key] === 'function') {
+        // only compose the handlers if both default and external slot props match the event handler
+        handlers[key] = (...args) => {
+          externalSlotPropsValue[key](...args);
+          defaultSlotPropsValue[key](...args);
+        };
+      }
+    });
+    return handlers;
+  }
   if (typeof externalSlotProps === 'function' || typeof defaultSlotProps === 'function') {
     return ownerState => {
       const defaultSlotPropsValue = typeof defaultSlotProps === 'function' ? defaultSlotProps(ownerState) : defaultSlotProps;
@@ -11,9 +32,11 @@ export default function mergeSlotProps(externalSlotProps, defaultSlotProps) {
         ...defaultSlotPropsValue
       }) : externalSlotProps;
       const className = clsx(ownerState?.className, defaultSlotPropsValue?.className, externalSlotPropsValue?.className);
+      const handlers = extractHandlers(externalSlotPropsValue, defaultSlotPropsValue);
       return {
         ...defaultSlotPropsValue,
         ...externalSlotPropsValue,
+        ...handlers,
         ...(!!className && {
           className
         }),
@@ -30,10 +53,12 @@ export default function mergeSlotProps(externalSlotProps, defaultSlotProps) {
     };
   }
   const typedDefaultSlotProps = defaultSlotProps;
+  const handlers = extractHandlers(externalSlotProps, typedDefaultSlotProps);
   const className = clsx(typedDefaultSlotProps?.className, externalSlotProps?.className);
   return {
     ...defaultSlotProps,
     ...externalSlotProps,
+    ...handlers,
     ...(!!className && {
       className
     }),

package/modern/version/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/material",
-  "version": "7.0.0-beta.3",
+  "version": "7.0.0-rc.0",
   "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.",
@@ -27,7 +27,7 @@
     "url": "https://opencollective.com/mui-org"
   },
   "dependencies": {
-    "@babel/runtime": "^7.26.9",
+    "@babel/runtime": "^7.26.10",
     "@popperjs/core": "^2.11.8",
     "@types/react-transition-group": "^4.4.12",
     "clsx": "^2.1.1",
@@ -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/core-downloads-tracker": "^7.0.0-rc.0",
+    "@mui/system": "7.0.0-rc.0",
+    "@mui/types": "^7.3.1",
+    "@mui/utils": "7.0.0-rc.0"
   },
   "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-rc.0"
   },
   "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;