@mui/material 6.0.0-dev.240424162023-9968b4889d → 6.0.0

package/GlobalStyles/GlobalStyles.js

@@ -1,17 +1,17 @@
 'use client';
 
-import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { GlobalStyles as SystemGlobalStyles } from '@mui/system';
-import defaultTheme from '../styles/defaultTheme';
-import THEME_ID from '../styles/identifier';
+import defaultTheme from "../styles/defaultTheme.js";
+import THEME_ID from "../styles/identifier.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 function GlobalStyles(props) {
-  return /*#__PURE__*/_jsx(SystemGlobalStyles, _extends({}, props, {
+  return /*#__PURE__*/_jsx(SystemGlobalStyles, {
+    ...props,
     defaultTheme: defaultTheme,
     themeId: THEME_ID
-  }));
+  });
 }
 process.env.NODE_ENV !== "production" ? GlobalStyles.propTypes /* remove-proptypes */ = {
   // ┌────────────────────────────── Warning ──────────────────────────────┐

package/GlobalStyles/index.js

@@ -1 +1 @@
-export { default } from './GlobalStyles';
+export { default } from "./GlobalStyles.js";

package/Grid/Grid.d.ts

@@ -139,6 +139,7 @@ export interface GridOwnProps extends SystemProps<Theme>, Breakpoints {
    * Defines the `flex-wrap` style property.
    * It's applied for all screen sizes.
    * @default 'wrap'
+   * @deprecated Use `flexWrap` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
    */
   wrap?: GridWrap;
   /**
@@ -166,6 +167,8 @@ export interface GridTypeMap<
  * API:
  *
  * - [Grid API](https://mui.com/material-ui/api/grid/)
+ *
+ * @deprecated Use the [`Grid2`](https://mui.com/material-ui/react-grid2/) component instead.
  */
 declare const Grid: OverridableComponent<GridTypeMap>;
 

package/Grid/Grid.js

@@ -10,29 +10,19 @@
 //
 // Follow this flexbox Guide to better understand the underlying model:
 // - https://css-tricks.com/snippets/css/a-guide-to-flexbox/
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-import _extends from "@babel/runtime/helpers/esm/extends";
-const _excluded = ["className", "columns", "columnSpacing", "component", "container", "direction", "item", "rowSpacing", "spacing", "wrap", "zeroMinWidth"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import { handleBreakpoints, unstable_resolveBreakpointValues as resolveBreakpointValues } from '@mui/system';
 import { extendSxProp } from '@mui/system/styleFunctionSx';
 import composeClasses from '@mui/utils/composeClasses';
-import requirePropFactory from '../utils/requirePropFactory';
-import styled from '../styles/styled';
-import useThemeProps from '../styles/useThemeProps';
-import useTheme from '../styles/useTheme';
-import GridContext from './GridContext';
-import gridClasses, { getGridUtilityClass } from './gridClasses';
+import requirePropFactory from "../utils/requirePropFactory.js";
+import styled from "../styles/styled.js";
+import useThemeProps from "../styles/useThemeProps.js";
+import useTheme from "../styles/useTheme.js";
+import GridContext from "./GridContext.js";
+import gridClasses, { getGridUtilityClass } from "./gridClasses.js";
 import { jsx as _jsx } from "react/jsx-runtime";
-function getOffset(val) {
-  const parse = parseFloat(val);
-  if (Number.isNaN(parse)) {
-    return val;
-  }
-  return `${parse}${String(val).replace(String(parse), '') || 'px'}`;
-}
 export function generateGrid({
   theme,
   ownerState
@@ -77,7 +67,7 @@ export function generateGrid({
       if (ownerState.container && ownerState.item && ownerState.columnSpacing !== 0) {
         const themeSpacing = theme.spacing(ownerState.columnSpacing);
         if (themeSpacing !== '0px') {
-          const fullWidth = `calc(${width} + ${getOffset(themeSpacing)})`;
+          const fullWidth = `calc(${width} + ${themeSpacing})`;
           more = {
             flexBasis: fullWidth,
             maxWidth: fullWidth
@@ -87,11 +77,12 @@ export function generateGrid({
 
       // Close to the bootstrap implementation:
       // https://github.com/twbs/bootstrap/blob/8fccaa2439e97ec72a4b7dc42ccc1f649790adb0/scss/mixins/_grid.scss#L41
-      styles = _extends({
+      styles = {
         flexBasis: width,
         flexGrow: 0,
-        maxWidth: width
-      }, more);
+        maxWidth: width,
+        ...more
+      };
     }
 
     // No need for a media query for the first size.
@@ -117,7 +108,7 @@ export function generateDirection({
     const output = {
       flexDirection: propValue
     };
-    if (propValue.indexOf('column') === 0) {
+    if (propValue.startsWith('column')) {
       output[`& > .${gridClasses.item}`] = {
         maxWidth: 'none'
       };
@@ -176,9 +167,9 @@ export function generateRowGap({
       const themeSpacing = theme.spacing(propValue);
       if (themeSpacing !== '0px') {
         return {
-          marginTop: `-${getOffset(themeSpacing)}`,
+          marginTop: theme.spacing(-propValue),
           [`& > .${gridClasses.item}`]: {
-            paddingTop: getOffset(themeSpacing)
+            paddingTop: themeSpacing
           }
         };
       }
@@ -221,11 +212,12 @@ export function generateColumnGap({
     }, columnSpacingValues, (propValue, breakpoint) => {
       const themeSpacing = theme.spacing(propValue);
       if (themeSpacing !== '0px') {
+        const negativeValue = theme.spacing(-propValue);
         return {
-          width: `calc(100% + ${getOffset(themeSpacing)})`,
-          marginLeft: `-${getOffset(themeSpacing)}`,
+          width: `calc(100% + ${themeSpacing})`,
+          marginLeft: negativeValue,
           [`& > .${gridClasses.item}`]: {
-            paddingLeft: getOffset(themeSpacing)
+            paddingLeft: themeSpacing
           }
         };
       }
@@ -300,20 +292,26 @@ const GridRoot = styled('div', {
     });
     return [styles.root, container && styles.container, item && styles.item, zeroMinWidth && styles.zeroMinWidth, ...spacingStyles, direction !== 'row' && styles[`direction-xs-${String(direction)}`], wrap !== 'wrap' && styles[`wrap-xs-${String(wrap)}`], ...breakpointsStyles];
   }
-})(({
+})(
+// FIXME(romgrk): Can't use memoTheme here
+({
   ownerState
-}) => _extends({
-  boxSizing: 'border-box'
-}, ownerState.container && {
-  display: 'flex',
-  flexWrap: 'wrap',
-  width: '100%'
-}, ownerState.item && {
-  margin: 0 // For instance, it's useful when used with a `figure` element.
-}, ownerState.zeroMinWidth && {
-  minWidth: 0
-}, ownerState.wrap !== 'wrap' && {
-  flexWrap: ownerState.wrap
+}) => ({
+  boxSizing: 'border-box',
+  ...(ownerState.container && {
+    display: 'flex',
+    flexWrap: 'wrap',
+    width: '100%'
+  }),
+  ...(ownerState.item && {
+    margin: 0 // For instance, it's useful when used with a `figure` element.
+  }),
+  ...(ownerState.zeroMinWidth && {
+    minWidth: 0
+  }),
+  ...(ownerState.wrap !== 'wrap' && {
+    flexWrap: ownerState.wrap
+  })
 }), generateDirection, generateRowGap, generateColumnGap, generateGrid);
 export function resolveSpacingClasses(spacing, breakpoints) {
   // undefined/null or `spacing` <= 0
@@ -364,6 +362,10 @@ const useUtilityClasses = ownerState => {
   };
   return composeClasses(slots, getGridUtilityClass, classes);
 };
+
+/**
+ * @deprecated Use the [`Grid2`](https://mui.com/material-ui/react-grid2/) component instead.
+ */
 const Grid = /*#__PURE__*/React.forwardRef(function Grid(inProps, ref) {
   const themeProps = useThemeProps({
     props: inProps,
@@ -374,19 +376,19 @@ const Grid = /*#__PURE__*/React.forwardRef(function Grid(inProps, ref) {
   } = useTheme();
   const props = extendSxProp(themeProps);
   const {
-      className,
-      columns: columnsProp,
-      columnSpacing: columnSpacingProp,
-      component = 'div',
-      container = false,
-      direction = 'row',
-      item = false,
-      rowSpacing: rowSpacingProp,
-      spacing = 0,
-      wrap = 'wrap',
-      zeroMinWidth = false
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded);
+    className,
+    columns: columnsProp,
+    columnSpacing: columnSpacingProp,
+    component = 'div',
+    container = false,
+    direction = 'row',
+    item = false,
+    rowSpacing: rowSpacingProp,
+    spacing = 0,
+    wrap = 'wrap',
+    zeroMinWidth = false,
+    ...other
+  } = props;
   const rowSpacing = rowSpacingProp || spacing;
   const columnSpacing = columnSpacingProp || spacing;
   const columnsContext = React.useContext(GridContext);
@@ -394,14 +396,17 @@ const Grid = /*#__PURE__*/React.forwardRef(function Grid(inProps, ref) {
   // columns set with default breakpoint unit of 12
   const columns = container ? columnsProp || 12 : columnsContext;
   const breakpointsValues = {};
-  const otherFiltered = _extends({}, other);
+  const otherFiltered = {
+    ...other
+  };
   breakpoints.keys.forEach(breakpoint => {
     if (other[breakpoint] != null) {
       breakpointsValues[breakpoint] = other[breakpoint];
       delete otherFiltered[breakpoint];
     }
   });
-  const ownerState = _extends({}, props, {
+  const ownerState = {
+    ...props,
     columns,
     container,
     direction,
@@ -410,19 +415,20 @@ const Grid = /*#__PURE__*/React.forwardRef(function Grid(inProps, ref) {
     columnSpacing,
     wrap,
     zeroMinWidth,
-    spacing
-  }, breakpointsValues, {
+    spacing,
+    ...breakpointsValues,
     breakpoints: breakpoints.keys
-  });
+  };
   const classes = useUtilityClasses(ownerState);
   return /*#__PURE__*/_jsx(GridContext.Provider, {
     value: columns,
-    children: /*#__PURE__*/_jsx(GridRoot, _extends({
+    children: /*#__PURE__*/_jsx(GridRoot, {
       ownerState: ownerState,
       className: clsx(classes.root, className),
       as: component,
-      ref: ref
-    }, otherFiltered))
+      ref: ref,
+      ...otherFiltered
+    })
   });
 });
 process.env.NODE_ENV !== "production" ? Grid.propTypes /* remove-proptypes */ = {
@@ -524,6 +530,7 @@ process.env.NODE_ENV !== "production" ? Grid.propTypes /* remove-proptypes */ =
    * Defines the `flex-wrap` style property.
    * It's applied for all screen sizes.
    * @default 'wrap'
+   * @deprecated Use `flexWrap` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
    */
   wrap: PropTypes.oneOf(['nowrap', 'wrap-reverse', 'wrap']),
   /**
@@ -556,7 +563,9 @@ process.env.NODE_ENV !== "production" ? Grid.propTypes /* remove-proptypes */ =
 if (process.env.NODE_ENV !== 'production') {
   const requireProp = requirePropFactory('Grid', Grid);
   // eslint-disable-next-line no-useless-concat
-  Grid['propTypes' + ''] = _extends({}, Grid.propTypes, {
+  Grid['propTypes' + ''] = {
+    // eslint-disable-next-line react/forbid-foreign-prop-types
+    ...Grid.propTypes,
     direction: requireProp('container'),
     lg: requireProp('item'),
     md: requireProp('item'),
@@ -565,6 +574,6 @@ if (process.env.NODE_ENV !== 'production') {
     wrap: requireProp('container'),
     xs: requireProp('item'),
     zeroMinWidth: requireProp('item')
-  });
+  };
 }
 export default Grid;

package/Grid/index.js

@@ -1,5 +1,5 @@
 'use client';
 
-export { default } from './Grid';
-export { default as gridClasses } from './gridClasses';
-export * from './gridClasses';
+export { default } from "./Grid.js";
+export { default as gridClasses } from "./gridClasses.js";
+export * from "./gridClasses.js";

package/Grid2/Grid2.d.ts

@@ -0,0 +1,109 @@
+import { SxProps, SystemProps } from '@mui/system';
+import { OverridableComponent, OverrideProps } from '@mui/types';
+import { Theme, Breakpoint } from '../styles';
+export type Grid2Slot = 'root';
+type ResponsiveStyleValue<T> = T | Array<T | null> | {
+    [key in Breakpoint]?: T | null;
+};
+export type GridDirection = 'row' | 'row-reverse' | 'column' | 'column-reverse';
+export type GridSpacing = number | string;
+export type GridWrap = 'nowrap' | 'wrap' | 'wrap-reverse';
+export type GridSize = 'auto' | 'grow' | number | false;
+export type GridOffset = 'auto' | number;
+export interface GridBaseProps {
+    /**
+     * The content of the component.
+     */
+    children?: React.ReactNode;
+    /**
+     * The number of columns.
+     * @default 12
+     */
+    columns?: ResponsiveStyleValue<number>;
+    /**
+     * Defines the horizontal space between the type `item` components.
+     * It overrides the value of the `spacing` prop.
+     */
+    columnSpacing?: ResponsiveStyleValue<GridSpacing>;
+    /**
+     * If `true`, the component will have the flex *container* behavior.
+     * You should be wrapping *items* with a *container*.
+     * @default false
+     */
+    container?: boolean;
+    /**
+     * Defines the `flex-direction` style property.
+     * It is applied for all screen sizes.
+     * @default 'row'
+     */
+    direction?: ResponsiveStyleValue<GridDirection>;
+    /**
+     * Defines the offset value for the type `item` components.
+     */
+    offset?: ResponsiveStyleValue<GridOffset>;
+    /**
+     * @internal
+     * The level of the grid starts from `0`
+     * and increases when the grid nests inside another grid regardless of container or item.
+     *
+     * ```js
+     * <Grid> // level 0
+     *   <Grid> // level 1
+     *     <Grid> // level 2
+     *   <Grid> // level 1
+     * ```
+     *
+     * Only consecutive grid is considered nesting.
+     * A grid container will start at `0` if there are non-Grid element above it.
+     *
+     * ```js
+     * <Grid> // level 0
+     *   <div>
+     *     <Grid> // level 0
+     *       <Grid> // level 1
+     * ```
+     */
+    unstable_level?: number;
+    /**
+     * Defines the vertical space between the type `item` components.
+     * It overrides the value of the `spacing` prop.
+     */
+    rowSpacing?: ResponsiveStyleValue<GridSpacing>;
+    /**
+     * Defines the size of the the type `item` components.
+     */
+    size?: ResponsiveStyleValue<GridSize>;
+    /**
+     * Defines the space between the type `item` components.
+     * It can only be used on a type `container` component.
+     * @default 0
+     */
+    spacing?: ResponsiveStyleValue<GridSpacing> | undefined;
+    /**
+     * Defines the `flex-wrap` style property.
+     * It's applied for all screen sizes.
+     * @default 'wrap'
+     */
+    wrap?: GridWrap;
+}
+export interface Grid2TypeMap<P = {}, D extends React.ElementType = 'div'> {
+    props: P & GridBaseProps & {
+        sx?: SxProps<Theme>;
+    } & SystemProps<Theme>;
+    defaultComponent: D;
+}
+export type Grid2Props<D extends React.ElementType = Grid2TypeMap['defaultComponent'], P = {
+    component?: React.ElementType;
+}> = OverrideProps<Grid2TypeMap<P, D>, D>;
+/**
+ *
+ * Demos:
+ *
+ * - [Grid version 2](https://mui.com/material-ui/react-grid2/)
+ *
+ * API:
+ *
+ * - [Grid2 API](https://mui.com/material-ui/api/grid-2/)
+ */
+declare const Grid2: OverridableComponent<Grid2TypeMap>;
+export default Grid2;

package/Grid2/Grid2.js

@@ -0,0 +1,112 @@
+'use client';
+
+import PropTypes from 'prop-types';
+import { createGrid as createGrid2 } from '@mui/system/Grid';
+import { styled, useThemeProps } from "../styles/index.js";
+/**
+ *
+ * Demos:
+ *
+ * - [Grid version 2](https://mui.com/material-ui/react-grid2/)
+ *
+ * API:
+ *
+ * - [Grid2 API](https://mui.com/material-ui/api/grid-2/)
+ */
+const Grid2 = createGrid2({
+  createStyledComponent: styled('div', {
+    name: 'MuiGrid2',
+    slot: 'Root',
+    overridesResolver: (props, styles) => styles.root
+  }),
+  componentName: 'MuiGrid2',
+  useThemeProps: inProps => useThemeProps({
+    props: inProps,
+    name: 'MuiGrid2'
+  })
+});
+process.env.NODE_ENV !== "production" ? Grid2.propTypes /* remove-proptypes */ = {
+  // ┌────────────────────────────── Warning ──────────────────────────────┐
+  // │ These PropTypes are generated from the TypeScript type definitions. │
+  // │ To update them, edit the TypeScript types and run `pnpm proptypes`. │
+  // └─────────────────────────────────────────────────────────────────────┘
+  /**
+   * The content of the component.
+   */
+  children: PropTypes.node,
+  /**
+   * The number of columns.
+   * @default 12
+   */
+  columns: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.arrayOf(PropTypes.number), PropTypes.number, PropTypes.object]),
+  /**
+   * Defines the horizontal space between the type `item` components.
+   * It overrides the value of the `spacing` prop.
+   */
+  columnSpacing: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])), PropTypes.number, PropTypes.object, PropTypes.string]),
+  /**
+   * If `true`, the component will have the flex *container* behavior.
+   * You should be wrapping *items* with a *container*.
+   * @default false
+   */
+  container: PropTypes.bool,
+  /**
+   * Defines the `flex-direction` style property.
+   * It is applied for all screen sizes.
+   * @default 'row'
+   */
+  direction: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row']), PropTypes.arrayOf(PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row'])), PropTypes.object]),
+  /**
+   * Defines the offset value for the type `item` components.
+   */
+  offset: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.string, PropTypes.number, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number])), PropTypes.object]),
+  /**
+   * Defines the vertical space between the type `item` components.
+   * It overrides the value of the `spacing` prop.
+   */
+  rowSpacing: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])), PropTypes.number, PropTypes.object, PropTypes.string]),
+  /**
+   * Defines the size of the the type `item` components.
+   */
+  size: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.string, PropTypes.bool, PropTypes.number, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.bool, PropTypes.number])), PropTypes.object]),
+  /**
+   * Defines the space between the type `item` components.
+   * It can only be used on a type `container` component.
+   * @default 0
+   */
+  spacing: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])), PropTypes.number, PropTypes.object, PropTypes.string]),
+  /**
+   * @ignore
+   */
+  sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
+  /**
+   * @internal
+   * The level of the grid starts from `0`
+   * and increases when the grid nests inside another grid regardless of container or item.
+   *
+   * ```js
+   * <Grid> // level 0
+   *   <Grid> // level 1
+   *     <Grid> // level 2
+   *   <Grid> // level 1
+   * ```
+   *
+   * Only consecutive grid is considered nesting.
+   * A grid container will start at `0` if there are non-Grid element above it.
+   *
+   * ```js
+   * <Grid> // level 0
+   *   <div>
+   *     <Grid> // level 0
+   *       <Grid> // level 1
+   * ```
+   */
+  unstable_level: PropTypes.number,
+  /**
+   * Defines the `flex-wrap` style property.
+   * It's applied for all screen sizes.
+   * @default 'wrap'
+   */
+  wrap: PropTypes.oneOf(['nowrap', 'wrap-reverse', 'wrap'])
+} : void 0;
+export default Grid2;

package/{Unstable_Grid2 → Grid2}/grid2Classes.d.ts

@@ -1,4 +1,4 @@
-import { GridClasses } from '@mui/system/Unstable_Grid';
+import { GridClasses } from '@mui/system/Grid';
 export type Grid2ClassKey = keyof GridClasses;
 export declare function getGrid2UtilityClass(slot: string): string;
 declare const grid2Classes: GridClasses;

package/{Unstable_Grid2 → Grid2}/index.d.ts

@@ -1,4 +1,4 @@
 export { default } from './Grid2';
-export * from './Grid2Props';
+export * from './Grid2';
 export { default as grid2Classes } from './grid2Classes';
 export * from './grid2Classes';

package/Grid2/index.js

@@ -0,0 +1,6 @@
+'use client';
+
+export { default } from "./Grid2.js";
+export * from "./Grid2.js";
+export { default as grid2Classes } from "./grid2Classes.js";
+export * from "./grid2Classes.js";

package/{Unstable_Grid2 → Grid2}/package.json

@@ -1,6 +1,6 @@
 {
   "sideEffects": false,
   "module": "./index.js",
-  "main": "../node/Unstable_Grid2/index.js",
+  "main": "../node/Grid2/index.js",
   "types": "./index.d.ts"
 }

package/Grow/Grow.d.ts

@@ -11,7 +11,7 @@ export interface GrowProps extends Omit<TransitionProps, 'timeout'> {
   /**
    * A single child content element.
    */
-  children: React.ReactElement<any, any>;
+  children: React.ReactElement<unknown, any>;
   /**
    * The transition timing function.
    * You may specify a single easing or a object containing enter and exit values.
@@ -47,4 +47,4 @@ export interface GrowProps extends Omit<TransitionProps, 'timeout'> {
  * - [Grow API](https://mui.com/material-ui/api/grow/)
  * - inherits [Transition API](https://reactcommunity.org/react-transition-group/transition/#Transition-props)
  */
-export default function Grow(props: GrowProps): JSX.Element;
+export default function Grow(props: GrowProps): React.JSX.Element;