@mui/system 6.0.0-alpha.10 → 6.0.0-alpha.11

package/CHANGELOG.md

@@ -1,5 +1,81 @@
 # [Versions](https://mui.com/versions/)
 
+## v6.0.0-alpha.11
+
+<!-- generated comparing v6.0.0-alpha.10..next -->
+
+_Jun 11, 2024_
+
+A big thanks to the 18 contributors who made this release possible.
+
+### `@mui/material@6.0.0-alpha.11`
+
+- &#8203;<!-- 38 -->[Autocomplete] Shouldn't resize when hovering (#42452) @ZeeshanTamboli
+- &#8203;<!-- 37 -->[Chip] Fix focus issue related with the Escape event (#41578) @shrilsharma
+- &#8203;<!-- 12 -->[Grid] Fix support for CSS variables (#42574) @oliviertassinari
+- &#8203;<!-- 11 -->[InputBase] Use `globalCss` for Pigment integration (#42431) @siriwatknp
+- &#8203;<!-- 10 -->Change React.ReactElement type from `any` to `unknown` (#42473) @sai6855
+- &#8203;<!-- 09 -->Integrate `extendSxProp` adapter (#42543) @siriwatknp
+- &#8203;<!-- 08 -->[Tab] Fix applying `iconWrapper` styles from theme and update its description (#42549) @sai6855
+- &#8203;<!-- 08 -->[pigment-css] Add `stringifyTheme` for Pigment CSS integration (#42476) @siriwatknp
+
+### `@mui/system@6.0.0-alpha.11`
+
+- &#8203;<!-- 11 -->[Grid] Remove `disableEqualOverflow` by using `gap` (#42526) @DiegoAndai
+- &#8203;<!-- 07 -->[useMediaQuery] Drop Safari < 14 support (#42464) @aarongarciah
+
+### `@mui/utils@6.0.0-alpha.11`
+
+- &#8203;<!-- 04 -->Allow passing `NaN` as `defaultValue` to `useControlled` (#41559) @iammminzzy
+
+### `@mui/codemod@6.0.0-alpha.11`
+
+- &#8203;<!-- 39 -->Improve styled and sx prop transformation (#42598) @siriwatknp
+- &#8203;<!-- 36 -->Support more cases for sx-prop transformation (#42527) @siriwatknp
+
+### `@mui/private-theming@6.0.0-alpha.11`
+
+- &#8203;<!-- 09 -->Fix issues reported by react compiler in `mui-private-theming` components (#42619) @sai6855
+
+### Docs
+
+- &#8203;<!-- 31 -->Add `theme.applyStyles` and migrate docs (#42498) @siriwatknp
+- &#8203;<!-- 29 -->Fix dashboard template console error (#42594) @oliviertassinari
+- &#8203;<!-- 28 -->Migrate system props to `sx` prop (#42475) @siriwatknp
+- &#8203;<!-- 27 -->[material-ui]Fix duplicated sentence (#42521) @alexfauquette
+- &#8203;<!-- 22 -->[Grid] Fix docs spacing (#42573) @oliviertassinari
+- &#8203;<!-- 21 -->[joy-ui] Add Next.js App Router instructions on how to prevent flickering (#42514) @devnyxie
+- &#8203;<!-- 20 -->[joy-ui] Fix HTML tag without preformatting (#42525) @jacobmoshipco
+- &#8203;<!-- 19 -->[material-ui] Add docs for complementary stepper components (#41900) @anle9650
+- &#8203;<!-- 18 -->[material-ui] Fix typo on Sign-in/Sign-up templates (#42605) @zanivan
+- &#8203;<!-- 17 -->[material-ui] Add container queries docs (#42434) @siriwatknp
+- &#8203;<!-- 16 -->[material-ui] Fix ESLint error in Stepper demo (#42559) @aarongarciah
+- &#8203;<!-- 15 -->[material-ui] Shorten useMediaQuery subheading (#42561) @aarongarciah
+- &#8203;<!-- 14 -->[material-ui] Add a Refine example project (#42461) @necatiozmen
+
+### Core
+
+- &#8203;<!-- 39 -->[website] Move the `React Engineer - X` role to future roles (#42532) @DanailH
+- &#8203;<!-- 35 -->[core] Allow `for..of` loops (#42600) @michaldudak
+- &#8203;<!-- 34 -->[core] Add comment about Object.js @oliviertassinari
+- &#8203;<!-- 33 -->[core] Disable eslint-plugin-react-compiler for Base (#42563) @aarongarciah
+- &#8203;<!-- 33 -->[core] Group Pigment CSS dependencies (#42174) @siriwatknp
+- &#8203;<!-- 32 -->[core] Configure eslint-plugin-react-compiler (#42555) @aarongarciah
+- &#8203;<!-- 31 -->[core] Skip charts animation for visual regression test (#42530) @alexfauquette
+- &#8203;<!-- 26 -->[docs-infra] Simplify click header (#42593) @oliviertassinari
+- &#8203;<!-- 25 -->[docs-infra] Add configurable jsdoc host variable (#42472) @tonygravell
+- &#8203;<!-- 25 -->[docs-infra] Add the Base UI logo with copy functionality (#42446) @danilo-leal
+- &#8203;<!-- 24 -->[docs-infra] Prevent link anchor when selecting text (#41994) @alexfauquette
+- &#8203;<!-- 23 -->[docs-infra] Add the Base UI logo with copy functionality (#42446) @danilo-leal
+- &#8203;<!-- 13 -->[examples] Remove Pigment CSS examples (#42471) @sai6855
+- &#8203;<!-- 06 -->[test] Restore pnpm tc command (#42572) @oliviertassinari
+- &#8203;<!-- 05 -->[test] Restore testing internal packages (#42519) @michaldudak
+- &#8203;<!-- 03 -->[website] Close Developer Advocate / Content Engineer role @oliviertassinari
+- &#8203;<!-- 02 -->[website] Remove blank line @oliviertassinari
+- &#8203;<!-- 01 -->[website] Fix mobile layout shift @oliviertassinari
+
+All contributors of this release in alphabetical order: @aarongarciah, @alexfauquette, @anle9650, @DanailH, @danilo-leal, @devnyxie, @DiegoAndai, @iammminzzy, @jacobmoshipco, @michaldudak, @necatiozmen, @oliviertassinari, @sai6855, @shrilsharma, @siriwatknp, @tonygravell, @zanivan, @ZeeshanTamboli
+
 ## v6.0.0-alpha.10
 
 <!-- generated comparing v6.0.0-alpha.9..next -->

package/Unstable_Grid/Grid.js

@@ -45,10 +45,6 @@ process.env.NODE_ENV !== "production" ? Grid.propTypes /* remove-proptypes */ =
    * @default 'row'
    */
   direction: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row']), PropTypes.arrayOf(PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row'])), PropTypes.object]),
-  /**
-   * If `true`, the negative margin and padding are apply only to the top and left sides of the grid.
-   */
-  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).

package/Unstable_Grid/GridProps.d.ts

@@ -123,10 +123,6 @@ export interface GridBaseProps extends Breakpoints {
      * @default 'row'
      */
     direction?: ResponsiveStyleValue<GridDirection>;
-    /**
-     * If `true`, the negative margin and padding are apply only to the top and left sides of the grid.
-     */
-    disableEqualOverflow?: boolean;
     /**
      * @internal
      * The level of the grid starts from `0`

package/Unstable_Grid/createGrid.js

@@ -33,10 +33,6 @@ 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,
@@ -55,7 +51,6 @@ export default function createGrid(options = {}) {
     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,
@@ -67,15 +62,9 @@ export default function createGrid(options = {}) {
       spacing: spacingProp = 0,
       rowSpacing: rowSpacingProp = spacingProp,
       columnSpacing: columnSpacingProp = spacingProp,
-      disableEqualOverflow: themeDisableEqualOverflow,
       unstable_level: level = 0,
       ...rest
     } = 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 = {};
@@ -104,13 +93,10 @@ export default function createGrid(options = {}) {
       rowSpacing,
       columnSpacing,
       gridSize,
-      gridOffset,
-      disableEqualOverflow: disableEqualOverflow ?? overflow ?? false,
-      // use context value if exists.
-      parentDisableEqualOverflow: overflow // for nested grid
+      gridOffset
     };
     const classes = useUtilityClasses(ownerState, theme);
-    let result = /*#__PURE__*/_jsx(GridRoot, {
+    return /*#__PURE__*/_jsx(GridRoot, {
       ref: ref,
       as: component,
       ownerState: ownerState,
@@ -125,16 +111,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,7 +120,6 @@ 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]),

package/Unstable_Grid/gridGenerator.d.ts

@@ -7,9 +7,7 @@ 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) => {};

package/Unstable_Grid/gridGenerator.js

@@ -31,7 +31,7 @@ export const generateGridSizeStyles = ({
   theme,
   ownerState
 }) => {
-  const getSelfSpacing = createGetSelfSpacing(ownerState);
+  const getParentSpacing = createGetParentSpacing(ownerState);
   const styles = {};
   traverseBreakpoints(theme.breakpoints, ownerState.gridSize, (appendStyle, value) => {
     let style = {};
@@ -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,6 +66,7 @@ export const generateGridOffsetStyles = ({
   theme,
   ownerState
 }) => {
+  const getParentSpacing = createGetParentSpacing(ownerState);
   const styles = {};
   traverseBreakpoints(theme.breakpoints, ownerState.gridOffset, (appendStyle, value) => {
     let 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,16 +171,7 @@ 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')}`
     })
   };
 };

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

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

package/modern/Unstable_Grid/Grid.js

@@ -45,10 +45,6 @@ process.env.NODE_ENV !== "production" ? Grid.propTypes /* remove-proptypes */ =
    * @default 'row'
    */
   direction: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row']), PropTypes.arrayOf(PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row'])), PropTypes.object]),
-  /**
-   * If `true`, the negative margin and padding are apply only to the top and left sides of the grid.
-   */
-  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).

package/modern/Unstable_Grid/createGrid.js

@@ -33,10 +33,6 @@ 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,
@@ -55,7 +51,6 @@ export default function createGrid(options = {}) {
     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,
@@ -67,15 +62,9 @@ export default function createGrid(options = {}) {
       spacing: spacingProp = 0,
       rowSpacing: rowSpacingProp = spacingProp,
       columnSpacing: columnSpacingProp = spacingProp,
-      disableEqualOverflow: themeDisableEqualOverflow,
       unstable_level: level = 0,
       ...rest
     } = 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 = {};
@@ -104,13 +93,10 @@ export default function createGrid(options = {}) {
       rowSpacing,
       columnSpacing,
       gridSize,
-      gridOffset,
-      disableEqualOverflow: disableEqualOverflow ?? overflow ?? false,
-      // use context value if exists.
-      parentDisableEqualOverflow: overflow // for nested grid
+      gridOffset
     };
     const classes = useUtilityClasses(ownerState, theme);
-    let result = /*#__PURE__*/_jsx(GridRoot, {
+    return /*#__PURE__*/_jsx(GridRoot, {
       ref: ref,
       as: component,
       ownerState: ownerState,
@@ -125,16 +111,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,7 +120,6 @@ 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]),

package/modern/Unstable_Grid/gridGenerator.js

@@ -31,7 +31,7 @@ export const generateGridSizeStyles = ({
   theme,
   ownerState
 }) => {
-  const getSelfSpacing = createGetSelfSpacing(ownerState);
+  const getParentSpacing = createGetParentSpacing(ownerState);
   const styles = {};
   traverseBreakpoints(theme.breakpoints, ownerState.gridSize, (appendStyle, value) => {
     let style = {};
@@ -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,6 +66,7 @@ export const generateGridOffsetStyles = ({
   theme,
   ownerState
 }) => {
+  const getParentSpacing = createGetParentSpacing(ownerState);
   const styles = {};
   traverseBreakpoints(theme.breakpoints, ownerState.gridOffset, (appendStyle, value) => {
     let 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,16 +171,7 @@ 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')}`
     })
   };
 };

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

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

package/modern/useMediaQuery/useMediaQuery.js

@@ -31,25 +31,17 @@ function useMediaQueryOld(query, defaultMatches, matchMedia, ssrMatchMedia, noSs
     return defaultMatches;
   });
   useEnhancedEffect(() => {
-    let active = true;
     if (!matchMedia) {
       return undefined;
     }
     const queryList = matchMedia(query);
     const updateMatch = () => {
-      // Workaround Safari wrong implementation of matchMedia
-      // TODO can we remove it?
-      // https://github.com/mui/material-ui/pull/17315#issuecomment-528286677
-      if (active) {
-        setMatch(queryList.matches);
-      }
+      setMatch(queryList.matches);
     };
     updateMatch();
-    // TODO: Use `addEventListener` once support for Safari < 14 is dropped
-    queryList.addListener(updateMatch);
+    queryList.addEventListener('change', updateMatch);
     return () => {
-      active = false;
-      queryList.removeListener(updateMatch);
+      queryList.removeEventListener('change', updateMatch);
     };
   }, [query, matchMedia]);
   return match;
@@ -77,10 +69,9 @@ function useMediaQueryNew(query, defaultMatches, matchMedia, ssrMatchMedia, noSs
     }
     const mediaQueryList = matchMedia(query);
     return [() => mediaQueryList.matches, notify => {
-      // TODO: Use `addEventListener` once support for Safari < 14 is dropped
-      mediaQueryList.addListener(notify);
+      mediaQueryList.addEventListener('change', notify);
       return () => {
-        mediaQueryList.removeListener(notify);
+        mediaQueryList.removeEventListener('change', notify);
       };
     }];
   }, [getDefaultSnapshot, matchMedia, query]);

package/node/Unstable_Grid/Grid.js

@@ -51,10 +51,6 @@ process.env.NODE_ENV !== "production" ? Grid.propTypes /* remove-proptypes */ =
    * @default 'row'
    */
   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 `true`, the negative margin and padding are apply only to the top and left sides of the grid.
-   */
-  disableEqualOverflow: _propTypes.default.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).

package/node/Unstable_Grid/createGrid.js

@@ -42,10 +42,6 @@ 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,
@@ -61,11 +57,10 @@ function createGrid(options = {}) {
   };
   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, _ref3, _disableEqualOverflow;
+    var _inProps$columns, _inProps$spacing, _ref, _inProps$rowSpacing, _ref2, _inProps$columnSpacin;
     const theme = (0, _useTheme.default)();
     const themeProps = useThemeProps(inProps);
     const props = (0, _styleFunctionSx.extendSxProp)(themeProps); // `color` type conflicts with html color attribute.
-    const overflow = React.useContext(GridOverflowContext);
     const {
       className,
       children,
@@ -77,15 +72,9 @@ function createGrid(options = {}) {
       spacing: spacingProp = 0,
       rowSpacing: rowSpacingProp = spacingProp,
       columnSpacing: columnSpacingProp = spacingProp,
-      disableEqualOverflow: themeDisableEqualOverflow,
       unstable_level: level = 0,
       ...rest
     } = 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 = {};
@@ -114,13 +103,10 @@ function createGrid(options = {}) {
       rowSpacing,
       columnSpacing,
       gridSize,
-      gridOffset,
-      disableEqualOverflow: (_ref3 = (_disableEqualOverflow = disableEqualOverflow) != null ? _disableEqualOverflow : overflow) != null ? _ref3 : false,
-      // use context value if exists.
-      parentDisableEqualOverflow: overflow // for nested grid
+      gridOffset
     };
     const classes = useUtilityClasses(ownerState, theme);
-    let result = /*#__PURE__*/(0, _jsxRuntime.jsx)(GridRoot, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(GridRoot, {
       ref: ref,
       as: component,
       ownerState: ownerState,
@@ -136,16 +122,6 @@ function createGrid(options = {}) {
         return child;
       })
     });
-    if (disableEqualOverflow !== undefined && disableEqualOverflow !== (overflow != null ? 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__*/(0, _jsxRuntime.jsx)(GridOverflowContext.Provider, {
-        value: disableEqualOverflow,
-        children: result
-      });
-    }
-    return result;
   });
   process.env.NODE_ENV !== "production" ? Grid.propTypes /* remove-proptypes */ = {
     children: _propTypes.default.node,
@@ -155,7 +131,6 @@ 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]),
-    disableEqualOverflow: _propTypes.default.bool,
     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]),

package/node/Unstable_Grid/gridGenerator.js

@@ -37,7 +37,7 @@ const generateGridSizeStyles = ({
   theme,
   ownerState
 }) => {
-  const getSelfSpacing = createGetSelfSpacing(ownerState);
+  const getParentSpacing = createGetParentSpacing(ownerState);
   const styles = {};
   (0, _traverseBreakpoints.traverseBreakpoints)(theme.breakpoints, ownerState.gridSize, (appendStyle, value) => {
     let style = {};
@@ -61,7 +61,7 @@ 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);
@@ -73,6 +73,7 @@ const generateGridOffsetStyles = ({
   theme,
   ownerState
 }) => {
+  const getParentSpacing = createGetParentSpacing(ownerState);
   const styles = {};
   (0, _traverseBreakpoints.traverseBreakpoints)(theme.breakpoints, ownerState.gridOffset, (appendStyle, value) => {
     let style = {};
@@ -83,7 +84,7 @@ 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);
@@ -175,7 +176,6 @@ const generateGridStyles = ({
   ownerState
 }) => {
   const getSelfSpacing = createGetSelfSpacing(ownerState);
-  const getParentSpacing = createGetParentSpacing(ownerState);
   return {
     minWidth: 0,
     boxSizing: 'border-box',
@@ -185,16 +185,7 @@ 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')}`
     })
   };
 };

package/node/cssContainerQueries/cssContainerQueries.js

@@ -37,10 +37,10 @@ function sortContainerQueries(theme, css) {
   });
 }
 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/));
 }
 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>\`.
@@ -49,7 +49,7 @@ For example, \`@sm\` or \`@600\` or \`@40rem/sidebar\`.` : (0, _formatMuiErrorMe
     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);
 }
 function cssContainerQueries(themeInput) {
@@ -63,7 +63,7 @@ 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/node/index.js

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

package/node/useMediaQuery/useMediaQuery.js

@@ -38,25 +38,17 @@ function useMediaQueryOld(query, defaultMatches, matchMedia, ssrMatchMedia, noSs
     return defaultMatches;
   });
   (0, _useEnhancedEffect.default)(() => {
-    let active = true;
     if (!matchMedia) {
       return undefined;
     }
     const queryList = matchMedia(query);
     const updateMatch = () => {
-      // Workaround Safari wrong implementation of matchMedia
-      // TODO can we remove it?
-      // https://github.com/mui/material-ui/pull/17315#issuecomment-528286677
-      if (active) {
-        setMatch(queryList.matches);
-      }
+      setMatch(queryList.matches);
     };
     updateMatch();
-    // TODO: Use `addEventListener` once support for Safari < 14 is dropped
-    queryList.addListener(updateMatch);
+    queryList.addEventListener('change', updateMatch);
     return () => {
-      active = false;
-      queryList.removeListener(updateMatch);
+      queryList.removeEventListener('change', updateMatch);
     };
   }, [query, matchMedia]);
   return match;
@@ -84,10 +76,9 @@ function useMediaQueryNew(query, defaultMatches, matchMedia, ssrMatchMedia, noSs
     }
     const mediaQueryList = matchMedia(query);
     return [() => mediaQueryList.matches, notify => {
-      // TODO: Use `addEventListener` once support for Safari < 14 is dropped
-      mediaQueryList.addListener(notify);
+      mediaQueryList.addEventListener('change', notify);
       return () => {
-        mediaQueryList.removeListener(notify);
+        mediaQueryList.removeEventListener('change', notify);
       };
     }];
   }, [getDefaultSnapshot, matchMedia, query]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/system",
-  "version": "6.0.0-alpha.10",
+  "version": "6.0.0-alpha.11",
   "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.",
@@ -26,14 +26,14 @@
     "url": "https://opencollective.com/mui-org"
   },
   "dependencies": {
-    "@babel/runtime": "^7.24.6",
+    "@babel/runtime": "^7.24.7",
     "clsx": "^2.1.1",
     "csstype": "^3.1.3",
     "prop-types": "^15.8.1",
-    "@mui/types": "^7.2.14",
-    "@mui/utils": "^6.0.0-alpha.9",
-    "@mui/styled-engine": "^6.0.0-alpha.9",
-    "@mui/private-theming": "^6.0.0-alpha.9"
+    "@mui/private-theming": "^6.0.0-alpha.11",
+    "@mui/styled-engine": "^6.0.0-alpha.11",
+    "@mui/utils": "^6.0.0-alpha.11",
+    "@mui/types": "^7.2.14"
   },
   "peerDependencies": {
     "@emotion/react": "^11.5.0",

package/useMediaQuery/useMediaQuery.js

@@ -31,25 +31,17 @@ function useMediaQueryOld(query, defaultMatches, matchMedia, ssrMatchMedia, noSs
     return defaultMatches;
   });
   useEnhancedEffect(() => {
-    let active = true;
     if (!matchMedia) {
       return undefined;
     }
     const queryList = matchMedia(query);
     const updateMatch = () => {
-      // Workaround Safari wrong implementation of matchMedia
-      // TODO can we remove it?
-      // https://github.com/mui/material-ui/pull/17315#issuecomment-528286677
-      if (active) {
-        setMatch(queryList.matches);
-      }
+      setMatch(queryList.matches);
     };
     updateMatch();
-    // TODO: Use `addEventListener` once support for Safari < 14 is dropped
-    queryList.addListener(updateMatch);
+    queryList.addEventListener('change', updateMatch);
     return () => {
-      active = false;
-      queryList.removeListener(updateMatch);
+      queryList.removeEventListener('change', updateMatch);
     };
   }, [query, matchMedia]);
   return match;
@@ -77,10 +69,9 @@ function useMediaQueryNew(query, defaultMatches, matchMedia, ssrMatchMedia, noSs
     }
     const mediaQueryList = matchMedia(query);
     return [() => mediaQueryList.matches, notify => {
-      // TODO: Use `addEventListener` once support for Safari < 14 is dropped
-      mediaQueryList.addListener(notify);
+      mediaQueryList.addEventListener('change', notify);
       return () => {
-        mediaQueryList.removeListener(notify);
+        mediaQueryList.removeEventListener('change', notify);
       };
     }];
   }, [getDefaultSnapshot, matchMedia, query]);