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

package/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 */ = {

package/Select/SelectInput.js

@@ -1,10 +1,7 @@
 'use client';
 
-import _extends from "@babel/runtime/helpers/esm/extends";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _formatMuiErrorMessage from "@mui/utils/formatMuiErrorMessage";
 var _span;
-const _excluded = ["aria-describedby", "aria-label", "autoFocus", "autoWidth", "children", "className", "defaultOpen", "defaultValue", "disabled", "displayEmpty", "error", "IconComponent", "inputRef", "labelId", "MenuProps", "multiple", "name", "onBlur", "onChange", "onClose", "onFocus", "onOpen", "open", "readOnly", "renderValue", "SelectDisplayProps", "tabIndex", "type", "value", "variant"];
 import * as React from 'react';
 import { isFragment } from 'react-is';
 import PropTypes from 'prop-types';
@@ -12,17 +9,18 @@ import clsx from 'clsx';
 import composeClasses from '@mui/utils/composeClasses';
 import useId from '@mui/utils/useId';
 import refType from '@mui/utils/refType';
-import ownerDocument from '../utils/ownerDocument';
-import capitalize from '../utils/capitalize';
-import Menu from '../Menu/Menu';
-import { nativeSelectSelectStyles, nativeSelectIconStyles } from '../NativeSelect/NativeSelectInput';
-import { isFilled } from '../InputBase/utils';
-import styled, { slotShouldForwardProp } from '../styles/styled';
-import useForkRef from '../utils/useForkRef';
-import useControlled from '../utils/useControlled';
-import selectClasses, { getSelectUtilityClasses } from './selectClasses';
+import ownerDocument from "../utils/ownerDocument.js";
+import capitalize from "../utils/capitalize.js";
+import Menu from "../Menu/Menu.js";
+import { StyledSelectSelect, StyledSelectIcon } from "../NativeSelect/NativeSelectInput.js";
+import { isFilled } from "../InputBase/utils.js";
+import { styled } from "../zero-styled/index.js";
+import slotShouldForwardProp from "../styles/slotShouldForwardProp.js";
+import useForkRef from "../utils/useForkRef.js";
+import useControlled from "../utils/useControlled.js";
+import selectClasses, { getSelectUtilityClasses } from "./selectClasses.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const SelectSelect = styled('div', {
+const SelectSelect = styled(StyledSelectSelect, {
   name: 'MuiSelect',
   slot: 'Select',
   overridesResolver: (props, styles) => {
@@ -41,7 +39,7 @@ const SelectSelect = styled('div', {
       [`&.${selectClasses.multiple}`]: styles.multiple
     }];
   }
-})(nativeSelectSelectStyles, {
+})({
   // Win specificity over the input base
   [`&.${selectClasses.select}`]: {
     height: 'auto',
@@ -53,7 +51,7 @@ const SelectSelect = styled('div', {
     overflow: 'hidden'
   }
 });
-const SelectIcon = styled('svg', {
+const SelectIcon = styled(StyledSelectIcon, {
   name: 'MuiSelect',
   slot: 'Icon',
   overridesResolver: (props, styles) => {
@@ -62,7 +60,7 @@ const SelectIcon = styled('svg', {
     } = props;
     return [styles.icon, ownerState.variant && styles[`icon${capitalize(ownerState.variant)}`], ownerState.open && styles.iconOpen];
   }
-})(nativeSelectIconStyles);
+})({});
 const SelectNativeInput = styled('input', {
   shouldForwardProp: prop => slotShouldForwardProp(prop) && prop !== 'classes',
   name: 'MuiSelect',
@@ -110,40 +108,39 @@ const useUtilityClasses = ownerState => {
  */
 const SelectInput = /*#__PURE__*/React.forwardRef(function SelectInput(props, ref) {
   const {
-      'aria-describedby': ariaDescribedby,
-      'aria-label': ariaLabel,
-      autoFocus,
-      autoWidth,
-      children,
-      className,
-      defaultOpen,
-      defaultValue,
-      disabled,
-      displayEmpty,
-      error = false,
-      IconComponent,
-      inputRef: inputRefProp,
-      labelId,
-      MenuProps = {},
-      multiple,
-      name,
-      onBlur,
-      onChange,
-      onClose,
-      onFocus,
-      onOpen,
-      open: openProp,
-      readOnly,
-      renderValue,
-      SelectDisplayProps = {},
-      tabIndex: tabIndexProp
-      // catching `type` from Input which makes no sense for SelectInput
-      ,
-
-      value: valueProp,
-      variant = 'standard'
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded);
+    'aria-describedby': ariaDescribedby,
+    'aria-label': ariaLabel,
+    autoFocus,
+    autoWidth,
+    children,
+    className,
+    defaultOpen,
+    defaultValue,
+    disabled,
+    displayEmpty,
+    error = false,
+    IconComponent,
+    inputRef: inputRefProp,
+    labelId,
+    MenuProps = {},
+    multiple,
+    name,
+    onBlur,
+    onChange,
+    onClose,
+    onFocus,
+    onOpen,
+    open: openProp,
+    readOnly,
+    renderValue,
+    SelectDisplayProps = {},
+    tabIndex: tabIndexProp,
+    // catching `type` from Input which makes no sense for SelectInput
+    type,
+    value: valueProp,
+    variant = 'standard',
+    ...other
+  } = props;
   const [value, setValueState] = useControlled({
     controlled: valueProp,
     default: defaultValue,
@@ -299,7 +296,7 @@ const SelectInput = /*#__PURE__*/React.forwardRef(function SelectInput(props, re
       // The native select doesn't respond to enter on macOS, but it's recommended by
       // https://www.w3.org/WAI/ARIA/apg/patterns/combobox/examples/combobox-select-only/
       'Enter'];
-      if (validKeys.indexOf(event.key) !== -1) {
+      if (validKeys.includes(event.key)) {
         event.preventDefault();
         update(true, event);
       }
@@ -424,17 +421,22 @@ const SelectInput = /*#__PURE__*/React.forwardRef(function SelectInput(props, re
     tabIndex = disabled ? null : 0;
   }
   const buttonId = SelectDisplayProps.id || (name ? `mui-component-select-${name}` : undefined);
-  const ownerState = _extends({}, props, {
+  const ownerState = {
+    ...props,
     variant,
     value,
     open,
     error
-  });
+  };
   const classes = useUtilityClasses(ownerState);
-  const paperProps = _extends({}, MenuProps.PaperProps, MenuProps.slotProps?.paper);
+  const paperProps = {
+    ...MenuProps.PaperProps,
+    ...MenuProps.slotProps?.paper
+  };
   const listboxId = useId();
   return /*#__PURE__*/_jsxs(React.Fragment, {
-    children: [/*#__PURE__*/_jsx(SelectSelect, _extends({
+    children: [/*#__PURE__*/_jsx(SelectSelect, {
+      as: "div",
       ref: handleDisplayRef,
       tabIndex: tabIndex,
       role: "combobox",
@@ -448,8 +450,8 @@ const SelectInput = /*#__PURE__*/React.forwardRef(function SelectInput(props, re
       onKeyDown: handleKeyDown,
       onMouseDown: disabled || readOnly ? null : handleMouseDown,
       onBlur: handleBlur,
-      onFocus: onFocus
-    }, SelectDisplayProps, {
+      onFocus: onFocus,
+      ...SelectDisplayProps,
       ownerState: ownerState,
       className: clsx(SelectDisplayProps.className, classes.select, className)
       // The id is required for proper a11y
@@ -460,7 +462,7 @@ const SelectInput = /*#__PURE__*/React.forwardRef(function SelectInput(props, re
         className: "notranslate",
         children: "\u200B"
       })) : display
-    })), /*#__PURE__*/_jsx(SelectNativeInput, _extends({
+    }), /*#__PURE__*/_jsx(SelectNativeInput, {
       "aria-invalid": error,
       value: Array.isArray(value) ? value.join(',') : value,
       name: name,
@@ -471,12 +473,13 @@ const SelectInput = /*#__PURE__*/React.forwardRef(function SelectInput(props, re
       disabled: disabled,
       className: classes.nativeInput,
       autoFocus: autoFocus,
+      ...other,
       ownerState: ownerState
-    }, other)), /*#__PURE__*/_jsx(SelectIcon, {
+    }), /*#__PURE__*/_jsx(SelectIcon, {
       as: IconComponent,
       className: classes.icon,
       ownerState: ownerState
-    }), /*#__PURE__*/_jsx(Menu, _extends({
+    }), /*#__PURE__*/_jsx(Menu, {
       id: `menu-${name || ''}`,
       anchorEl: anchorElement,
       open: open,
@@ -488,24 +491,28 @@ const SelectInput = /*#__PURE__*/React.forwardRef(function SelectInput(props, re
       transformOrigin: {
         vertical: 'top',
         horizontal: 'center'
-      }
-    }, MenuProps, {
-      MenuListProps: _extends({
+      },
+      ...MenuProps,
+      MenuListProps: {
         'aria-labelledby': labelId,
         role: 'listbox',
         'aria-multiselectable': multiple ? 'true' : undefined,
         disableListWrap: true,
-        id: listboxId
-      }, MenuProps.MenuListProps),
-      slotProps: _extends({}, MenuProps.slotProps, {
-        paper: _extends({}, paperProps, {
-          style: _extends({
-            minWidth: menuMinWidth
-          }, paperProps != null ? paperProps.style : null)
-        })
-      }),
+        id: listboxId,
+        ...MenuProps.MenuListProps
+      },
+      slotProps: {
+        ...MenuProps.slotProps,
+        paper: {
+          ...paperProps,
+          style: {
+            minWidth: menuMinWidth,
+            ...(paperProps != null ? paperProps.style : null)
+          }
+        }
+      },
       children: items
-    }))]
+    })]
   });
 });
 process.env.NODE_ENV !== "production" ? SelectInput.propTypes = {

package/Select/index.js

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

package/Select/selectClasses.d.ts

@@ -7,6 +7,8 @@ export interface SelectClasses {
     multiple: string;
     /** Styles applied to the select component if `variant="filled"`. */
     filled: string;
+    /** Styles applied to the select component if it is focused. */
+    focused: string;
     /** Styles applied to the select component if `variant="outlined"`. */
     outlined: string;
     /** Styles applied to the select component if `variant="standard"`. */