@mui/x-date-pickers 7.0.0-alpha.3 → 7.0.0-alpha.5

package/modern/TimeField/useTimeField.js

@@ -14,17 +14,13 @@ const useDefaultizedTimeField = props => {
     format: props.format ?? defaultFormat
   });
 };
-export const useTimeField = ({
-  props: inProps,
-  inputRef
-}) => {
+export const useTimeField = inProps => {
   const props = useDefaultizedTimeField(inProps);
   const {
     forwardedProps,
     internalProps
   } = splitFieldInternalAndForwardedProps(props, 'time');
   return useField({
-    inputRef,
     forwardedProps,
     internalProps,
     valueManager: singleItemValueManager,

package/modern/TimePicker/TimePicker.js

@@ -149,6 +149,10 @@ process.env.NODE_ENV !== "production" ? TimePicker.propTypes = {
    * @default 1
    */
   minutesStep: PropTypes.number,
+  /**
+   * Name attribute used by the `input` element in the Field.
+   */
+  name: PropTypes.string,
   /**
    * Callback fired when the value is accepted.
    * @template TValue The value type. Will be either the same type as `value` or `null`. Can be in `[start, end]` format in case of range value.
@@ -229,7 +233,7 @@ process.env.NODE_ENV !== "production" ? TimePicker.propTypes = {
    * 4. If `null` is provided, no section will be selected
    * If not provided, the selected sections will be handled internally.
    */
-  selectedSections: PropTypes.oneOfType([PropTypes.oneOf(['all', 'day', 'hours', 'meridiem', 'minutes', 'month', 'seconds', 'weekDay', 'year']), PropTypes.number, PropTypes.shape({
+  selectedSections: PropTypes.oneOfType([PropTypes.oneOf(['all', 'day', 'empty', 'hours', 'meridiem', 'minutes', 'month', 'seconds', 'weekDay', 'year']), PropTypes.number, PropTypes.shape({
     endIndex: PropTypes.number.isRequired,
     startIndex: PropTypes.number.isRequired
   })]),

package/modern/YearCalendar/YearCalendar.js

@@ -115,7 +115,6 @@ export const YearCalendar = /*#__PURE__*/React.forwardRef(function YearCalendar(
     granularity: SECTION_TYPE_GRANULARITY.year
   }), [] // eslint-disable-line react-hooks/exhaustive-deps
   );
-
   const ownerState = props;
   const classes = useUtilityClasses(ownerState);
   const todayYear = React.useMemo(() => utils.getYear(now), [utils, now]);

package/modern/hooks/useClearableField.js

@@ -1,23 +1,26 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["ownerState"];
+const _excluded = ["clearable", "onClear", "InputProps", "sx", "slots", "slotProps"],
+  _excluded2 = ["ownerState"];
 import * as React from 'react';
 import { useSlotProps } from '@mui/base/utils';
 import MuiIconButton from '@mui/material/IconButton';
 import InputAdornment from '@mui/material/InputAdornment';
 import { ClearIcon } from '../icons';
-import { useLocaleText } from '../internals';
+import { useLocaleText } from '../internals/hooks/useUtils';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-export const useClearableField = ({
-  clearable,
-  fieldProps: forwardedFieldProps,
-  InputProps: ForwardedInputProps,
-  onClear,
-  slots,
-  slotProps
-}) => {
+export const useClearableField = props => {
   const localeText = useLocaleText();
+  const {
+      clearable,
+      onClear,
+      InputProps,
+      sx,
+      slots,
+      slotProps
+    } = props,
+    other = _objectWithoutPropertiesLoose(props, _excluded);
   const IconButton = slots?.clearButton ?? MuiIconButton;
   // The spread is here to avoid this bug mui/material-ui#34056
   const _useSlotProps = useSlotProps({
@@ -29,30 +32,30 @@ export const useClearableField = ({
         title: localeText.fieldClearLabel
       }
     }),
-    iconButtonProps = _objectWithoutPropertiesLoose(_useSlotProps, _excluded);
+    iconButtonProps = _objectWithoutPropertiesLoose(_useSlotProps, _excluded2);
   const EndClearIcon = slots?.clearIcon ?? ClearIcon;
   const endClearIconProps = useSlotProps({
     elementType: EndClearIcon,
     externalSlotProps: slotProps?.clearIcon,
     ownerState: {}
   });
-  const InputProps = _extends({}, ForwardedInputProps, {
-    endAdornment: clearable ? /*#__PURE__*/_jsxs(React.Fragment, {
-      children: [/*#__PURE__*/_jsx(InputAdornment, {
-        position: "end",
-        sx: {
-          marginRight: ForwardedInputProps?.endAdornment ? -1 : -1.5
-        },
-        children: /*#__PURE__*/_jsx(IconButton, _extends({}, iconButtonProps, {
-          onClick: onClear,
-          children: /*#__PURE__*/_jsx(EndClearIcon, _extends({
-            fontSize: "small"
-          }, endClearIconProps))
-        }))
-      }), ForwardedInputProps?.endAdornment]
-    }) : ForwardedInputProps?.endAdornment
-  });
-  const fieldProps = _extends({}, forwardedFieldProps, {
+  return _extends({}, other, {
+    InputProps: _extends({}, InputProps, {
+      endAdornment: clearable ? /*#__PURE__*/_jsxs(React.Fragment, {
+        children: [/*#__PURE__*/_jsx(InputAdornment, {
+          position: "end",
+          sx: {
+            marginRight: InputProps?.endAdornment ? -1 : -1.5
+          },
+          children: /*#__PURE__*/_jsx(IconButton, _extends({}, iconButtonProps, {
+            onClick: onClear,
+            children: /*#__PURE__*/_jsx(EndClearIcon, _extends({
+              fontSize: "small"
+            }, endClearIconProps))
+          }))
+        }), InputProps?.endAdornment]
+      }) : InputProps?.endAdornment
+    }),
     sx: [{
       '& .clearButton': {
         opacity: 1
@@ -67,10 +70,6 @@ export const useClearableField = ({
           }
         }
       }
-    }, ...(Array.isArray(forwardedFieldProps.sx) ? forwardedFieldProps.sx : [forwardedFieldProps.sx])]
+    }, ...(Array.isArray(sx) ? sx : [sx])]
   });
-  return {
-    InputProps,
-    fieldProps
-  };
 };

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-date-pickers v7.0.0-alpha.3
+ * @mui/x-date-pickers v7.0.0-alpha.5
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/modern/internals/components/PickersArrowSwitcher/index.js

@@ -1 +1,2 @@
-export { PickersArrowSwitcher } from './PickersArrowSwitcher';
+export { PickersArrowSwitcher } from './PickersArrowSwitcher';
+export { pickersArrowSwitcherClasses, getPickersArrowSwitcherUtilityClass } from './pickersArrowSwitcherClasses';

package/modern/internals/components/PickersTextField/Outline.js

@@ -1,6 +1,6 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
-const _excluded = ["children", "classes", "className", "label", "notched"];
+const _excluded = ["children", "className", "label"];
 import * as React from 'react';
 import { styled } from '@mui/material/styles';
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -69,13 +69,11 @@ const OutlineLegend = styled('legend')(({
 export default function Outline(props) {
   const {
       className,
-      label,
-      notched
+      label
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const withLabel = label != null && label !== '';
   const ownerState = _extends({}, props, {
-    notched,
     withLabel
   });
   return /*#__PURE__*/_jsx(OutlineRoot, _extends({

package/modern/internals/components/PickersTextField/PickersInput.js

@@ -1,18 +1,20 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
-const _excluded = ["elements", "defaultValue", "label", "onFocus", "onWrapperClick", "onBlur", "valueStr", "onValueStrChange", "id", "InputProps", "inputProps", "autoFocus", "ownerState", "endAdornment", "startAdornment"];
+const _excluded = ["elements", "areAllSectionsEmpty", "defaultValue", "label", "value", "onChange", "id", "autoFocus", "endAdornment", "startAdornment", "contentEditable", "tabIndex", "fullWidth", "inputProps", "inputRef", "sectionsContainerRef"];
 import * as React from 'react';
 import clsx from 'clsx';
 import Box from '@mui/material/Box';
 import { useFormControl } from '@mui/material/FormControl';
 import { styled } from '@mui/material/styles';
 import useForkRef from '@mui/utils/useForkRef';
-import { unstable_composeClasses as composeClasses, unstable_capitalize as capitalize, visuallyHidden } from '@mui/utils';
+import composeClasses from '@mui/utils/composeClasses';
+import capitalize from '@mui/utils/capitalize';
+import visuallyHidden from '@mui/utils/visuallyHidden';
 import { pickersInputClasses, getPickersInputUtilityClass } from './pickersTextFieldClasses';
 import Outline from './Outline';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-const SectionsWrapper = styled(Box, {
+const PickersInputRoot = styled(Box, {
   name: 'MuiPickersInput',
   slot: 'Root',
   overridesResolver: (props, styles) => styles.root
@@ -29,6 +31,7 @@ const SectionsWrapper = styled(Box, {
     alignItems: 'center',
     width: ownerState.fullWidth ? '100%' : '25ch',
     position: 'relative',
+    outline: 'none',
     borderRadius: (theme.vars || theme).shape.borderRadius,
     [`&:hover .${pickersInputClasses.notchedOutline}`]: {
       borderColor: (theme.vars || theme).palette.text.primary
@@ -59,22 +62,30 @@ const SectionsWrapper = styled(Box, {
     padding: '8.5px 14px'
   });
 });
-const SectionsContainer = styled('div', {
+const PickersInputSectionsContainer = styled('div', {
   name: 'MuiPickersInput',
-  slot: 'Input',
-  overridesResolver: (props, styles) => styles.input
+  slot: 'SectionsContainer',
+  overridesResolver: (props, styles) => styles.sectionsContainer
 })(({
   theme,
   ownerState
-}) => ({
+}) => _extends({
   fontFamily: theme.typography.fontFamily,
   fontSize: 'inherit',
   lineHeight: '1.4375em',
   // 23px
   flexGrow: 1,
-  visibility: ownerState.adornedStart || ownerState.focused ? 'visible' : 'hidden'
-}));
-const SectionContainer = styled('span', {
+  outline: 'none'
+}, !(ownerState.adornedStart || ownerState.focused || ownerState.filled) && _extends({
+  color: 'currentColor'
+}, ownerState.label == null && (theme.vars ? {
+  opacity: theme.vars.opacity.inputPlaceholder
+} : {
+  opacity: theme.palette.mode === 'light' ? 0.42 : 0.5
+}), ownerState.label != null && {
+  opacity: 0
+})));
+const PickersInputSection = styled('span', {
   name: 'MuiPickersInput',
   slot: 'Section',
   overridesResolver: (props, styles) => styles.section
@@ -87,9 +98,9 @@ const SectionContainer = styled('span', {
   // 23px
   flexGrow: 1
 }));
-const SectionInput = styled('span', {
+const PickersInputContent = styled('span', {
   name: 'MuiPickersInput',
-  slot: 'Content',
+  slot: 'SectionContent',
   overridesResolver: (props, styles) => styles.content
 })(({
   theme
@@ -100,16 +111,16 @@ const SectionInput = styled('span', {
   letterSpacing: 'inherit',
   width: 'fit-content'
 }));
-const SectionSeparator = styled('span', {
+const PickersInputSeparator = styled('span', {
   name: 'MuiPickersInput',
   slot: 'Separator',
   overridesResolver: (props, styles) => styles.separator
 })(() => ({
   whiteSpace: 'pre'
 }));
-const FakeHiddenInput = styled('input', {
+const PickersInputInput = styled('input', {
   name: 'MuiPickersInput',
-  slot: 'HiddenInput',
+  slot: 'Input',
   overridesResolver: (props, styles) => styles.hiddenInput
 })(_extends({}, visuallyHidden));
 const NotchedOutlineRoot = styled(Outline, {
@@ -124,36 +135,6 @@ const NotchedOutlineRoot = styled(Outline, {
     borderColor: theme.vars ? `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.23)` : borderColor
   };
 });
-function InputContent({
-  elements,
-  contentEditable,
-  ownerState
-}) {
-  if (contentEditable) {
-    return elements.map(({
-      content,
-      before,
-      after
-    }) => `${before.children}${content.children}${after.children}`).join('');
-  }
-  return /*#__PURE__*/_jsx(React.Fragment, {
-    children: elements.map(({
-      container,
-      content,
-      before,
-      after
-    }, elementIndex) => /*#__PURE__*/_jsxs(SectionContainer, _extends({}, container, {
-      children: [/*#__PURE__*/_jsx(SectionSeparator, _extends({}, before, {
-        className: clsx(pickersInputClasses.before, before?.className)
-      })), /*#__PURE__*/_jsx(SectionInput, _extends({}, content, {
-        className: clsx(pickersInputClasses.content, content?.className),
-        ownerState
-      })), /*#__PURE__*/_jsx(SectionSeparator, _extends({}, after, {
-        className: clsx(pickersInputClasses.after, after?.className)
-      }))]
-    }), elementIndex))
-  });
-}
 const useUtilityClasses = ownerState => {
   const {
     focused,
@@ -161,104 +142,127 @@ const useUtilityClasses = ownerState => {
     error,
     classes,
     fullWidth,
+    readOnly,
     color,
     size,
     endAdornment,
     startAdornment
   } = ownerState;
   const slots = {
-    root: ['root', focused && !disabled && 'focused', disabled && 'disabled', error && 'error', fullWidth && 'fullWidth', `color${capitalize(color)}`, size === 'small' && 'inputSizeSmall', Boolean(startAdornment) && 'adornedStart', Boolean(endAdornment) && 'adornedEnd'],
+    root: ['root', focused && !disabled && 'focused', disabled && 'disabled', readOnly && 'readOnly', error && 'error', fullWidth && 'fullWidth', `color${capitalize(color)}`, size === 'small' && 'inputSizeSmall', Boolean(startAdornment) && 'adornedStart', Boolean(endAdornment) && 'adornedEnd'],
     notchedOutline: ['notchedOutline'],
-    before: ['before'],
-    after: ['after'],
-    content: ['content'],
-    input: ['input']
+    input: ['input'],
+    sectionsContainer: ['sectionsContainer'],
+    sectionContent: ['sectionContent'],
+    sectionBefore: ['sectionBefore'],
+    sectionAfter: ['sectionAfter']
   };
   return composeClasses(slots, getPickersInputUtilityClass, classes);
 };
-
-// TODO: move to utils
-// Separates the state props from the form control
-function formControlState({
-  props,
-  states,
-  muiFormControl
-}) {
-  return states.reduce((acc, state) => {
-    acc[state] = props[state];
-    if (muiFormControl) {
-      if (typeof props[state] === 'undefined') {
-        acc[state] = muiFormControl[state];
-      }
-    }
-    return acc;
-  }, {});
-}
-const PickersInput = /*#__PURE__*/React.forwardRef(function PickersInput(props, ref) {
+export const PickersInput = /*#__PURE__*/React.forwardRef(function PickersInput(props, ref) {
   const {
       elements,
+      areAllSectionsEmpty,
       label,
-      onWrapperClick,
-      valueStr,
-      onValueStrChange,
+      value,
+      onChange,
       id,
-      ownerState: ownerStateProp,
       endAdornment,
-      startAdornment
+      startAdornment,
+      contentEditable,
+      tabIndex,
+      inputProps,
+      inputRef,
+      sectionsContainerRef
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
-  const inputRef = React.useRef(null);
-  const handleInputRef = useForkRef(ref, inputRef);
+  const rootRef = React.useRef(null);
+  const handleRootRef = useForkRef(ref, rootRef);
+  const handleInputRef = useForkRef(inputProps?.ref, inputRef);
   const muiFormControl = useFormControl();
-  const fcs = formControlState({
-    props,
-    muiFormControl,
-    states: ['color', 'disabled', 'error', 'focused', 'size', 'required', 'fullWidth', 'adornedStart']
-  });
+  if (!muiFormControl) {
+    throw new Error('MUI: PickersInput should always be used inside a PickersTextField component');
+  }
+  const handleInputFocus = event => {
+    // Fix a bug with IE11 where the focus/blur events are triggered
+    // while the component is disabled.
+    if (muiFormControl.disabled) {
+      event.stopPropagation();
+      return;
+    }
+    muiFormControl.onFocus?.(event);
+  };
   React.useEffect(() => {
     if (muiFormControl) {
       muiFormControl.setAdornedStart(Boolean(startAdornment));
     }
   }, [muiFormControl, startAdornment]);
-  const ownerState = _extends({}, props, ownerStateProp, {
-    color: fcs.color || 'primary',
-    disabled: fcs.disabled,
-    error: fcs.error,
-    focused: fcs.focused,
-    fullWidth: fcs.fullWidth,
-    size: fcs.size
-  });
+  React.useEffect(() => {
+    if (!muiFormControl) {
+      return;
+    }
+    if (areAllSectionsEmpty) {
+      muiFormControl.onEmpty();
+    } else {
+      muiFormControl.onFilled();
+    }
+  }, [muiFormControl, areAllSectionsEmpty]);
+  const ownerState = _extends({}, props, muiFormControl);
   const classes = useUtilityClasses(ownerState);
-  return /*#__PURE__*/_jsxs(SectionsWrapper, _extends({
-    ref: handleInputRef
-  }, other, {
+  return /*#__PURE__*/_jsxs(PickersInputRoot, _extends({}, other, {
     className: classes.root,
-    onClick: onWrapperClick,
     ownerState: ownerState,
-    "aria-invalid": fcs.error,
-    children: [startAdornment, /*#__PURE__*/_jsxs(SectionsContainer, {
+    "aria-invalid": muiFormControl.error,
+    ref: handleRootRef,
+    children: [startAdornment, /*#__PURE__*/_jsx(PickersInputSectionsContainer, {
       ownerState: ownerState,
-      className: classes.input,
-      children: [/*#__PURE__*/_jsx(InputContent, {
-        elements: elements,
-        contentEditable: other.contentEditable,
-        ownerState: ownerState
-      }), /*#__PURE__*/_jsx(FakeHiddenInput, {
-        value: valueStr,
-        onChange: onValueStrChange,
-        id: id,
-        "aria-hidden": "true",
-        tabIndex: -1
-      })]
+      className: classes.sectionsContainer,
+      contentEditable: contentEditable,
+      suppressContentEditableWarning: true,
+      onFocus: handleInputFocus,
+      onBlur: muiFormControl.onBlur,
+      tabIndex: tabIndex,
+      ref: sectionsContainerRef,
+      children: contentEditable ? elements.map(({
+        content,
+        before,
+        after
+      }) => `${before.children}${content.children}${after.children}`).join('') : /*#__PURE__*/_jsx(React.Fragment, {
+        children: elements.map(({
+          container,
+          content,
+          before,
+          after
+        }, elementIndex) => /*#__PURE__*/_jsxs(PickersInputSection, _extends({}, container, {
+          children: [/*#__PURE__*/_jsx(PickersInputSeparator, _extends({}, before, {
+            className: clsx(pickersInputClasses.sectionBefore, before?.className)
+          })), /*#__PURE__*/_jsx(PickersInputContent, _extends({}, content, {
+            suppressContentEditableWarning: true,
+            className: clsx(pickersInputClasses.sectionContent, content?.className),
+            ownerState
+          })), /*#__PURE__*/_jsx(PickersInputSeparator, _extends({}, after, {
+            className: clsx(pickersInputClasses.sectionAfter, after?.className)
+          }))]
+        }), elementIndex))
+      })
     }), endAdornment, /*#__PURE__*/_jsx(NotchedOutlineRoot, {
-      shrink: fcs.adornedStart || fcs.focused,
-      notched: fcs.adornedStart || fcs.focused,
+      shrink: muiFormControl.adornedStart || muiFormControl.focused || muiFormControl.filled,
+      notched: muiFormControl.adornedStart || muiFormControl.focused || muiFormControl.filled,
       className: classes.notchedOutline,
-      label: label != null && label !== '' && fcs.required ? /*#__PURE__*/_jsxs(React.Fragment, {
+      label: label != null && label !== '' && muiFormControl.required ? /*#__PURE__*/_jsxs(React.Fragment, {
         children: [label, "\u2009", '*']
       }) : label,
       ownerState: ownerState
-    })]
+    }), /*#__PURE__*/_jsx(PickersInputInput, _extends({
+      className: classes.input,
+      value: value,
+      onChange: onChange,
+      id: id,
+      "aria-hidden": "true",
+      tabIndex: -1
+    }, inputProps, {
+      ref: handleInputRef
+    }))]
   }));
 });
-export default PickersInput;
+PickersInput.muiName = 'Input';