@mui/system 6.0.0-alpha.9 → 6.0.0-beta.1

package/Unstable_Grid/Grid.js

@@ -46,62 +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 `true`, the negative margin and padding are apply only to the top and left sides of the grid.
+   * Defines the offset value for the type `item` components.
    */
-  disableEqualOverflow: PropTypes.bool,
-  /**
-   * 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
-   */
-  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
+   * Defines the size of the the type `item` components.
    */
-  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.
-   */
-  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.
@@ -140,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.
      */
@@ -124,9 +39,9 @@ export interface GridBaseProps extends Breakpoints {
      */
     direction?: ResponsiveStyleValue<GridDirection>;
     /**
-     * If `true`, the negative margin and padding are apply only to the top and left sides of the grid.
+     * Defines the offset value for the type `item` components.
      */
-    disableEqualOverflow?: boolean;
+    offset?: ResponsiveStyleValue<GridOffset>;
     /**
      * @internal
      * The level of the grid starts from `0`
@@ -155,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.
@@ -168,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

@@ -33,29 +33,47 @@ export default function createGrid(options = {}) {
     useThemeProps = useThemePropsDefault,
     componentName = 'MuiGrid'
   } = options;
-  const GridOverflowContext = /*#__PURE__*/React.createContext(undefined);
-  if (process.env.NODE_ENV !== 'production') {
-    GridOverflowContext.displayName = 'GridOverflowContext';
-  }
   const useUtilityClasses = (ownerState, theme) => {
     const {
       container,
       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();
     const themeProps = useThemeProps(inProps);
     const props = extendSxProp(themeProps); // `color` type conflicts with html color attribute.
-    const overflow = React.useContext(GridOverflowContext);
     const {
       className,
       children,
@@ -64,31 +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,
-      disableEqualOverflow: themeDisableEqualOverflow,
       unstable_level: level = 0,
-      ...rest
+      ...other
     } = props;
-    // Because `disableEqualOverflow` can be set from the theme's defaultProps, the **nested** grid should look at the instance props instead.
-    let disableEqualOverflow = themeDisableEqualOverflow;
-    if (level && themeDisableEqualOverflow !== undefined) {
-      disableEqualOverflow = inProps.disableEqualOverflow;
-    }
-    // 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);
@@ -103,14 +106,11 @@ export default function createGrid(options = {}) {
       spacing,
       rowSpacing,
       columnSpacing,
-      gridSize,
-      gridOffset,
-      disableEqualOverflow: disableEqualOverflow ?? overflow ?? false,
-      // use context value if exists.
-      parentDisableEqualOverflow: overflow // for nested grid
+      size,
+      offset
     };
     const classes = useUtilityClasses(ownerState, theme);
-    let result = /*#__PURE__*/_jsx(GridRoot, {
+    return /*#__PURE__*/_jsx(GridRoot, {
       ref: ref,
       as: component,
       ownerState: ownerState,
@@ -125,16 +125,6 @@ export default function createGrid(options = {}) {
         return child;
       })
     });
-    if (disableEqualOverflow !== undefined && disableEqualOverflow !== (overflow ?? false)) {
-      // There are 2 possibilities that should wrap with the GridOverflowContext to communicate with the nested grids:
-      // 1. It is the root grid with `disableEqualOverflow`.
-      // 2. It is a nested grid with different `disableEqualOverflow` from the context.
-      result = /*#__PURE__*/_jsx(GridOverflowContext.Provider, {
-        value: disableEqualOverflow,
-        children: result
-      });
-    }
-    return result;
   });
   process.env.NODE_ENV !== "production" ? Grid.propTypes /* remove-proptypes */ = {
     children: PropTypes.node,
@@ -144,21 +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]),
-    disableEqualOverflow: PropTypes.bool,
-    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

@@ -7,18 +7,11 @@ interface Props {
         breakpoints: Breakpoints;
         spacing?: Spacing;
     };
-    ownerState: GridOwnerState & {
-        parentDisableEqualOverflow?: boolean;
-    };
+    ownerState: GridOwnerState;
 }
 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;
 };
@@ -27,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

@@ -31,11 +31,11 @@ export const generateGridSizeStyles = ({
   theme,
   ownerState
 }) => {
-  const getSelfSpacing = createGetSelfSpacing(ownerState);
+  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,
@@ -55,7 +55,7 @@ export const generateGridSizeStyles = ({
       style = {
         flexGrow: 0,
         flexBasis: 'auto',
-        width: `calc(100% * ${value} / ${getParentColumns(ownerState)}${isNestedContainer(ownerState) ? ` + ${getSelfSpacing('column')}` : ''})`
+        width: `calc(100% * ${value} / ${getParentColumns(ownerState)} - (${getParentColumns(ownerState)} - ${value}) * (${getParentSpacing('column')} / ${getParentColumns(ownerState)}))`
       };
     }
     appendStyle(styles, style);
@@ -66,8 +66,9 @@ export const generateGridOffsetStyles = ({
   theme,
   ownerState
 }) => {
+  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 = {
@@ -76,7 +77,7 @@ export const generateGridOffsetStyles = ({
     }
     if (typeof value === 'number') {
       style = {
-        marginLeft: value === 0 ? '0px' : `calc(100% * ${value} / ${getParentColumns(ownerState)})`
+        marginLeft: value === 0 ? '0px' : `calc(100% * ${value} / ${getParentColumns(ownerState)} + ${getParentSpacing('column')} * ${value} / ${getParentColumns(ownerState)})`
       };
     }
     appendStyle(styles, style);
@@ -161,7 +162,6 @@ export const generateGridStyles = ({
   ownerState
 }) => {
   const getSelfSpacing = createGetSelfSpacing(ownerState);
-  const getParentSpacing = createGetParentSpacing(ownerState);
   return {
     minWidth: 0,
     boxSizing: 'border-box',
@@ -171,22 +171,13 @@ export const generateGridStyles = ({
       ...(ownerState.wrap && ownerState.wrap !== 'wrap' && {
         flexWrap: ownerState.wrap
       }),
-      margin: `calc(${getSelfSpacing('row')} / -2) calc(${getSelfSpacing('column')} / -2)`,
-      ...(ownerState.disableEqualOverflow && {
-        margin: `calc(${getSelfSpacing('row')} * -1) 0px 0px calc(${getSelfSpacing('column')} * -1)`
-      })
-    }),
-    ...((!ownerState.container || isNestedContainer(ownerState)) && {
-      padding: `calc(${getParentSpacing('row')} / 2) calc(${getParentSpacing('column')} / 2)`,
-      ...((ownerState.disableEqualOverflow || ownerState.parentDisableEqualOverflow) && {
-        padding: `${getParentSpacing('row')} 0px 0px ${getParentSpacing('column')}`
-      })
+      gap: `${getSelfSpacing('row')} ${getSelfSpacing('column')}`
     })
   };
 };
-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/cssContainerQueries/cssContainerQueries.js

@@ -26,10 +26,10 @@ export function sortContainerQueries(theme, css) {
   });
 }
 export function isCqShorthand(breakpointKeys, value) {
-  return value.startsWith('@') && (breakpointKeys.some(key => value.startsWith(`@${key}`)) || !!value.match(/^@\d/));
+  return value === '@' || value.startsWith('@') && (breakpointKeys.some(key => value.startsWith(`@${key}`)) || !!value.match(/^@\d/));
 }
 export function getContainerQuery(theme, shorthand) {
-  const matches = shorthand.match(/^@([^/]+)\/?(.+)?$/);
+  const matches = shorthand.match(/^@([^/]+)?\/?(.+)?$/);
   if (!matches) {
     if (process.env.NODE_ENV !== 'production') {
       throw new Error(process.env.NODE_ENV !== "production" ? `MUI: The provided shorthand ${`(${shorthand})`} is invalid. The format should be \`@<breakpoint | number>\` or \`@<breakpoint | number>/<container>\`.
@@ -38,7 +38,7 @@ For example, \`@sm\` or \`@600\` or \`@40rem/sidebar\`.` : _formatMuiErrorMessag
     return null;
   }
   const [, containerQuery, containerName] = matches;
-  const value = Number.isNaN(+containerQuery) ? containerQuery : +containerQuery;
+  const value = Number.isNaN(+containerQuery) ? containerQuery || 0 : +containerQuery;
   return theme.containerQueries(containerName).up(value);
 }
 export default function cssContainerQueries(themeInput) {
@@ -52,7 +52,7 @@ export default function cssContainerQueries(themeInput) {
       const result = toContainerQuery(themeInput.breakpoints.not(...args), name);
       if (result.includes('not all and')) {
         // `@container` does not work with `not all and`, so need to invert the logic
-        return result.replace('not all and ', '').replace('min-width:', 'width<').replace('max-width:', 'width>');
+        return result.replace('not all and ', '').replace('min-width:', 'width<').replace('max-width:', 'width>').replace('and', 'or');
       }
       return result;
     };

package/cssVars/createCssVarsProvider.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import getInitColorSchemeScript from './getInitColorSchemeScript';
+import InitColorSchemeScript from '../InitColorSchemeScript';
 import { Mode, Result } from './useCurrentColorScheme';
 
 export interface ColorSchemeContextValue<SupportedColorScheme extends string>
@@ -92,7 +92,7 @@ export interface CreateCssVarsProviderResult<
     >,
   ) => React.ReactElement<any>;
   useColorScheme: () => ColorSchemeContextValue<ColorScheme>;
-  getInitColorSchemeScript: typeof getInitColorSchemeScript;
+  getInitColorSchemeScript: typeof InitColorSchemeScript;
 }
 
 export default function createCssVarsProvider<

package/cssVars/createCssVarsProvider.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { GlobalStyles } from '@mui/styled-engine';
 import { useTheme as muiUseTheme } from '@mui/private-theming';
 import ThemeProvider from '../ThemeProvider';
-import systemGetInitColorSchemeScript, { DEFAULT_ATTRIBUTE, DEFAULT_COLOR_SCHEME_STORAGE_KEY, DEFAULT_MODE_STORAGE_KEY } from './getInitColorSchemeScript';
+import InitColorSchemeScript, { DEFAULT_ATTRIBUTE, DEFAULT_COLOR_SCHEME_STORAGE_KEY, DEFAULT_MODE_STORAGE_KEY } from '../InitColorSchemeScript/InitColorSchemeScript';
 import useCurrentColorScheme from './useCurrentColorScheme';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export const DISABLE_CSS_TRANSITION = '*{-webkit-transition:none!important;-moz-transition:none!important;-o-transition:none!important;-ms-transition:none!important;transition:none!important}';
@@ -299,7 +299,7 @@ export default function createCssVarsProvider(options) {
   } : void 0;
   const defaultLightColorScheme = typeof designSystemColorScheme === 'string' ? designSystemColorScheme : designSystemColorScheme.light;
   const defaultDarkColorScheme = typeof designSystemColorScheme === 'string' ? designSystemColorScheme : designSystemColorScheme.dark;
-  const getInitColorSchemeScript = params => systemGetInitColorSchemeScript({
+  const getInitColorSchemeScript = params => InitColorSchemeScript({
     attribute: defaultAttribute,
     colorSchemeStorageKey: defaultColorSchemeStorageKey,
     defaultMode: designSystemMode,

package/cssVars/index.d.ts

@@ -1,6 +1,5 @@
 export { default } from './createCssVarsProvider';
 export type { CreateCssVarsProviderResult, CssVarsProviderConfig, ColorSchemeContextValue, } from './createCssVarsProvider';
-export { default as getInitColorSchemeScript } from './getInitColorSchemeScript';
 export { default as prepareCssVars } from './prepareCssVars';
 export { default as prepareTypographyVars } from './prepareTypographyVars';
 export type { ExtractTypographyTokens } from './prepareTypographyVars';

package/cssVars/index.js

@@ -1,7 +1,6 @@
 'use client';
 
 export { default } from './createCssVarsProvider';
-export { default as getInitColorSchemeScript } from './getInitColorSchemeScript';
 export { default as prepareCssVars } from './prepareCssVars';
 export { default as prepareTypographyVars } from './prepareTypographyVars';
 export { default as createCssVarsTheme } from './createCssVarsTheme';

package/cssVars/prepareCssVars.js

@@ -75,7 +75,7 @@ function prepareCssVars(theme, {
     }) || ':root', rootCss);
     const {
       [colorScheme]: defaultSchemeVal,
-      ...rest
+      ...other
     } = colorSchemesMap;
     if (defaultSchemeVal) {
       // default color scheme has to come before other color schemes
@@ -86,7 +86,7 @@ function prepareCssVars(theme, {
         ...css
       }) || `[${theme.attribute || 'data-color-scheme'}="${colorScheme}"]`, css);
     }
-    Object.entries(rest).forEach(([key, {
+    Object.entries(other).forEach(([key, {
       css
     }]) => {
       insertStyleSheet(getSelector?.(key, {

package/cssVars/useCurrentColorScheme.js

@@ -1,7 +1,7 @@
 'use client';
 
 import * as React from 'react';
-import { DEFAULT_MODE_STORAGE_KEY, DEFAULT_COLOR_SCHEME_STORAGE_KEY } from './getInitColorSchemeScript';
+import { DEFAULT_MODE_STORAGE_KEY, DEFAULT_COLOR_SCHEME_STORAGE_KEY } from '../InitColorSchemeScript/InitColorSchemeScript';
 export function getSystemMode(mode) {
   if (typeof window !== 'undefined' && mode === 'system') {
     const mql = window.matchMedia('(prefers-color-scheme: dark)');

package/index.js

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