@mui/system 9.0.0-alpha.4 → 9.0.0-beta.0

package/Box/Box.d.mts

@@ -21,7 +21,7 @@ export type SimpleSystemKeys = keyof PropsFor<ComposedStyleFunction<[typeof bord
 // This is needed as these are used as keys inside AllSystemCSSProperties
 type StandardSystemKeys = Extract<SimpleSystemKeys, keyof AllSystemCSSProperties>;
 export type SystemProps<Theme extends object = {}> = { [K in StandardSystemKeys]?: ResponsiveStyleValue<AllSystemCSSProperties[K]> | ((theme: Theme) => ResponsiveStyleValue<AllSystemCSSProperties[K]>) };
-export interface BoxOwnProps<Theme extends object = SystemTheme> extends SystemProps<Theme> {
+export interface BoxOwnProps<Theme extends object = SystemTheme> {
   children?: React.ReactNode;
   ref?: React.Ref<unknown> | undefined;
   /**

package/Box/Box.d.ts

@@ -21,7 +21,7 @@ export type SimpleSystemKeys = keyof PropsFor<ComposedStyleFunction<[typeof bord
 // This is needed as these are used as keys inside AllSystemCSSProperties
 type StandardSystemKeys = Extract<SimpleSystemKeys, keyof AllSystemCSSProperties>;
 export type SystemProps<Theme extends object = {}> = { [K in StandardSystemKeys]?: ResponsiveStyleValue<AllSystemCSSProperties[K]> | ((theme: Theme) => ResponsiveStyleValue<AllSystemCSSProperties[K]>) };
-export interface BoxOwnProps<Theme extends object = SystemTheme> extends SystemProps<Theme> {
+export interface BoxOwnProps<Theme extends object = SystemTheme> {
   children?: React.ReactNode;
   ref?: React.Ref<unknown> | undefined;
   /**

package/CHANGELOG.md

@@ -1,5 +1,62 @@
 # [Versions](https://mui.com/versions/)
 
+## 9.0.0-beta.0
+
+<!-- generated comparing v9.0.0-alpha.4..master -->
+
+_Mar 25, 2026_
+
+A big thanks to the 8 contributors who made this release possible.
+
+### `@mui/material@9.0.0-beta.0`
+
+#### Breaking Changes
+
+- [linear-progress] Remove deprecated CSS classes (#48068) @mj12albert
+- [list-item, list-item-text] Remove deprecated props (#48042) @siriwatknp
+- [button-group] Remove deprecated classes (#48043) @siriwatknp
+- [card] Remove deprecated CardHeader props (#47995) @silviuaavram
+- [checkbox][radio][switch] Remove deprecated inputProps and inputRef (#48059) @siriwatknp
+- [chip] Remove deprecated classes (#48046) @silviuaavram
+- [dialog][modal][drawer][swipeabledrawer] Remove deprecated props and classes (#48039) @silviuaavram
+- [divider] Remove deprecated CSS classes (#48075) @siriwatknp
+- [drawer] Remove deprecated CSS classes (#48077) @siriwatknp
+- [image-list-item-bar] Remove deprecated CSS classes (#48064) @siriwatknp
+- [inputs] Remove deprecated props & classes (#48071) @mj12albert
+- [material-ui] Remove unnecessary overridesResolvers from styled components (#48082) @ZeeshanTamboli
+- [material-ui][system] Remove deprecated system props from Box, Stack, Typography (#48072) @siriwatknp
+- [pagination-item] Remove deprecated CSS classes (#48076) @siriwatknp
+- [pagination-item] Remove deprecated props (#48038) @siriwatknp
+- [rating] Remove deprecated IconContainerComponent (#48019) @siriwatknp
+- [select] Remove deprecated CSS classes (#48065) @mj12albert
+- [slider] Remove deprecated CSS classes (#48074) @siriwatknp
+- [step-connector][step-content][step-label] Remove deprecated props and classes (#48058) @siriwatknp
+- [tabs][tab] Remove deprecated CSS classes (#48078) @siriwatknp
+- [table-pagination][table-sort-label] Remove deprecated props and classes (#48060) @siriwatknp
+- [toggle-button-group] Remove deprecated classes (#48061) @siriwatknp
+
+#### Changes
+
+- [system] Improve performance when using sx prop (#44254) @romgrk
+
+### `@mui/codemod@9.0.0-beta.0`
+
+- [codemod] Add missing codemod links in upgrade guide (#48069) @silviuaavram
+
+### Docs
+
+- Mention all breaking changes in changelog (#48091) @silviuaavram
+- Fix link to upgrade-to-v9 docs in release CHANGELOG (#48081) @ZeeshanTamboli
+
+### Core
+
+- Update browserslistrc (#48085) @silviuaavram
+- [code-infra] Prevent major version updates of bundler/framework packages in bundling fixtures (#48062) @Copilot
+- [code-infra][icons-material] Avoid material utils barrel in createSvgIcon (#48029) @anchmelev
+- [docs-infra] Migrate more leaf components to mui-docs (#48018) @brijeshb42
+
+All contributors of this release in alphabetical order: @anchmelev, @brijeshb42, @Copilot, @mj12albert, @romgrk, @silviuaavram, @siriwatknp, @ZeeshanTamboli
+
 ## 9.0.0-alpha.4
 
 <!-- generated comparing v9.0.0-alpha.3..master -->
@@ -118,7 +175,7 @@ A big thanks to the 11 contributors who made this release possible.
 - [tablepagination] Format pagination numbers according to locale (#47803) @siriwatknp
 - [textfield] Use non-native label for `<TextField select/>` (#47958) @mj12albert
 
-Check out the [v9 upgrade guide](https://mui.com/material-ui/migration/upgrade-to-v9/).
+Check out the [v9 upgrade guide](https://next.mui.com/material-ui/migration/upgrade-to-v9/).
 
 #### Changes
 
@@ -167,11 +224,16 @@ A big thanks to the 10 contributors who made this release possible. Here are som
 
 ### `@mui/material@9.0.0-alpha.3`
 
+#### Breaking Changes
+
+- [stepper][menulist][tabs] Improve accessibility (#47687) @silviuaavram
+
+#### Changes
+
 - [autocomplete] Add `root` slot (#47852) @GerardasB
 - [autocomplete] Fix popup reopening on window focus regain with openOnFocus (#47790) @aman44444
 - [autocomplete] Support full slots for clearIndicator and popupIndicator (#47891) @silviuaavram
 - [material-ui] Partially revert "[material-ui] Clean up duplicated CSS rules (#47838)" (#47927) @sai6855
-- [stepper][menulist][tabs] Improve accessibility (#47687) @silviuaavram
 
 ### Docs
 
@@ -229,16 +291,21 @@ A big thanks to the 13 contributors who made this release possible. Here are som
 
 ### @mui/material@9.0.0-alpha.1
 
+#### Breaking Changes
+
 - [Autocomplete] Prevents Autocomplete menu from opening on right click (#47797) @silviuaavram
 - [Backdrop] Remove aria-hidden by default (#47798) @silviuaavram
 - [ButtonBase] Ensure that onClick propagates when non-native button is clicked (#47800) @silviuaavram
 - [Dialog][Modal] Remove `disableEscapeKeyDown` prop (#47695) @silviuaavram
 - [Grid] Remove system props support (#47846) @siriwatknp
-- [TableCell][theme] Apply `alpha` before color mixing to border bottom color when nativeColor + cssVariables is used (#47762) @ZeeshanTamboli
 - [theme] Remove MuiTouchRipple from theme component types (#47849) @siriwatknp
-- [Tooltip] Fix error is thrown when wrapping an input which is disabled while focused (#47684) @ZeeshanTamboli
 - [useAutocomplete] Improve isOptionEqualToValue value argument type (#47801) @silviuaavram
 
+#### Changes
+
+- [TableCell][theme] Apply `alpha` before color mixing to border bottom color when nativeColor + cssVariables is used (#47762) @ZeeshanTamboli
+- [Tooltip] Fix error is thrown when wrapping an input which is disabled while focused (#47684) @ZeeshanTamboli
+
 ### Docs
 
 - [docs] Add updated community theme resource (#47847) @PeterTYLiu

package/Stack/StackProps.d.mts

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { OverrideProps } from '@mui/types';
 import { ResponsiveStyleValue, SxProps } from "../styleFunctionSx/index.mjs";
-import { SystemProps } from "../Box/index.mjs";
 import { Theme } from "../createTheme/index.mjs";
 export interface StackBaseProps {
   /**
@@ -40,7 +39,7 @@ export interface StackTypeMap<AdditionalProps = {}, DefaultComponent extends Rea
      * The system prop, which allows defining system overrides as well as additional CSS styles.
      */
     sx?: SxProps<Theme> | undefined;
-  } & SystemProps<Theme>;
+  };
   defaultComponent: DefaultComponent;
 }
 export type StackProps<RootComponent extends React.ElementType = StackTypeMap['defaultComponent'], AdditionalProps = {

package/Stack/StackProps.d.ts

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { OverrideProps } from '@mui/types';
 import { ResponsiveStyleValue, SxProps } from "../styleFunctionSx/index.js";
-import { SystemProps } from "../Box/index.js";
 import { Theme } from "../createTheme/index.js";
 export interface StackBaseProps {
   /**
@@ -40,7 +39,7 @@ export interface StackTypeMap<AdditionalProps = {}, DefaultComponent extends Rea
      * The system prop, which allows defining system overrides as well as additional CSS styles.
      */
     sx?: SxProps<Theme> | undefined;
-  } & SystemProps<Theme>;
+  };
   defaultComponent: DefaultComponent;
 }
 export type StackProps<RootComponent extends React.ElementType = StackTypeMap['defaultComponent'], AdditionalProps = {

package/Stack/createStack.js

@@ -16,7 +16,6 @@ var _generateUtilityClass = _interopRequireDefault(require("@mui/utils/generateU
 var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
 var _styled = _interopRequireDefault(require("../styled"));
 var _useThemeProps = _interopRequireDefault(require("../useThemeProps"));
-var _styleFunctionSx = require("../styleFunctionSx");
 var _createTheme = _interopRequireDefault(require("../createTheme"));
 var _breakpoints = require("../breakpoints");
 var _spacing = require("../spacing");
@@ -144,7 +143,6 @@ function createStack(options = {}) {
   const StackRoot = createStyledComponent(style);
   const Stack = /*#__PURE__*/React.forwardRef(function Grid(inProps, ref) {
     const themeProps = useThemeProps(inProps);
-    const props = (0, _styleFunctionSx.extendSxProp)(themeProps); // `color` type conflicts with html color attribute.
     const {
       component = 'div',
       direction = 'column',
@@ -154,7 +152,7 @@ function createStack(options = {}) {
       className,
       useFlexGap = false,
       ...other
-    } = props;
+    } = themeProps;
     const ownerState = {
       direction,
       spacing,

package/Stack/createStack.mjs

@@ -8,7 +8,6 @@ import generateUtilityClass from '@mui/utils/generateUtilityClass';
 import composeClasses from '@mui/utils/composeClasses';
 import systemStyled from "../styled/index.mjs";
 import useThemePropsSystem from "../useThemeProps/index.mjs";
-import { extendSxProp } from "../styleFunctionSx/index.mjs";
 import createTheme from "../createTheme/index.mjs";
 import { handleBreakpoints, mergeBreakpointsInOrder, resolveBreakpointValues } from "../breakpoints/index.mjs";
 import { createUnarySpacing, getValue } from "../spacing/index.mjs";
@@ -135,7 +134,6 @@ export default function createStack(options = {}) {
   const StackRoot = createStyledComponent(style);
   const Stack = /*#__PURE__*/React.forwardRef(function Grid(inProps, ref) {
     const themeProps = useThemeProps(inProps);
-    const props = extendSxProp(themeProps); // `color` type conflicts with html color attribute.
     const {
       component = 'div',
       direction = 'column',
@@ -145,7 +143,7 @@ export default function createStack(options = {}) {
       className,
       useFlexGap = false,
       ...other
-    } = props;
+    } = themeProps;
     const ownerState = {
       direction,
       spacing,

package/breakpoints/breakpoints.d.mts

@@ -1,8 +1,9 @@
 import { CSSObject } from '@mui/styled-engine';
 import { Breakpoints } from "../createBreakpoints/createBreakpoints.mjs";
-import type { Breakpoint } from "../createTheme/index.mjs";
+import type { Breakpoint, Theme } from "../createTheme/index.mjs";
 import { ResponsiveStyleValue } from "../styleFunctionSx/index.mjs";
 import { StyleFunction } from "../style/index.mjs";
+export const DEFAULT_BREAKPOINTS: Breakpoints;
 export interface ResolveBreakpointValuesOptions<T> {
   values: ResponsiveStyleValue<T>;
   breakpoints?: Breakpoints['values'] | undefined;
@@ -10,7 +11,9 @@ export interface ResolveBreakpointValuesOptions<T> {
 }
 export function resolveBreakpointValues<T>(options: ResolveBreakpointValuesOptions<T>): Record<string, T>;
 export function mergeBreakpointsInOrder(breakpoints: Breakpoints, styles: CSSObject[]): CSSObject;
+export function iterateBreakpoints(target: any, theme: Theme, propValue: any, callback: (mediaKey: string | undefined, value: any, initialKey?: string) => any): any;
 export function handleBreakpoints<Props>(props: Props, propValue: any, styleFromPropValue: (value: any, breakpoint?: Breakpoint) => any): any;
+export function hasBreakpoint(breakpoints: Breakpoints, value: any): boolean;
 type DefaultBreakPoints = 'xs' | 'sm' | 'md' | 'lg' | 'xl';
 
 /**

package/breakpoints/breakpoints.d.ts

@@ -1,8 +1,9 @@
 import { CSSObject } from '@mui/styled-engine';
 import { Breakpoints } from "../createBreakpoints/createBreakpoints.js";
-import type { Breakpoint } from "../createTheme/index.js";
+import type { Breakpoint, Theme } from "../createTheme/index.js";
 import { ResponsiveStyleValue } from "../styleFunctionSx/index.js";
 import { StyleFunction } from "../style/index.js";
+export const DEFAULT_BREAKPOINTS: Breakpoints;
 export interface ResolveBreakpointValuesOptions<T> {
   values: ResponsiveStyleValue<T>;
   breakpoints?: Breakpoints['values'] | undefined;
@@ -10,7 +11,9 @@ export interface ResolveBreakpointValuesOptions<T> {
 }
 export function resolveBreakpointValues<T>(options: ResolveBreakpointValuesOptions<T>): Record<string, T>;
 export function mergeBreakpointsInOrder(breakpoints: Breakpoints, styles: CSSObject[]): CSSObject;
+export function iterateBreakpoints(target: any, theme: Theme, propValue: any, callback: (mediaKey: string | undefined, value: any, initialKey?: string) => any): any;
 export function handleBreakpoints<Props>(props: Props, propValue: any, styleFromPropValue: (value: any, breakpoint?: Breakpoint) => any): any;
+export function hasBreakpoint(breakpoints: Breakpoints, value: any): boolean;
 type DefaultBreakPoints = 'xs' | 'sm' | 'md' | 'lg' | 'xl';
 
 /**

package/breakpoints/breakpoints.js

@@ -4,18 +4,26 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.DEFAULT_BREAKPOINTS = void 0;
 exports.computeBreakpointsBase = computeBreakpointsBase;
 exports.createEmptyBreakpointObject = createEmptyBreakpointObject;
 exports.default = void 0;
 exports.handleBreakpoints = handleBreakpoints;
+exports.hasBreakpoint = hasBreakpoint;
+exports.iterateBreakpoints = iterateBreakpoints;
 exports.mergeBreakpointsInOrder = mergeBreakpointsInOrder;
 exports.removeUnusedBreakpoints = removeUnusedBreakpoints;
 exports.resolveBreakpointValues = resolveBreakpointValues;
 exports.values = void 0;
 var _propTypes = _interopRequireDefault(require("prop-types"));
+var _isObjectEmpty = _interopRequireDefault(require("@mui/utils/isObjectEmpty"));
+var _fastDeepAssign = _interopRequireDefault(require("@mui/utils/fastDeepAssign"));
 var _deepmerge = _interopRequireDefault(require("@mui/utils/deepmerge"));
 var _merge = _interopRequireDefault(require("../merge"));
 var _cssContainerQueries = require("../cssContainerQueries");
+var _createBreakpoints = _interopRequireDefault(require("../createBreakpoints/createBreakpoints"));
+const EMPTY_THEME = {};
+
 // The breakpoint **start** at this value.
 // For instance with the first breakpoint xs: [xs, sm[.
 const values = exports.values = {
@@ -29,12 +37,9 @@ const values = exports.values = {
   // desktop
   xl: 1536 // large screen
 };
-const defaultBreakpoints = {
-  // Sorted ASC by size. That's important.
-  // It can't be configured as it's used statically for propTypes.
-  keys: ['xs', 'sm', 'md', 'lg', 'xl'],
-  up: key => `@media (min-width:${values[key]}px)`
-};
+const DEFAULT_BREAKPOINTS = exports.DEFAULT_BREAKPOINTS = (0, _createBreakpoints.default)({
+  values
+});
 const defaultContainerQueries = {
   containerQueries: containerName => ({
     up: key => {
@@ -47,44 +52,59 @@ const defaultContainerQueries = {
   })
 };
 function handleBreakpoints(props, propValue, styleFromPropValue) {
-  const theme = props.theme || {};
+  const result = {};
+  return iterateBreakpoints(result, props.theme, propValue, (mediaKey, value, initialKey) => {
+    const finalValue = styleFromPropValue(value, initialKey);
+    if (mediaKey) {
+      result[mediaKey] = finalValue;
+    } else {
+      (0, _fastDeepAssign.default)(result, finalValue);
+    }
+  });
+}
+function iterateBreakpoints(target, theme, propValue, callback) {
+  theme ?? (theme = EMPTY_THEME);
   if (Array.isArray(propValue)) {
-    const themeBreakpoints = theme.breakpoints || defaultBreakpoints;
-    return propValue.reduce((acc, item, index) => {
-      acc[themeBreakpoints.up(themeBreakpoints.keys[index])] = styleFromPropValue(propValue[index]);
-      return acc;
-    }, {});
+    const breakpoints = theme.breakpoints ?? DEFAULT_BREAKPOINTS;
+    for (let i = 0; i < propValue.length; i += 1) {
+      buildBreakpoint(target, breakpoints.up(breakpoints.keys[i]), propValue[i], undefined, callback);
+    }
+    return target;
   }
   if (typeof propValue === 'object') {
-    const themeBreakpoints = theme.breakpoints || defaultBreakpoints;
-    return Object.keys(propValue).reduce((acc, breakpoint) => {
-      if ((0, _cssContainerQueries.isCqShorthand)(themeBreakpoints.keys, breakpoint)) {
-        const containerKey = (0, _cssContainerQueries.getContainerQuery)(theme.containerQueries ? theme : defaultContainerQueries, breakpoint);
+    const breakpoints = theme.breakpoints ?? DEFAULT_BREAKPOINTS;
+    const breakpointValues = breakpoints.values ?? values;
+    for (const key in propValue) {
+      if ((0, _cssContainerQueries.isCqShorthand)(breakpoints.keys, key)) {
+        const containerKey = (0, _cssContainerQueries.getContainerQuery)(theme.containerQueries ? theme : defaultContainerQueries, key);
         if (containerKey) {
-          acc[containerKey] = styleFromPropValue(propValue[breakpoint], breakpoint);
+          buildBreakpoint(target, containerKey, propValue[key], key, callback);
         }
       }
-      // key is breakpoint
-      else if (Object.keys(themeBreakpoints.values || values).includes(breakpoint)) {
-        const mediaKey = themeBreakpoints.up(breakpoint);
-        acc[mediaKey] = styleFromPropValue(propValue[breakpoint], breakpoint);
+      // key is key
+      else if (key in breakpointValues) {
+        const mediaKey = breakpoints.up(key);
+        buildBreakpoint(target, mediaKey, propValue[key], key, callback);
       } else {
-        const cssKey = breakpoint;
-        acc[cssKey] = propValue[cssKey];
+        const cssKey = key;
+        target[cssKey] = propValue[cssKey];
       }
-      return acc;
-    }, {});
+    }
+    return target;
   }
-  const output = styleFromPropValue(propValue);
-  return output;
+  callback(undefined, propValue);
+  return target;
+}
+function buildBreakpoint(target, mediaKey, value, initialKey, callback) {
+  target[mediaKey] ?? (target[mediaKey] = {});
+  callback(mediaKey, value, initialKey);
 }
-function breakpoints(styleFunction) {
-  // false positive
+function setupBreakpoints(styleFunction) {
   // eslint-disable-next-line react/function-component-definition
   const newStyleFunction = props => {
     const theme = props.theme || {};
     const base = styleFunction(props);
-    const themeBreakpoints = theme.breakpoints || defaultBreakpoints;
+    const themeBreakpoints = theme.breakpoints || DEFAULT_BREAKPOINTS;
     const extended = themeBreakpoints.keys.reduce((acc, key) => {
       if (props[key]) {
         acc = acc || {};
@@ -108,28 +128,30 @@ function breakpoints(styleFunction) {
   newStyleFunction.filterProps = ['xs', 'sm', 'md', 'lg', 'xl', ...styleFunction.filterProps];
   return newStyleFunction;
 }
-function createEmptyBreakpointObject(breakpointsInput = {}) {
-  const breakpointsInOrder = breakpointsInput.keys?.reduce((acc, key) => {
-    const breakpointStyleKey = breakpointsInput.up(key);
-    acc[breakpointStyleKey] = {};
-    return acc;
-  }, {});
-  return breakpointsInOrder || {};
+function createEmptyBreakpointObject(breakpoints = DEFAULT_BREAKPOINTS) {
+  const {
+    internal_mediaKeys: mediaKeys
+  } = breakpoints;
+  const result = {};
+  for (let i = 0; i < mediaKeys.length; i += 1) {
+    result[mediaKeys[i]] = {};
+  }
+  return result;
 }
-function removeUnusedBreakpoints(breakpointKeys, style) {
-  return breakpointKeys.reduce((acc, key) => {
-    const breakpointOutput = acc[key];
-    const isBreakpointUnused = !breakpointOutput || Object.keys(breakpointOutput).length === 0;
-    if (isBreakpointUnused) {
-      delete acc[key];
+function removeUnusedBreakpoints(breakpoints, style) {
+  const breakpointKeys = breakpoints.internal_mediaKeys;
+  for (let i = 0; i < breakpointKeys.length; i += 1) {
+    const key = breakpointKeys[i];
+    if ((0, _isObjectEmpty.default)(style[key])) {
+      delete style[key];
     }
-    return acc;
-  }, style);
+  }
+  return style;
 }
-function mergeBreakpointsInOrder(breakpointsInput, ...styles) {
-  const emptyBreakpoints = createEmptyBreakpointObject(breakpointsInput);
+function mergeBreakpointsInOrder(breakpoints, ...styles) {
+  const emptyBreakpoints = createEmptyBreakpointObject(breakpoints);
   const mergedOutput = [emptyBreakpoints, ...styles].reduce((prev, next) => (0, _deepmerge.default)(prev, next), {});
-  return removeUnusedBreakpoints(Object.keys(emptyBreakpoints), mergedOutput);
+  return removeUnusedBreakpoints(breakpoints, mergedOutput);
 }
 
 // compute base for responsive values; e.g.,
@@ -181,4 +203,23 @@ function resolveBreakpointValues({
     return acc;
   }, {});
 }
-var _default = exports.default = breakpoints;
+function hasBreakpoint(breakpoints, value) {
+  if (Array.isArray(value)) {
+    return true;
+  }
+  if (typeof value === 'object' && value !== null) {
+    for (let i = 0; i < breakpoints.keys.length; i += 1) {
+      if (breakpoints.keys[i] in value) {
+        return true;
+      }
+    }
+    const valueKeys = Object.keys(value);
+    for (let i = 0; i < valueKeys.length; i += 1) {
+      if ((0, _cssContainerQueries.isCqShorthand)(breakpoints.keys, valueKeys[i])) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+var _default = exports.default = setupBreakpoints;

package/breakpoints/breakpoints.mjs

@@ -1,7 +1,11 @@
 import PropTypes from 'prop-types';
+import isObjectEmpty from '@mui/utils/isObjectEmpty';
+import fastDeepAssign from '@mui/utils/fastDeepAssign';
 import deepmerge from '@mui/utils/deepmerge';
 import merge from "../merge/index.mjs";
 import { isCqShorthand, getContainerQuery } from "../cssContainerQueries/index.mjs";
+import createBreakpoints from "../createBreakpoints/createBreakpoints.mjs";
+const EMPTY_THEME = {};
 
 // The breakpoint **start** at this value.
 // For instance with the first breakpoint xs: [xs, sm[.
@@ -16,12 +20,9 @@ export const values = {
   // desktop
   xl: 1536 // large screen
 };
-const defaultBreakpoints = {
-  // Sorted ASC by size. That's important.
-  // It can't be configured as it's used statically for propTypes.
-  keys: ['xs', 'sm', 'md', 'lg', 'xl'],
-  up: key => `@media (min-width:${values[key]}px)`
-};
+export const DEFAULT_BREAKPOINTS = createBreakpoints({
+  values
+});
 const defaultContainerQueries = {
   containerQueries: containerName => ({
     up: key => {
@@ -34,44 +35,59 @@ const defaultContainerQueries = {
   })
 };
 export function handleBreakpoints(props, propValue, styleFromPropValue) {
-  const theme = props.theme || {};
+  const result = {};
+  return iterateBreakpoints(result, props.theme, propValue, (mediaKey, value, initialKey) => {
+    const finalValue = styleFromPropValue(value, initialKey);
+    if (mediaKey) {
+      result[mediaKey] = finalValue;
+    } else {
+      fastDeepAssign(result, finalValue);
+    }
+  });
+}
+export function iterateBreakpoints(target, theme, propValue, callback) {
+  theme ??= EMPTY_THEME;
   if (Array.isArray(propValue)) {
-    const themeBreakpoints = theme.breakpoints || defaultBreakpoints;
-    return propValue.reduce((acc, item, index) => {
-      acc[themeBreakpoints.up(themeBreakpoints.keys[index])] = styleFromPropValue(propValue[index]);
-      return acc;
-    }, {});
+    const breakpoints = theme.breakpoints ?? DEFAULT_BREAKPOINTS;
+    for (let i = 0; i < propValue.length; i += 1) {
+      buildBreakpoint(target, breakpoints.up(breakpoints.keys[i]), propValue[i], undefined, callback);
+    }
+    return target;
   }
   if (typeof propValue === 'object') {
-    const themeBreakpoints = theme.breakpoints || defaultBreakpoints;
-    return Object.keys(propValue).reduce((acc, breakpoint) => {
-      if (isCqShorthand(themeBreakpoints.keys, breakpoint)) {
-        const containerKey = getContainerQuery(theme.containerQueries ? theme : defaultContainerQueries, breakpoint);
+    const breakpoints = theme.breakpoints ?? DEFAULT_BREAKPOINTS;
+    const breakpointValues = breakpoints.values ?? values;
+    for (const key in propValue) {
+      if (isCqShorthand(breakpoints.keys, key)) {
+        const containerKey = getContainerQuery(theme.containerQueries ? theme : defaultContainerQueries, key);
         if (containerKey) {
-          acc[containerKey] = styleFromPropValue(propValue[breakpoint], breakpoint);
+          buildBreakpoint(target, containerKey, propValue[key], key, callback);
         }
       }
-      // key is breakpoint
-      else if (Object.keys(themeBreakpoints.values || values).includes(breakpoint)) {
-        const mediaKey = themeBreakpoints.up(breakpoint);
-        acc[mediaKey] = styleFromPropValue(propValue[breakpoint], breakpoint);
+      // key is key
+      else if (key in breakpointValues) {
+        const mediaKey = breakpoints.up(key);
+        buildBreakpoint(target, mediaKey, propValue[key], key, callback);
       } else {
-        const cssKey = breakpoint;
-        acc[cssKey] = propValue[cssKey];
+        const cssKey = key;
+        target[cssKey] = propValue[cssKey];
       }
-      return acc;
-    }, {});
+    }
+    return target;
   }
-  const output = styleFromPropValue(propValue);
-  return output;
+  callback(undefined, propValue);
+  return target;
+}
+function buildBreakpoint(target, mediaKey, value, initialKey, callback) {
+  target[mediaKey] ??= {};
+  callback(mediaKey, value, initialKey);
 }
-function breakpoints(styleFunction) {
-  // false positive
+function setupBreakpoints(styleFunction) {
   // eslint-disable-next-line react/function-component-definition
   const newStyleFunction = props => {
     const theme = props.theme || {};
     const base = styleFunction(props);
-    const themeBreakpoints = theme.breakpoints || defaultBreakpoints;
+    const themeBreakpoints = theme.breakpoints || DEFAULT_BREAKPOINTS;
     const extended = themeBreakpoints.keys.reduce((acc, key) => {
       if (props[key]) {
         acc = acc || {};
@@ -95,28 +111,30 @@ function breakpoints(styleFunction) {
   newStyleFunction.filterProps = ['xs', 'sm', 'md', 'lg', 'xl', ...styleFunction.filterProps];
   return newStyleFunction;
 }
-export function createEmptyBreakpointObject(breakpointsInput = {}) {
-  const breakpointsInOrder = breakpointsInput.keys?.reduce((acc, key) => {
-    const breakpointStyleKey = breakpointsInput.up(key);
-    acc[breakpointStyleKey] = {};
-    return acc;
-  }, {});
-  return breakpointsInOrder || {};
+export function createEmptyBreakpointObject(breakpoints = DEFAULT_BREAKPOINTS) {
+  const {
+    internal_mediaKeys: mediaKeys
+  } = breakpoints;
+  const result = {};
+  for (let i = 0; i < mediaKeys.length; i += 1) {
+    result[mediaKeys[i]] = {};
+  }
+  return result;
 }
-export function removeUnusedBreakpoints(breakpointKeys, style) {
-  return breakpointKeys.reduce((acc, key) => {
-    const breakpointOutput = acc[key];
-    const isBreakpointUnused = !breakpointOutput || Object.keys(breakpointOutput).length === 0;
-    if (isBreakpointUnused) {
-      delete acc[key];
+export function removeUnusedBreakpoints(breakpoints, style) {
+  const breakpointKeys = breakpoints.internal_mediaKeys;
+  for (let i = 0; i < breakpointKeys.length; i += 1) {
+    const key = breakpointKeys[i];
+    if (isObjectEmpty(style[key])) {
+      delete style[key];
     }
-    return acc;
-  }, style);
+  }
+  return style;
 }
-export function mergeBreakpointsInOrder(breakpointsInput, ...styles) {
-  const emptyBreakpoints = createEmptyBreakpointObject(breakpointsInput);
+export function mergeBreakpointsInOrder(breakpoints, ...styles) {
+  const emptyBreakpoints = createEmptyBreakpointObject(breakpoints);
   const mergedOutput = [emptyBreakpoints, ...styles].reduce((prev, next) => deepmerge(prev, next), {});
-  return removeUnusedBreakpoints(Object.keys(emptyBreakpoints), mergedOutput);
+  return removeUnusedBreakpoints(breakpoints, mergedOutput);
 }
 
 // compute base for responsive values; e.g.,
@@ -168,4 +186,23 @@ export function resolveBreakpointValues({
     return acc;
   }, {});
 }
-export default breakpoints;
+export function hasBreakpoint(breakpoints, value) {
+  if (Array.isArray(value)) {
+    return true;
+  }
+  if (typeof value === 'object' && value !== null) {
+    for (let i = 0; i < breakpoints.keys.length; i += 1) {
+      if (breakpoints.keys[i] in value) {
+        return true;
+      }
+    }
+    const valueKeys = Object.keys(value);
+    for (let i = 0; i < valueKeys.length; i += 1) {
+      if (isCqShorthand(breakpoints.keys, valueKeys[i])) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+export default setupBreakpoints;