@mui/x-date-pickers 6.2.0 → 6.3.0

package/legacy/internals/hooks/useDesktopPicker/useDesktopPicker.js

@@ -1,8 +1,9 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["ownerState"],
-  _excluded2 = ["ownerState"];
+var _excluded = ["props", "getOpenDialogAriaText"],
+  _excluded2 = ["ownerState"],
+  _excluded3 = ["ownerState"];
 import * as React from 'react';
 import { useSlotProps } from '@mui/base/utils';
 import MuiInputAdornment from '@mui/material/InputAdornment';
@@ -25,9 +26,8 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 export var useDesktopPicker = function useDesktopPicker(_ref) {
   var _innerSlotProps$toolb, _innerSlotProps$toolb2, _slots$inputAdornment, _slots$openPickerButt, _slots$layout;
   var props = _ref.props,
-    valueManager = _ref.valueManager,
     getOpenDialogAriaText = _ref.getOpenDialogAriaText,
-    validator = _ref.validator;
+    pickerParams = _objectWithoutProperties(_ref, _excluded);
   var slots = props.slots,
     innerSlotProps = props.slotProps,
     className = props.className,
@@ -45,15 +45,13 @@ export var useDesktopPicker = function useDesktopPicker(_ref) {
   var containerRef = React.useRef(null);
   var labelId = useId();
   var isToolbarHidden = (_innerSlotProps$toolb = innerSlotProps == null ? void 0 : (_innerSlotProps$toolb2 = innerSlotProps.toolbar) == null ? void 0 : _innerSlotProps$toolb2.hidden) != null ? _innerSlotProps$toolb : false;
-  var _usePicker = usePicker({
+  var _usePicker = usePicker(_extends({}, pickerParams, {
       props: props,
       inputRef: internalInputRef,
-      valueManager: valueManager,
-      validator: validator,
       autoFocusView: true,
       additionalViewProps: {},
       wrapperVariant: 'desktop'
-    }),
+    })),
     open = _usePicker.open,
     actions = _usePicker.actions,
     hasUIView = _usePicker.hasUIView,
@@ -71,7 +69,7 @@ export var useDesktopPicker = function useDesktopPicker(_ref) {
       ownerState: props
     }),
     inputAdornmentOwnerState = _useSlotProps.ownerState,
-    inputAdornmentProps = _objectWithoutProperties(_useSlotProps, _excluded);
+    inputAdornmentProps = _objectWithoutProperties(_useSlotProps, _excluded2);
   var OpenPickerButton = (_slots$openPickerButt = slots.openPickerButton) != null ? _slots$openPickerButt : IconButton;
   var _useSlotProps2 = useSlotProps({
       elementType: OpenPickerButton,
@@ -85,7 +83,7 @@ export var useDesktopPicker = function useDesktopPicker(_ref) {
       ownerState: props
     }),
     openPickerButtonOwnerState = _useSlotProps2.ownerState,
-    openPickerButtonProps = _objectWithoutProperties(_useSlotProps2, _excluded2);
+    openPickerButtonProps = _objectWithoutProperties(_useSlotProps2, _excluded3);
   var OpenPickerIcon = slots.openPickerIcon;
   var Field = slots.field;
   var fieldProps = useSlotProps({
@@ -101,7 +99,8 @@ export var useDesktopPicker = function useDesktopPicker(_ref) {
       format: format,
       formatDensity: formatDensity,
       label: label,
-      autoFocus: autoFocus && !props.open
+      autoFocus: autoFocus && !props.open,
+      focused: open ? true : undefined
     }),
     ownerState: props
   });

package/legacy/internals/hooks/useField/useField.js

@@ -7,7 +7,7 @@ import useEnhancedEffect from '@mui/utils/useEnhancedEffect';
 import useEventCallback from '@mui/utils/useEventCallback';
 import useForkRef from '@mui/utils/useForkRef';
 import { useTheme } from '@mui/material/styles';
-import { useValidation } from '../validation/useValidation';
+import { useValidation } from '../useValidation';
 import { useUtils } from '../useUtils';
 import { adjustSectionValue, isAndroid, cleanString, getSectionOrder } from './useField.utils';
 import { useFieldState } from './useFieldState';
@@ -26,14 +26,6 @@ export var useField = function useField(params) {
     setTempAndroidValueStr = _useFieldState.setTempAndroidValueStr,
     sectionsValueBoundaries = _useFieldState.sectionsValueBoundaries,
     placeholder = _useFieldState.placeholder;
-  var _useFieldCharacterEdi = useFieldCharacterEditing({
-      sections: state.sections,
-      updateSectionValue: updateSectionValue,
-      sectionsValueBoundaries: sectionsValueBoundaries,
-      setTempAndroidValueStr: setTempAndroidValueStr
-    }),
-    applyCharacterEditing = _useFieldCharacterEdi.applyCharacterEditing,
-    resetCharacterQuery = _useFieldCharacterEdi.resetCharacterQuery;
   var inputRefProp = params.inputRef,
     internalProps = params.internalProps,
     _params$internalProps = params.internalProps,
@@ -52,6 +44,14 @@ export var useField = function useField(params) {
     fieldValueManager = params.fieldValueManager,
     valueManager = params.valueManager,
     validator = params.validator;
+  var _useFieldCharacterEdi = useFieldCharacterEditing({
+      sections: state.sections,
+      updateSectionValue: updateSectionValue,
+      sectionsValueBoundaries: sectionsValueBoundaries,
+      setTempAndroidValueStr: setTempAndroidValueStr
+    }),
+    applyCharacterEditing = _useFieldCharacterEdi.applyCharacterEditing,
+    resetCharacterQuery = _useFieldCharacterEdi.resetCharacterQuery;
   var inputRef = React.useRef(null);
   var handleRef = useForkRef(inputRefProp, inputRef);
   var focusTimeoutRef = React.useRef(undefined);
@@ -130,7 +130,8 @@ export var useField = function useField(params) {
       var activeSection = state.sections[selectedSectionIndexes.startIndex];
       var lettersOnly = /^[a-zA-Z]+$/.test(pastedValue);
       var digitsOnly = /^[0-9]+$/.test(pastedValue);
-      var isValidPastedValue = activeSection.contentType === 'letter' && lettersOnly || activeSection.contentType === 'digit' && digitsOnly;
+      var digitsAndLetterOnly = /^(([a-zA-Z]+)|)([0-9]+)(([a-zA-Z]+)|)$/.test(pastedValue);
+      var isValidPastedValue = activeSection.contentType === 'letter' && lettersOnly || activeSection.contentType === 'digit' && digitsOnly || activeSection.contentType === 'digit-with-letter' && digitsAndLetterOnly;
       if (isValidPastedValue) {
         // Early return to let the paste update section, value
         return;

package/legacy/internals/hooks/useField/useField.utils.js

@@ -8,12 +8,14 @@ export var getDateSectionConfigFromFormatToken = function getDateSectionConfigFr
   if (typeof config === 'string') {
     return {
       type: config,
-      contentType: config === 'meridiem' ? 'letter' : 'digit'
+      contentType: config === 'meridiem' ? 'letter' : 'digit',
+      maxLength: undefined
     };
   }
   return {
     type: config.sectionType,
-    contentType: config.contentType
+    contentType: config.contentType,
+    maxLength: config.maxLength
   };
 };
 var getDeltaFromKeyCode = function getDeltaFromKeyCode(keyCode) {
@@ -69,36 +71,33 @@ export var getLetterEditingOptions = function getLetterEditingOptions(utils, sec
       }
   }
 };
-export var cleanDigitSectionValue = function cleanDigitSectionValue(utils, value, sectionType, format, hasLeadingZeros, sectionBoundaries) {
-  var hasLetter = function hasLetter() {
-    var startOfYear = utils.startOfYear(utils.date());
-    var startOfYearStr = utils.formatByString(startOfYear, format);
-    return Number.isNaN(Number(startOfYearStr));
-  };
+export var cleanLeadingZeros = function cleanLeadingZeros(utils, valueStr, size) {
+  var cleanValueStr = valueStr;
+
+  // Remove the leading zeros
+  cleanValueStr = Number(cleanValueStr).toString();
+
+  // Add enough leading zeros to fill the section
+  while (cleanValueStr.length < size) {
+    cleanValueStr = "0".concat(cleanValueStr);
+  }
+  return cleanValueStr;
+};
+export var cleanDigitSectionValue = function cleanDigitSectionValue(utils, value, sectionBoundaries, section) {
   if (process.env.NODE_ENV !== 'production') {
-    if (sectionType !== 'day' && hasLetter()) {
-      throw new Error(["MUI: The token \"".concat(format, "\" is a digit format with letter in it.'\n             This type of format is only supported for 'day' sections")].join('\n'));
+    if (section.type !== 'day' && section.contentType === 'digit-with-letter') {
+      throw new Error(["MUI: The token \"".concat(section.format, "\" is a digit format with letter in it.'\n             This type of format is only supported for 'day' sections")].join('\n'));
     }
   }
-  if (sectionType === 'day' && hasLetter()) {
+  if (section.type === 'day' && section.contentType === 'digit-with-letter') {
     var date = utils.setDate(sectionBoundaries.longestMonth, value);
-    return utils.formatByString(date, format);
+    return utils.formatByString(date, section.format);
   }
 
   // queryValue without leading `0` (`01` => `1`)
   var valueStr = value.toString();
-  if (hasLeadingZeros) {
-    var size = utils.formatByString(utils.date(), format).length;
-    var cleanValueStr = valueStr;
-
-    // Remove the leading zeros
-    cleanValueStr = Number(cleanValueStr).toString();
-
-    // Add enough leading zeros to fill the section
-    while (cleanValueStr.length < size) {
-      cleanValueStr = "0".concat(cleanValueStr);
-    }
-    return cleanValueStr;
+  if (section.hasLeadingZerosInInput) {
+    return cleanLeadingZeros(utils, valueStr, section.maxLength);
   }
   return valueStr;
 };
@@ -114,7 +113,7 @@ export var adjustSectionValue = function adjustSectionValue(utils, section, keyC
       contentType: section.contentType
     });
     var getCleanValue = function getCleanValue(value) {
-      return cleanDigitSectionValue(utils, value, section.type, section.format, section.hasLeadingZeros, sectionBoundaries);
+      return cleanDigitSectionValue(utils, value, sectionBoundaries, section);
     };
     if (shouldSetAbsolute) {
       if (section.type === 'year' && !isEnd && !isStart) {
@@ -150,20 +149,24 @@ export var adjustSectionValue = function adjustSectionValue(utils, section, keyC
     var newOptionIndex = (currentOptionIndex + options.length + delta) % options.length;
     return options[newOptionIndex];
   };
-  if (section.contentType === 'digit') {
+  if (section.contentType === 'digit' || section.contentType === 'digit-with-letter') {
     return adjustDigitSection();
   }
   return adjustLetterSection();
 };
 export var getSectionVisibleValue = function getSectionVisibleValue(section, target) {
   var value = section.value || section.placeholder;
+  var hasLeadingZeros = target === 'non-input' ? section.hasLeadingZerosInFormat : section.hasLeadingZerosInInput;
+  if (target === 'non-input' && section.hasLeadingZerosInInput && !section.hasLeadingZerosInFormat) {
+    value = Number(value).toString();
+  }
 
   // In the input, we add an empty character at the end of each section without leading zeros.
   // This makes sure that `onChange` will always be fired.
   // Otherwise, when your input value equals `1/dd/yyyy` (format `M/DD/YYYY` on DayJs),
   // If you press `1`, on the first section, the new value is also `1/dd/yyyy`,
   // So the browser will not fire the input `onChange`.
-  var shouldAddInvisibleSpace = ['input-rtl', 'input-ltr'].includes(target) && section.contentType === 'digit' && !section.hasLeadingZeros && value.length === 1;
+  var shouldAddInvisibleSpace = ['input-rtl', 'input-ltr'].includes(target) && section.contentType === 'digit' && !hasLeadingZeros && value.length === 1;
   if (shouldAddInvisibleSpace) {
     value = "".concat(value, "\u200E");
   }
@@ -259,7 +262,7 @@ export var changeSectionValueFormat = function changeSectionValueFormat(utils, v
 var isFourDigitYearFormat = function isFourDigitYearFormat(utils, format) {
   return utils.formatByString(utils.date(), format).length === 4;
 };
-export var doesSectionHaveLeadingZeros = function doesSectionHaveLeadingZeros(utils, contentType, sectionType, format) {
+export var doesSectionFormatHaveLeadingZeros = function doesSectionFormatHaveLeadingZeros(utils, contentType, sectionType, format) {
   if (contentType !== 'digit') {
     return false;
   }
@@ -320,21 +323,41 @@ var getEscapedPartsFromFormat = function getEscapedPartsFromFormat(utils, format
   }
   return escapedParts;
 };
-export var splitFormatIntoSections = function splitFormatIntoSections(utils, localeText, format, date, formatDensity) {
+export var splitFormatIntoSections = function splitFormatIntoSections(utils, localeText, format, date, formatDensity, shouldRespectLeadingZeros) {
   var startSeparator = '';
   var sections = [];
+  var now = utils.date();
   var commitToken = function commitToken(token) {
     if (token === '') {
       return null;
     }
     var sectionConfig = getDateSectionConfigFromFormatToken(utils, token);
-    var sectionValue = date == null || !utils.isValid(date) ? '' : utils.formatByString(date, token);
-    var hasLeadingZeros = doesSectionHaveLeadingZeros(utils, sectionConfig.contentType, sectionConfig.type, token);
+    var hasLeadingZerosInFormat = doesSectionFormatHaveLeadingZeros(utils, sectionConfig.contentType, sectionConfig.type, token);
+    var hasLeadingZerosInInput = shouldRespectLeadingZeros ? hasLeadingZerosInFormat : sectionConfig.contentType === 'digit';
+    var isValidDate = date != null && utils.isValid(date);
+    var sectionValue = isValidDate ? utils.formatByString(date, token) : '';
+    var maxLength = null;
+    if (hasLeadingZerosInInput) {
+      if (hasLeadingZerosInFormat) {
+        maxLength = sectionValue === '' ? utils.formatByString(now, token).length : sectionValue.length;
+      } else {
+        if (sectionConfig.maxLength == null) {
+          throw new Error("MUI: The token ".concat(token, " should have a 'maxDigitNumber' property on it's adapter"));
+        }
+        maxLength = sectionConfig.maxLength;
+        if (isValidDate) {
+          sectionValue = cleanLeadingZeros(utils, sectionValue, maxLength);
+        }
+      }
+    }
     sections.push(_extends({}, sectionConfig, {
       format: token,
+      maxLength: maxLength,
       value: sectionValue,
       placeholder: getSectionPlaceholder(utils, localeText, sectionConfig, token),
-      hasLeadingZeros: hasLeadingZeros,
+      hasLeadingZeros: hasLeadingZerosInFormat,
+      hasLeadingZerosInFormat: hasLeadingZerosInFormat,
+      hasLeadingZerosInInput: hasLeadingZerosInInput,
       startSeparator: sections.length === 0 ? startSeparator : '',
       endSeparator: '',
       modified: false
@@ -434,7 +457,8 @@ export var getDateFromDateSections = function getDateFromDateSections(utils, sec
 };
 export var createDateStrForInputFromSections = function createDateStrForInputFromSections(sections, isRTL) {
   var formattedSections = sections.map(function (section) {
-    return "".concat(section.startSeparator).concat(getSectionVisibleValue(section, isRTL ? 'input-rtl' : 'input-ltr')).concat(section.endSeparator);
+    var dateValue = getSectionVisibleValue(section, isRTL ? 'input-rtl' : 'input-ltr');
+    return "".concat(section.startSeparator).concat(dateValue).concat(section.endSeparator);
   });
   var dateStr = formattedSections.join('');
   if (!isRTL) {
@@ -665,7 +689,7 @@ export var clampDaySectionIfPossible = function clampDaySectionIfPossible(utils,
       contentType: section.contentType
     });
     return _extends({}, section, {
-      value: cleanDigitSectionValue(utils, dayBoundaries.minimum, section.type, section.format, section.hasLeadingZeros, dayBoundaries)
+      value: cleanDigitSectionValue(utils, dayBoundaries.minimum, dayBoundaries, section)
     });
   });
   var startOfMonth = getDateFromDateSections(utils, sectionsForStartOfMonth);

package/legacy/internals/hooks/useField/useFieldCharacterEditing.js

@@ -3,7 +3,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import * as React from 'react';
 import useEventCallback from '@mui/utils/useEventCallback';
 import { useUtils } from '../useUtils';
-import { changeSectionValueFormat, cleanDigitSectionValue, doesSectionHaveLeadingZeros, getDateSectionConfigFromFormatToken, getDaysInWeekStr, getLetterEditingOptions } from './useField.utils';
+import { changeSectionValueFormat, cleanDigitSectionValue, doesSectionFormatHaveLeadingZeros, getDateSectionConfigFromFormatToken, getDaysInWeekStr, getLetterEditingOptions } from './useField.utils';
 
 /**
  * The letter editing and the numeric editing each define a `CharacterEditingApplier`.
@@ -177,12 +177,12 @@ export var useFieldCharacterEditing = function useFieldCharacterEditing(_ref) {
     return applyQuery(params, getFirstSectionValueMatchingWithQuery);
   };
   var applyNumericEditing = function applyNumericEditing(params) {
-    var getNewSectionValue = function getNewSectionValue(queryValue, sectionType, format, hasLeadingZeros, contentType) {
+    var getNewSectionValue = function getNewSectionValue(queryValue, section) {
       var queryValueNumber = Number("".concat(queryValue));
-      var sectionBoundaries = sectionsValueBoundaries[sectionType]({
+      var sectionBoundaries = sectionsValueBoundaries[section.type]({
         currentDate: null,
-        format: format,
-        contentType: contentType
+        format: section.format,
+        contentType: section.contentType
       });
       if (queryValueNumber > sectionBoundaries.maximum) {
         return {
@@ -199,21 +199,29 @@ export var useFieldCharacterEditing = function useFieldCharacterEditing(_ref) {
         };
       }
       var shouldGoToNextSection = Number("".concat(queryValue, "0")) > sectionBoundaries.maximum || queryValue.length === sectionBoundaries.maximum.toString().length;
-      var newSectionValue = cleanDigitSectionValue(utils, queryValueNumber, sectionType, format, hasLeadingZeros, sectionBoundaries);
+      var newSectionValue = cleanDigitSectionValue(utils, queryValueNumber, sectionBoundaries, section);
       return {
         sectionValue: newSectionValue,
         shouldGoToNextSection: shouldGoToNextSection
       };
     };
     var getFirstSectionValueMatchingWithQuery = function getFirstSectionValueMatchingWithQuery(queryValue, activeSection) {
-      if (activeSection.contentType === 'digit') {
-        return getNewSectionValue(queryValue, activeSection.type, activeSection.format, activeSection.hasLeadingZeros, activeSection.contentType);
+      if (activeSection.contentType === 'digit' || activeSection.contentType === 'digit-with-letter') {
+        return getNewSectionValue(queryValue, activeSection);
       }
 
       // When editing a letter-format month and the user presses a digit,
       // We can support the numeric editing by using the digit-format month and re-formatting the result.
       if (activeSection.type === 'month') {
-        var response = getNewSectionValue(queryValue, activeSection.type, 'MM', doesSectionHaveLeadingZeros(utils, 'digit', 'month', 'MM'), 'digit');
+        var hasLeadingZerosInFormat = doesSectionFormatHaveLeadingZeros(utils, 'digit', 'month', 'MM');
+        var response = getNewSectionValue(queryValue, {
+          type: activeSection.type,
+          format: 'MM',
+          hasLeadingZerosInFormat: hasLeadingZerosInFormat,
+          hasLeadingZerosInInput: true,
+          contentType: 'digit',
+          maxLength: 2
+        });
         if (isQueryResponseWithoutValue(response)) {
           return response;
         }
@@ -226,7 +234,7 @@ export var useFieldCharacterEditing = function useFieldCharacterEditing(_ref) {
       // When editing a letter-format weekDay and the user presses a digit,
       // We can support the numeric editing by returning the nth day in the week day array.
       if (activeSection.type === 'weekDay') {
-        var _response = getNewSectionValue(queryValue, activeSection.type, activeSection.format, activeSection.hasLeadingZeros, activeSection.contentType);
+        var _response = getNewSectionValue(queryValue, activeSection);
         if (isQueryResponseWithoutValue(_response)) {
           return _response;
         }

package/legacy/internals/hooks/useField/useFieldState.js

@@ -26,7 +26,9 @@ export var useFieldState = function useFieldState(params) {
     _params$internalProps2 = _params$internalProps.formatDensity,
     formatDensity = _params$internalProps2 === void 0 ? 'dense' : _params$internalProps2,
     selectedSectionsProp = _params$internalProps.selectedSections,
-    onSelectedSectionsChange = _params$internalProps.onSelectedSectionsChange;
+    onSelectedSectionsChange = _params$internalProps.onSelectedSectionsChange,
+    _params$internalProps3 = _params$internalProps.shouldRespectLeadingZeros,
+    shouldRespectLeadingZeros = _params$internalProps3 === void 0 ? false : _params$internalProps3;
   var firstDefaultValue = React.useRef(defaultValue);
   var valueFromTheOutside = (_ref = valueProp != null ? valueProp : firstDefaultValue.current) != null ? _ref : valueManager.emptyValue;
   var sectionsValueBoundaries = React.useMemo(function () {
@@ -35,9 +37,9 @@ export var useFieldState = function useFieldState(params) {
   var getSectionsFromValue = React.useCallback(function (value) {
     var fallbackSections = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
     return fieldValueManager.getSectionsFromValue(utils, value, fallbackSections, isRTL, function (date) {
-      return splitFormatIntoSections(utils, localeText, format, date, formatDensity);
+      return splitFormatIntoSections(utils, localeText, format, date, formatDensity, shouldRespectLeadingZeros);
     });
-  }, [fieldValueManager, format, localeText, isRTL, utils, formatDensity]);
+  }, [fieldValueManager, format, localeText, isRTL, shouldRespectLeadingZeros, utils, formatDensity]);
   var placeholder = React.useMemo(function () {
     return fieldValueManager.getValueStrFromSections(getSectionsFromValue(valueManager.emptyValue), isRTL);
   }, [fieldValueManager, getSectionsFromValue, valueManager.emptyValue, isRTL]);
@@ -47,7 +49,7 @@ export var useFieldState = function useFieldState(params) {
       return {
         sections: sections,
         value: valueFromTheOutside,
-        referenceValue: fieldValueManager.updateReferenceValue(utils, valueFromTheOutside, valueManager.getTodayValue(utils)),
+        referenceValue: fieldValueManager.updateReferenceValue(utils, valueFromTheOutside, valueManager.getTodayValue(utils, valueType)),
         tempValueStrAndroid: null
       };
     }),
@@ -178,7 +180,7 @@ export var useFieldState = function useFieldState(params) {
       if (date == null || !utils.isValid(date)) {
         return null;
       }
-      var sections = splitFormatIntoSections(utils, localeText, format, date, formatDensity);
+      var sections = splitFormatIntoSections(utils, localeText, format, date, formatDensity, shouldRespectLeadingZeros);
       return mergeDateIntoReferenceDate(utils, date, sections, referenceDate, false);
     };
     var newValue = fieldValueManager.parseValueStr(valueStr, state.referenceValue, parseDateStr);

package/legacy/internals/hooks/useMobilePicker/useMobilePicker.js

@@ -1,4 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["props", "getOpenDialogAriaText"];
 import * as React from 'react';
 import { useSlotProps } from '@mui/base/utils';
 import useForkRef from '@mui/utils/useForkRef';
@@ -20,9 +22,8 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 export var useMobilePicker = function useMobilePicker(_ref) {
   var _innerSlotProps$toolb, _innerSlotProps$toolb2, _slots$layout;
   var props = _ref.props,
-    valueManager = _ref.valueManager,
     getOpenDialogAriaText = _ref.getOpenDialogAriaText,
-    validator = _ref.validator;
+    pickerParams = _objectWithoutProperties(_ref, _excluded);
   var slots = props.slots,
     innerSlotProps = props.slotProps,
     className = props.className,
@@ -38,15 +39,13 @@ export var useMobilePicker = function useMobilePicker(_ref) {
   var internalInputRef = React.useRef(null);
   var labelId = useId();
   var isToolbarHidden = (_innerSlotProps$toolb = innerSlotProps == null ? void 0 : (_innerSlotProps$toolb2 = innerSlotProps.toolbar) == null ? void 0 : _innerSlotProps$toolb2.hidden) != null ? _innerSlotProps$toolb : false;
-  var _usePicker = usePicker({
+  var _usePicker = usePicker(_extends({}, pickerParams, {
       props: props,
       inputRef: internalInputRef,
-      valueManager: valueManager,
-      validator: validator,
       autoFocusView: true,
       additionalViewProps: {},
       wrapperVariant: 'mobile'
-    }),
+    })),
     open = _usePicker.open,
     actions = _usePicker.actions,
     layoutProps = _usePicker.layoutProps,

package/legacy/internals/hooks/usePicker/usePicker.js

@@ -6,6 +6,7 @@ var warnRenderInputIsDefined = buildWarning(['The `renderInput` prop has been re
 export var usePicker = function usePicker(_ref) {
   var props = _ref.props,
     valueManager = _ref.valueManager,
+    valueType = _ref.valueType,
     wrapperVariant = _ref.wrapperVariant,
     inputRef = _ref.inputRef,
     additionalViewProps = _ref.additionalViewProps,
@@ -19,6 +20,7 @@ export var usePicker = function usePicker(_ref) {
   var pickerValueResponse = usePickerValue({
     props: props,
     valueManager: valueManager,
+    valueType: valueType,
     wrapperVariant: wrapperVariant,
     validator: validator
   });

package/legacy/internals/hooks/usePicker/usePickerValue.js

@@ -5,7 +5,7 @@ import { unstable_useControlled as useControlled } from '@mui/utils';
 import useEventCallback from '@mui/utils/useEventCallback';
 import { useOpenState } from '../useOpenState';
 import { useLocalizationContext, useUtils } from '../useUtils';
-import { useValidation } from '../validation/useValidation';
+import { useValidation } from '../useValidation';
 /**
  * Decide if the new value should be published
  * The published value will be passed to `onChange` if defined.
@@ -92,6 +92,7 @@ var shouldClosePicker = function shouldClosePicker(params) {
 export var usePickerValue = function usePickerValue(_ref) {
   var props = _ref.props,
     valueManager = _ref.valueManager,
+    valueType = _ref.valueType,
     wrapperVariant = _ref.wrapperVariant,
     validator = _ref.validator;
   var onAccept = props.onAccept,
@@ -200,21 +201,16 @@ export var usePickerValue = function usePickerValue(_ref) {
       setIsOpen(false);
     }
   });
-  React.useEffect(function () {
-    if (isOpen) {
-      setDateState(function (prev) {
-        return _extends({}, prev, {
-          lastCommittedValue: dateState.draft
-        });
-      });
-    }
-  }, [isOpen]); // eslint-disable-line react-hooks/exhaustive-deps
-
   if (inValue !== undefined && (dateState.lastControlledValue === undefined || !valueManager.areValuesEqual(utils, dateState.lastControlledValue, inValue))) {
+    var isUpdateComingFromPicker = valueManager.areValuesEqual(utils, dateState.draft, inValue);
     setDateState(function (prev) {
       return _extends({}, prev, {
-        lastControlledValue: inValue,
-        draft: inValue
+        lastControlledValue: inValue
+      }, isUpdateComingFromPicker ? {} : {
+        lastCommittedValue: inValue,
+        lastPublishedValue: inValue,
+        draft: inValue,
+        hasBeenModifiedSinceMount: true
       });
     });
   }
@@ -248,7 +244,7 @@ export var usePickerValue = function usePickerValue(_ref) {
   });
   var handleSetToday = useEventCallback(function () {
     updateDate({
-      value: valueManager.getTodayValue(utils),
+      value: valueManager.getTodayValue(utils, valueType),
       name: 'setValueFromAction',
       pickerAction: 'today'
     });

package/legacy/internals/hooks/useStaticPicker/useStaticPicker.js

@@ -1,5 +1,7 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["props", "ref"];
 import * as React from 'react';
 import clsx from 'clsx';
 import { styled } from '@mui/material/styles';
@@ -26,9 +28,8 @@ var PickerStaticLayout = styled(PickersLayout)(function (_ref) {
 export var useStaticPicker = function useStaticPicker(_ref2) {
   var _slots$layout;
   var props = _ref2.props,
-    valueManager = _ref2.valueManager,
-    validator = _ref2.validator,
-    ref = _ref2.ref;
+    ref = _ref2.ref,
+    pickerParams = _objectWithoutProperties(_ref2, _excluded);
   var localeText = props.localeText,
     slots = props.slots,
     slotProps = props.slotProps,
@@ -36,14 +37,12 @@ export var useStaticPicker = function useStaticPicker(_ref2) {
     sx = props.sx,
     displayStaticWrapperAs = props.displayStaticWrapperAs,
     autoFocus = props.autoFocus;
-  var _usePicker = usePicker({
+  var _usePicker = usePicker(_extends({}, pickerParams, {
       props: props,
-      valueManager: valueManager,
-      validator: validator,
       autoFocusView: autoFocus != null ? autoFocus : false,
       additionalViewProps: {},
       wrapperVariant: displayStaticWrapperAs
-    }),
+    })),
     layoutProps = _usePicker.layoutProps,
     renderCurrentView = _usePicker.renderCurrentView;
   var Layout = (_slots$layout = slots == null ? void 0 : slots.layout) != null ? _slots$layout : PickerStaticLayout;

package/legacy/internals/hooks/{validation/useValidation.js → useValidation.js}

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { useLocalizationContext } from '../useUtils';
+import { useLocalizationContext } from './useUtils';
 export function useValidation(props, validate, isSameError, defaultErrorState) {
   var value = props.value,
     onError = props.onError;

package/legacy/internals/hooks/useViews.js

@@ -59,24 +59,14 @@ export function useViews(_ref) {
   var previousView = (_views = views[viewIndex - 1]) != null ? _views : null;
   var nextView = (_views2 = views[viewIndex + 1]) != null ? _views2 : null;
   var handleChangeView = useEventCallback(function (newView) {
+    if (newView === view) {
+      return;
+    }
     setView(newView);
     if (onViewChange) {
       onViewChange(newView);
     }
   });
-  var goToNextView = useEventCallback(function () {
-    if (nextView) {
-      handleChangeView(nextView);
-    }
-  });
-  var setValueAndGoToNextView = useEventCallback(function (value, currentViewSelectionState) {
-    var isSelectionFinishedOnCurrentView = currentViewSelectionState === 'finish';
-    var globalSelectionState = isSelectionFinishedOnCurrentView && Boolean(nextView) ? 'partial' : currentViewSelectionState;
-    onChange(value, globalSelectionState);
-    if (isSelectionFinishedOnCurrentView) {
-      goToNextView();
-    }
-  });
   var handleFocusedViewChange = useEventCallback(function (viewToFocus, hasFocus) {
     if (hasFocus) {
       // Focus event
@@ -91,6 +81,31 @@ export function useViews(_ref) {
 
     onFocusedViewChange == null ? void 0 : onFocusedViewChange(viewToFocus, hasFocus);
   });
+  var goToNextView = useEventCallback(function () {
+    if (nextView) {
+      handleChangeView(nextView);
+    }
+    handleFocusedViewChange(nextView, true);
+  });
+  var setValueAndGoToNextView = useEventCallback(function (value, currentViewSelectionState, selectedView) {
+    var isSelectionFinishedOnCurrentView = currentViewSelectionState === 'finish';
+    var hasMoreViews = selectedView ?
+    // handles case like `DateTimePicker`, where a view might return a `finish` selection state
+    // but we it's not the final view given all `views` -> overall selection state should be `partial`.
+    views.indexOf(selectedView) < views.length - 1 : Boolean(nextView);
+    var globalSelectionState = isSelectionFinishedOnCurrentView && hasMoreViews ? 'partial' : currentViewSelectionState;
+    onChange(value, globalSelectionState);
+    if (isSelectionFinishedOnCurrentView) {
+      goToNextView();
+    }
+  });
+  var setValueAndGoToView = useEventCallback(function (value, newView, selectedView) {
+    onChange(value, newView ? 'partial' : 'finish', selectedView);
+    if (newView) {
+      handleChangeView(newView);
+      handleFocusedViewChange(newView, true);
+    }
+  });
   return {
     view: view,
     setView: handleChangeView,
@@ -100,6 +115,7 @@ export function useViews(_ref) {
     previousView: previousView,
     defaultView: defaultView.current,
     goToNextView: goToNextView,
-    setValueAndGoToNextView: setValueAndGoToNextView
+    setValueAndGoToNextView: setValueAndGoToNextView,
+    setValueAndGoToView: setValueAndGoToView
   };
 }

package/legacy/internals/index.js

@@ -13,15 +13,15 @@ export { useField, createDateStrForInputFromSections, addPositionPropertiesToSec
 export { usePicker } from './hooks/usePicker';
 export { useStaticPicker } from './hooks/useStaticPicker';
 export { useLocalizationContext, useDefaultDates, useUtils, useLocaleText, useNow } from './hooks/useUtils';
-export { useValidation } from './hooks/validation/useValidation';
-export { validateDate } from './hooks/validation/useDateValidation';
-export { validateTime } from './hooks/validation/useTimeValidation';
-export { validateDateTime } from './hooks/validation/useDateTimeValidation';
+export { useValidation } from './hooks/useValidation';
 export { usePreviousMonthDisabled, useNextMonthDisabled } from './hooks/date-helpers-hooks';
 export { applyDefaultDate, replaceInvalidDateByNull, areDatesEqual } from './utils/date-utils';
 export { executeInTheNextEventLoopTick, getActiveElement, onSpaceOrEnter, DEFAULT_DESKTOP_MODE_MEDIA_QUERY } from './utils/utils';
 export { defaultReduceAnimations } from './utils/defaultReduceAnimations';
-export { extractValidationProps } from './utils/validation';
+export { extractValidationProps } from './utils/validation/extractValidationProps';
+export { validateDate } from './utils/validation/validateDate';
+export { validateDateTime } from './utils/validation/validateDateTime';
+export { validateTime } from './utils/validation/validateTime';
 export { buildDeprecatedPropsWarning } from './utils/warning';
 export { uncapitalizeObjectKeys } from './utils/slots-migration';
 export { PickersCalendarHeader } from '../DateCalendar/PickersCalendarHeader';