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

package/node/internals/hooks/useDesktopRangePicker/useDesktopRangePicker.js

@@ -9,7 +9,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var React = _interopRequireWildcard(require("react"));
 var _utils = require("@mui/base/utils");
-var _xLicensePro = require("@mui/x-license-pro");
+var _xLicense = require("@mui/x-license");
 var _LocalizationProvider = require("@mui/x-date-pickers/LocalizationProvider");
 var _PickersLayout = require("@mui/x-date-pickers/PickersLayout");
 var _internals = require("@mui/x-date-pickers/internals");
@@ -26,7 +26,7 @@ const useDesktopRangePicker = _ref => {
       props
     } = _ref,
     pickerParams = (0, _objectWithoutPropertiesLoose2.default)(_ref, _excluded);
-  (0, _xLicensePro.useLicenseVerifier)('x-date-pickers-pro', releaseInfo);
+  (0, _xLicense.useLicenseVerifier)('x-date-pickers-pro', releaseInfo);
   const {
     slots,
     slotProps,
@@ -34,6 +34,9 @@ const useDesktopRangePicker = _ref => {
     sx,
     format,
     formatDensity,
+    enableAccessibleFieldDOMStructure,
+    selectedSections,
+    onSelectedSectionsChange,
     timezone,
     label,
     inputRef,
@@ -48,12 +51,14 @@ 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
-  } = (0, _useRangePosition.useRangePosition)(props);
+    onRangePositionChange
+  } = (0, _useRangePosition.useRangePosition)(props, fieldType === 'single-input' ? startFieldRef : undefined);
   const {
     open,
     actions,
@@ -65,6 +70,7 @@ const useDesktopRangePicker = _ref => {
     props,
     wrapperVariant: 'desktop',
     autoFocusView: false,
+    fieldRef: rangePosition === 'start' ? startFieldRef : endFieldRef,
     additionalViewProps: {
       rangePosition,
       onRangePositionChange
@@ -85,7 +91,6 @@ const useDesktopRangePicker = _ref => {
     });
   };
   const Field = slots.field;
-  const fieldType = Field.fieldType ?? 'multi-input';
   const fieldProps = (0, _utils.useSlotProps)({
     elementType: Field,
     externalSlotProps: slotProps?.field,
@@ -96,13 +101,16 @@ 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 = (0, _useEnrichedRangePickerFieldProps.useEnrichedRangePickerFieldProps)({
@@ -117,11 +125,12 @@ 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/node/internals/hooks/useEnrichedRangePickerFieldProps.js

@@ -32,34 +32,32 @@ const useMultiInputFieldSlotProps = ({
   anchorRef,
   currentView,
   initialView,
-  onViewChange
+  onViewChange,
+  startFieldRef,
+  endFieldRef
 }) => {
   const localeText = (0, _internals.useLocaleText)();
-  const startRef = React.useRef(null);
-  const endRef = React.useRef(null);
-  const startFieldRef = React.useRef(null);
-  const endFieldRef = React.useRef(null);
   const handleStartFieldRef = (0, _useForkRef.default)(fieldProps.unstableStartFieldRef, startFieldRef);
-  const handleEndFieldRef = (0, _useForkRef.default)(fieldProps.unstableFieldRef, endFieldRef);
+  const handleEndFieldRef = (0, _useForkRef.default)(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');
@@ -98,11 +96,10 @@ const useMultiInputFieldSlotProps = ({
   const slotProps = (0, _extends2.default)({}, fieldProps.slotProps, {
     textField: ownerState => {
       const resolvedComponentProps = (0, _utils.resolveComponentProps)(pickerSlotProps?.textField, ownerState);
-      let inputProps;
+      let textFieldProps;
       let InputProps;
       if (ownerState.position === 'start') {
-        inputProps = (0, _extends2.default)({
-          inputRef: startRef,
+        textFieldProps = (0, _extends2.default)({
           label: inLocaleText?.start ?? localeText.start,
           onKeyDown: (0, _internals.onSpaceOrEnter)(openRangeStartSelection),
           onFocus: handleFocusStart,
@@ -118,8 +115,7 @@ const useMultiInputFieldSlotProps = ({
           });
         }
       } else {
-        inputProps = (0, _extends2.default)({
-          inputRef: endRef,
+        textFieldProps = (0, _extends2.default)({
           label: inLocaleText?.end ?? localeText.end,
           onKeyDown: (0, _internals.onSpaceOrEnter)(openRangeEndSelection),
           onFocus: handleFocusEnd,
@@ -133,7 +129,7 @@ const useMultiInputFieldSlotProps = ({
       }
       return (0, _extends2.default)({}, labelId != null && {
         id: `${labelId}-${ownerState.position}`
-      }, inputProps, (0, _utils.resolveComponentProps)(pickerSlotProps?.textField, ownerState), {
+      }, textFieldProps, (0, _utils.resolveComponentProps)(pickerSlotProps?.textField, ownerState), {
         InputProps
       });
     },
@@ -147,12 +143,13 @@ const useMultiInputFieldSlotProps = ({
   });
 
   /* TODO: remove this when a clearable behavior for multiple input range fields is implemented */
-  const restFieldProps = (0, _objectWithoutPropertiesLoose2.default)(fieldProps, _excluded);
+  const _ref = fieldProps,
+    restFieldProps = (0, _objectWithoutPropertiesLoose2.default)(_ref, _excluded);
   const enrichedFieldProps = (0, _extends2.default)({}, restFieldProps, {
-    slots,
-    slotProps,
     unstableStartFieldRef: handleStartFieldRef,
-    unstableEndFieldRef: handleEndFieldRef
+    unstableEndFieldRef: handleEndFieldRef,
+    slots,
+    slotProps
   });
   return enrichedFieldProps;
 };
@@ -161,49 +158,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 = (0, _useForkRef.default)(inInputRef, inputRef);
-  const handleFieldRef = (0, _useForkRef.default)(fieldProps.unstableFieldRef, singleInputFieldRef);
+  const handleFieldRef = (0, _useForkRef.default)(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 !== (0, _internals.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 = (0, _useEventCallback.default)(selectedSections => {
+  const handleSelectedSectionsChange = (0, _useEventCallback.default)(selectedSection => {
     setTimeout(updateRangePosition);
-    fieldProps.onSelectedSectionsChange?.(selectedSections);
+    fieldProps.onSelectedSectionsChange?.(selectedSection);
   });
   const openPicker = event => {
     event.stopPropagation();
@@ -226,7 +224,6 @@ const useSingleInputFieldSlotProps = ({
     slotProps,
     label,
     unstableFieldRef: handleFieldRef,
-    inputRef: handleInputRef,
     onKeyDown: (0, _internals.onSpaceOrEnter)(openPicker, fieldProps.onKeyDown),
     onSelectedSectionsChange: handleSelectedSectionsChange,
     onBlur,

package/node/internals/hooks/useMobileRangePicker/useMobileRangePicker.js

@@ -9,7 +9,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var React = _interopRequireWildcard(require("react"));
 var _utils = require("@mui/base/utils");
-var _xLicensePro = require("@mui/x-license-pro");
+var _xLicense = require("@mui/x-license");
 var _LocalizationProvider = require("@mui/x-date-pickers/LocalizationProvider");
 var _PickersLayout = require("@mui/x-date-pickers/PickersLayout");
 var _internals = require("@mui/x-date-pickers/internals");
@@ -27,7 +27,7 @@ const useMobileRangePicker = _ref => {
       props
     } = _ref,
     pickerParams = (0, _objectWithoutPropertiesLoose2.default)(_ref, _excluded);
-  (0, _xLicensePro.useLicenseVerifier)('x-date-pickers-pro', releaseInfo);
+  (0, _xLicense.useLicenseVerifier)('x-date-pickers-pro', releaseInfo);
   const {
     slots,
     slotProps: innerSlotProps,
@@ -35,6 +35,9 @@ const useMobileRangePicker = _ref => {
     sx,
     format,
     formatDensity,
+    enableAccessibleFieldDOMStructure,
+    selectedSections,
+    onSelectedSectionsChange,
     timezone,
     label,
     inputRef,
@@ -44,11 +47,13 @@ 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
-  } = (0, _useRangePosition.useRangePosition)(props);
+    onRangePositionChange
+  } = (0, _useRangePosition.useRangePosition)(props, fieldType === 'single-input' ? startFieldRef : undefined);
   const labelId = (0, _useId.default)();
   const contextLocaleText = (0, _internals.useLocaleText)();
   const {
@@ -61,13 +66,13 @@ 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 = (0, _utils.useSlotProps)({
     elementType: Field,
     externalSlotProps: innerSlotProps?.field,
@@ -78,11 +83,14 @@ const useMobileRangePicker = _ref => {
       sx,
       format,
       formatDensity,
+      enableAccessibleFieldDOMStructure,
+      selectedSections,
+      onSelectedSectionsChange,
       timezone
-    }, fieldType === 'single-input' && {
+    }, inputRef ? {
       inputRef,
       name
-    }),
+    } : {}),
     ownerState: props
   });
   const isToolbarHidden = innerSlotProps?.toolbar?.hidden ?? false;
@@ -98,10 +106,11 @@ const useMobileRangePicker = _ref => {
     localeText,
     rangePosition,
     onRangePositionChange,
-    singleInputFieldRef,
     pickerSlots: slots,
     pickerSlotProps: innerSlotProps,
-    fieldProps
+    fieldProps,
+    startFieldRef,
+    endFieldRef
   });
   const slotPropsForLayout = (0, _extends2.default)({}, innerSlotProps, {
     tabs: (0, _extends2.default)({}, innerSlotProps?.tabs, {

package/node/internals/hooks/useMultiInputFieldSelectedSections.js

@@ -0,0 +1,50 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useMultiInputFieldSelectedSections = void 0;
+var React = _interopRequireWildcard(require("react"));
+var _useForkRef = _interopRequireDefault(require("@mui/utils/useForkRef"));
+var _useEventCallback = _interopRequireDefault(require("@mui/utils/useEventCallback"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+const useMultiInputFieldSelectedSections = params => {
+  const unstableEndFieldRef = React.useRef(null);
+  const handleUnstableEndFieldRef = (0, _useForkRef.default)(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 = (0, _useEventCallback.default)(newSelectedSections => {
+    setStartSelectedSection(newSelectedSections);
+    if (getActiveField() === 'start') {
+      params.onSelectedSectionsChange?.(newSelectedSections);
+    }
+  });
+  const handleEndSelectedSectionChange = (0, _useEventCallback.default)(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
+    }
+  };
+};
+exports.useMultiInputFieldSelectedSections = useMultiInputFieldSelectedSections;

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

@@ -9,10 +9,10 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _useEventCallback = _interopRequireDefault(require("@mui/utils/useEventCallback"));
 var _DateField = require("@mui/x-date-pickers/DateField");
 var _internals = require("@mui/x-date-pickers/internals");
-var _useSingleInputDateRangeField = require("../../../SingleInputDateRangeField/useSingleInputDateRangeField");
 var _validateDateRange = require("../../utils/validation/validateDateRange");
 var _valueManagers = require("../../utils/valueManagers");
 var _shared = require("./shared");
+var _useMultiInputFieldSelectedSections = require("../useMultiInputFieldSelectedSections");
 const useMultiInputDateRangeField = ({
   sharedProps: inSharedProps,
   startTextFieldProps,
@@ -20,7 +20,7 @@ const useMultiInputDateRangeField = ({
   endTextFieldProps,
   unstableEndFieldRef
 }) => {
-  const sharedProps = (0, _useSingleInputDateRangeField.useDefaultizedDateRangeFieldProps)(inSharedProps);
+  const sharedProps = (0, _internals.useDefaultizedDateField)(inSharedProps);
   const adapter = (0, _internals.useLocalizationContext)();
   const {
     value: valueProp,
@@ -33,7 +33,9 @@ const useMultiInputDateRangeField = ({
     readOnly,
     selectedSections,
     onSelectedSectionsChange,
-    timezone: timezoneProp
+    timezone: timezoneProp,
+    enableAccessibleFieldDOMStructure,
+    autoFocus
   } = sharedProps;
   const {
     value,
@@ -70,37 +72,40 @@ const useMultiInputDateRangeField = ({
     value,
     timezone
   }), _validateDateRange.validateDateRange, _valueManagers.rangeValueManager.isSameError, _valueManagers.rangeValueManager.defaultErrorState);
+  const selectedSectionsResponse = (0, _useMultiInputFieldSelectedSections.useMultiInputFieldSelectedSections)({
+    selectedSections,
+    onSelectedSectionsChange,
+    unstableStartFieldRef,
+    unstableEndFieldRef
+  });
   const startFieldProps = (0, _extends2.default)({
     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 = (0, _extends2.default)({
     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 = (0, _DateField.unstable_useDateField)(startFieldProps);
   const endDateResponse = (0, _DateField.unstable_useDateField)(endFieldProps);

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useMultiInputDateTimeRangeField = exports.useDefaultizedDateTimeRangeFieldProps = void 0;
+exports.useMultiInputDateTimeRangeField = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _useEventCallback = _interopRequireDefault(require("@mui/utils/useEventCallback"));
 var _DateTimeField = require("@mui/x-date-pickers/DateTimeField");
@@ -12,23 +12,7 @@ var _internals = require("@mui/x-date-pickers/internals");
 var _validateDateTimeRange = require("../../utils/validation/validateDateTimeRange");
 var _valueManagers = require("../../utils/valueManagers");
 var _shared = require("./shared");
-const useDefaultizedDateTimeRangeFieldProps = props => {
-  const utils = (0, _internals.useUtils)();
-  const defaultDates = (0, _internals.useDefaultDates)();
-  const ampm = props.ampm ?? utils.is12HourCycleInCurrentLocale();
-  const defaultFormat = ampm ? utils.formats.keyboardDateTime12h : utils.formats.keyboardDateTime24h;
-  return (0, _extends2.default)({}, props, {
-    disablePast: props.disablePast ?? false,
-    disableFuture: props.disableFuture ?? false,
-    format: props.format ?? defaultFormat,
-    minDate: (0, _internals.applyDefaultDate)(utils, props.minDateTime ?? props.minDate, defaultDates.minDate),
-    maxDate: (0, _internals.applyDefaultDate)(utils, props.maxDateTime ?? props.maxDate, defaultDates.maxDate),
-    minTime: props.minDateTime ?? props.minTime,
-    maxTime: props.maxDateTime ?? props.maxTime,
-    disableIgnoringDatePartForTimeValidation: Boolean(props.minDateTime || props.maxDateTime)
-  });
-};
-exports.useDefaultizedDateTimeRangeFieldProps = useDefaultizedDateTimeRangeFieldProps;
+var _useMultiInputFieldSelectedSections = require("../useMultiInputFieldSelectedSections");
 const useMultiInputDateTimeRangeField = ({
   sharedProps: inSharedProps,
   startTextFieldProps,
@@ -36,19 +20,22 @@ const useMultiInputDateTimeRangeField = ({
   endTextFieldProps,
   unstableEndFieldRef
 }) => {
-  const sharedProps = useDefaultizedDateTimeRangeFieldProps(inSharedProps);
+  const sharedProps = (0, _internals.useDefaultizedDateTimeField)(inSharedProps);
   const adapter = (0, _internals.useLocalizationContext)();
   const {
     value: valueProp,
     defaultValue,
     format,
+    formatDensity,
     shouldRespectLeadingZeros,
-    timezone: timezoneProp,
     onChange,
     disabled,
     readOnly,
     selectedSections,
-    onSelectedSectionsChange
+    onSelectedSectionsChange,
+    timezone: timezoneProp,
+    enableAccessibleFieldDOMStructure,
+    autoFocus
   } = sharedProps;
   const {
     value,
@@ -85,35 +72,40 @@ const useMultiInputDateTimeRangeField = ({
     value,
     timezone
   }), _validateDateTimeRange.validateDateTimeRange, _valueManagers.rangeValueManager.isSameError, _valueManagers.rangeValueManager.defaultErrorState);
+  const selectedSectionsResponse = (0, _useMultiInputFieldSelectedSections.useMultiInputFieldSelectedSections)({
+    selectedSections,
+    onSelectedSectionsChange,
+    unstableStartFieldRef,
+    unstableEndFieldRef
+  });
   const startFieldProps = (0, _extends2.default)({
     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 = (0, _extends2.default)({
     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 = (0, _DateTimeField.unstable_useDateTimeField)(startFieldProps);
   const endDateResponse = (0, _DateTimeField.unstable_useDateTimeField)(endFieldProps);