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

package/node/MultiInputTimeRangeField/MultiInputTimeRangeField.js

@@ -17,9 +17,10 @@ var _styles = require("@mui/material/styles");
 var _utils = require("@mui/base/utils");
 var _utils2 = require("@mui/utils");
 var _internals = require("@mui/x-date-pickers/internals");
+var _PickersTextField = require("@mui/x-date-pickers/PickersTextField");
 var _useMultiInputTimeRangeField = require("../internals/hooks/useMultiInputRangeField/useMultiInputTimeRangeField");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["slots", "slotProps", "disabled", "autoFocus", "unstableStartFieldRef", "unstableEndFieldRef", "className"];
+const _excluded = ["slots", "slotProps", "unstableStartFieldRef", "unstableEndFieldRef", "className"];
 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 multiInputTimeRangeFieldClasses = exports.multiInputTimeRangeFieldClasses = (0, _utils2.unstable_generateUtilityClasses)('MuiMultiInputTimeRangeField', ['root', 'separator']);
@@ -68,14 +69,12 @@ const MultiInputTimeRangeField = exports.MultiInputTimeRangeField = /*#__PURE__*
     name: 'MuiMultiInputTimeRangeField'
   });
   const {
-    internalProps: timeFieldInternalProps,
+    internalProps,
     forwardedProps
   } = (0, _internals.splitFieldInternalAndForwardedProps)(themeProps, 'time');
   const {
       slots,
       slotProps,
-      disabled,
-      autoFocus,
       unstableStartFieldRef,
       unstableEndFieldRef,
       className
@@ -94,13 +93,10 @@ const MultiInputTimeRangeField = exports.MultiInputTimeRangeField = /*#__PURE__*
     ownerState,
     className: (0, _clsx.clsx)(className, classes.root)
   });
-  const TextField = slots?.textField ?? _TextField.default;
+  const TextField = slots?.textField ?? (inProps.enableAccessibleFieldDOMStructure ? _PickersTextField.PickersTextField : _TextField.default);
   const startTextFieldProps = (0, _utils.useSlotProps)({
     elementType: TextField,
     externalSlotProps: slotProps?.textField,
-    additionalProps: {
-      autoFocus
-    },
     ownerState: (0, _extends2.default)({}, ownerState, {
       position: 'start'
     })
@@ -120,9 +116,7 @@ const MultiInputTimeRangeField = exports.MultiInputTimeRangeField = /*#__PURE__*
     className: classes.separator
   });
   const fieldResponse = (0, _useMultiInputTimeRangeField.useMultiInputTimeRangeField)({
-    sharedProps: (0, _extends2.default)({}, timeFieldInternalProps, {
-      disabled
-    }),
+    sharedProps: internalProps,
     startTextFieldProps,
     endTextFieldProps,
     unstableStartFieldRef,
@@ -148,6 +142,9 @@ process.env.NODE_ENV !== "production" ? MultiInputTimeRangeField.propTypes = {
    * @default `utils.is12HourCycleInCurrentLocale()`
    */
   ampm: _propTypes.default.bool,
+  /**
+   * If `true`, the `input` element is focused during the first mount.
+   */
   autoFocus: _propTypes.default.bool,
   /**
    * Override or extend the styles applied to the component.
@@ -189,6 +186,10 @@ process.env.NODE_ENV !== "production" ? MultiInputTimeRangeField.propTypes = {
    * Add an element between each child.
    */
   divider: _propTypes.default.node,
+  /**
+   * @default false
+   */
+  enableAccessibleFieldDOMStructure: _propTypes.default.bool,
   /**
    * Format of the date when rendered in the input(s).
    */
@@ -249,17 +250,14 @@ process.env.NODE_ENV !== "production" ? MultiInputTimeRangeField.propTypes = {
   referenceDate: _propTypes.default.object,
   /**
    * The currently selected sections.
-   * This prop accept four formats:
+   * This prop accepts four formats:
    * 1. If a number is provided, the section at this index will be selected.
-   * 2. If an object with a `startIndex` and `endIndex` properties are provided, the sections between those two indexes will be selected.
-   * 3. If a string of type `FieldSectionType` is provided, the first section with that name will be selected.
-   * 4. If `null` is provided, no section will be selected
+   * 2. If a string of type `FieldSectionType` is provided, the first section with that name will be selected.
+   * 3. If `"all"` is provided, all the sections will be selected.
+   * 4. If `null` is provided, no section will be selected.
    * If not provided, the selected sections will be handled internally.
    */
-  selectedSections: _propTypes.default.oneOfType([_propTypes.default.oneOf(['all', 'day', 'empty', 'hours', 'meridiem', 'minutes', 'month', 'seconds', 'weekDay', 'year']), _propTypes.default.number, _propTypes.default.shape({
-    endIndex: _propTypes.default.number.isRequired,
-    startIndex: _propTypes.default.number.isRequired
-  })]),
+  selectedSections: _propTypes.default.oneOfType([_propTypes.default.oneOf(['all', 'day', 'empty', 'hours', 'meridiem', 'minutes', 'month', 'seconds', 'weekDay', 'year']), _propTypes.default.number]),
   /**
    * Disable specific time.
    * @template TDate

package/node/SingleInputDateRangeField/SingleInputDateRangeField.js

@@ -12,9 +12,10 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _styles = require("@mui/material/styles");
 var _utils = require("@mui/base/utils");
+var _utils2 = require("@mui/utils");
 var _hooks = require("@mui/x-date-pickers/hooks");
 var _internals = require("@mui/x-date-pickers/internals");
-var _utils2 = require("@mui/utils");
+var _PickersTextField = require("@mui/x-date-pickers/PickersTextField");
 var _useSingleInputDateRangeField = require("./useSingleInputDateRangeField");
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["slots", "slotProps", "InputProps", "inputProps"];
@@ -43,7 +44,7 @@ const SingleInputDateRangeField = exports.SingleInputDateRangeField = /*#__PURE_
     } = themeProps,
     other = (0, _objectWithoutPropertiesLoose2.default)(themeProps, _excluded);
   const ownerState = themeProps;
-  const TextField = slots?.textField ?? _TextField.default;
+  const TextField = slots?.textField ?? (inProps.enableAccessibleFieldDOMStructure ? _PickersTextField.PickersTextField : _TextField.default);
   const textFieldProps = (0, _utils.useSlotProps)({
     elementType: TextField,
     externalSlotProps: slotProps?.textField,
@@ -109,6 +110,10 @@ process.env.NODE_ENV !== "production" ? SingleInputDateRangeField.propTypes = {
    * @default false
    */
   disablePast: _propTypes.default.bool,
+  /**
+   * @default false
+   */
+  enableAccessibleFieldDOMStructure: _propTypes.default.bool,
   /**
    * If `true`, the component is displayed in focused state.
    */
@@ -235,17 +240,14 @@ process.env.NODE_ENV !== "production" ? SingleInputDateRangeField.propTypes = {
   required: _propTypes.default.bool,
   /**
    * The currently selected sections.
-   * This prop accept four formats:
+   * This prop accepts four formats:
    * 1. If a number is provided, the section at this index will be selected.
-   * 2. If an object with a `startIndex` and `endIndex` properties are provided, the sections between those two indexes will be selected.
-   * 3. If a string of type `FieldSectionType` is provided, the first section with that name will be selected.
-   * 4. If `null` is provided, no section will be selected
+   * 2. If a string of type `FieldSectionType` is provided, the first section with that name will be selected.
+   * 3. If `"all"` is provided, all the sections will be selected.
+   * 4. If `null` is provided, no section will be selected.
    * If not provided, the selected sections will be handled internally.
    */
-  selectedSections: _propTypes.default.oneOfType([_propTypes.default.oneOf(['all', 'day', 'empty', 'hours', 'meridiem', 'minutes', 'month', 'seconds', 'weekDay', 'year']), _propTypes.default.number, _propTypes.default.shape({
-    endIndex: _propTypes.default.number.isRequired,
-    startIndex: _propTypes.default.number.isRequired
-  })]),
+  selectedSections: _propTypes.default.oneOfType([_propTypes.default.oneOf(['all', 'day', 'empty', 'hours', 'meridiem', 'minutes', 'month', 'seconds', 'weekDay', 'year']), _propTypes.default.number]),
   /**
    * Disable specific date.
    *

package/node/SingleInputDateRangeField/useSingleInputDateRangeField.js

@@ -1,28 +1,14 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useSingleInputDateRangeField = exports.useDefaultizedDateRangeFieldProps = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+exports.useSingleInputDateRangeField = void 0;
 var _internals = require("@mui/x-date-pickers/internals");
 var _valueManagers = require("../internals/utils/valueManagers");
 var _validateDateRange = require("../internals/utils/validation/validateDateRange");
-const useDefaultizedDateRangeFieldProps = props => {
-  const utils = (0, _internals.useUtils)();
-  const defaultDates = (0, _internals.useDefaultDates)();
-  return (0, _extends2.default)({}, props, {
-    disablePast: props.disablePast ?? false,
-    disableFuture: props.disableFuture ?? false,
-    format: props.format ?? utils.formats.keyboardDate,
-    minDate: (0, _internals.applyDefaultDate)(utils, props.minDate, defaultDates.minDate),
-    maxDate: (0, _internals.applyDefaultDate)(utils, props.maxDate, defaultDates.maxDate)
-  });
-};
-exports.useDefaultizedDateRangeFieldProps = useDefaultizedDateRangeFieldProps;
 const useSingleInputDateRangeField = inProps => {
-  const props = useDefaultizedDateRangeFieldProps(inProps);
+  const props = (0, _internals.useDefaultizedDateField)(inProps);
   const {
     forwardedProps,
     internalProps

package/node/SingleInputDateTimeRangeField/SingleInputDateTimeRangeField.js

@@ -11,10 +11,11 @@ var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _internals = require("@mui/x-date-pickers/internals");
+var _PickersTextField = require("@mui/x-date-pickers/PickersTextField");
 var _styles = require("@mui/material/styles");
-var _utils = require("@mui/base/utils");
+var _utils = require("@mui/utils");
+var _utils2 = require("@mui/base/utils");
 var _hooks = require("@mui/x-date-pickers/hooks");
-var _utils2 = require("@mui/utils");
 var _useSingleInputDateTimeRangeField = require("./useSingleInputDateTimeRangeField");
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["slots", "slotProps", "InputProps", "inputProps"];
@@ -43,8 +44,8 @@ const SingleInputDateTimeRangeField = exports.SingleInputDateTimeRangeField = /*
     } = themeProps,
     other = (0, _objectWithoutPropertiesLoose2.default)(themeProps, _excluded);
   const ownerState = themeProps;
-  const TextField = slots?.textField ?? _TextField.default;
-  const textFieldProps = (0, _utils.useSlotProps)({
+  const TextField = slots?.textField ?? (inProps.enableAccessibleFieldDOMStructure ? _PickersTextField.PickersTextField : _TextField.default);
+  const textFieldProps = (0, _utils2.useSlotProps)({
     elementType: TextField,
     externalSlotProps: slotProps?.textField,
     externalForwardedProps: other,
@@ -119,6 +120,10 @@ process.env.NODE_ENV !== "production" ? SingleInputDateTimeRangeField.propTypes
    * @default false
    */
   disablePast: _propTypes.default.bool,
+  /**
+   * @default false
+   */
+  enableAccessibleFieldDOMStructure: _propTypes.default.bool,
   /**
    * If `true`, the component is displayed in focused state.
    */
@@ -177,7 +182,7 @@ process.env.NODE_ENV !== "production" ? SingleInputDateTimeRangeField.propTypes
   /**
    * Pass a ref to the `input` element.
    */
-  inputRef: _utils2.refType,
+  inputRef: _utils.refType,
   /**
    * The label content.
    */
@@ -268,17 +273,14 @@ process.env.NODE_ENV !== "production" ? SingleInputDateTimeRangeField.propTypes
   required: _propTypes.default.bool,
   /**
    * The currently selected sections.
-   * This prop accept four formats:
+   * This prop accepts four formats:
    * 1. If a number is provided, the section at this index will be selected.
-   * 2. If an object with a `startIndex` and `endIndex` properties are provided, the sections between those two indexes will be selected.
-   * 3. If a string of type `FieldSectionType` is provided, the first section with that name will be selected.
-   * 4. If `null` is provided, no section will be selected
+   * 2. If a string of type `FieldSectionType` is provided, the first section with that name will be selected.
+   * 3. If `"all"` is provided, all the sections will be selected.
+   * 4. If `null` is provided, no section will be selected.
    * If not provided, the selected sections will be handled internally.
    */
-  selectedSections: _propTypes.default.oneOfType([_propTypes.default.oneOf(['all', 'day', 'empty', 'hours', 'meridiem', 'minutes', 'month', 'seconds', 'weekDay', 'year']), _propTypes.default.number, _propTypes.default.shape({
-    endIndex: _propTypes.default.number.isRequired,
-    startIndex: _propTypes.default.number.isRequired
-  })]),
+  selectedSections: _propTypes.default.oneOfType([_propTypes.default.oneOf(['all', 'day', 'empty', 'hours', 'meridiem', 'minutes', 'month', 'seconds', 'weekDay', 'year']), _propTypes.default.number]),
   /**
    * Disable specific date.
    *

package/node/SingleInputDateTimeRangeField/useSingleInputDateTimeRangeField.js

@@ -1,33 +1,14 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useSingleInputDateTimeRangeField = exports.useDefaultizedTimeRangeFieldProps = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+exports.useSingleInputDateTimeRangeField = void 0;
 var _internals = require("@mui/x-date-pickers/internals");
 var _valueManagers = require("../internals/utils/valueManagers");
 var _validateDateTimeRange = require("../internals/utils/validation/validateDateTimeRange");
-const useDefaultizedTimeRangeFieldProps = 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.useDefaultizedTimeRangeFieldProps = useDefaultizedTimeRangeFieldProps;
 const useSingleInputDateTimeRangeField = inProps => {
-  const props = useDefaultizedTimeRangeFieldProps(inProps);
+  const props = (0, _internals.useDefaultizedDateTimeField)(inProps);
   const {
     forwardedProps,
     internalProps

package/node/SingleInputTimeRangeField/SingleInputTimeRangeField.js

@@ -12,6 +12,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _hooks = require("@mui/x-date-pickers/hooks");
 var _internals = require("@mui/x-date-pickers/internals");
+var _PickersTextField = require("@mui/x-date-pickers/PickersTextField");
 var _styles = require("@mui/material/styles");
 var _utils = require("@mui/base/utils");
 var _utils2 = require("@mui/utils");
@@ -43,7 +44,7 @@ const SingleInputTimeRangeField = exports.SingleInputTimeRangeField = /*#__PURE_
     } = themeProps,
     other = (0, _objectWithoutPropertiesLoose2.default)(themeProps, _excluded);
   const ownerState = themeProps;
-  const TextField = slots?.textField ?? _TextField.default;
+  const TextField = slots?.textField ?? (inProps.enableAccessibleFieldDOMStructure ? _PickersTextField.PickersTextField : _TextField.default);
   const textFieldProps = (0, _utils.useSlotProps)({
     elementType: TextField,
     externalSlotProps: slotProps?.textField,
@@ -119,6 +120,10 @@ process.env.NODE_ENV !== "production" ? SingleInputTimeRangeField.propTypes = {
    * @default false
    */
   disablePast: _propTypes.default.bool,
+  /**
+   * @default false
+   */
+  enableAccessibleFieldDOMStructure: _propTypes.default.bool,
   /**
    * If `true`, the component is displayed in focused state.
    */
@@ -252,17 +257,14 @@ process.env.NODE_ENV !== "production" ? SingleInputTimeRangeField.propTypes = {
   required: _propTypes.default.bool,
   /**
    * The currently selected sections.
-   * This prop accept four formats:
+   * This prop accepts four formats:
    * 1. If a number is provided, the section at this index will be selected.
-   * 2. If an object with a `startIndex` and `endIndex` properties are provided, the sections between those two indexes will be selected.
-   * 3. If a string of type `FieldSectionType` is provided, the first section with that name will be selected.
-   * 4. If `null` is provided, no section will be selected
+   * 2. If a string of type `FieldSectionType` is provided, the first section with that name will be selected.
+   * 3. If `"all"` is provided, all the sections will be selected.
+   * 4. If `null` is provided, no section will be selected.
    * If not provided, the selected sections will be handled internally.
    */
-  selectedSections: _propTypes.default.oneOfType([_propTypes.default.oneOf(['all', 'day', 'empty', 'hours', 'meridiem', 'minutes', 'month', 'seconds', 'weekDay', 'year']), _propTypes.default.number, _propTypes.default.shape({
-    endIndex: _propTypes.default.number.isRequired,
-    startIndex: _propTypes.default.number.isRequired
-  })]),
+  selectedSections: _propTypes.default.oneOfType([_propTypes.default.oneOf(['all', 'day', 'empty', 'hours', 'meridiem', 'minutes', 'month', 'seconds', 'weekDay', 'year']), _propTypes.default.number]),
   /**
    * Disable specific time.
    * @template TDate

package/node/SingleInputTimeRangeField/useSingleInputTimeRangeField.js

@@ -1,27 +1,14 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useSingleInputTimeRangeField = exports.useDefaultizedTimeRangeFieldProps = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+exports.useSingleInputTimeRangeField = void 0;
 var _internals = require("@mui/x-date-pickers/internals");
 var _valueManagers = require("../internals/utils/valueManagers");
 var _validateTimeRange = require("../internals/utils/validation/validateTimeRange");
-const useDefaultizedTimeRangeFieldProps = props => {
-  const utils = (0, _internals.useUtils)();
-  const ampm = props.ampm ?? utils.is12HourCycleInCurrentLocale();
-  const defaultFormat = ampm ? utils.formats.fullTime12h : utils.formats.fullTime24h;
-  return (0, _extends2.default)({}, props, {
-    disablePast: props.disablePast ?? false,
-    disableFuture: props.disableFuture ?? false,
-    format: props.format ?? defaultFormat
-  });
-};
-exports.useDefaultizedTimeRangeFieldProps = useDefaultizedTimeRangeFieldProps;
 const useSingleInputTimeRangeField = inProps => {
-  const props = useDefaultizedTimeRangeFieldProps(inProps);
+  const props = (0, _internals.useDefaultizedTimeField)(inProps);
   const {
     forwardedProps,
     internalProps

package/node/StaticDateRangePicker/StaticDateRangePicker.js

@@ -139,7 +139,6 @@ StaticDateRangePicker.propTypes = {
   /**
    * The day view will show as many weeks as needed after the end of the current month to match this value.
    * Put it to 6 to have a fixed number of weeks in Gregorian calendars
-   * @default undefined
    */
   fixedWeekNumber: _propTypes.default.number,
   /**

package/node/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-date-pickers-pro v7.0.0-beta.2
+ * @mui/x-date-pickers-pro v7.0.0-beta.4
  *
  * @license MUI X Commercial
  * This source code is licensed under the commercial license found in the

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

@@ -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,