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

package/modern/Rating/Rating.js

@@ -1,9 +1,5 @@
 'use client';
 
-import _extends from "@babel/runtime/helpers/esm/extends";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["value"],
-  _excluded2 = ["className", "defaultValue", "disabled", "emptyIcon", "emptyLabelText", "getLabelText", "highlightSelectedOnly", "icon", "IconContainerComponent", "max", "name", "onChange", "onChangeActive", "onMouseLeave", "onMouseMove", "precision", "readOnly", "size", "value"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
@@ -12,12 +8,15 @@ import visuallyHidden from '@mui/utils/visuallyHidden';
 import chainPropTypes from '@mui/utils/chainPropTypes';
 import composeClasses from '@mui/utils/composeClasses';
 import { useRtl } from '@mui/system/RtlProvider';
-import { capitalize, useForkRef, useIsFocusVisible, useControlled, unstable_useId as useId } from '../utils';
-import Star from '../internal/svg-icons/Star';
-import StarBorder from '../internal/svg-icons/StarBorder';
-import useThemeProps from '../styles/useThemeProps';
-import styled, { slotShouldForwardProp } from '../styles/styled';
-import ratingClasses, { getRatingUtilityClass } from './ratingClasses';
+import isFocusVisible from '@mui/utils/isFocusVisible';
+import { capitalize, useForkRef, useControlled, unstable_useId as useId } from "../utils/index.js";
+import Star from "../internal/svg-icons/Star.js";
+import StarBorder from "../internal/svg-icons/StarBorder.js";
+import { styled } from "../zero-styled/index.js";
+import memoTheme from "../utils/memoTheme.js";
+import { useDefaultProps } from "../DefaultPropsProvider/index.js";
+import slotShouldForwardProp from "../styles/slotShouldForwardProp.js";
+import ratingClasses, { getRatingUtilityClass } from "./ratingClasses.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 function getDecimalPrecision(num) {
   const decimalPart = num.toString().split('.')[1];
@@ -65,7 +64,7 @@ const RatingRoot = styled('span', {
       [`& .${ratingClasses.visuallyHidden}`]: styles.visuallyHidden
     }, styles.root, styles[`size${capitalize(ownerState.size)}`], ownerState.readOnly && styles.readOnly];
   }
-})(({
+})(memoTheme(({
   theme
 }) => ({
   display: 'inline-flex',
@@ -108,7 +107,7 @@ const RatingRoot = styled('span', {
       pointerEvents: 'none'
     }
   }]
-}));
+})));
 const RatingLabel = styled('label', {
   name: 'MuiRating',
   slot: 'Label',
@@ -139,7 +138,7 @@ const RatingIcon = styled('span', {
     } = props;
     return [styles.icon, ownerState.iconEmpty && styles.iconEmpty, ownerState.iconFilled && styles.iconFilled, ownerState.iconHover && styles.iconHover, ownerState.iconFocus && styles.iconFocus, ownerState.iconActive && styles.iconActive];
   }
-})(({
+})(memoTheme(({
   theme
 }) => ({
   // Fit wrapper to actual icon size.
@@ -165,7 +164,7 @@ const RatingIcon = styled('span', {
       color: (theme.vars || theme).palette.action.disabled
     }
   }]
-}));
+})));
 const RatingDecimal = styled('span', {
   name: 'MuiRating',
   slot: 'Decimal',
@@ -188,8 +187,13 @@ const RatingDecimal = styled('span', {
   }]
 });
 function IconContainer(props) {
-  const other = _objectWithoutPropertiesLoose(props, _excluded);
-  return /*#__PURE__*/_jsx("span", _extends({}, other));
+  const {
+    value,
+    ...other
+  } = props;
+  return /*#__PURE__*/_jsx("span", {
+    ...other
+  });
 }
 process.env.NODE_ENV !== "production" ? IconContainer.propTypes = {
   value: PropTypes.number.isRequired
@@ -227,32 +231,35 @@ function RatingItem(props) {
     as: IconContainerComponent,
     value: itemValue,
     className: clsx(classes.icon, isFilled ? classes.iconFilled : classes.iconEmpty, isHovered && classes.iconHover, isFocused && classes.iconFocus, isActive && classes.iconActive),
-    ownerState: _extends({}, ownerState, {
+    ownerState: {
+      ...ownerState,
       iconEmpty: !isFilled,
       iconFilled: isFilled,
       iconHover: isHovered,
       iconFocus: isFocused,
       iconActive: isActive
-    }),
+    },
     children: emptyIcon && !isFilled ? emptyIcon : icon
   });
   if (readOnly) {
-    return /*#__PURE__*/_jsx("span", _extends({}, labelProps, {
+    return /*#__PURE__*/_jsx("span", {
+      ...labelProps,
       children: container
-    }));
+    });
   }
   return /*#__PURE__*/_jsxs(React.Fragment, {
-    children: [/*#__PURE__*/_jsxs(RatingLabel, _extends({
-      ownerState: _extends({}, ownerState, {
+    children: [/*#__PURE__*/_jsxs(RatingLabel, {
+      ownerState: {
+        ...ownerState,
         emptyValueFocused: undefined
-      }),
-      htmlFor: id
-    }, labelProps, {
+      },
+      htmlFor: id,
+      ...labelProps,
       children: [container, /*#__PURE__*/_jsx("span", {
         className: classes.visuallyHidden,
         children: getLabelText(itemValue)
       })]
-    })), /*#__PURE__*/_jsx("input", {
+    }), /*#__PURE__*/_jsx("input", {
       className: classes.visuallyHidden,
       onFocus: onFocus,
       onBlur: onBlur,
@@ -297,35 +304,35 @@ const defaultEmptyIcon = /*#__PURE__*/_jsx(StarBorder, {
   fontSize: "inherit"
 });
 function defaultLabelText(value) {
-  return `${value} Star${value !== 1 ? 's' : ''}`;
+  return `${value || '0'} Star${value !== 1 ? 's' : ''}`;
 }
 const Rating = /*#__PURE__*/React.forwardRef(function Rating(inProps, ref) {
-  const props = useThemeProps({
+  const props = useDefaultProps({
     name: 'MuiRating',
     props: inProps
   });
   const {
-      className,
-      defaultValue = null,
-      disabled = false,
-      emptyIcon = defaultEmptyIcon,
-      emptyLabelText = 'Empty',
-      getLabelText = defaultLabelText,
-      highlightSelectedOnly = false,
-      icon = defaultIcon,
-      IconContainerComponent = IconContainer,
-      max = 5,
-      name: nameProp,
-      onChange,
-      onChangeActive,
-      onMouseLeave,
-      onMouseMove,
-      precision = 1,
-      readOnly = false,
-      size = 'medium',
-      value: valueProp
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded2);
+    className,
+    defaultValue = null,
+    disabled = false,
+    emptyIcon = defaultEmptyIcon,
+    emptyLabelText = 'Empty',
+    getLabelText = defaultLabelText,
+    highlightSelectedOnly = false,
+    icon = defaultIcon,
+    IconContainerComponent = IconContainer,
+    max = 5,
+    name: nameProp,
+    onChange,
+    onChangeActive,
+    onMouseLeave,
+    onMouseMove,
+    precision = 1,
+    readOnly = false,
+    size = 'medium',
+    value: valueProp,
+    ...other
+  } = props;
   const name = useId(nameProp);
   const [valueDerived, setValueState] = useControlled({
     controlled: valueProp,
@@ -348,15 +355,9 @@ const Rating = /*#__PURE__*/React.forwardRef(function Rating(inProps, ref) {
   if (focus !== -1) {
     value = focus;
   }
-  const {
-    isFocusVisibleRef,
-    onBlur: handleBlurVisible,
-    onFocus: handleFocusVisible,
-    ref: focusVisibleRef
-  } = useIsFocusVisible();
   const [focusVisible, setFocusVisible] = React.useState(false);
   const rootRef = React.useRef();
-  const handleRef = useForkRef(focusVisibleRef, rootRef, ref);
+  const handleRef = useForkRef(rootRef, ref);
   const handleMouseMove = event => {
     if (onMouseMove) {
       onMouseMove(event);
@@ -426,8 +427,7 @@ const Rating = /*#__PURE__*/React.forwardRef(function Rating(inProps, ref) {
     }
   };
   const handleFocus = event => {
-    handleFocusVisible(event);
-    if (isFocusVisibleRef.current === true) {
+    if (isFocusVisible(event.target)) {
       setFocusVisible(true);
     }
     const newFocus = parseFloat(event.target.value);
@@ -440,8 +440,7 @@ const Rating = /*#__PURE__*/React.forwardRef(function Rating(inProps, ref) {
     if (hover !== -1) {
       return;
     }
-    handleBlurVisible(event);
-    if (isFocusVisibleRef.current === false) {
+    if (!isFocusVisible(event.target)) {
       setFocusVisible(false);
     }
     const newFocus = -1;
@@ -451,7 +450,8 @@ const Rating = /*#__PURE__*/React.forwardRef(function Rating(inProps, ref) {
     }));
   };
   const [emptyValueFocused, setEmptyValueFocused] = React.useState(false);
-  const ownerState = _extends({}, props, {
+  const ownerState = {
+    ...props,
     defaultValue,
     disabled,
     emptyIcon,
@@ -465,17 +465,17 @@ const Rating = /*#__PURE__*/React.forwardRef(function Rating(inProps, ref) {
     precision,
     readOnly,
     size
-  });
+  };
   const classes = useUtilityClasses(ownerState);
-  return /*#__PURE__*/_jsxs(RatingRoot, _extends({
+  return /*#__PURE__*/_jsxs(RatingRoot, {
     ref: handleRef,
     onMouseMove: handleMouseMove,
     onMouseLeave: handleMouseLeave,
     className: clsx(classes.root, className, readOnly && 'MuiRating-readOnly'),
     ownerState: ownerState,
     role: readOnly ? 'img' : null,
-    "aria-label": readOnly ? getLabelText(value) : null
-  }, other, {
+    "aria-label": readOnly ? getLabelText(value) : null,
+    ...other,
     children: [Array.from(new Array(max)).map((_, index) => {
       const itemValue = index + 1;
       const ratingItemProps = {
@@ -507,7 +507,8 @@ const Rating = /*#__PURE__*/React.forwardRef(function Rating(inProps, ref) {
           iconActive: isActive,
           children: items.map(($, indexDecimal) => {
             const itemDecimalValue = roundValueToPrecision(itemValue - 1 + (indexDecimal + 1) * precision, precision);
-            return /*#__PURE__*/_jsx(RatingItem, _extends({}, ratingItemProps, {
+            return /*#__PURE__*/_jsx(RatingItem, {
+              ...ratingItemProps,
               // The icon is already displayed as active
               isActive: false,
               itemValue: itemDecimalValue,
@@ -518,14 +519,15 @@ const Rating = /*#__PURE__*/React.forwardRef(function Rating(inProps, ref) {
                   position: 'absolute'
                 }
               }
-            }), itemDecimalValue);
+            }, itemDecimalValue);
           })
         }, itemValue);
       }
-      return /*#__PURE__*/_jsx(RatingItem, _extends({}, ratingItemProps, {
+      return /*#__PURE__*/_jsx(RatingItem, {
+        ...ratingItemProps,
         isActive: isActive,
         itemValue: itemValue
-      }), itemValue);
+      }, itemValue);
     }), !readOnly && !disabled && /*#__PURE__*/_jsxs(RatingLabel, {
       className: clsx(classes.label, classes.labelEmptyValue),
       ownerState: ownerState,
@@ -544,7 +546,7 @@ const Rating = /*#__PURE__*/React.forwardRef(function Rating(inProps, ref) {
         children: emptyLabelText
       })]
     })]
-  }));
+  });
 });
 process.env.NODE_ENV !== "production" ? Rating.propTypes /* remove-proptypes */ = {
   // ┌────────────────────────────── Warning ──────────────────────────────┐
@@ -587,7 +589,7 @@ process.env.NODE_ENV !== "production" ? Rating.propTypes /* remove-proptypes */
    * @param {number} value The rating label's value to format.
    * @returns {string}
    * @default function defaultLabelText(value) {
-   *   return `${value} Star${value !== 1 ? 's' : ''}`;
+   *   return `${value || '0'} Star${value !== 1 ? 's' : ''}`;
    * }
    */
   getLabelText: PropTypes.func,

package/modern/Rating/index.js

@@ -1,3 +1,3 @@
-export { default } from './Rating';
-export { default as ratingClasses } from './ratingClasses';
-export * from './ratingClasses';
+export { default } from "./Rating.js";
+export { default as ratingClasses } from "./ratingClasses.js";
+export * from "./ratingClasses.js";

package/modern/ScopedCssBaseline/ScopedCssBaseline.js

@@ -1,16 +1,14 @@
 'use client';
 
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-import _extends from "@babel/runtime/helpers/esm/extends";
-const _excluded = ["className", "component", "enableColorScheme"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import composeClasses from '@mui/utils/composeClasses';
-import useThemeProps from '../styles/useThemeProps';
-import styled from '../styles/styled';
-import { html, body } from '../CssBaseline/CssBaseline';
-import { getScopedCssBaselineUtilityClass } from './scopedCssBaselineClasses';
+import { styled } from "../zero-styled/index.js";
+import memoTheme from "../utils/memoTheme.js";
+import { useDefaultProps } from "../DefaultPropsProvider/index.js";
+import { html, body } from "../CssBaseline/CssBaseline.js";
+import { getScopedCssBaselineUtilityClass } from "./scopedCssBaselineClasses.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const useUtilityClasses = ownerState => {
   const {
@@ -25,47 +23,66 @@ const ScopedCssBaselineRoot = styled('div', {
   name: 'MuiScopedCssBaseline',
   slot: 'Root',
   overridesResolver: (props, styles) => styles.root
-})(({
-  theme,
-  ownerState
+})(memoTheme(({
+  theme
 }) => {
   const colorSchemeStyles = {};
-  if (ownerState.enableColorScheme && theme.colorSchemes) {
+  if (theme.colorSchemes) {
     Object.entries(theme.colorSchemes).forEach(([key, scheme]) => {
-      colorSchemeStyles[`&${theme.getColorSchemeSelector(key).replace(/\s*&/, '')}`] = {
-        colorScheme: scheme.palette?.mode
-      };
+      const selector = theme.getColorSchemeSelector(key);
+      if (selector.startsWith('@')) {
+        colorSchemeStyles[selector] = {
+          colorScheme: scheme.palette?.mode
+        };
+      } else {
+        colorSchemeStyles[`&${selector.replace(/\s*&/, '')}`] = {
+          colorScheme: scheme.palette?.mode
+        };
+      }
     });
   }
-  return _extends({}, html(theme, ownerState.enableColorScheme), body(theme), {
+  return {
+    ...html(theme, false),
+    ...body(theme),
     '& *, & *::before, & *::after': {
       boxSizing: 'inherit'
     },
     '& strong, & b': {
       fontWeight: theme.typography.fontWeightBold
-    }
-  }, colorSchemeStyles);
-});
+    },
+    variants: [{
+      props: {
+        enableColorScheme: true
+      },
+      style: theme.vars ? colorSchemeStyles : {
+        colorScheme: theme.palette.mode
+      }
+    }]
+  };
+}));
 const ScopedCssBaseline = /*#__PURE__*/React.forwardRef(function ScopedCssBaseline(inProps, ref) {
-  const props = useThemeProps({
+  const props = useDefaultProps({
     props: inProps,
     name: 'MuiScopedCssBaseline'
   });
   const {
-      className,
-      component = 'div'
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded);
-  const ownerState = _extends({}, props, {
+    className,
+    component = 'div',
+    enableColorScheme,
+    ...other
+  } = props;
+  const ownerState = {
+    ...props,
     component
-  });
+  };
   const classes = useUtilityClasses(ownerState);
-  return /*#__PURE__*/_jsx(ScopedCssBaselineRoot, _extends({
+  return /*#__PURE__*/_jsx(ScopedCssBaselineRoot, {
     as: component,
     className: clsx(classes.root, className),
     ref: ref,
-    ownerState: ownerState
-  }, other));
+    ownerState: ownerState,
+    ...other
+  });
 });
 process.env.NODE_ENV !== "production" ? ScopedCssBaseline.propTypes /* remove-proptypes */ = {
   // ┌────────────────────────────── Warning ──────────────────────────────┐

package/modern/ScopedCssBaseline/index.js

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

package/modern/Select/Select.js

@@ -1,24 +1,22 @@
 'use client';
 
-import _extends from "@babel/runtime/helpers/esm/extends";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["autoWidth", "children", "classes", "className", "defaultOpen", "displayEmpty", "IconComponent", "id", "input", "inputProps", "label", "labelId", "MenuProps", "multiple", "native", "onClose", "onOpen", "open", "renderValue", "SelectDisplayProps", "variant"],
-  _excluded2 = ["root"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import deepmerge from '@mui/utils/deepmerge';
-import SelectInput from './SelectInput';
-import formControlState from '../FormControl/formControlState';
-import useFormControl from '../FormControl/useFormControl';
-import ArrowDropDownIcon from '../internal/svg-icons/ArrowDropDown';
-import Input from '../Input';
-import NativeSelectInput from '../NativeSelect/NativeSelectInput';
-import FilledInput from '../FilledInput';
-import OutlinedInput from '../OutlinedInput';
-import useThemeProps from '../styles/useThemeProps';
-import useForkRef from '../utils/useForkRef';
-import styled, { rootShouldForwardProp } from '../styles/styled';
+import getReactNodeRef from '@mui/utils/getReactNodeRef';
+import SelectInput from "./SelectInput.js";
+import formControlState from "../FormControl/formControlState.js";
+import useFormControl from "../FormControl/useFormControl.js";
+import ArrowDropDownIcon from "../internal/svg-icons/ArrowDropDown.js";
+import Input from "../Input/index.js";
+import NativeSelectInput from "../NativeSelect/NativeSelectInput.js";
+import FilledInput from "../FilledInput/index.js";
+import OutlinedInput from "../OutlinedInput/index.js";
+import useThemeProps from "../styles/useThemeProps.js";
+import useForkRef from "../utils/useForkRef.js";
+import { styled } from "../zero-styled/index.js";
+import rootShouldForwardProp from "../styles/rootShouldForwardProp.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const useUtilityClasses = ownerState => {
   const {
@@ -41,29 +39,29 @@ const Select = /*#__PURE__*/React.forwardRef(function Select(inProps, ref) {
     props: inProps
   });
   const {
-      autoWidth = false,
-      children,
-      classes: classesProp = {},
-      className,
-      defaultOpen = false,
-      displayEmpty = false,
-      IconComponent = ArrowDropDownIcon,
-      id,
-      input,
-      inputProps,
-      label,
-      labelId,
-      MenuProps,
-      multiple = false,
-      native = false,
-      onClose,
-      onOpen,
-      open,
-      renderValue,
-      SelectDisplayProps,
-      variant: variantProp = 'outlined'
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded);
+    autoWidth = false,
+    children,
+    classes: classesProp = {},
+    className,
+    defaultOpen = false,
+    displayEmpty = false,
+    IconComponent = ArrowDropDownIcon,
+    id,
+    input,
+    inputProps,
+    label,
+    labelId,
+    MenuProps,
+    multiple = false,
+    native = false,
+    onClose,
+    onOpen,
+    open,
+    renderValue,
+    SelectDisplayProps,
+    variant: variantProp = 'outlined',
+    ...other
+  } = props;
   const inputComponent = native ? NativeSelectInput : SelectInput;
   const muiFormControl = useFormControl();
   const fcs = formControlState({
@@ -72,12 +70,16 @@ const Select = /*#__PURE__*/React.forwardRef(function Select(inProps, ref) {
     states: ['variant', 'error']
   });
   const variant = fcs.variant || variantProp;
-  const ownerState = _extends({}, props, {
+  const ownerState = {
+    ...props,
     variant,
     classes: classesProp
-  });
+  };
   const classes = useUtilityClasses(ownerState);
-  const restOfClasses = _objectWithoutPropertiesLoose(classes, _excluded2);
+  const {
+    root,
+    ...restOfClasses
+  } = classes;
   const InputComponent = input || {
     standard: /*#__PURE__*/_jsx(StyledInput, {
       ownerState: ownerState
@@ -90,46 +92,52 @@ const Select = /*#__PURE__*/React.forwardRef(function Select(inProps, ref) {
       ownerState: ownerState
     })
   }[variant];
-  const inputComponentRef = useForkRef(ref, InputComponent.ref);
+  const inputComponentRef = useForkRef(ref, getReactNodeRef(InputComponent));
   return /*#__PURE__*/_jsx(React.Fragment, {
-    children: /*#__PURE__*/React.cloneElement(InputComponent, _extends({
+    children: /*#__PURE__*/React.cloneElement(InputComponent, {
       // Most of the logic is implemented in `SelectInput`.
       // The `Select` component is a simple API wrapper to expose something better to play with.
       inputComponent,
-      inputProps: _extends({
+      inputProps: {
         children,
         error: fcs.error,
         IconComponent,
         variant,
         type: undefined,
         // We render a select. We can ignore the type provided by the `Input`.
-        multiple
-      }, native ? {
-        id
-      } : {
-        autoWidth,
-        defaultOpen,
-        displayEmpty,
-        labelId,
-        MenuProps,
-        onClose,
-        onOpen,
-        open,
-        renderValue,
-        SelectDisplayProps: _extends({
+        multiple,
+        ...(native ? {
           id
-        }, SelectDisplayProps)
-      }, inputProps, {
-        classes: inputProps ? deepmerge(restOfClasses, inputProps.classes) : restOfClasses
-      }, input ? input.props.inputProps : {})
-    }, (multiple && native || displayEmpty) && variant === 'outlined' ? {
-      notched: true
-    } : {}, {
+        } : {
+          autoWidth,
+          defaultOpen,
+          displayEmpty,
+          labelId,
+          MenuProps,
+          onClose,
+          onOpen,
+          open,
+          renderValue,
+          SelectDisplayProps: {
+            id,
+            ...SelectDisplayProps
+          }
+        }),
+        ...inputProps,
+        classes: inputProps ? deepmerge(restOfClasses, inputProps.classes) : restOfClasses,
+        ...(input ? input.props.inputProps : {})
+      },
+      ...((multiple && native || displayEmpty) && variant === 'outlined' ? {
+        notched: true
+      } : {}),
       ref: inputComponentRef,
-      className: clsx(InputComponent.props.className, className, classes.root)
-    }, !input && {
-      variant
-    }, other))
+      className: clsx(InputComponent.props.className, className, classes.root),
+      // If a custom input is provided via 'input' prop, do not allow 'variant' to be propagated to it's root element. See https://github.com/mui/material-ui/issues/33894.
+      ...(!input && {
+        variant
+      }),
+      ...other
+    })
   });
 });
 process.env.NODE_ENV !== "production" ? Select.propTypes /* remove-proptypes */ = {