@mui/x-date-pickers-pro 7.0.0-beta.1 → 7.0.0-beta.4

package/modern/internals/hooks/useDesktopRangePicker/useDesktopRangePicker.js

@@ -3,7 +3,7 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 const _excluded = ["props"];
 import * as React from 'react';
 import { useSlotProps } from '@mui/base/utils';
-import { useLicenseVerifier } from '@mui/x-license-pro';
+import { useLicenseVerifier } from '@mui/x-license';
 import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
 import { PickersLayout } from '@mui/x-date-pickers/PickersLayout';
 import { executeInTheNextEventLoopTick, getActiveElement, usePicker, PickersPopper } from '@mui/x-date-pickers/internals';
@@ -26,6 +26,9 @@ export const useDesktopRangePicker = _ref => {
     sx,
     format,
     formatDensity,
+    enableAccessibleFieldDOMStructure,
+    selectedSections,
+    onSelectedSectionsChange,
     timezone,
     label,
     inputRef,
@@ -40,12 +43,14 @@ export const useDesktopRangePicker = _ref => {
   const fieldContainerRef = React.useRef(null);
   const anchorRef = React.useRef(null);
   const popperRef = React.useRef(null);
+  const startFieldRef = React.useRef(null);
+  const endFieldRef = React.useRef(null);
   const initialView = React.useRef(props.openTo ?? null);
+  const fieldType = slots.field.fieldType ?? 'multi-input';
   const {
     rangePosition,
-    onRangePositionChange,
-    singleInputFieldRef
-  } = useRangePosition(props);
+    onRangePositionChange
+  } = useRangePosition(props, fieldType === 'single-input' ? startFieldRef : undefined);
   const {
     open,
     actions,
@@ -57,6 +62,7 @@ export const useDesktopRangePicker = _ref => {
     props,
     wrapperVariant: 'desktop',
     autoFocusView: false,
+    fieldRef: rangePosition === 'start' ? startFieldRef : endFieldRef,
     additionalViewProps: {
       rangePosition,
       onRangePositionChange
@@ -77,7 +83,6 @@ export const useDesktopRangePicker = _ref => {
     });
   };
   const Field = slots.field;
-  const fieldType = Field.fieldType ?? 'multi-input';
   const fieldProps = useSlotProps({
     elementType: Field,
     externalSlotProps: slotProps?.field,
@@ -88,13 +93,16 @@ export const useDesktopRangePicker = _ref => {
       sx,
       format,
       formatDensity,
+      enableAccessibleFieldDOMStructure,
+      selectedSections,
+      onSelectedSectionsChange,
       timezone,
       autoFocus: autoFocus && !props.open,
       ref: fieldContainerRef
-    }, fieldType === 'single-input' && {
+    }, inputRef ? {
       inputRef,
       name
-    }),
+    } : {}),
     ownerState: props
   });
   const enrichedFieldProps = useEnrichedRangePickerFieldProps({
@@ -109,11 +117,12 @@ export const useDesktopRangePicker = _ref => {
     onBlur: handleBlur,
     rangePosition,
     onRangePositionChange,
-    singleInputFieldRef,
     pickerSlotProps: slotProps,
     pickerSlots: slots,
     fieldProps,
     anchorRef,
+    startFieldRef,
+    endFieldRef,
     currentView: layoutProps.view !== props.openTo ? layoutProps.view : undefined,
     initialView: initialView.current ?? undefined,
     onViewChange: layoutProps.onViewChange

package/modern/internals/hooks/useEnrichedRangePickerFieldProps.js

@@ -5,7 +5,7 @@ import * as React from 'react';
 import { resolveComponentProps } from '@mui/base/utils';
 import useEventCallback from '@mui/utils/useEventCallback';
 import useForkRef from '@mui/utils/useForkRef';
-import { onSpaceOrEnter, useLocaleText, getActiveElement } from '@mui/x-date-pickers/internals';
+import { onSpaceOrEnter, useLocaleText } from '@mui/x-date-pickers/internals';
 const useMultiInputFieldSlotProps = ({
   wrapperVariant,
   open,
@@ -23,34 +23,32 @@ const useMultiInputFieldSlotProps = ({
   anchorRef,
   currentView,
   initialView,
-  onViewChange
+  onViewChange,
+  startFieldRef,
+  endFieldRef
 }) => {
   const localeText = useLocaleText();
-  const startRef = React.useRef(null);
-  const endRef = React.useRef(null);
-  const startFieldRef = React.useRef(null);
-  const endFieldRef = React.useRef(null);
   const handleStartFieldRef = useForkRef(fieldProps.unstableStartFieldRef, startFieldRef);
-  const handleEndFieldRef = useForkRef(fieldProps.unstableFieldRef, endFieldRef);
+  const handleEndFieldRef = useForkRef(fieldProps.unstableEndFieldRef, endFieldRef);
   const previousRangePosition = React.useRef(rangePosition);
   React.useEffect(() => {
     if (!open) {
       return;
     }
-    const currentRef = rangePosition === 'start' ? startRef : endRef;
-    currentRef.current?.focus();
     const currentFieldRef = rangePosition === 'start' ? startFieldRef : endFieldRef;
+    currentFieldRef.current?.focusField();
     if (!currentFieldRef.current || !currentView) {
       // could happen when the user is switching between the inputs
       previousRangePosition.current = rangePosition;
       return;
     }
+
     // bring back focus to the field
     currentFieldRef.current.setSelectedSections(
     // use the current view or `0` when the range position has just been swapped
     previousRangePosition.current === rangePosition ? currentView : 0);
     previousRangePosition.current = rangePosition;
-  }, [rangePosition, open, currentView]);
+  }, [rangePosition, open, currentView, startFieldRef, endFieldRef]);
   const openRangeStartSelection = event => {
     event.stopPropagation();
     onRangePositionChange('start');
@@ -89,11 +87,10 @@ const useMultiInputFieldSlotProps = ({
   const slotProps = _extends({}, fieldProps.slotProps, {
     textField: ownerState => {
       const resolvedComponentProps = resolveComponentProps(pickerSlotProps?.textField, ownerState);
-      let inputProps;
+      let textFieldProps;
       let InputProps;
       if (ownerState.position === 'start') {
-        inputProps = _extends({
-          inputRef: startRef,
+        textFieldProps = _extends({
           label: inLocaleText?.start ?? localeText.start,
           onKeyDown: onSpaceOrEnter(openRangeStartSelection),
           onFocus: handleFocusStart,
@@ -109,8 +106,7 @@ const useMultiInputFieldSlotProps = ({
           });
         }
       } else {
-        inputProps = _extends({
-          inputRef: endRef,
+        textFieldProps = _extends({
           label: inLocaleText?.end ?? localeText.end,
           onKeyDown: onSpaceOrEnter(openRangeEndSelection),
           onFocus: handleFocusEnd,
@@ -124,7 +120,7 @@ const useMultiInputFieldSlotProps = ({
       }
       return _extends({}, labelId != null && {
         id: `${labelId}-${ownerState.position}`
-      }, inputProps, resolveComponentProps(pickerSlotProps?.textField, ownerState), {
+      }, textFieldProps, resolveComponentProps(pickerSlotProps?.textField, ownerState), {
         InputProps
       });
     },
@@ -138,12 +134,13 @@ const useMultiInputFieldSlotProps = ({
   });
 
   /* TODO: remove this when a clearable behavior for multiple input range fields is implemented */
-  const restFieldProps = _objectWithoutPropertiesLoose(fieldProps, _excluded);
+  const _ref = fieldProps,
+    restFieldProps = _objectWithoutPropertiesLoose(_ref, _excluded);
   const enrichedFieldProps = _extends({}, restFieldProps, {
-    slots,
-    slotProps,
     unstableStartFieldRef: handleStartFieldRef,
-    unstableEndFieldRef: handleEndFieldRef
+    unstableEndFieldRef: handleEndFieldRef,
+    slots,
+    slotProps
   });
   return enrichedFieldProps;
 };
@@ -152,49 +149,50 @@ const useSingleInputFieldSlotProps = ({
   open,
   actions,
   readOnly,
-  inputRef: inInputRef,
   labelId,
   disableOpenPicker,
   label,
   onBlur,
   rangePosition,
   onRangePositionChange,
-  singleInputFieldRef,
+  startFieldRef,
+  endFieldRef,
   pickerSlots,
   pickerSlotProps,
   fieldProps,
   anchorRef,
   currentView
 }) => {
-  const inputRef = React.useRef(null);
-  const handleInputRef = useForkRef(inInputRef, inputRef);
-  const handleFieldRef = useForkRef(fieldProps.unstableFieldRef, singleInputFieldRef);
+  const handleFieldRef = useForkRef(fieldProps.unstableFieldRef, startFieldRef, endFieldRef);
   React.useEffect(() => {
-    if (!open) {
+    if (!open || !startFieldRef.current) {
       return;
     }
-    inputRef.current?.focus();
-    if (!singleInputFieldRef.current || !currentView) {
+    if (startFieldRef.current.isFieldFocused()) {
       return;
     }
-    const sections = singleInputFieldRef.current.getSections().map(section => section.type);
+
     // bring back focus to the field with the current view section selected
-    singleInputFieldRef.current.setSelectedSections(rangePosition === 'start' ? sections.indexOf(currentView) : sections.lastIndexOf(currentView));
-  }, [rangePosition, open, currentView, singleInputFieldRef]);
+    if (currentView) {
+      const sections = startFieldRef.current.getSections().map(section => section.type);
+      const newSelectedSection = rangePosition === 'start' ? sections.indexOf(currentView) : sections.lastIndexOf(currentView);
+      startFieldRef.current?.focusField(newSelectedSection);
+    }
+  }, [rangePosition, open, currentView, startFieldRef]);
   const updateRangePosition = () => {
-    if (!singleInputFieldRef.current || inputRef.current !== getActiveElement(document)) {
+    if (!startFieldRef.current?.isFieldFocused()) {
       return;
     }
-    const sections = singleInputFieldRef.current.getSections();
-    const activeSectionIndex = singleInputFieldRef.current?.getActiveSectionIndex();
+    const sections = startFieldRef.current.getSections();
+    const activeSectionIndex = startFieldRef.current?.getActiveSectionIndex();
     const domRangePosition = activeSectionIndex == null || activeSectionIndex < sections.length / 2 ? 'start' : 'end';
     if (domRangePosition != null && domRangePosition !== rangePosition) {
       onRangePositionChange(domRangePosition);
     }
   };
-  const handleSelectedSectionsChange = useEventCallback(selectedSections => {
+  const handleSelectedSectionsChange = useEventCallback(selectedSection => {
     setTimeout(updateRangePosition);
-    fieldProps.onSelectedSectionsChange?.(selectedSections);
+    fieldProps.onSelectedSectionsChange?.(selectedSection);
   });
   const openPicker = event => {
     event.stopPropagation();
@@ -217,7 +215,6 @@ const useSingleInputFieldSlotProps = ({
     slotProps,
     label,
     unstableFieldRef: handleFieldRef,
-    inputRef: handleInputRef,
     onKeyDown: onSpaceOrEnter(openPicker, fieldProps.onKeyDown),
     onSelectedSectionsChange: handleSelectedSectionsChange,
     onBlur,

package/modern/internals/hooks/useMobileRangePicker/useMobileRangePicker.js

@@ -3,7 +3,7 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 const _excluded = ["props"];
 import * as React from 'react';
 import { useSlotProps } from '@mui/base/utils';
-import { useLicenseVerifier } from '@mui/x-license-pro';
+import { useLicenseVerifier } from '@mui/x-license';
 import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
 import { PickersLayout } from '@mui/x-date-pickers/PickersLayout';
 import { usePicker, PickersModalDialog, useLocaleText } from '@mui/x-date-pickers/internals';
@@ -27,6 +27,9 @@ export const useMobileRangePicker = _ref => {
     sx,
     format,
     formatDensity,
+    enableAccessibleFieldDOMStructure,
+    selectedSections,
+    onSelectedSectionsChange,
     timezone,
     label,
     inputRef,
@@ -36,11 +39,13 @@ export const useMobileRangePicker = _ref => {
     disableOpenPicker,
     localeText
   } = props;
+  const startFieldRef = React.useRef(null);
+  const endFieldRef = React.useRef(null);
+  const fieldType = slots.field.fieldType ?? 'multi-input';
   const {
     rangePosition,
-    onRangePositionChange,
-    singleInputFieldRef
-  } = useRangePosition(props);
+    onRangePositionChange
+  } = useRangePosition(props, fieldType === 'single-input' ? startFieldRef : undefined);
   const labelId = useId();
   const contextLocaleText = useLocaleText();
   const {
@@ -53,13 +58,13 @@ export const useMobileRangePicker = _ref => {
     props,
     wrapperVariant: 'mobile',
     autoFocusView: true,
+    fieldRef: rangePosition === 'start' ? startFieldRef : endFieldRef,
     additionalViewProps: {
       rangePosition,
       onRangePositionChange
     }
   }));
   const Field = slots.field;
-  const fieldType = Field.fieldType ?? 'multi-input';
   const fieldProps = useSlotProps({
     elementType: Field,
     externalSlotProps: innerSlotProps?.field,
@@ -70,11 +75,14 @@ export const useMobileRangePicker = _ref => {
       sx,
       format,
       formatDensity,
+      enableAccessibleFieldDOMStructure,
+      selectedSections,
+      onSelectedSectionsChange,
       timezone
-    }, fieldType === 'single-input' && {
+    }, inputRef ? {
       inputRef,
       name
-    }),
+    } : {}),
     ownerState: props
   });
   const isToolbarHidden = innerSlotProps?.toolbar?.hidden ?? false;
@@ -90,10 +98,11 @@ export const useMobileRangePicker = _ref => {
     localeText,
     rangePosition,
     onRangePositionChange,
-    singleInputFieldRef,
     pickerSlots: slots,
     pickerSlotProps: innerSlotProps,
-    fieldProps
+    fieldProps,
+    startFieldRef,
+    endFieldRef
   });
   const slotPropsForLayout = _extends({}, innerSlotProps, {
     tabs: _extends({}, innerSlotProps?.tabs, {

package/modern/internals/hooks/useMultiInputFieldSelectedSections.js

@@ -0,0 +1,40 @@
+import * as React from 'react';
+import useForkRef from '@mui/utils/useForkRef';
+import useEventCallback from '@mui/utils/useEventCallback';
+export const useMultiInputFieldSelectedSections = params => {
+  const unstableEndFieldRef = React.useRef(null);
+  const handleUnstableEndFieldRef = useForkRef(params.unstableEndFieldRef, unstableEndFieldRef);
+  const [startSelectedSection, setStartSelectedSection] = React.useState(params.selectedSections ?? null);
+  const [endSelectedSection, setEndSelectedSection] = React.useState(null);
+  const getActiveField = () => {
+    if (unstableEndFieldRef.current && unstableEndFieldRef.current.isFieldFocused()) {
+      return 'end';
+    }
+    return 'start';
+  };
+  const handleStartSelectedSectionChange = useEventCallback(newSelectedSections => {
+    setStartSelectedSection(newSelectedSections);
+    if (getActiveField() === 'start') {
+      params.onSelectedSectionsChange?.(newSelectedSections);
+    }
+  });
+  const handleEndSelectedSectionChange = useEventCallback(newSelectedSections => {
+    setEndSelectedSection(newSelectedSections);
+    if (getActiveField() === 'end') {
+      params.onSelectedSectionsChange?.(newSelectedSections);
+    }
+  });
+  const activeField = getActiveField();
+  return {
+    start: {
+      unstableFieldRef: params.unstableStartFieldRef,
+      selectedSections: activeField === 'start' && params.selectedSections !== undefined ? params.selectedSections : startSelectedSection,
+      onSelectedSectionsChange: handleStartSelectedSectionChange
+    },
+    end: {
+      unstableFieldRef: handleUnstableEndFieldRef,
+      selectedSections: activeField === 'end' && params.selectedSections !== undefined ? params.selectedSections : endSelectedSection,
+      onSelectedSectionsChange: handleEndSelectedSectionChange
+    }
+  };
+};

package/modern/internals/hooks/useMultiInputRangeField/useMultiInputDateRangeField.js

@@ -1,11 +1,11 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import useEventCallback from '@mui/utils/useEventCallback';
 import { unstable_useDateField as useDateField } from '@mui/x-date-pickers/DateField';
-import { useLocalizationContext, useValidation, useControlledValueWithTimezone } from '@mui/x-date-pickers/internals';
-import { useDefaultizedDateRangeFieldProps } from '../../../SingleInputDateRangeField/useSingleInputDateRangeField';
+import { useLocalizationContext, useValidation, useControlledValueWithTimezone, useDefaultizedDateField } from '@mui/x-date-pickers/internals';
 import { validateDateRange } from '../../utils/validation/validateDateRange';
 import { rangeValueManager } from '../../utils/valueManagers';
 import { excludeProps } from './shared';
+import { useMultiInputFieldSelectedSections } from '../useMultiInputFieldSelectedSections';
 export const useMultiInputDateRangeField = ({
   sharedProps: inSharedProps,
   startTextFieldProps,
@@ -13,7 +13,7 @@ export const useMultiInputDateRangeField = ({
   endTextFieldProps,
   unstableEndFieldRef
 }) => {
-  const sharedProps = useDefaultizedDateRangeFieldProps(inSharedProps);
+  const sharedProps = useDefaultizedDateField(inSharedProps);
   const adapter = useLocalizationContext();
   const {
     value: valueProp,
@@ -26,7 +26,9 @@ export const useMultiInputDateRangeField = ({
     readOnly,
     selectedSections,
     onSelectedSectionsChange,
-    timezone: timezoneProp
+    timezone: timezoneProp,
+    enableAccessibleFieldDOMStructure,
+    autoFocus
   } = sharedProps;
   const {
     value,
@@ -63,37 +65,40 @@ export const useMultiInputDateRangeField = ({
     value,
     timezone
   }), validateDateRange, rangeValueManager.isSameError, rangeValueManager.defaultErrorState);
+  const selectedSectionsResponse = useMultiInputFieldSelectedSections({
+    selectedSections,
+    onSelectedSectionsChange,
+    unstableStartFieldRef,
+    unstableEndFieldRef
+  });
   const startFieldProps = _extends({
     error: !!validationError[0]
-  }, startTextFieldProps, {
+  }, startTextFieldProps, selectedSectionsResponse.start, {
     disabled,
     readOnly,
     format,
     formatDensity,
     shouldRespectLeadingZeros,
     timezone,
-    unstableFieldRef: unstableStartFieldRef,
     value: valueProp === undefined ? undefined : valueProp[0],
     defaultValue: defaultValue === undefined ? undefined : defaultValue[0],
     onChange: handleStartDateChange,
-    selectedSections,
-    onSelectedSectionsChange
+    enableAccessibleFieldDOMStructure,
+    autoFocus // Do not add on end field.
   });
   const endFieldProps = _extends({
     error: !!validationError[1]
-  }, endTextFieldProps, {
+  }, endTextFieldProps, selectedSectionsResponse.end, {
     format,
     formatDensity,
     shouldRespectLeadingZeros,
     disabled,
     readOnly,
     timezone,
-    unstableFieldRef: unstableEndFieldRef,
     value: valueProp === undefined ? undefined : valueProp[1],
     defaultValue: defaultValue === undefined ? undefined : defaultValue[1],
     onChange: handleEndDateChange,
-    selectedSections,
-    onSelectedSectionsChange
+    enableAccessibleFieldDOMStructure
   });
   const startDateResponse = useDateField(startFieldProps);
   const endDateResponse = useDateField(endFieldProps);

package/modern/internals/hooks/useMultiInputRangeField/useMultiInputDateTimeRangeField.js

@@ -1,26 +1,11 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import useEventCallback from '@mui/utils/useEventCallback';
 import { unstable_useDateTimeField as useDateTimeField } from '@mui/x-date-pickers/DateTimeField';
-import { applyDefaultDate, useDefaultDates, useLocalizationContext, useUtils, useValidation, useControlledValueWithTimezone } from '@mui/x-date-pickers/internals';
+import { useLocalizationContext, useValidation, useControlledValueWithTimezone, useDefaultizedDateTimeField } from '@mui/x-date-pickers/internals';
 import { validateDateTimeRange } from '../../utils/validation/validateDateTimeRange';
 import { rangeValueManager } from '../../utils/valueManagers';
 import { excludeProps } from './shared';
-export const useDefaultizedDateTimeRangeFieldProps = props => {
-  const utils = useUtils();
-  const defaultDates = useDefaultDates();
-  const ampm = props.ampm ?? utils.is12HourCycleInCurrentLocale();
-  const defaultFormat = ampm ? utils.formats.keyboardDateTime12h : utils.formats.keyboardDateTime24h;
-  return _extends({}, props, {
-    disablePast: props.disablePast ?? false,
-    disableFuture: props.disableFuture ?? false,
-    format: props.format ?? defaultFormat,
-    minDate: applyDefaultDate(utils, props.minDateTime ?? props.minDate, defaultDates.minDate),
-    maxDate: applyDefaultDate(utils, props.maxDateTime ?? props.maxDate, defaultDates.maxDate),
-    minTime: props.minDateTime ?? props.minTime,
-    maxTime: props.maxDateTime ?? props.maxTime,
-    disableIgnoringDatePartForTimeValidation: Boolean(props.minDateTime || props.maxDateTime)
-  });
-};
+import { useMultiInputFieldSelectedSections } from '../useMultiInputFieldSelectedSections';
 export const useMultiInputDateTimeRangeField = ({
   sharedProps: inSharedProps,
   startTextFieldProps,
@@ -28,19 +13,22 @@ export const useMultiInputDateTimeRangeField = ({
   endTextFieldProps,
   unstableEndFieldRef
 }) => {
-  const sharedProps = useDefaultizedDateTimeRangeFieldProps(inSharedProps);
+  const sharedProps = useDefaultizedDateTimeField(inSharedProps);
   const adapter = useLocalizationContext();
   const {
     value: valueProp,
     defaultValue,
     format,
+    formatDensity,
     shouldRespectLeadingZeros,
-    timezone: timezoneProp,
     onChange,
     disabled,
     readOnly,
     selectedSections,
-    onSelectedSectionsChange
+    onSelectedSectionsChange,
+    timezone: timezoneProp,
+    enableAccessibleFieldDOMStructure,
+    autoFocus
   } = sharedProps;
   const {
     value,
@@ -77,35 +65,40 @@ export const useMultiInputDateTimeRangeField = ({
     value,
     timezone
   }), validateDateTimeRange, rangeValueManager.isSameError, rangeValueManager.defaultErrorState);
+  const selectedSectionsResponse = useMultiInputFieldSelectedSections({
+    selectedSections,
+    onSelectedSectionsChange,
+    unstableStartFieldRef,
+    unstableEndFieldRef
+  });
   const startFieldProps = _extends({
     error: !!validationError[0]
-  }, startTextFieldProps, {
-    format,
-    shouldRespectLeadingZeros,
+  }, startTextFieldProps, selectedSectionsResponse.start, {
     disabled,
     readOnly,
+    format,
+    formatDensity,
+    shouldRespectLeadingZeros,
     timezone,
-    unstableFieldRef: unstableStartFieldRef,
     value: valueProp === undefined ? undefined : valueProp[0],
     defaultValue: defaultValue === undefined ? undefined : defaultValue[0],
     onChange: handleStartDateChange,
-    selectedSections,
-    onSelectedSectionsChange
+    enableAccessibleFieldDOMStructure,
+    autoFocus // Do not add on end field.
   });
   const endFieldProps = _extends({
     error: !!validationError[1]
-  }, endTextFieldProps, {
+  }, endTextFieldProps, selectedSectionsResponse.end, {
     format,
+    formatDensity,
     shouldRespectLeadingZeros,
     disabled,
     readOnly,
     timezone,
-    unstableFieldRef: unstableEndFieldRef,
     value: valueProp === undefined ? undefined : valueProp[1],
     defaultValue: defaultValue === undefined ? undefined : defaultValue[1],
     onChange: handleEndDateChange,
-    selectedSections,
-    onSelectedSectionsChange
+    enableAccessibleFieldDOMStructure
   });
   const startDateResponse = useDateTimeField(startFieldProps);
   const endDateResponse = useDateTimeField(endFieldProps);

package/modern/internals/hooks/useMultiInputRangeField/useMultiInputTimeRangeField.js

@@ -1,20 +1,11 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import useEventCallback from '@mui/utils/useEventCallback';
 import { unstable_useTimeField as useTimeField } from '@mui/x-date-pickers/TimeField';
-import { useLocalizationContext, useUtils, useValidation, useControlledValueWithTimezone } from '@mui/x-date-pickers/internals';
+import { useLocalizationContext, useValidation, useControlledValueWithTimezone, useDefaultizedTimeField } from '@mui/x-date-pickers/internals';
 import { validateTimeRange } from '../../utils/validation/validateTimeRange';
 import { rangeValueManager } from '../../utils/valueManagers';
 import { excludeProps } from './shared';
-export const useDefaultizedTimeRangeFieldProps = props => {
-  const utils = useUtils();
-  const ampm = props.ampm ?? utils.is12HourCycleInCurrentLocale();
-  const defaultFormat = ampm ? utils.formats.fullTime12h : utils.formats.fullTime24h;
-  return _extends({}, props, {
-    disablePast: props.disablePast ?? false,
-    disableFuture: props.disableFuture ?? false,
-    format: props.format ?? defaultFormat
-  });
-};
+import { useMultiInputFieldSelectedSections } from '../useMultiInputFieldSelectedSections';
 export const useMultiInputTimeRangeField = ({
   sharedProps: inSharedProps,
   startTextFieldProps,
@@ -22,19 +13,22 @@ export const useMultiInputTimeRangeField = ({
   endTextFieldProps,
   unstableEndFieldRef
 }) => {
-  const sharedProps = useDefaultizedTimeRangeFieldProps(inSharedProps);
+  const sharedProps = useDefaultizedTimeField(inSharedProps);
   const adapter = useLocalizationContext();
   const {
     value: valueProp,
     defaultValue,
     format,
+    formatDensity,
     shouldRespectLeadingZeros,
-    timezone: timezoneProp,
     onChange,
     disabled,
     readOnly,
     selectedSections,
-    onSelectedSectionsChange
+    onSelectedSectionsChange,
+    timezone: timezoneProp,
+    enableAccessibleFieldDOMStructure,
+    autoFocus
   } = sharedProps;
   const {
     value,
@@ -71,35 +65,40 @@ export const useMultiInputTimeRangeField = ({
     value,
     timezone
   }), validateTimeRange, rangeValueManager.isSameError, rangeValueManager.defaultErrorState);
+  const selectedSectionsResponse = useMultiInputFieldSelectedSections({
+    selectedSections,
+    onSelectedSectionsChange,
+    unstableStartFieldRef,
+    unstableEndFieldRef
+  });
   const startFieldProps = _extends({
     error: !!validationError[0]
-  }, startTextFieldProps, {
-    format,
-    shouldRespectLeadingZeros,
+  }, startTextFieldProps, selectedSectionsResponse.start, {
     disabled,
     readOnly,
+    format,
+    formatDensity,
+    shouldRespectLeadingZeros,
     timezone,
-    unstableFieldRef: unstableStartFieldRef,
     value: valueProp === undefined ? undefined : valueProp[0],
     defaultValue: defaultValue === undefined ? undefined : defaultValue[0],
     onChange: handleStartDateChange,
-    selectedSections,
-    onSelectedSectionsChange
+    enableAccessibleFieldDOMStructure,
+    autoFocus // Do not add on end field.
   });
   const endFieldProps = _extends({
     error: !!validationError[1]
-  }, endTextFieldProps, {
+  }, endTextFieldProps, selectedSectionsResponse.end, {
     format,
+    formatDensity,
     shouldRespectLeadingZeros,
     disabled,
     readOnly,
     timezone,
-    unstableFieldRef: unstableEndFieldRef,
     value: valueProp === undefined ? undefined : valueProp[1],
     defaultValue: defaultValue === undefined ? undefined : defaultValue[1],
     onChange: handleEndDateChange,
-    selectedSections,
-    onSelectedSectionsChange
+    enableAccessibleFieldDOMStructure
   });
   const startDateResponse = useTimeField(startFieldProps);
   const endDateResponse = useTimeField(endFieldProps);