@mui/system 6.0.0-alpha.12 → 6.0.0-alpha.14

package/CHANGELOG.md

@@ -1,5 +1,96 @@
 # [Versions](https://mui.com/versions/)
 
+## v6.0.0-alpha.14
+
+<!-- generated comparing v6.0.0-alpha.13..next -->
+
+_Jul 3, 2024_
+
+A big thanks to the 12 contributors who made this release possible. Here are some highlights ✨:
+
+- ✨ Updated Grid v2 to match PigmentGrid (#42742) @DiegoAndai
+
+### `@mui/material@v6.0.0-alpha.14`
+
+#### BREAKING CHANGES
+
+- [Grid] Update Grid props to match PigmentGrid (#42742) @DiegoAndai
+
+  Use the codemod below to migrate the props:
+
+  ```bash
+  npx @mui/codemod@next v6.0.0/grid-v2-props /path/to/folder
+  ```
+
+#### Changes
+
+- [Alert] Add ability to override slot props (#42787) @alexey-kozlenkov
+- [Dialog] Revert incorrect textAlign style removal (#42778) @DiegoAndai
+- [theme] Support `CssVarsTheme` in `responsiveFontSizes` return type (#42786) @jxdp
+
+### Docs
+
+- [material-ui] Add some writing tweaks to v6 migration page (#42623) @danilo-leal
+- [material-ui] Fix issues reported by react-compiler in docs folder (#42830) @sai6855
+- [material-ui] Add some writing tweaks to v6 migration page (#42623) @danilo-leal
+- [base-ui] Fix wrong description for `UseTabParameters.onChange` (#42749) @ohgree
+- Fix 301 MDN redirections @oliviertassinari
+
+### Core
+
+- [core] Bump React to 18.3.1 (#42047) @renovate[bot]
+- [core] Revert lint for `useThemeProps` (#42817) @siriwatknp
+- [core] Remove useIsFocusVisible util (#42467) @DiegoAndai
+- [core] Remove react-test-renderer (#42784) @aarongarciah
+- [core][mui-utils] Remove remaining IE11 references (#42777) @DiegoAndai
+- [code-infra] Move `HighlightedCode` test into `@mui/docs` package (#42835) @LukasTy
+- [code-infra] Cleanup `@mui/docs` usage and legacy re-exports (#42833) @LukasTy
+- [docs-infra] Fix React Compiler ESLint issues in website components (#42566) @aarongarciah
+- [docs-infra] Add batch of design polish (#42823) @danilo-leal
+- [test][mui-utils] Remove usages of deprecated react-dom APIs (#42780) @aarongarciah
+- [test][joy-ui][Autocomplete] Fix spread key error in test (#42775) @aarongarciah
+
+All contributors of this release in alphabetical order: @aarongarciah, @alexey-kozlenkov, @danilo-leal, @DiegoAndai, @Janpot, @jxdp, @LukasTy, @ohgree, @oliviertassinari, @renovate[bot], @sai6855, @siriwatknp
+
+## v6.0.0-alpha.13
+
+<!-- generated comparing v6.0.0-alpha.12..next -->
+
+_Jun 27, 2024_
+
+A big thanks to the 10 contributors who made this release possible. Here are some highlights ✨:
+
+- 🚀 Added layout components for Pigment CSS integration (#42693) @siriwatknp
+
+### `@mui/material@6.0.0-alpha.13`
+
+- [Autocomplete] Fix more React 18.3 key spread warnings in demos (#42639) @wbt
+- [Container][Grid][Stack][Hidden] Export Pigment CSS layout components (#42693) @siriwatknp
+- [Text Field] when click password visibility button, text caret position change to very front. (#42595) @appleSimple
+- [Modal] migrate useSlotProps to useSLot (#42150) @sai6855
+
+### `@mui/styles@6.0.0-alpha.13`
+
+- [withStyles] Expect React defaultProps warning in test (#42752) @aarongarciah
+
+### Docs
+
+- Fix link in CONTRIBUTING.md (#42755) @Janpot
+- Add documentation on migrating JSS's alternative, array-based syntax to syntax supported by Emotion (#42053) @cjl750
+- Fix type error in virtualized table demo (#42757) @aarongarciah
+- Add first batch of v6 migration (#42242) @siriwatknp
+- Fix quotes on font-family dedeclaration in the Landing Page template theme (#42748) @joetats
+
+### Core
+
+- [code-infra] Refactor eslint `import/no-cycle` rule (#42705) @LukasTy
+- [core] Target direct version for prerelease (#42768) @siriwatknp
+- [test] Remove enzyme (#42706) @aarongarciah
+- [test] Remove createMount test util (#42703) @aarongarciah
+- [website] Add Ale to team (#42764) @alelthomas
+
+All contributors of this release in alphabetical order: @aarongarciah, @alelthomas, @appleSimple, @cjl750, @Janpot, @joetats, @LukasTy, @sai6855, @siriwatknp, @wbt
+
 ## v6.0.0-alpha.12
 
 <!-- generated comparing v6.0.0-alpha.11..next -->

package/Unstable_Grid/Grid.js

@@ -46,58 +46,18 @@ process.env.NODE_ENV !== "production" ? Grid.propTypes /* remove-proptypes */ =
    */
   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]),
   /**
-   * If a number, it sets the number of columns the grid item uses.
-   * It can't be greater than the total number of columns of the container (12 by default).
-   * If 'auto', the grid item's width matches its content.
-   * If false, the prop is ignored.
-   * If true, the grid item's width grows to use the space available in the grid container.
-   * The value is applied for the `lg` breakpoint and wider screens if not overridden.
-   * @default false
-   */
-  lg: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-  /**
-   * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-   * If 'auto', the grid item push itself to the right-end of the container.
-   * The value is applied for the `lg` breakpoint and wider screens if not overridden.
-   */
-  lgOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
-  /**
-   * If a number, it sets the number of columns the grid item uses.
-   * It can't be greater than the total number of columns of the container (12 by default).
-   * If 'auto', the grid item's width matches its content.
-   * If false, the prop is ignored.
-   * If true, the grid item's width grows to use the space available in the grid container.
-   * The value is applied for the `md` breakpoint and wider screens if not overridden.
-   * @default false
+   * Defines the offset value for the type `item` components.
    */
-  md: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-  /**
-   * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-   * If 'auto', the grid item push itself to the right-end of the container.
-   * The value is applied for the `md` breakpoint and wider screens if not overridden.
-   */
-  mdOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
+  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]),
   /**
-   * If a number, it sets the number of columns the grid item uses.
-   * It can't be greater than the total number of columns of the container (12 by default).
-   * If 'auto', the grid item's width matches its content.
-   * If false, the prop is ignored.
-   * If true, the grid item's width grows to use the space available in the grid container.
-   * The value is applied for the `sm` breakpoint and wider screens if not overridden.
-   * @default false
-   */
-  sm: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-  /**
-   * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-   * If 'auto', the grid item push itself to the right-end of the container.
-   * The value is applied for the `sm` breakpoint and wider screens if not overridden.
+   * Defines the size of the the type `item` components.
    */
-  smOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
+  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.
@@ -136,38 +96,6 @@ process.env.NODE_ENV !== "production" ? Grid.propTypes /* remove-proptypes */ =
    * It's applied for all screen sizes.
    * @default 'wrap'
    */
-  wrap: PropTypes.oneOf(['nowrap', 'wrap-reverse', 'wrap']),
-  /**
-   * If a number, it sets the number of columns the grid item uses.
-   * It can't be greater than the total number of columns of the container (12 by default).
-   * If 'auto', the grid item's width matches its content.
-   * If false, the prop is ignored.
-   * If true, the grid item's width grows to use the space available in the grid container.
-   * The value is applied for the `xl` breakpoint and wider screens if not overridden.
-   * @default false
-   */
-  xl: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-  /**
-   * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-   * If 'auto', the grid item push itself to the right-end of the container.
-   * The value is applied for the `xl` breakpoint and wider screens if not overridden.
-   */
-  xlOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
-  /**
-   * If a number, it sets the number of columns the grid item uses.
-   * It can't be greater than the total number of columns of the container (12 by default).
-   * If 'auto', the grid item's width matches its content.
-   * If false, the prop is ignored.
-   * If true, the grid item's width grows to use the space available in the grid container.
-   * The value is applied for all the screen sizes with the lowest priority.
-   * @default false
-   */
-  xs: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-  /**
-   * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-   * If 'auto', the grid item push itself to the right-end of the container.
-   * The value is applied for the `xs` breakpoint and wider screens if not overridden.
-   */
-  xsOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number])
+  wrap: PropTypes.oneOf(['nowrap', 'wrap-reverse', 'wrap'])
 } : void 0;
 export default Grid;

package/Unstable_Grid/GridProps.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { OverrideProps, IfEquals } from '@mui/types';
+import { OverrideProps, PartiallyRequired } from '@mui/types';
 import { SxProps } from '../styleFunctionSx';
-import { Theme, Breakpoint, BreakpointOverrides } from '../createTheme';
+import { Theme, Breakpoint } from '../createTheme';
 import { SystemProps } from '../Box';
 type ResponsiveStyleValue<T> = T | Array<T | null> | {
     [key in Breakpoint]?: T | null;
@@ -9,94 +9,9 @@ type ResponsiveStyleValue<T> = T | Array<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' | number;
-export interface GridDefaultBreakpoints {
-    /**
-     * If a number, it sets the number of columns the grid item uses.
-     * It can't be greater than the total number of columns of the container (12 by default).
-     * If 'auto', the grid item's width matches its content.
-     * If false, the prop is ignored.
-     * If true, the grid item's width grows to use the space available in the grid container.
-     * The value is applied for the `lg` breakpoint and wider screens if not overridden.
-     * @default false
-     */
-    lg?: boolean | GridSize;
-    /**
-     * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-     * If 'auto', the grid item push itself to the right-end of the container.
-     * The value is applied for the `lg` breakpoint and wider screens if not overridden.
-     */
-    lgOffset?: GridSize;
-    /**
-     * If a number, it sets the number of columns the grid item uses.
-     * It can't be greater than the total number of columns of the container (12 by default).
-     * If 'auto', the grid item's width matches its content.
-     * If false, the prop is ignored.
-     * If true, the grid item's width grows to use the space available in the grid container.
-     * The value is applied for the `md` breakpoint and wider screens if not overridden.
-     * @default false
-     */
-    md?: boolean | GridSize;
-    /**
-     * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-     * If 'auto', the grid item push itself to the right-end of the container.
-     * The value is applied for the `md` breakpoint and wider screens if not overridden.
-     */
-    mdOffset?: GridSize;
-    /**
-     * If a number, it sets the number of columns the grid item uses.
-     * It can't be greater than the total number of columns of the container (12 by default).
-     * If 'auto', the grid item's width matches its content.
-     * If false, the prop is ignored.
-     * If true, the grid item's width grows to use the space available in the grid container.
-     * The value is applied for the `sm` breakpoint and wider screens if not overridden.
-     * @default false
-     */
-    sm?: boolean | GridSize;
-    /**
-     * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-     * If 'auto', the grid item push itself to the right-end of the container.
-     * The value is applied for the `sm` breakpoint and wider screens if not overridden.
-     */
-    smOffset?: GridSize;
-    /**
-     * If a number, it sets the number of columns the grid item uses.
-     * It can't be greater than the total number of columns of the container (12 by default).
-     * If 'auto', the grid item's width matches its content.
-     * If false, the prop is ignored.
-     * If true, the grid item's width grows to use the space available in the grid container.
-     * The value is applied for the `xl` breakpoint and wider screens if not overridden.
-     * @default false
-     */
-    xl?: boolean | GridSize;
-    /**
-     * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-     * If 'auto', the grid item push itself to the right-end of the container.
-     * The value is applied for the `xl` breakpoint and wider screens if not overridden.
-     */
-    xlOffset?: GridSize;
-    /**
-     * If a number, it sets the number of columns the grid item uses.
-     * It can't be greater than the total number of columns of the container (12 by default).
-     * If 'auto', the grid item's width matches its content.
-     * If false, the prop is ignored.
-     * If true, the grid item's width grows to use the space available in the grid container.
-     * The value is applied for all the screen sizes with the lowest priority.
-     * @default false
-     */
-    xs?: boolean | GridSize;
-    /**
-     * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-     * If 'auto', the grid item push itself to the right-end of the container.
-     * The value is applied for the `xs` breakpoint and wider screens if not overridden.
-     */
-    xsOffset?: GridSize;
-}
-type CustomBreakpoints = Partial<Record<Breakpoint, boolean | GridSize> & Record<`${Breakpoint}Offset`, GridSize>>;
-interface BreakpointOverridesEmpty {
-}
-type Breakpoints = IfEquals<BreakpointOverrides, BreakpointOverridesEmpty, GridDefaultBreakpoints, CustomBreakpoints>;
-export interface GridBaseProps extends Breakpoints {
+export type GridSize = 'auto' | 'grow' | number | false;
+export type GridOffset = 'auto' | number;
+export interface GridBaseProps {
     /**
      * The content of the component.
      */
@@ -123,6 +38,10 @@ export interface GridBaseProps extends Breakpoints {
      * @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`
@@ -151,6 +70,10 @@ export interface GridBaseProps extends Breakpoints {
      * 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.
@@ -164,11 +87,7 @@ export interface GridBaseProps extends Breakpoints {
      */
     wrap?: GridWrap;
 }
-export interface GridOwnerState extends GridBaseProps {
-    unstable_level: number;
-    gridSize: Partial<Record<Breakpoint, GridSize | boolean>>;
-    gridOffset: Partial<Record<Breakpoint, GridSize>>;
-}
+export type GridOwnerState = PartiallyRequired<GridBaseProps, 'size' | 'offset' | 'unstable_level'>;
 export interface GridTypeMap<AdditionalProps = {}, DefaultComponent extends React.ElementType = 'div'> {
     props: AdditionalProps & GridBaseProps & {
         sx?: SxProps<Theme>;

package/Unstable_Grid/createGrid.js

@@ -39,13 +39,36 @@ export default function createGrid(options = {}) {
       direction,
       spacing,
       wrap,
-      gridSize
+      size
     } = ownerState;
     const slots = {
-      root: ['root', container && 'container', wrap !== 'wrap' && `wrap-xs-${String(wrap)}`, ...generateDirectionClasses(direction), ...generateSizeClassNames(gridSize), ...(container ? generateSpacingClassNames(spacing, theme.breakpoints.keys[0]) : [])]
+      root: ['root', container && 'container', wrap !== 'wrap' && `wrap-xs-${String(wrap)}`, ...generateDirectionClasses(direction), ...generateSizeClassNames(size), ...(container ? generateSpacingClassNames(spacing, theme.breakpoints.keys[0]) : [])]
     };
     return composeClasses(slots, slot => generateUtilityClass(componentName, slot), {});
   };
+  function parseResponsiveProp(propValue, breakpoints, shouldUseValue = () => true) {
+    const parsedProp = {};
+    if (propValue === null) {
+      return parsedProp;
+    }
+    if (Array.isArray(propValue)) {
+      propValue.forEach((value, index) => {
+        if (value !== null && shouldUseValue(value) && breakpoints.keys[index]) {
+          parsedProp[breakpoints.keys[index]] = value;
+        }
+      });
+    } else if (typeof propValue === 'object') {
+      Object.keys(propValue).forEach(key => {
+        const value = propValue[key];
+        if (value !== null && value !== undefined && shouldUseValue(value)) {
+          parsedProp[key] = value;
+        }
+      });
+    } else {
+      parsedProp[breakpoints.keys[0]] = propValue;
+    }
+    return parsedProp;
+  }
   const GridRoot = createStyledComponent(generateGridColumnsStyles, generateGridColumnSpacingStyles, generateGridRowSpacingStyles, generateGridSizeStyles, generateGridDirectionStyles, generateGridStyles, generateGridOffsetStyles);
   const Grid = /*#__PURE__*/React.forwardRef(function Grid(inProps, ref) {
     const theme = useTheme();
@@ -59,25 +82,16 @@ export default function createGrid(options = {}) {
       component = 'div',
       direction = 'row',
       wrap = 'wrap',
+      size: sizeProp = {},
+      offset: offsetProp = {},
       spacing: spacingProp = 0,
       rowSpacing: rowSpacingProp = spacingProp,
       columnSpacing: columnSpacingProp = spacingProp,
       unstable_level: level = 0,
       ...rest
     } = props;
-    // collect breakpoints related props because they can be customized from the theme.
-    const gridSize = {};
-    const gridOffset = {};
-    const other = {};
-    Object.entries(rest).forEach(([key, val]) => {
-      if (theme.breakpoints.values[key] !== undefined) {
-        gridSize[key] = val;
-      } else if (theme.breakpoints.values[key.replace('Offset', '')] !== undefined) {
-        gridOffset[key.replace('Offset', '')] = val;
-      } else {
-        other[key] = val;
-      }
-    });
+    const size = parseResponsiveProp(sizeProp, theme.breakpoints, val => val !== false);
+    const offset = parseResponsiveProp(offsetProp, theme.breakpoints);
     const columns = inProps.columns ?? (level ? undefined : columnsProp);
     const spacing = inProps.spacing ?? (level ? undefined : spacingProp);
     const rowSpacing = inProps.rowSpacing ?? inProps.spacing ?? (level ? undefined : rowSpacingProp);
@@ -92,8 +106,8 @@ export default function createGrid(options = {}) {
       spacing,
       rowSpacing,
       columnSpacing,
-      gridSize,
-      gridOffset
+      size,
+      offset
     };
     const classes = useUtilityClasses(ownerState, theme);
     return /*#__PURE__*/_jsx(GridRoot, {
@@ -101,7 +115,7 @@ export default function createGrid(options = {}) {
       as: component,
       ownerState: ownerState,
       className: clsx(classes.root, className),
-      ...other,
+      ...rest,
       children: React.Children.map(children, child => {
         if ( /*#__PURE__*/React.isValidElement(child) && isMuiElement(child, ['Grid'])) {
           return /*#__PURE__*/React.cloneElement(child, {
@@ -120,20 +134,12 @@ export default function createGrid(options = {}) {
     component: PropTypes.elementType,
     container: PropTypes.bool,
     direction: PropTypes.oneOfType([PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row']), PropTypes.arrayOf(PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row'])), PropTypes.object]),
-    lg: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-    lgOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
-    md: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-    mdOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
+    offset: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number])), PropTypes.object]),
     rowSpacing: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])), PropTypes.number, PropTypes.object, PropTypes.string]),
-    sm: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-    smOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
+    size: PropTypes.oneOfType([PropTypes.string, PropTypes.bool, PropTypes.number, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.bool, PropTypes.number])), PropTypes.object]),
     spacing: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])), PropTypes.number, PropTypes.object, PropTypes.string]),
     sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
-    wrap: PropTypes.oneOf(['nowrap', 'wrap-reverse', 'wrap']),
-    xl: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-    xlOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
-    xs: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-    xsOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number])
+    wrap: PropTypes.oneOf(['nowrap', 'wrap-reverse', 'wrap'])
   } : void 0;
 
   // @ts-ignore internal logic for nested grid

package/Unstable_Grid/gridClasses.js

@@ -6,7 +6,7 @@ export function getGridUtilityClass(slot) {
 const SPACINGS = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
 const DIRECTIONS = ['column-reverse', 'column', 'row-reverse', 'row'];
 const WRAPS = ['nowrap', 'wrap-reverse', 'wrap'];
-const GRID_SIZES = ['auto', true, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
+const GRID_SIZES = ['auto', 'grow', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
 const gridClasses = generateUtilityClasses('MuiGrid', ['root', 'container', 'item',
 // spacings
 ...SPACINGS.map(spacing => `spacing-xs-${spacing}`),

package/Unstable_Grid/gridGenerator.d.ts

@@ -11,12 +11,7 @@ interface Props {
 }
 export declare const generateGridSizeStyles: ({ theme, ownerState }: Props) => {};
 export declare const generateGridOffsetStyles: ({ theme, ownerState }: Props) => {};
-export declare const generateGridColumnsStyles: ({ theme, ownerState }: Props) => {
-    [x: string]: string;
-    '--Grid-columns'?: undefined;
-} | {
-    '--Grid-columns': number;
-};
+export declare const generateGridColumnsStyles: ({ theme, ownerState }: Props) => Record<string, string | number | undefined>;
 export declare const generateGridRowSpacingStyles: ({ theme, ownerState }: Props) => {
     [x: string]: string;
 };
@@ -25,7 +20,7 @@ export declare const generateGridColumnSpacingStyles: ({ theme, ownerState }: Pr
 };
 export declare const generateGridDirectionStyles: ({ theme, ownerState }: Props) => {};
 export declare const generateGridStyles: ({ ownerState }: Props) => {};
-export declare const generateSizeClassNames: (gridSize: GridOwnerState['gridSize']) => string[];
+export declare const generateSizeClassNames: (size: GridOwnerState['size']) => string[];
 export declare const generateSpacingClassNames: (spacing: GridOwnerState['spacing'], smallestBreakpoint?: string) => string[];
 export declare const generateDirectionClasses: (direction: ResponsiveStyleValue<GridDirection> | undefined) => string[];
 export {};

package/Unstable_Grid/gridGenerator.js

@@ -33,9 +33,9 @@ export const generateGridSizeStyles = ({
 }) => {
   const getParentSpacing = createGetParentSpacing(ownerState);
   const styles = {};
-  traverseBreakpoints(theme.breakpoints, ownerState.gridSize, (appendStyle, value) => {
+  traverseBreakpoints(theme.breakpoints, ownerState.size, (appendStyle, value) => {
     let style = {};
-    if (value === true) {
+    if (value === 'grow') {
       style = {
         flexBasis: 0,
         flexGrow: 1,
@@ -68,7 +68,7 @@ export const generateGridOffsetStyles = ({
 }) => {
   const getParentSpacing = createGetParentSpacing(ownerState);
   const styles = {};
-  traverseBreakpoints(theme.breakpoints, ownerState.gridOffset, (appendStyle, value) => {
+  traverseBreakpoints(theme.breakpoints, ownerState.offset, (appendStyle, value) => {
     let style = {};
     if (value === 'auto') {
       style = {
@@ -175,9 +175,9 @@ export const generateGridStyles = ({
     })
   };
 };
-export const generateSizeClassNames = gridSize => {
+export const generateSizeClassNames = size => {
   const classNames = [];
-  Object.entries(gridSize).forEach(([key, value]) => {
+  Object.entries(size).forEach(([key, value]) => {
     if (value !== false && value !== undefined) {
       classNames.push(`grid-${key}-${String(value)}`);
     }

package/createTheme/createTheme.d.ts

@@ -6,7 +6,7 @@ import { SxConfig, SxProps } from '../styleFunctionSx';
 import { ApplyStyles } from './applyStyles';
 import { CssContainerQueries } from '../cssContainerQueries';
 
-export { Breakpoint, BreakpointOverrides } from './createBreakpoints';
+export { Breakpoint, Breakpoints, BreakpointOverrides } from './createBreakpoints';
 
 export type Direction = 'ltr' | 'rtl';
 

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/system v6.0.0-alpha.12
+ * @mui/system v6.0.0-alpha.14
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/modern/Unstable_Grid/Grid.js

@@ -46,58 +46,18 @@ process.env.NODE_ENV !== "production" ? Grid.propTypes /* remove-proptypes */ =
    */
   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]),
   /**
-   * If a number, it sets the number of columns the grid item uses.
-   * It can't be greater than the total number of columns of the container (12 by default).
-   * If 'auto', the grid item's width matches its content.
-   * If false, the prop is ignored.
-   * If true, the grid item's width grows to use the space available in the grid container.
-   * The value is applied for the `lg` breakpoint and wider screens if not overridden.
-   * @default false
-   */
-  lg: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-  /**
-   * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-   * If 'auto', the grid item push itself to the right-end of the container.
-   * The value is applied for the `lg` breakpoint and wider screens if not overridden.
-   */
-  lgOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
-  /**
-   * If a number, it sets the number of columns the grid item uses.
-   * It can't be greater than the total number of columns of the container (12 by default).
-   * If 'auto', the grid item's width matches its content.
-   * If false, the prop is ignored.
-   * If true, the grid item's width grows to use the space available in the grid container.
-   * The value is applied for the `md` breakpoint and wider screens if not overridden.
-   * @default false
+   * Defines the offset value for the type `item` components.
    */
-  md: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-  /**
-   * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-   * If 'auto', the grid item push itself to the right-end of the container.
-   * The value is applied for the `md` breakpoint and wider screens if not overridden.
-   */
-  mdOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
+  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]),
   /**
-   * If a number, it sets the number of columns the grid item uses.
-   * It can't be greater than the total number of columns of the container (12 by default).
-   * If 'auto', the grid item's width matches its content.
-   * If false, the prop is ignored.
-   * If true, the grid item's width grows to use the space available in the grid container.
-   * The value is applied for the `sm` breakpoint and wider screens if not overridden.
-   * @default false
-   */
-  sm: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-  /**
-   * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-   * If 'auto', the grid item push itself to the right-end of the container.
-   * The value is applied for the `sm` breakpoint and wider screens if not overridden.
+   * Defines the size of the the type `item` components.
    */
-  smOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
+  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.
@@ -136,38 +96,6 @@ process.env.NODE_ENV !== "production" ? Grid.propTypes /* remove-proptypes */ =
    * It's applied for all screen sizes.
    * @default 'wrap'
    */
-  wrap: PropTypes.oneOf(['nowrap', 'wrap-reverse', 'wrap']),
-  /**
-   * If a number, it sets the number of columns the grid item uses.
-   * It can't be greater than the total number of columns of the container (12 by default).
-   * If 'auto', the grid item's width matches its content.
-   * If false, the prop is ignored.
-   * If true, the grid item's width grows to use the space available in the grid container.
-   * The value is applied for the `xl` breakpoint and wider screens if not overridden.
-   * @default false
-   */
-  xl: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-  /**
-   * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-   * If 'auto', the grid item push itself to the right-end of the container.
-   * The value is applied for the `xl` breakpoint and wider screens if not overridden.
-   */
-  xlOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
-  /**
-   * If a number, it sets the number of columns the grid item uses.
-   * It can't be greater than the total number of columns of the container (12 by default).
-   * If 'auto', the grid item's width matches its content.
-   * If false, the prop is ignored.
-   * If true, the grid item's width grows to use the space available in the grid container.
-   * The value is applied for all the screen sizes with the lowest priority.
-   * @default false
-   */
-  xs: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-  /**
-   * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-   * If 'auto', the grid item push itself to the right-end of the container.
-   * The value is applied for the `xs` breakpoint and wider screens if not overridden.
-   */
-  xsOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number])
+  wrap: PropTypes.oneOf(['nowrap', 'wrap-reverse', 'wrap'])
 } : void 0;
 export default Grid;

package/modern/Unstable_Grid/createGrid.js

@@ -39,13 +39,36 @@ export default function createGrid(options = {}) {
       direction,
       spacing,
       wrap,
-      gridSize
+      size
     } = ownerState;
     const slots = {
-      root: ['root', container && 'container', wrap !== 'wrap' && `wrap-xs-${String(wrap)}`, ...generateDirectionClasses(direction), ...generateSizeClassNames(gridSize), ...(container ? generateSpacingClassNames(spacing, theme.breakpoints.keys[0]) : [])]
+      root: ['root', container && 'container', wrap !== 'wrap' && `wrap-xs-${String(wrap)}`, ...generateDirectionClasses(direction), ...generateSizeClassNames(size), ...(container ? generateSpacingClassNames(spacing, theme.breakpoints.keys[0]) : [])]
     };
     return composeClasses(slots, slot => generateUtilityClass(componentName, slot), {});
   };
+  function parseResponsiveProp(propValue, breakpoints, shouldUseValue = () => true) {
+    const parsedProp = {};
+    if (propValue === null) {
+      return parsedProp;
+    }
+    if (Array.isArray(propValue)) {
+      propValue.forEach((value, index) => {
+        if (value !== null && shouldUseValue(value) && breakpoints.keys[index]) {
+          parsedProp[breakpoints.keys[index]] = value;
+        }
+      });
+    } else if (typeof propValue === 'object') {
+      Object.keys(propValue).forEach(key => {
+        const value = propValue[key];
+        if (value !== null && value !== undefined && shouldUseValue(value)) {
+          parsedProp[key] = value;
+        }
+      });
+    } else {
+      parsedProp[breakpoints.keys[0]] = propValue;
+    }
+    return parsedProp;
+  }
   const GridRoot = createStyledComponent(generateGridColumnsStyles, generateGridColumnSpacingStyles, generateGridRowSpacingStyles, generateGridSizeStyles, generateGridDirectionStyles, generateGridStyles, generateGridOffsetStyles);
   const Grid = /*#__PURE__*/React.forwardRef(function Grid(inProps, ref) {
     const theme = useTheme();
@@ -59,25 +82,16 @@ export default function createGrid(options = {}) {
       component = 'div',
       direction = 'row',
       wrap = 'wrap',
+      size: sizeProp = {},
+      offset: offsetProp = {},
       spacing: spacingProp = 0,
       rowSpacing: rowSpacingProp = spacingProp,
       columnSpacing: columnSpacingProp = spacingProp,
       unstable_level: level = 0,
       ...rest
     } = props;
-    // collect breakpoints related props because they can be customized from the theme.
-    const gridSize = {};
-    const gridOffset = {};
-    const other = {};
-    Object.entries(rest).forEach(([key, val]) => {
-      if (theme.breakpoints.values[key] !== undefined) {
-        gridSize[key] = val;
-      } else if (theme.breakpoints.values[key.replace('Offset', '')] !== undefined) {
-        gridOffset[key.replace('Offset', '')] = val;
-      } else {
-        other[key] = val;
-      }
-    });
+    const size = parseResponsiveProp(sizeProp, theme.breakpoints, val => val !== false);
+    const offset = parseResponsiveProp(offsetProp, theme.breakpoints);
     const columns = inProps.columns ?? (level ? undefined : columnsProp);
     const spacing = inProps.spacing ?? (level ? undefined : spacingProp);
     const rowSpacing = inProps.rowSpacing ?? inProps.spacing ?? (level ? undefined : rowSpacingProp);
@@ -92,8 +106,8 @@ export default function createGrid(options = {}) {
       spacing,
       rowSpacing,
       columnSpacing,
-      gridSize,
-      gridOffset
+      size,
+      offset
     };
     const classes = useUtilityClasses(ownerState, theme);
     return /*#__PURE__*/_jsx(GridRoot, {
@@ -101,7 +115,7 @@ export default function createGrid(options = {}) {
       as: component,
       ownerState: ownerState,
       className: clsx(classes.root, className),
-      ...other,
+      ...rest,
       children: React.Children.map(children, child => {
         if ( /*#__PURE__*/React.isValidElement(child) && isMuiElement(child, ['Grid'])) {
           return /*#__PURE__*/React.cloneElement(child, {
@@ -120,20 +134,12 @@ export default function createGrid(options = {}) {
     component: PropTypes.elementType,
     container: PropTypes.bool,
     direction: PropTypes.oneOfType([PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row']), PropTypes.arrayOf(PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row'])), PropTypes.object]),
-    lg: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-    lgOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
-    md: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-    mdOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
+    offset: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number])), PropTypes.object]),
     rowSpacing: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])), PropTypes.number, PropTypes.object, PropTypes.string]),
-    sm: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-    smOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
+    size: PropTypes.oneOfType([PropTypes.string, PropTypes.bool, PropTypes.number, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.bool, PropTypes.number])), PropTypes.object]),
     spacing: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])), PropTypes.number, PropTypes.object, PropTypes.string]),
     sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
-    wrap: PropTypes.oneOf(['nowrap', 'wrap-reverse', 'wrap']),
-    xl: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-    xlOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
-    xs: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number, PropTypes.bool]),
-    xsOffset: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number])
+    wrap: PropTypes.oneOf(['nowrap', 'wrap-reverse', 'wrap'])
   } : void 0;
 
   // @ts-ignore internal logic for nested grid

package/modern/Unstable_Grid/gridClasses.js

@@ -6,7 +6,7 @@ export function getGridUtilityClass(slot) {
 const SPACINGS = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
 const DIRECTIONS = ['column-reverse', 'column', 'row-reverse', 'row'];
 const WRAPS = ['nowrap', 'wrap-reverse', 'wrap'];
-const GRID_SIZES = ['auto', true, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
+const GRID_SIZES = ['auto', 'grow', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
 const gridClasses = generateUtilityClasses('MuiGrid', ['root', 'container', 'item',
 // spacings
 ...SPACINGS.map(spacing => `spacing-xs-${spacing}`),

package/modern/Unstable_Grid/gridGenerator.js

@@ -33,9 +33,9 @@ export const generateGridSizeStyles = ({
 }) => {
   const getParentSpacing = createGetParentSpacing(ownerState);
   const styles = {};
-  traverseBreakpoints(theme.breakpoints, ownerState.gridSize, (appendStyle, value) => {
+  traverseBreakpoints(theme.breakpoints, ownerState.size, (appendStyle, value) => {
     let style = {};
-    if (value === true) {
+    if (value === 'grow') {
       style = {
         flexBasis: 0,
         flexGrow: 1,
@@ -68,7 +68,7 @@ export const generateGridOffsetStyles = ({
 }) => {
   const getParentSpacing = createGetParentSpacing(ownerState);
   const styles = {};
-  traverseBreakpoints(theme.breakpoints, ownerState.gridOffset, (appendStyle, value) => {
+  traverseBreakpoints(theme.breakpoints, ownerState.offset, (appendStyle, value) => {
     let style = {};
     if (value === 'auto') {
       style = {
@@ -175,9 +175,9 @@ export const generateGridStyles = ({
     })
   };
 };
-export const generateSizeClassNames = gridSize => {
+export const generateSizeClassNames = size => {
   const classNames = [];
-  Object.entries(gridSize).forEach(([key, value]) => {
+  Object.entries(size).forEach(([key, value]) => {
     if (value !== false && value !== undefined) {
       classNames.push(`grid-${key}-${String(value)}`);
     }

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/system v6.0.0-alpha.12
+ * @mui/system v6.0.0-alpha.14
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/node/Unstable_Grid/Grid.js

@@ -52,58 +52,18 @@ process.env.NODE_ENV !== "production" ? Grid.propTypes /* remove-proptypes */ =
    */
   direction: _propTypes.default /* @typescript-to-proptypes-ignore */.oneOfType([_propTypes.default.oneOf(['column-reverse', 'column', 'row-reverse', 'row']), _propTypes.default.arrayOf(_propTypes.default.oneOf(['column-reverse', 'column', 'row-reverse', 'row'])), _propTypes.default.object]),
   /**
-   * If a number, it sets the number of columns the grid item uses.
-   * It can't be greater than the total number of columns of the container (12 by default).
-   * If 'auto', the grid item's width matches its content.
-   * If false, the prop is ignored.
-   * If true, the grid item's width grows to use the space available in the grid container.
-   * The value is applied for the `lg` breakpoint and wider screens if not overridden.
-   * @default false
-   */
-  lg: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number, _propTypes.default.bool]),
-  /**
-   * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-   * If 'auto', the grid item push itself to the right-end of the container.
-   * The value is applied for the `lg` breakpoint and wider screens if not overridden.
-   */
-  lgOffset: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number]),
-  /**
-   * If a number, it sets the number of columns the grid item uses.
-   * It can't be greater than the total number of columns of the container (12 by default).
-   * If 'auto', the grid item's width matches its content.
-   * If false, the prop is ignored.
-   * If true, the grid item's width grows to use the space available in the grid container.
-   * The value is applied for the `md` breakpoint and wider screens if not overridden.
-   * @default false
+   * Defines the offset value for the type `item` components.
    */
-  md: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number, _propTypes.default.bool]),
-  /**
-   * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-   * If 'auto', the grid item push itself to the right-end of the container.
-   * The value is applied for the `md` breakpoint and wider screens if not overridden.
-   */
-  mdOffset: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number]),
+  offset: _propTypes.default /* @typescript-to-proptypes-ignore */.oneOfType([_propTypes.default.string, _propTypes.default.number, _propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number])), _propTypes.default.object]),
   /**
    * Defines the vertical space between the type `item` components.
    * It overrides the value of the `spacing` prop.
    */
   rowSpacing: _propTypes.default /* @typescript-to-proptypes-ignore */.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string])), _propTypes.default.number, _propTypes.default.object, _propTypes.default.string]),
   /**
-   * If a number, it sets the number of columns the grid item uses.
-   * It can't be greater than the total number of columns of the container (12 by default).
-   * If 'auto', the grid item's width matches its content.
-   * If false, the prop is ignored.
-   * If true, the grid item's width grows to use the space available in the grid container.
-   * The value is applied for the `sm` breakpoint and wider screens if not overridden.
-   * @default false
-   */
-  sm: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number, _propTypes.default.bool]),
-  /**
-   * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-   * If 'auto', the grid item push itself to the right-end of the container.
-   * The value is applied for the `sm` breakpoint and wider screens if not overridden.
+   * Defines the size of the the type `item` components.
    */
-  smOffset: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number]),
+  size: _propTypes.default /* @typescript-to-proptypes-ignore */.oneOfType([_propTypes.default.string, _propTypes.default.bool, _propTypes.default.number, _propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.bool, _propTypes.default.number])), _propTypes.default.object]),
   /**
    * Defines the space between the type `item` components.
    * It can only be used on a type `container` component.
@@ -142,38 +102,6 @@ process.env.NODE_ENV !== "production" ? Grid.propTypes /* remove-proptypes */ =
    * It's applied for all screen sizes.
    * @default 'wrap'
    */
-  wrap: _propTypes.default.oneOf(['nowrap', 'wrap-reverse', 'wrap']),
-  /**
-   * If a number, it sets the number of columns the grid item uses.
-   * It can't be greater than the total number of columns of the container (12 by default).
-   * If 'auto', the grid item's width matches its content.
-   * If false, the prop is ignored.
-   * If true, the grid item's width grows to use the space available in the grid container.
-   * The value is applied for the `xl` breakpoint and wider screens if not overridden.
-   * @default false
-   */
-  xl: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number, _propTypes.default.bool]),
-  /**
-   * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-   * If 'auto', the grid item push itself to the right-end of the container.
-   * The value is applied for the `xl` breakpoint and wider screens if not overridden.
-   */
-  xlOffset: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number]),
-  /**
-   * If a number, it sets the number of columns the grid item uses.
-   * It can't be greater than the total number of columns of the container (12 by default).
-   * If 'auto', the grid item's width matches its content.
-   * If false, the prop is ignored.
-   * If true, the grid item's width grows to use the space available in the grid container.
-   * The value is applied for all the screen sizes with the lowest priority.
-   * @default false
-   */
-  xs: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number, _propTypes.default.bool]),
-  /**
-   * If a number, it sets the margin-left equals to the number of columns the grid item uses.
-   * If 'auto', the grid item push itself to the right-end of the container.
-   * The value is applied for the `xs` breakpoint and wider screens if not overridden.
-   */
-  xsOffset: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number])
+  wrap: _propTypes.default.oneOf(['nowrap', 'wrap-reverse', 'wrap'])
 } : void 0;
 var _default = exports.default = Grid;

package/node/Unstable_Grid/createGrid.js

@@ -48,13 +48,36 @@ function createGrid(options = {}) {
       direction,
       spacing,
       wrap,
-      gridSize
+      size
     } = ownerState;
     const slots = {
-      root: ['root', container && 'container', wrap !== 'wrap' && `wrap-xs-${String(wrap)}`, ...(0, _gridGenerator.generateDirectionClasses)(direction), ...(0, _gridGenerator.generateSizeClassNames)(gridSize), ...(container ? (0, _gridGenerator.generateSpacingClassNames)(spacing, theme.breakpoints.keys[0]) : [])]
+      root: ['root', container && 'container', wrap !== 'wrap' && `wrap-xs-${String(wrap)}`, ...(0, _gridGenerator.generateDirectionClasses)(direction), ...(0, _gridGenerator.generateSizeClassNames)(size), ...(container ? (0, _gridGenerator.generateSpacingClassNames)(spacing, theme.breakpoints.keys[0]) : [])]
     };
     return (0, _composeClasses.default)(slots, slot => (0, _generateUtilityClass.default)(componentName, slot), {});
   };
+  function parseResponsiveProp(propValue, breakpoints, shouldUseValue = () => true) {
+    const parsedProp = {};
+    if (propValue === null) {
+      return parsedProp;
+    }
+    if (Array.isArray(propValue)) {
+      propValue.forEach((value, index) => {
+        if (value !== null && shouldUseValue(value) && breakpoints.keys[index]) {
+          parsedProp[breakpoints.keys[index]] = value;
+        }
+      });
+    } else if (typeof propValue === 'object') {
+      Object.keys(propValue).forEach(key => {
+        const value = propValue[key];
+        if (value !== null && value !== undefined && shouldUseValue(value)) {
+          parsedProp[key] = value;
+        }
+      });
+    } else {
+      parsedProp[breakpoints.keys[0]] = propValue;
+    }
+    return parsedProp;
+  }
   const GridRoot = createStyledComponent(_gridGenerator.generateGridColumnsStyles, _gridGenerator.generateGridColumnSpacingStyles, _gridGenerator.generateGridRowSpacingStyles, _gridGenerator.generateGridSizeStyles, _gridGenerator.generateGridDirectionStyles, _gridGenerator.generateGridStyles, _gridGenerator.generateGridOffsetStyles);
   const Grid = /*#__PURE__*/React.forwardRef(function Grid(inProps, ref) {
     var _inProps$columns, _inProps$spacing, _ref, _inProps$rowSpacing, _ref2, _inProps$columnSpacin;
@@ -69,25 +92,16 @@ function createGrid(options = {}) {
       component = 'div',
       direction = 'row',
       wrap = 'wrap',
+      size: sizeProp = {},
+      offset: offsetProp = {},
       spacing: spacingProp = 0,
       rowSpacing: rowSpacingProp = spacingProp,
       columnSpacing: columnSpacingProp = spacingProp,
       unstable_level: level = 0,
       ...rest
     } = props;
-    // collect breakpoints related props because they can be customized from the theme.
-    const gridSize = {};
-    const gridOffset = {};
-    const other = {};
-    Object.entries(rest).forEach(([key, val]) => {
-      if (theme.breakpoints.values[key] !== undefined) {
-        gridSize[key] = val;
-      } else if (theme.breakpoints.values[key.replace('Offset', '')] !== undefined) {
-        gridOffset[key.replace('Offset', '')] = val;
-      } else {
-        other[key] = val;
-      }
-    });
+    const size = parseResponsiveProp(sizeProp, theme.breakpoints, val => val !== false);
+    const offset = parseResponsiveProp(offsetProp, theme.breakpoints);
     const columns = (_inProps$columns = inProps.columns) != null ? _inProps$columns : level ? undefined : columnsProp;
     const spacing = (_inProps$spacing = inProps.spacing) != null ? _inProps$spacing : level ? undefined : spacingProp;
     const rowSpacing = (_ref = (_inProps$rowSpacing = inProps.rowSpacing) != null ? _inProps$rowSpacing : inProps.spacing) != null ? _ref : level ? undefined : rowSpacingProp;
@@ -102,8 +116,8 @@ function createGrid(options = {}) {
       spacing,
       rowSpacing,
       columnSpacing,
-      gridSize,
-      gridOffset
+      size,
+      offset
     };
     const classes = useUtilityClasses(ownerState, theme);
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(GridRoot, {
@@ -111,7 +125,7 @@ function createGrid(options = {}) {
       as: component,
       ownerState: ownerState,
       className: (0, _clsx.default)(classes.root, className),
-      ...other,
+      ...rest,
       children: React.Children.map(children, child => {
         if ( /*#__PURE__*/React.isValidElement(child) && (0, _isMuiElement.default)(child, ['Grid'])) {
           var _unstable_level;
@@ -131,20 +145,12 @@ function createGrid(options = {}) {
     component: _propTypes.default.elementType,
     container: _propTypes.default.bool,
     direction: _propTypes.default.oneOfType([_propTypes.default.oneOf(['column-reverse', 'column', 'row-reverse', 'row']), _propTypes.default.arrayOf(_propTypes.default.oneOf(['column-reverse', 'column', 'row-reverse', 'row'])), _propTypes.default.object]),
-    lg: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number, _propTypes.default.bool]),
-    lgOffset: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number]),
-    md: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number, _propTypes.default.bool]),
-    mdOffset: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number]),
+    offset: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number, _propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number])), _propTypes.default.object]),
     rowSpacing: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string])), _propTypes.default.number, _propTypes.default.object, _propTypes.default.string]),
-    sm: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number, _propTypes.default.bool]),
-    smOffset: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number]),
+    size: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.bool, _propTypes.default.number, _propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.bool, _propTypes.default.number])), _propTypes.default.object]),
     spacing: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string])), _propTypes.default.number, _propTypes.default.object, _propTypes.default.string]),
     sx: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object, _propTypes.default.bool])), _propTypes.default.func, _propTypes.default.object]),
-    wrap: _propTypes.default.oneOf(['nowrap', 'wrap-reverse', 'wrap']),
-    xl: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number, _propTypes.default.bool]),
-    xlOffset: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number]),
-    xs: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number, _propTypes.default.bool]),
-    xsOffset: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.number])
+    wrap: _propTypes.default.oneOf(['nowrap', 'wrap-reverse', 'wrap'])
   } : void 0;
 
   // @ts-ignore internal logic for nested grid

package/node/Unstable_Grid/gridClasses.js

@@ -14,7 +14,7 @@ function getGridUtilityClass(slot) {
 const SPACINGS = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
 const DIRECTIONS = ['column-reverse', 'column', 'row-reverse', 'row'];
 const WRAPS = ['nowrap', 'wrap-reverse', 'wrap'];
-const GRID_SIZES = ['auto', true, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
+const GRID_SIZES = ['auto', 'grow', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
 const gridClasses = (0, _generateUtilityClasses.default)('MuiGrid', ['root', 'container', 'item',
 // spacings
 ...SPACINGS.map(spacing => `spacing-xs-${spacing}`),

package/node/Unstable_Grid/gridGenerator.js

@@ -39,9 +39,9 @@ const generateGridSizeStyles = ({
 }) => {
   const getParentSpacing = createGetParentSpacing(ownerState);
   const styles = {};
-  (0, _traverseBreakpoints.traverseBreakpoints)(theme.breakpoints, ownerState.gridSize, (appendStyle, value) => {
+  (0, _traverseBreakpoints.traverseBreakpoints)(theme.breakpoints, ownerState.size, (appendStyle, value) => {
     let style = {};
-    if (value === true) {
+    if (value === 'grow') {
       style = {
         flexBasis: 0,
         flexGrow: 1,
@@ -75,7 +75,7 @@ const generateGridOffsetStyles = ({
 }) => {
   const getParentSpacing = createGetParentSpacing(ownerState);
   const styles = {};
-  (0, _traverseBreakpoints.traverseBreakpoints)(theme.breakpoints, ownerState.gridOffset, (appendStyle, value) => {
+  (0, _traverseBreakpoints.traverseBreakpoints)(theme.breakpoints, ownerState.offset, (appendStyle, value) => {
     let style = {};
     if (value === 'auto') {
       style = {
@@ -190,9 +190,9 @@ const generateGridStyles = ({
   };
 };
 exports.generateGridStyles = generateGridStyles;
-const generateSizeClassNames = gridSize => {
+const generateSizeClassNames = size => {
   const classNames = [];
-  Object.entries(gridSize).forEach(([key, value]) => {
+  Object.entries(size).forEach(([key, value]) => {
     if (value !== false && value !== undefined) {
       classNames.push(`grid-${key}-${String(value)}`);
     }

package/node/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/system v6.0.0-alpha.12
+ * @mui/system v6.0.0-alpha.14
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/system",
-  "version": "6.0.0-alpha.12",
+  "version": "6.0.0-alpha.14",
   "private": false,
   "author": "MUI Team",
   "description": "MUI System is a set of CSS utilities to help you build custom designs more efficiently. It makes it possible to rapidly lay out custom designs.",
@@ -30,10 +30,10 @@
     "clsx": "^2.1.1",
     "csstype": "^3.1.3",
     "prop-types": "^15.8.1",
-    "@mui/private-theming": "^6.0.0-alpha.12",
+    "@mui/private-theming": "6.0.0-alpha.14",
     "@mui/types": "^7.2.14",
-    "@mui/utils": "^6.0.0-alpha.12",
-    "@mui/styled-engine": "^6.0.0-alpha.12"
+    "@mui/styled-engine": "6.0.0-alpha.14",
+    "@mui/utils": "6.0.0-alpha.14"
   },
   "peerDependencies": {
     "@emotion/react": "^11.5.0",