@mui/x-date-pickers-pro 7.0.0-beta.2 → 7.0.0-beta.5

package/internals/hooks/useDesktopRangePicker/useDesktopRangePicker.js

@@ -27,6 +27,9 @@ export const useDesktopRangePicker = _ref => {
     sx,
     format,
     formatDensity,
+    enableAccessibleFieldDOMStructure,
+    selectedSections,
+    onSelectedSectionsChange,
     timezone,
     label,
     inputRef,
@@ -41,12 +44,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 = props.openTo) != null ? _props$openTo : null);
+  const fieldType = (_fieldType = slots.field.fieldType) != null ? _fieldType : 'multi-input';
   const {
     rangePosition,
-    onRangePositionChange,
-    singleInputFieldRef
-  } = useRangePosition(props);
+    onRangePositionChange
+  } = useRangePosition(props, fieldType === 'single-input' ? startFieldRef : undefined);
   const {
     open,
     actions,
@@ -58,6 +63,7 @@ export const useDesktopRangePicker = _ref => {
     props,
     wrapperVariant: 'desktop',
     autoFocusView: false,
+    fieldRef: rangePosition === 'start' ? startFieldRef : endFieldRef,
     additionalViewProps: {
       rangePosition,
       onRangePositionChange
@@ -79,7 +85,6 @@ export const useDesktopRangePicker = _ref => {
     });
   };
   const Field = slots.field;
-  const fieldType = (_fieldType = Field.fieldType) != null ? _fieldType : 'multi-input';
   const fieldProps = useSlotProps({
     elementType: Field,
     externalSlotProps: slotProps == null ? void 0 : slotProps.field,
@@ -90,13 +95,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({
@@ -111,11 +119,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 = initialView.current) != null ? _initialView$current : undefined,
     onViewChange: layoutProps.onViewChange

package/internals/hooks/useDesktopRangePicker/useDesktopRangePicker.types.d.ts

@@ -3,15 +3,15 @@ import { PickerValidDate } from '@mui/x-date-pickers/models';
 import { RangeOnlyPickerProps, RangePickerAdditionalViewProps, UseRangePickerParams, UseRangePickerProps, UseRangePickerSlotProps, UseRangePickerSlots } from '../models/useRangePicker';
 export interface UseDesktopRangePickerSlots<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem> extends UseRangePickerSlots<TDate, TView>, PickersPopperSlots {
 }
-export interface UseDesktopRangePickerSlotProps<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem> extends UseRangePickerSlotProps<TDate, TView>, PickersPopperSlotProps {
+export interface UseDesktopRangePickerSlotProps<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, TEnableAccessibleFieldDOMStructure extends boolean> extends UseRangePickerSlotProps<TDate, TView, TEnableAccessibleFieldDOMStructure>, PickersPopperSlotProps {
 }
-export interface DesktopRangeOnlyPickerProps<TDate extends PickerValidDate> extends RangeOnlyPickerProps<TDate> {
+export interface DesktopRangeOnlyPickerProps extends RangeOnlyPickerProps {
     /**
      * If `true`, the start `input` element is focused during the first mount.
      */
     autoFocus?: boolean;
 }
-export interface UseDesktopRangePickerProps<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, TError, TExternalProps extends UsePickerViewsProps<any, any, TView, any, any>> extends UseRangePickerProps<TDate, TView, TError, TExternalProps, DesktopRangePickerAdditionalViewProps> {
+export interface UseDesktopRangePickerProps<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, TEnableAccessibleFieldDOMStructure extends boolean, TError, TExternalProps extends UsePickerViewsProps<any, any, TView, any, any>> extends UseRangePickerProps<TDate, TView, TError, TExternalProps, DesktopRangePickerAdditionalViewProps> {
     /**
      * Overridable component slots.
      * @default {}
@@ -21,9 +21,9 @@ export interface UseDesktopRangePickerProps<TDate extends PickerValidDate, TView
      * The props used for each component slot.
      * @default {}
      */
-    slotProps?: UseDesktopRangePickerSlotProps<TDate, TView>;
+    slotProps?: UseDesktopRangePickerSlotProps<TDate, TView, TEnableAccessibleFieldDOMStructure>;
 }
 export interface DesktopRangePickerAdditionalViewProps extends RangePickerAdditionalViewProps {
 }
-export interface UseDesktopRangePickerParams<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, TExternalProps extends UseDesktopRangePickerProps<TDate, TView, any, TExternalProps>> extends UseRangePickerParams<TDate, TView, TExternalProps, DesktopRangePickerAdditionalViewProps> {
+export interface UseDesktopRangePickerParams<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, TEnableAccessibleFieldDOMStructure extends boolean, TExternalProps extends UseDesktopRangePickerProps<TDate, TView, TEnableAccessibleFieldDOMStructure, any, TExternalProps>> extends UseRangePickerParams<TDate, TView, TExternalProps, DesktopRangePickerAdditionalViewProps> {
 }

package/internals/hooks/useEnrichedRangePickerFieldProps.d.ts

@@ -1,14 +1,14 @@
 import * as React from 'react';
 import Stack, { StackProps } from '@mui/material/Stack';
 import Typography, { TypographyProps } from '@mui/material/Typography';
-import TextField, { TextFieldProps } from '@mui/material/TextField';
+import TextField from '@mui/material/TextField';
 import { SlotComponentProps } from '@mui/base/utils';
-import { BaseSingleInputFieldProps, PickerValidDate } from '@mui/x-date-pickers/models';
+import { BaseSingleInputFieldProps, FieldRef, PickerValidDate } from '@mui/x-date-pickers/models';
 import { UseClearableFieldSlots, UseClearableFieldSlotProps } from '@mui/x-date-pickers/hooks';
 import { PickersInputLocaleText } from '@mui/x-date-pickers/locales';
-import { BaseFieldProps, UsePickerResponse, WrapperVariant, UsePickerProps, DateOrTimeViewWithMeridiem } from '@mui/x-date-pickers/internals';
-import { BaseMultiInputFieldProps, RangeFieldSection, UseDateRangeFieldProps, FieldType } from '../models';
-import { DateRange, RangePosition } from '../../models';
+import { BaseFieldProps, UsePickerResponse, WrapperVariant, UsePickerProps, SlotComponentPropsFromProps, DateOrTimeViewWithMeridiem } from '@mui/x-date-pickers/internals';
+import { UseDateRangeFieldProps } from '../models';
+import { BaseMultiInputFieldProps, RangeFieldSection, DateRange, RangePosition, FieldType } from '../../models';
 import { UseRangePositionResponse } from './useRangePosition';
 export interface RangePickerFieldSlots extends UseClearableFieldSlots {
     field: React.ElementType;
@@ -25,35 +25,35 @@ export interface RangePickerFieldSlots extends UseClearableFieldSlots {
     /**
      * Form control with an input to render a date or time inside the default field.
      * It is rendered twice: once for the start element and once for the end element.
-     * Receives the same props as `@mui/material/TextField`.
-     * @default TextField from '@mui/material'
+     * @default TextField from '@mui/material' or PickersTextField if `enableAccessibleFieldDOMStructure` is `true`.
      */
-    textField?: React.ElementType<TextFieldProps>;
+    textField?: React.ElementType;
 }
-export interface RangePickerFieldSlotProps<TDate extends PickerValidDate> extends UseClearableFieldSlotProps {
-    field?: SlotComponentProps<React.ElementType<BaseMultiInputFieldProps<DateRange<TDate>, TDate, RangeFieldSection, unknown>>, {}, UsePickerProps<DateRange<TDate>, TDate, any, RangeFieldSection, any, any, any>>;
+export interface RangePickerFieldSlotProps<TDate extends PickerValidDate, TEnableAccessibleFieldDOMStructure extends boolean> extends UseClearableFieldSlotProps {
+    field?: SlotComponentPropsFromProps<BaseMultiInputFieldProps<DateRange<TDate>, TDate, RangeFieldSection, TEnableAccessibleFieldDOMStructure, unknown>, {}, UsePickerProps<DateRange<TDate>, TDate, any, any, any, any>>;
     fieldRoot?: SlotComponentProps<typeof Stack, {}, Record<string, any>>;
     fieldSeparator?: SlotComponentProps<typeof Typography, {}, Record<string, any>>;
-    textField?: SlotComponentProps<typeof TextField, {}, UseDateRangeFieldProps<TDate> & {
+    textField?: SlotComponentProps<typeof TextField, {}, UseDateRangeFieldProps<TDate, TEnableAccessibleFieldDOMStructure> & {
         position?: RangePosition;
     }>;
 }
-export interface UseEnrichedRangePickerFieldPropsParams<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, TError, FieldProps extends BaseFieldProps<DateRange<TDate>, TDate, RangeFieldSection, TError> = BaseFieldProps<DateRange<TDate>, TDate, RangeFieldSection, TError>> extends Pick<UsePickerResponse<DateRange<TDate>, TView, RangeFieldSection, any>, 'open' | 'actions'>, UseRangePositionResponse {
+export interface UseEnrichedRangePickerFieldPropsParams<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, TEnableAccessibleFieldDOMStructure extends boolean, TError, FieldProps extends BaseFieldProps<DateRange<TDate>, TDate, RangeFieldSection, TEnableAccessibleFieldDOMStructure, TError> = BaseFieldProps<DateRange<TDate>, TDate, RangeFieldSection, TEnableAccessibleFieldDOMStructure, TError>> extends Pick<UsePickerResponse<DateRange<TDate>, TView, RangeFieldSection, any>, 'open' | 'actions'>, UseRangePositionResponse {
     wrapperVariant: WrapperVariant;
     fieldType: FieldType;
     readOnly?: boolean;
     labelId?: string;
     disableOpenPicker?: boolean;
     onBlur?: () => void;
-    inputRef?: React.Ref<HTMLInputElement>;
     label?: React.ReactNode;
     localeText: PickersInputLocaleText<TDate> | undefined;
-    pickerSlotProps: RangePickerFieldSlotProps<TDate> | undefined;
+    pickerSlotProps: RangePickerFieldSlotProps<TDate, TEnableAccessibleFieldDOMStructure> | undefined;
     pickerSlots: RangePickerFieldSlots | undefined;
     fieldProps: FieldProps;
     anchorRef?: React.Ref<HTMLDivElement>;
     currentView?: TView | null;
     initialView?: TView;
     onViewChange?: (view: TView) => void;
+    startFieldRef: React.RefObject<FieldRef<RangeFieldSection>>;
+    endFieldRef: React.RefObject<FieldRef<RangeFieldSection>>;
 }
-export declare const useEnrichedRangePickerFieldProps: <TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, TError>(params: UseEnrichedRangePickerFieldPropsParams<TDate, TView, TError, BaseFieldProps<DateRange<TDate>, TDate, RangeFieldSection, TError>>) => BaseMultiInputFieldProps<DateRange<TDate>, TDate, RangeFieldSection, TError> | BaseSingleInputFieldProps<DateRange<TDate>, TDate, RangeFieldSection, TError>;
+export declare const useEnrichedRangePickerFieldProps: <TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, TEnableAccessibleFieldDOMStructure extends boolean, TError>(params: UseEnrichedRangePickerFieldPropsParams<TDate, TView, TEnableAccessibleFieldDOMStructure, TError, BaseFieldProps<DateRange<TDate>, TDate, RangeFieldSection, TEnableAccessibleFieldDOMStructure, TError>>) => BaseMultiInputFieldProps<DateRange<TDate>, TDate, RangeFieldSection, TEnableAccessibleFieldDOMStructure, TError> | BaseSingleInputFieldProps<DateRange<TDate>, TDate, RangeFieldSection, TEnableAccessibleFieldDOMStructure, TError>;

package/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,35 +23,33 @@ 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(() => {
-    var _currentRef$current;
+    var _currentFieldRef$curr;
     if (!open) {
       return;
     }
-    const currentRef = rangePosition === 'start' ? startRef : endRef;
-    (_currentRef$current = currentRef.current) == null || _currentRef$current.focus();
     const currentFieldRef = rangePosition === 'start' ? startFieldRef : endFieldRef;
+    (_currentFieldRef$curr = currentFieldRef.current) == null || _currentFieldRef$curr.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');
@@ -90,12 +88,11 @@ const useMultiInputFieldSlotProps = ({
   const slotProps = _extends({}, fieldProps.slotProps, {
     textField: ownerState => {
       const resolvedComponentProps = resolveComponentProps(pickerSlotProps == null ? void 0 : pickerSlotProps.textField, ownerState);
-      let inputProps;
+      let textFieldProps;
       let InputProps;
       if (ownerState.position === 'start') {
         var _inLocaleText$start;
-        inputProps = _extends({
-          inputRef: startRef,
+        textFieldProps = _extends({
           label: (_inLocaleText$start = inLocaleText == null ? void 0 : inLocaleText.start) != null ? _inLocaleText$start : localeText.start,
           onKeyDown: onSpaceOrEnter(openRangeStartSelection),
           onFocus: handleFocusStart,
@@ -112,8 +109,7 @@ const useMultiInputFieldSlotProps = ({
         }
       } else {
         var _inLocaleText$end;
-        inputProps = _extends({
-          inputRef: endRef,
+        textFieldProps = _extends({
           label: (_inLocaleText$end = inLocaleText == null ? void 0 : inLocaleText.end) != null ? _inLocaleText$end : localeText.end,
           onKeyDown: onSpaceOrEnter(openRangeEndSelection),
           onFocus: handleFocusEnd,
@@ -127,7 +123,7 @@ const useMultiInputFieldSlotProps = ({
       }
       return _extends({}, labelId != null && {
         id: `${labelId}-${ownerState.position}`
-      }, inputProps, resolveComponentProps(pickerSlotProps == null ? void 0 : pickerSlotProps.textField, ownerState), {
+      }, textFieldProps, resolveComponentProps(pickerSlotProps == null ? void 0 : pickerSlotProps.textField, ownerState), {
         InputProps
       });
     },
@@ -141,12 +137,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;
 };
@@ -155,52 +152,53 @@ 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(() => {
-    var _inputRef$current;
-    if (!open) {
+    if (!open || !startFieldRef.current) {
       return;
     }
-    (_inputRef$current = inputRef.current) == null || _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) {
+      var _startFieldRef$curren;
+      const sections = startFieldRef.current.getSections().map(section => section.type);
+      const newSelectedSection = rangePosition === 'start' ? sections.indexOf(currentView) : sections.lastIndexOf(currentView);
+      (_startFieldRef$curren = startFieldRef.current) == null || _startFieldRef$curren.focusField(newSelectedSection);
+    }
+  }, [rangePosition, open, currentView, startFieldRef]);
   const updateRangePosition = () => {
-    var _singleInputFieldRef$;
-    if (!singleInputFieldRef.current || inputRef.current !== getActiveElement(document)) {
+    var _startFieldRef$curren2, _startFieldRef$curren3;
+    if (!((_startFieldRef$curren2 = startFieldRef.current) != null && _startFieldRef$curren2.isFieldFocused())) {
       return;
     }
-    const sections = singleInputFieldRef.current.getSections();
-    const activeSectionIndex = (_singleInputFieldRef$ = singleInputFieldRef.current) == null ? void 0 : _singleInputFieldRef$.getActiveSectionIndex();
+    const sections = startFieldRef.current.getSections();
+    const activeSectionIndex = (_startFieldRef$curren3 = startFieldRef.current) == null ? void 0 : _startFieldRef$curren3.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 => {
     var _fieldProps$onSelecte;
     setTimeout(updateRangePosition);
-    (_fieldProps$onSelecte = fieldProps.onSelectedSectionsChange) == null || _fieldProps$onSelecte.call(fieldProps, selectedSections);
+    (_fieldProps$onSelecte = fieldProps.onSelectedSectionsChange) == null || _fieldProps$onSelecte.call(fieldProps, selectedSection);
   });
   const openPicker = event => {
     event.stopPropagation();
@@ -223,7 +221,6 @@ const useSingleInputFieldSlotProps = ({
     slotProps,
     label,
     unstableFieldRef: handleFieldRef,
-    inputRef: handleInputRef,
     onKeyDown: onSpaceOrEnter(openPicker, fieldProps.onKeyDown),
     onSelectedSectionsChange: handleSelectedSectionsChange,
     onBlur,

package/internals/hooks/useMobileRangePicker/useMobileRangePicker.d.ts

@@ -2,6 +2,6 @@ import * as React from 'react';
 import { DateOrTimeViewWithMeridiem } from '@mui/x-date-pickers/internals';
 import { PickerValidDate } from '@mui/x-date-pickers/models';
 import { UseMobileRangePickerParams, UseMobileRangePickerProps } from './useMobileRangePicker.types';
-export declare const useMobileRangePicker: <TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, TExternalProps extends UseMobileRangePickerProps<TDate, TView, any, TExternalProps>>({ props, ...pickerParams }: UseMobileRangePickerParams<TDate, TView, TExternalProps>) => {
+export declare const useMobileRangePicker: <TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, TEnableAccessibleFieldDOMStructure extends boolean, TExternalProps extends UseMobileRangePickerProps<TDate, TView, TEnableAccessibleFieldDOMStructure, any, TExternalProps>>({ props, ...pickerParams }: UseMobileRangePickerParams<TDate, TView, TEnableAccessibleFieldDOMStructure, TExternalProps>) => {
     renderPicker: () => React.JSX.Element;
 };

package/internals/hooks/useMobileRangePicker/useMobileRangePicker.js

@@ -28,6 +28,9 @@ export const useMobileRangePicker = _ref => {
     sx,
     format,
     formatDensity,
+    enableAccessibleFieldDOMStructure,
+    selectedSections,
+    onSelectedSectionsChange,
     timezone,
     label,
     inputRef,
@@ -37,11 +40,13 @@ export const useMobileRangePicker = _ref => {
     disableOpenPicker,
     localeText
   } = props;
+  const startFieldRef = React.useRef(null);
+  const endFieldRef = React.useRef(null);
+  const fieldType = (_fieldType = slots.field.fieldType) != null ? _fieldType : 'multi-input';
   const {
     rangePosition,
-    onRangePositionChange,
-    singleInputFieldRef
-  } = useRangePosition(props);
+    onRangePositionChange
+  } = useRangePosition(props, fieldType === 'single-input' ? startFieldRef : undefined);
   const labelId = useId();
   const contextLocaleText = useLocaleText();
   const {
@@ -54,13 +59,13 @@ export const useMobileRangePicker = _ref => {
     props,
     wrapperVariant: 'mobile',
     autoFocusView: true,
+    fieldRef: rangePosition === 'start' ? startFieldRef : endFieldRef,
     additionalViewProps: {
       rangePosition,
       onRangePositionChange
     }
   }));
   const Field = slots.field;
-  const fieldType = (_fieldType = Field.fieldType) != null ? _fieldType : 'multi-input';
   const fieldProps = useSlotProps({
     elementType: Field,
     externalSlotProps: innerSlotProps == null ? void 0 : innerSlotProps.field,
@@ -71,11 +76,14 @@ export const useMobileRangePicker = _ref => {
       sx,
       format,
       formatDensity,
+      enableAccessibleFieldDOMStructure,
+      selectedSections,
+      onSelectedSectionsChange,
       timezone
-    }, fieldType === 'single-input' && {
+    }, inputRef ? {
       inputRef,
       name
-    }),
+    } : {}),
     ownerState: props
   });
   const isToolbarHidden = (_innerSlotProps$toolb = innerSlotProps == null || (_innerSlotProps$toolb2 = innerSlotProps.toolbar) == null ? void 0 : _innerSlotProps$toolb2.hidden) != null ? _innerSlotProps$toolb : false;
@@ -91,10 +99,11 @@ export const useMobileRangePicker = _ref => {
     localeText,
     rangePosition,
     onRangePositionChange,
-    singleInputFieldRef,
     pickerSlots: slots,
     pickerSlotProps: innerSlotProps,
-    fieldProps
+    fieldProps,
+    startFieldRef,
+    endFieldRef
   });
   const slotPropsForLayout = _extends({}, innerSlotProps, {
     tabs: _extends({}, innerSlotProps == null ? void 0 : innerSlotProps.tabs, {
@@ -109,7 +118,7 @@ export const useMobileRangePicker = _ref => {
   });
   const Layout = (_slots$layout = slots == null ? void 0 : slots.layout) != null ? _slots$layout : PickersLayout;
   const finalLocaleText = _extends({}, contextLocaleText, localeText);
-  let labelledById = labelId;
+  let labelledById = pickerParams.valueType === 'date-time' ? `${labelId}-start-toolbar ${labelId}-end-toolbar` : labelId;
   if (isToolbarHidden) {
     const labels = [];
     if (fieldType === 'multi-input') {

package/internals/hooks/useMobileRangePicker/useMobileRangePicker.types.d.ts

@@ -3,11 +3,11 @@ import { PickerValidDate } from '@mui/x-date-pickers/models';
 import { RangeOnlyPickerProps, RangePickerAdditionalViewProps, UseRangePickerParams, UseRangePickerProps, UseRangePickerSlotProps, UseRangePickerSlots } from '../models/useRangePicker';
 export interface UseMobileRangePickerSlots<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem> extends UseRangePickerSlots<TDate, TView>, PickersModalDialogSlots {
 }
-export interface UseMobileRangePickerSlotProps<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem> extends UseRangePickerSlotProps<TDate, TView>, PickersModalDialogSlotProps {
+export interface UseMobileRangePickerSlotProps<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, TEnableAccessibleFieldDOMStructure extends boolean> extends UseRangePickerSlotProps<TDate, TView, TEnableAccessibleFieldDOMStructure>, PickersModalDialogSlotProps {
 }
-export interface MobileRangeOnlyPickerProps<TDate extends PickerValidDate> extends RangeOnlyPickerProps<TDate> {
+export interface MobileRangeOnlyPickerProps extends RangeOnlyPickerProps {
 }
-export interface UseMobileRangePickerProps<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, TError, TExternalProps extends UsePickerViewsProps<any, any, TView, any, any>> extends UseRangePickerProps<TDate, TView, TError, TExternalProps, MobileRangePickerAdditionalViewProps> {
+export interface UseMobileRangePickerProps<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, TEnableAccessibleFieldDOMStructure extends boolean, TError, TExternalProps extends UsePickerViewsProps<any, any, TView, any, any>> extends UseRangePickerProps<TDate, TView, TError, TExternalProps, MobileRangePickerAdditionalViewProps> {
     /**
      * Overridable component slots.
      * @default {}
@@ -17,9 +17,9 @@ export interface UseMobileRangePickerProps<TDate extends PickerValidDate, TView
      * The props used for each component slot.
      * @default {}
      */
-    slotProps?: UseMobileRangePickerSlotProps<TDate, TView>;
+    slotProps?: UseMobileRangePickerSlotProps<TDate, TView, TEnableAccessibleFieldDOMStructure>;
 }
 export interface MobileRangePickerAdditionalViewProps extends RangePickerAdditionalViewProps {
 }
-export interface UseMobileRangePickerParams<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, TExternalProps extends UseMobileRangePickerProps<TDate, TView, any, TExternalProps>> extends UseRangePickerParams<TDate, TView, TExternalProps, MobileRangePickerAdditionalViewProps> {
+export interface UseMobileRangePickerParams<TDate extends PickerValidDate, TView extends DateOrTimeViewWithMeridiem, TEnableAccessibleFieldDOMStructure extends boolean, TExternalProps extends UseMobileRangePickerProps<TDate, TView, TEnableAccessibleFieldDOMStructure, any, TExternalProps>> extends UseRangePickerParams<TDate, TView, TExternalProps, MobileRangePickerAdditionalViewProps> {
 }

package/internals/hooks/useMultiInputFieldSelectedSections.d.ts

@@ -0,0 +1,21 @@
+import * as React from 'react';
+import { UseFieldInternalProps } from '@mui/x-date-pickers/internals';
+import { FieldRef, FieldSelectedSections } from '@mui/x-date-pickers/models';
+import { RangeFieldSection } from '../../models';
+interface UseMultiInputFieldSelectedSectionsParams extends Pick<UseFieldInternalProps<any, any, RangeFieldSection, any, any>, 'selectedSections' | 'onSelectedSectionsChange'> {
+    unstableStartFieldRef?: React.Ref<FieldRef<RangeFieldSection>>;
+    unstableEndFieldRef?: React.Ref<FieldRef<RangeFieldSection>>;
+}
+export declare const useMultiInputFieldSelectedSections: (params: UseMultiInputFieldSelectedSectionsParams) => {
+    start: {
+        unstableFieldRef: React.Ref<FieldRef<RangeFieldSection>> | undefined;
+        selectedSections: FieldSelectedSections;
+        onSelectedSectionsChange: (newSelectedSections: FieldSelectedSections) => void;
+    };
+    end: {
+        unstableFieldRef: ((instance: FieldRef<RangeFieldSection> | null) => void) | null;
+        selectedSections: FieldSelectedSections;
+        onSelectedSectionsChange: (newSelectedSections: FieldSelectedSections) => void;
+    };
+};
+export {};

package/internals/hooks/useMultiInputFieldSelectedSections.js

@@ -0,0 +1,43 @@
+import * as React from 'react';
+import useForkRef from '@mui/utils/useForkRef';
+import useEventCallback from '@mui/utils/useEventCallback';
+export const useMultiInputFieldSelectedSections = params => {
+  var _params$selectedSecti;
+  const unstableEndFieldRef = React.useRef(null);
+  const handleUnstableEndFieldRef = useForkRef(params.unstableEndFieldRef, unstableEndFieldRef);
+  const [startSelectedSection, setStartSelectedSection] = React.useState((_params$selectedSecti = params.selectedSections) != null ? _params$selectedSecti : 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') {
+      var _params$onSelectedSec;
+      (_params$onSelectedSec = params.onSelectedSectionsChange) == null || _params$onSelectedSec.call(params, newSelectedSections);
+    }
+  });
+  const handleEndSelectedSectionChange = useEventCallback(newSelectedSections => {
+    setEndSelectedSection(newSelectedSections);
+    if (getActiveField() === 'end') {
+      var _params$onSelectedSec2;
+      (_params$onSelectedSec2 = params.onSelectedSectionsChange) == null || _params$onSelectedSec2.call(params, 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/internals/hooks/useMultiInputRangeField/useMultiInputDateRangeField.d.ts

@@ -1,4 +1,4 @@
 import { PickerValidDate } from '@mui/x-date-pickers/models';
 import { UseMultiInputDateRangeFieldParams } from '../../../MultiInputDateRangeField/MultiInputDateRangeField.types';
 import type { UseMultiInputRangeFieldResponse } from './useMultiInputRangeField.types';
-export declare const useMultiInputDateRangeField: <TDate extends PickerValidDate, TTextFieldSlotProps extends {}>({ sharedProps: inSharedProps, startTextFieldProps, unstableStartFieldRef, endTextFieldProps, unstableEndFieldRef, }: UseMultiInputDateRangeFieldParams<TDate, TTextFieldSlotProps>) => UseMultiInputRangeFieldResponse<TTextFieldSlotProps>;
+export declare const useMultiInputDateRangeField: <TDate extends PickerValidDate, TEnableAccessibleFieldDOMStructure extends boolean, TTextFieldSlotProps extends {}>({ sharedProps: inSharedProps, startTextFieldProps, unstableStartFieldRef, endTextFieldProps, unstableEndFieldRef, }: UseMultiInputDateRangeFieldParams<TDate, TEnableAccessibleFieldDOMStructure, TTextFieldSlotProps>) => UseMultiInputRangeFieldResponse<TEnableAccessibleFieldDOMStructure, TTextFieldSlotProps>;

package/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/internals/hooks/useMultiInputRangeField/useMultiInputDateTimeRangeField.d.ts

@@ -1,5 +1,4 @@
 import { PickerValidDate } from '@mui/x-date-pickers/models';
-import type { UseMultiInputDateTimeRangeFieldDefaultizedProps, UseMultiInputDateTimeRangeFieldParams, UseMultiInputDateTimeRangeFieldProps } from '../../../MultiInputDateTimeRangeField/MultiInputDateTimeRangeField.types';
+import type { UseMultiInputDateTimeRangeFieldParams } from '../../../MultiInputDateTimeRangeField/MultiInputDateTimeRangeField.types';
 import type { UseMultiInputRangeFieldResponse } from './useMultiInputRangeField.types';
-export declare const useDefaultizedDateTimeRangeFieldProps: <TDate extends PickerValidDate, AdditionalProps extends {}>(props: UseMultiInputDateTimeRangeFieldProps<TDate>) => UseMultiInputDateTimeRangeFieldDefaultizedProps<TDate, AdditionalProps>;
-export declare const useMultiInputDateTimeRangeField: <TDate extends PickerValidDate, TTextFieldSlotProps extends {}>({ sharedProps: inSharedProps, startTextFieldProps, unstableStartFieldRef, endTextFieldProps, unstableEndFieldRef, }: UseMultiInputDateTimeRangeFieldParams<TDate, TTextFieldSlotProps>) => UseMultiInputRangeFieldResponse<TTextFieldSlotProps>;
+export declare const useMultiInputDateTimeRangeField: <TDate extends PickerValidDate, TEnableAccessibleFieldDOMStructure extends boolean, TTextFieldSlotProps extends {}>({ sharedProps: inSharedProps, startTextFieldProps, unstableStartFieldRef, endTextFieldProps, unstableEndFieldRef, }: UseMultiInputDateTimeRangeFieldParams<TDate, TEnableAccessibleFieldDOMStructure, TTextFieldSlotProps>) => UseMultiInputRangeFieldResponse<TEnableAccessibleFieldDOMStructure, TTextFieldSlotProps>;