@mui/material 6.0.0-alpha.3 → 6.0.0-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/material",
-  "version": "6.0.0-alpha.3",
+  "version": "6.0.0-alpha.5",
   "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.",
@@ -29,16 +29,16 @@
   "dependencies": {
     "@babel/runtime": "^7.24.4",
     "@types/react-transition-group": "^4.4.10",
-    "clsx": "^2.1.0",
+    "clsx": "^2.1.1",
     "csstype": "^3.1.3",
     "prop-types": "^15.8.1",
     "react-is": "^18.2.0",
     "react-transition-group": "^4.4.5",
-    "@mui/base": "5.0.0-beta.42",
-    "@mui/system": "^6.0.0-alpha.3",
+    "@mui/core-downloads-tracker": "^6.0.0-alpha.5",
     "@mui/types": "^7.2.14",
-    "@mui/utils": "^6.0.0-alpha.3",
-    "@mui/core-downloads-tracker": "^6.0.0-alpha.3"
+    "@mui/utils": "^6.0.0-alpha.5",
+    "@mui/system": "^6.0.0-alpha.5",
+    "@mui/base": "5.0.0-beta.43"
   },
   "peerDependencies": {
     "@emotion/react": "^11.5.0",

package/styles/experimental_extendTheme.d.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { OverridableStringUnion } from '@mui/types';
 import { SxConfig, SxProps, CSSObject, ApplyStyles } from '@mui/system';
+import { ExtractTypographyTokens } from '@mui/system/cssVars';
 import { ThemeOptions, Theme } from './createTheme';
 import { Palette, PaletteOptions } from './createPalette';
 import { Shadows } from './shadows';
@@ -321,6 +322,7 @@ export interface CssVarsThemeOptions extends Omit<ThemeOptions, 'palette' | 'com
 
 // should not include keys defined in `shouldSkipGeneratingVar` and have value typeof function
 export interface ThemeVars {
+  font: ExtractTypographyTokens<Theme['typography']>;
   palette: Omit<
     ColorSystem['palette'],
     | 'colorScheme'

package/styles/experimental_extendTheme.js

@@ -5,7 +5,7 @@ const _excluded = ["colorSchemes", "cssVarPrefix", "shouldSkipGeneratingVar", "g
 import deepmerge from '@mui/utils/deepmerge';
 import { unstable_createGetCssVar as systemCreateGetCssVar, createSpacing } from '@mui/system';
 import { createUnarySpacing } from '@mui/system/spacing';
-import { prepareCssVars } from '@mui/system/cssVars';
+import { prepareCssVars, prepareTypographyVars } from '@mui/system/cssVars';
 import styleFunctionSx, { unstable_defaultSxConfig as defaultSxConfig } from '@mui/system/styleFunctionSx';
 import { private_safeColorChannel as safeColorChannel, private_safeAlpha as safeAlpha, private_safeDarken as safeDarken, private_safeLighten as safeLighten, private_safeEmphasize as safeEmphasize, hslToRgb } from '@mui/system/colorManipulator';
 import defaultShouldSkipGeneratingVar from './shouldSkipGeneratingVar';
@@ -118,6 +118,7 @@ export default function extendTheme(options = {}, ...args) {
         overlays: colorSchemesInput.dark?.overlays || defaultDarkOverlays
       })
     }),
+    font: _extends({}, prepareTypographyVars(muiTheme.typography), muiTheme.font),
     spacing: getSpacingVal(input.spacing)
   });
   Object.keys(theme.colorSchemes).forEach(key => {

package/styles/getOverlayAlpha.d.ts

@@ -1,2 +1 @@
-declare const getOverlayAlpha: (elevation: number) => string;
-export default getOverlayAlpha;
+export default function getOverlayAlpha(elevation: number): number;

package/styles/getOverlayAlpha.js

@@ -1,11 +1,10 @@
 // Inspired by https://github.com/material-components/material-components-ios/blob/bca36107405594d5b7b16265a5b0ed698f85a5ee/components/Elevation/src/UIColor%2BMaterialElevation.m#L61
-const getOverlayAlpha = elevation => {
+export default function getOverlayAlpha(elevation) {
   let alphaValue;
   if (elevation < 1) {
     alphaValue = 5.11916 * elevation ** 2;
   } else {
     alphaValue = 4.5 * Math.log(elevation + 1) + 2;
   }
-  return (alphaValue / 100).toFixed(2);
-};
-export default getOverlayAlpha;
+  return Math.round(alphaValue * 10) / 1000;
+}