@mui/x-date-pickers-pro 8.0.0-alpha.0 → 8.0.0-alpha.10

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

@@ -1,14 +1,16 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["props"];
+const _excluded = ["props"],
+  _excluded2 = ["ownerState"];
 import * as React from 'react';
 import useSlotProps from '@mui/utils/useSlotProps';
 import { useLicenseVerifier } from '@mui/x-license';
 import { PickersLayout } from '@mui/x-date-pickers/PickersLayout';
-import { executeInTheNextEventLoopTick, getActiveElement, usePicker, PickersPopper, PickerProvider } from '@mui/x-date-pickers/internals';
-import { useEnrichedRangePickerFieldProps } from "../useEnrichedRangePickerFieldProps.js";
+import { executeInTheNextEventLoopTick, getActiveElement, usePicker, PickerPopper, PickerProvider, PickerFieldUIContextProvider } from '@mui/x-date-pickers/internals';
+import { useEnrichedRangePickerField } from "../useEnrichedRangePickerField.js";
 import { getReleaseInfo } from "../../utils/releaseInfo.js";
 import { useRangePosition } from "../useRangePosition.js";
+import { PickerRangePositionContext } from "../../../hooks/usePickerRangePositionContext.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const releaseInfo = getReleaseInfo();
 export const useDesktopRangePicker = _ref => {
@@ -20,58 +22,45 @@ export const useDesktopRangePicker = _ref => {
   const {
     slots,
     slotProps,
-    className,
-    sx,
-    format,
-    formatDensity,
-    enableAccessibleFieldDOMStructure,
-    selectedSections,
-    onSelectedSectionsChange,
-    timezone,
-    label,
     inputRef,
-    name,
     readOnly,
-    disabled,
     autoFocus,
     disableOpenPicker,
-    localeText,
-    reduceAnimations
+    localeText
   } = props;
   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 singleInputFieldRef = React.useRef(null);
   const initialView = React.useRef(props.openTo ?? null);
   const fieldType = slots.field.fieldType ?? 'multi-input';
+  const rangePositionResponse = useRangePosition(props, fieldType === 'single-input' ? singleInputFieldRef : undefined);
+  let fieldRef;
+  if (fieldType === 'single-input') {
+    fieldRef = singleInputFieldRef;
+  } else if (rangePositionResponse.rangePosition === 'start') {
+    fieldRef = startFieldRef;
+  } else {
+    fieldRef = endFieldRef;
+  }
   const {
-    rangePosition,
-    onRangePositionChange
-  } = useRangePosition(props, fieldType === 'single-input' ? startFieldRef : undefined);
-  const {
-    open,
-    actions,
-    layoutProps,
     providerProps,
     renderCurrentView,
-    shouldRestoreFocus,
-    fieldProps: pickerFieldProps,
     ownerState
   } = usePicker(_extends({}, pickerParams, {
     props,
-    wrapperVariant: 'desktop',
+    variant: 'desktop',
     autoFocusView: false,
-    fieldRef: rangePosition === 'start' ? startFieldRef : endFieldRef,
-    localeText,
-    additionalViewProps: {
-      rangePosition,
-      onRangePositionChange
-    }
+    fieldRef,
+    localeText
   }));
+
+  // Temporary hack to hide the opening button on the range pickers until we have migrate them to the new opening logic.
+  providerProps.contextValue.triggerStatus = 'hidden';
   React.useEffect(() => {
-    if (layoutProps.view) {
-      initialView.current = layoutProps.view;
+    if (providerProps.contextValue.view) {
+      initialView.current = providerProps.contextValue.view;
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -80,90 +69,69 @@ export const useDesktopRangePicker = _ref => {
       if (fieldContainerRef.current?.contains(getActiveElement(document)) || popperRef.current?.contains(getActiveElement(document))) {
         return;
       }
-      actions.onDismiss();
+
+      // This direct access to `providerProps` will go away once the range fields stop having their views in a tooltip.
+      providerProps.privateContextValue.dismissViews();
     });
   };
   const Field = slots.field;
-  const fieldProps = useSlotProps({
-    elementType: Field,
-    externalSlotProps: slotProps?.field,
-    additionalProps: _extends({
-      // Internal props
-      readOnly,
-      disabled,
-      format,
-      formatDensity,
-      enableAccessibleFieldDOMStructure,
-      selectedSections,
-      onSelectedSectionsChange,
-      timezone,
-      autoFocus: autoFocus && !props.open
-    }, pickerFieldProps, {
-      // onChange and value
-
-      // Forwarded props
-      className,
-      sx,
-      ref: fieldContainerRef
-    }, fieldType === 'single-input' && !!inputRef && {
-      inputRef
-    }, fieldType === 'single-input' && {
-      name
+  const _useSlotProps = useSlotProps({
+      elementType: Field,
+      externalSlotProps: slotProps?.field,
+      additionalProps: {
+        // Internal props
+        readOnly,
+        autoFocus: autoFocus && !props.open,
+        // Forwarded props
+        ref: fieldContainerRef
+      },
+      ownerState
     }),
-    ownerState
-  });
-  const enrichedFieldProps = useEnrichedRangePickerFieldProps({
-    wrapperVariant: 'desktop',
+    fieldProps = _objectWithoutPropertiesLoose(_useSlotProps, _excluded2);
+  const enrichedFieldResponse = useEnrichedRangePickerField(_extends({
+    variant: 'desktop',
     fieldType,
-    open,
-    actions,
+    // These direct access to `providerProps` will go away once the range fields handle the picker opening
+    contextValue: providerProps.contextValue,
+    fieldPrivateContextValue: providerProps.fieldPrivateContextValue,
     readOnly,
     disableOpenPicker,
-    label,
     localeText,
     onBlur: handleBlur,
-    rangePosition,
-    onRangePositionChange,
     pickerSlotProps: slotProps,
     pickerSlots: slots,
     fieldProps,
-    anchorRef,
+    anchorRef: providerProps.contextValue.triggerRef,
     startFieldRef,
     endFieldRef,
-    currentView: layoutProps.view !== props.openTo ? layoutProps.view : undefined,
-    initialView: initialView.current ?? undefined,
-    onViewChange: layoutProps.onViewChange
-  });
-  const slotPropsForLayout = _extends({}, slotProps, {
-    tabs: _extends({}, slotProps?.tabs, {
-      rangePosition,
-      onRangePositionChange
-    }),
-    toolbar: _extends({}, slotProps?.toolbar, {
-      rangePosition,
-      onRangePositionChange
-    })
-  });
+    singleInputFieldRef,
+    currentView: providerProps.contextValue.view !== props.openTo ? providerProps.contextValue.view : undefined,
+    initialView: initialView.current ?? undefined
+  }, rangePositionResponse));
   const Layout = slots?.layout ?? PickersLayout;
-  const renderPicker = () => /*#__PURE__*/_jsxs(PickerProvider, _extends({}, providerProps, {
-    children: [/*#__PURE__*/_jsx(Field, _extends({}, enrichedFieldProps)), /*#__PURE__*/_jsx(PickersPopper, _extends({
-      role: "tooltip",
-      placement: "bottom-start",
-      containerRef: popperRef,
-      anchorEl: anchorRef.current,
-      onBlur: handleBlur
-    }, actions, {
-      open: open,
+  const renderPicker = () => /*#__PURE__*/_jsx(PickerProvider, _extends({}, providerProps, {
+    // This override will go away once the range fields handle the picker opening
+    fieldPrivateContextValue: _extends({}, providerProps.fieldPrivateContextValue, enrichedFieldResponse.fieldPrivateContextValue),
+    children: /*#__PURE__*/_jsx(PickerFieldUIContextProvider, {
       slots: slots,
       slotProps: slotProps,
-      shouldRestoreFocus: shouldRestoreFocus,
-      reduceAnimations: reduceAnimations,
-      children: /*#__PURE__*/_jsx(Layout, _extends({}, layoutProps, slotProps?.layout, {
-        slots: slots,
-        slotProps: slotPropsForLayout,
-        children: renderCurrentView()
-      }))
-    }))]
+      inputRef: inputRef,
+      children: /*#__PURE__*/_jsxs(PickerRangePositionContext.Provider, {
+        value: rangePositionResponse,
+        children: [/*#__PURE__*/_jsx(Field, _extends({}, enrichedFieldResponse.fieldProps)), /*#__PURE__*/_jsx(PickerPopper, {
+          role: "tooltip",
+          containerRef: popperRef,
+          onBlur: handleBlur,
+          slots: slots,
+          slotProps: slotProps,
+          children: /*#__PURE__*/_jsx(Layout, _extends({}, slotProps?.layout, {
+            slots: slots,
+            slotProps: slotProps,
+            children: renderCurrentView()
+          }))
+        })]
+      })
+    })
   }));
   return {
     renderPicker

package/modern/internals/hooks/{useEnrichedRangePickerFieldProps.js → useEnrichedRangePickerField.js}

@@ -8,15 +8,14 @@ import useForkRef from '@mui/utils/useForkRef';
 import { usePickerTranslations } from '@mui/x-date-pickers/hooks';
 import { onSpaceOrEnter } from '@mui/x-date-pickers/internals';
 const useMultiInputFieldSlotProps = ({
-  wrapperVariant,
-  open,
-  actions,
+  contextValue,
+  variant,
   readOnly,
   labelId,
   disableOpenPicker,
   onBlur,
   rangePosition,
-  onRangePositionChange,
+  setRangePosition,
   localeText: inLocaleText,
   pickerSlotProps,
   pickerSlots,
@@ -24,7 +23,6 @@ const useMultiInputFieldSlotProps = ({
   anchorRef,
   currentView,
   initialView,
-  onViewChange,
   startFieldRef,
   endFieldRef
 }) => {
@@ -33,7 +31,7 @@ const useMultiInputFieldSlotProps = ({
   const handleEndFieldRef = useForkRef(fieldProps.unstableEndFieldRef, endFieldRef);
   const previousRangePosition = React.useRef(rangePosition);
   React.useEffect(() => {
-    if (!open) {
+    if (!contextValue.open || variant === 'mobile') {
       return;
     }
     const currentFieldRef = rangePosition === 'start' ? startFieldRef : endFieldRef;
@@ -49,34 +47,36 @@ const useMultiInputFieldSlotProps = ({
     // 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, startFieldRef, endFieldRef]);
+  }, [rangePosition, contextValue.open, currentView, startFieldRef, endFieldRef, variant]);
   const openRangeStartSelection = event => {
     event.stopPropagation();
-    onRangePositionChange('start');
+    setRangePosition('start');
     if (!readOnly && !disableOpenPicker) {
-      actions.onOpen(event);
+      event.preventDefault();
+      contextValue.setOpen(true);
     }
   };
   const openRangeEndSelection = event => {
     event.stopPropagation();
-    onRangePositionChange('end');
+    setRangePosition('end');
     if (!readOnly && !disableOpenPicker) {
-      actions.onOpen(event);
+      event.preventDefault();
+      contextValue.setOpen(true);
     }
   };
   const handleFocusStart = () => {
-    if (open) {
-      onRangePositionChange('start');
+    if (contextValue.open) {
+      setRangePosition('start');
       if (previousRangePosition.current !== 'start' && initialView) {
-        onViewChange?.(initialView);
+        contextValue.setView?.(initialView);
       }
     }
   };
   const handleFocusEnd = () => {
-    if (open) {
-      onRangePositionChange('end');
+    if (contextValue.open) {
+      setRangePosition('end');
       if (previousRangePosition.current !== 'end' && initialView) {
-        onViewChange?.(initialView);
+        contextValue.setView?.(initialView);
       }
     }
   };
@@ -95,10 +95,10 @@ const useMultiInputFieldSlotProps = ({
           label: inLocaleText?.start ?? translations.start,
           onKeyDown: onSpaceOrEnter(openRangeStartSelection),
           onFocus: handleFocusStart,
-          focused: open ? rangePosition === 'start' : undefined
-        }, !readOnly && !fieldProps.disabled && {
+          focused: contextValue.open ? rangePosition === 'start' : undefined
+        }, !readOnly && !contextValue.disabled && {
           onClick: openRangeStartSelection
-        }, wrapperVariant === 'mobile' && {
+        }, variant === 'mobile' && {
           readOnly: true
         });
         if (anchorRef) {
@@ -111,10 +111,10 @@ const useMultiInputFieldSlotProps = ({
           label: inLocaleText?.end ?? translations.end,
           onKeyDown: onSpaceOrEnter(openRangeEndSelection),
           onFocus: handleFocusEnd,
-          focused: open ? rangePosition === 'end' : undefined
-        }, !readOnly && !fieldProps.disabled && {
+          focused: contextValue.open ? rangePosition === 'end' : undefined
+        }, !readOnly && !contextValue.disabled && {
           onClick: openRangeEndSelection
-        }, wrapperVariant === 'mobile' && {
+        }, variant === 'mobile' && {
           readOnly: true
         });
         InputProps = resolvedComponentProps?.InputProps;
@@ -143,96 +143,83 @@ const useMultiInputFieldSlotProps = ({
     slots,
     slotProps
   });
-  return enrichedFieldProps;
+  return {
+    fieldProps: enrichedFieldProps,
+    fieldPrivateContextValue: {}
+  };
 };
 const useSingleInputFieldSlotProps = ({
-  wrapperVariant,
-  open,
-  actions,
+  contextValue,
+  fieldPrivateContextValue,
+  variant,
   readOnly,
   labelId,
   disableOpenPicker,
-  label,
   onBlur,
   rangePosition,
-  onRangePositionChange,
-  startFieldRef,
-  endFieldRef,
-  pickerSlots,
-  pickerSlotProps,
+  setRangePosition,
+  singleInputFieldRef,
   fieldProps,
-  anchorRef,
   currentView
 }) => {
-  const handleFieldRef = useForkRef(fieldProps.unstableFieldRef, startFieldRef, endFieldRef);
+  const handleFieldRef = useForkRef(fieldProps.unstableFieldRef, singleInputFieldRef);
   React.useEffect(() => {
-    if (!open || !startFieldRef.current) {
+    if (!contextValue.open || !singleInputFieldRef.current || variant === 'mobile') {
       return;
     }
-    if (startFieldRef.current.isFieldFocused()) {
+    if (singleInputFieldRef.current.isFieldFocused()) {
       return;
     }
 
     // bring back focus to the field with the current view section selected
     if (currentView) {
-      const sections = startFieldRef.current.getSections().map(section => section.type);
+      const sections = singleInputFieldRef.current.getSections().map(section => section.type);
       const newSelectedSection = rangePosition === 'start' ? sections.indexOf(currentView) : sections.lastIndexOf(currentView);
-      startFieldRef.current?.focusField(newSelectedSection);
+      singleInputFieldRef.current?.focusField(newSelectedSection);
     }
-  }, [rangePosition, open, currentView, startFieldRef]);
+  }, [rangePosition, contextValue.open, currentView, singleInputFieldRef, variant]);
   const updateRangePosition = () => {
-    if (!startFieldRef.current?.isFieldFocused()) {
+    if (!singleInputFieldRef.current?.isFieldFocused()) {
       return;
     }
-    const sections = startFieldRef.current.getSections();
-    const activeSectionIndex = startFieldRef.current?.getActiveSectionIndex();
+    const sections = singleInputFieldRef.current.getSections();
+    const activeSectionIndex = singleInputFieldRef.current?.getActiveSectionIndex();
     const domRangePosition = activeSectionIndex == null || activeSectionIndex < sections.length / 2 ? 'start' : 'end';
     if (domRangePosition != null && domRangePosition !== rangePosition) {
-      onRangePositionChange(domRangePosition);
+      setRangePosition(domRangePosition);
     }
   };
   const handleSelectedSectionsChange = useEventCallback(selectedSection => {
     setTimeout(updateRangePosition);
-    fieldProps.onSelectedSectionsChange?.(selectedSection);
+    fieldPrivateContextValue.onSelectedSectionsChange?.(selectedSection);
   });
   const openPicker = event => {
     event.stopPropagation();
     if (!readOnly && !disableOpenPicker) {
-      actions.onOpen(event);
+      event.preventDefault();
+      contextValue.setOpen(true);
     }
   };
-  const slots = _extends({}, fieldProps.slots, {
-    textField: pickerSlots?.textField,
-    clearButton: pickerSlots?.clearButton,
-    clearIcon: pickerSlots?.clearIcon
-  });
-  const slotProps = _extends({}, fieldProps.slotProps, {
-    textField: pickerSlotProps?.textField,
-    clearButton: pickerSlotProps?.clearButton,
-    clearIcon: pickerSlotProps?.clearIcon
-  });
   const enrichedFieldProps = _extends({}, fieldProps, {
-    slots,
-    slotProps,
-    label,
     unstableFieldRef: handleFieldRef,
     onKeyDown: onSpaceOrEnter(openPicker, fieldProps.onKeyDown),
-    onSelectedSectionsChange: handleSelectedSectionsChange,
     onBlur,
-    InputProps: _extends({
-      ref: anchorRef
-    }, fieldProps?.InputProps),
-    focused: open ? true : undefined
+    focused: contextValue.open ? true : undefined
   }, labelId != null && {
     id: labelId
-  }, wrapperVariant === 'mobile' && {
+  }, variant === 'mobile' && {
     readOnly: true
-  }, !readOnly && !fieldProps.disabled && {
+  }, !readOnly && !contextValue.disabled && {
     onClick: openPicker
   });
-  return enrichedFieldProps;
+  return {
+    fieldProps: enrichedFieldProps,
+    fieldPrivateContextValue: {
+      onSelectedSectionsChange: handleSelectedSectionsChange
+    }
+  };
 };
-export const useEnrichedRangePickerFieldProps = params => {
+export const useEnrichedRangePickerField = params => {
   /* eslint-disable react-hooks/rules-of-hooks */
   if (process.env.NODE_ENV !== 'production') {
     const fieldTypeRef = React.useRef(params.fieldType);

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

@@ -1,16 +1,18 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["props"];
+const _excluded = ["props"],
+  _excluded2 = ["ownerState"];
 import * as React from 'react';
 import useSlotProps from '@mui/utils/useSlotProps';
 import { useLicenseVerifier } from '@mui/x-license';
 import { PickersLayout } from '@mui/x-date-pickers/PickersLayout';
-import { usePicker, PickersModalDialog, PickerProvider } from '@mui/x-date-pickers/internals';
+import { usePicker, PickersModalDialog, PickerProvider, PickerFieldUIContextProvider } from '@mui/x-date-pickers/internals';
 import { usePickerTranslations } from '@mui/x-date-pickers/hooks';
 import useId from '@mui/utils/useId';
-import { useEnrichedRangePickerFieldProps } from "../useEnrichedRangePickerFieldProps.js";
+import { useEnrichedRangePickerField } from "../useEnrichedRangePickerField.js";
 import { getReleaseInfo } from "../../utils/releaseInfo.js";
 import { useRangePosition } from "../useRangePosition.js";
+import { PickerRangePositionContext } from "../../../hooks/usePickerRangePositionContext.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const releaseInfo = getReleaseInfo();
 export const useMobileRangePicker = _ref => {
@@ -22,107 +24,70 @@ export const useMobileRangePicker = _ref => {
   const {
     slots,
     slotProps: innerSlotProps,
-    className,
-    sx,
-    format,
-    formatDensity,
-    enableAccessibleFieldDOMStructure,
-    selectedSections,
-    onSelectedSectionsChange,
-    timezone,
     label,
     inputRef,
-    name,
     readOnly,
-    disabled,
     disableOpenPicker,
     localeText
   } = props;
   const startFieldRef = React.useRef(null);
   const endFieldRef = React.useRef(null);
+  const singleInputFieldRef = React.useRef(null);
   const fieldType = slots.field.fieldType ?? 'multi-input';
-  const {
-    rangePosition,
-    onRangePositionChange
-  } = useRangePosition(props, fieldType === 'single-input' ? startFieldRef : undefined);
+  const rangePositionResponse = useRangePosition(props, fieldType === 'single-input' ? singleInputFieldRef : undefined);
   const labelId = useId();
   const contextTranslations = usePickerTranslations();
+  let fieldRef;
+  if (fieldType === 'single-input') {
+    fieldRef = singleInputFieldRef;
+  } else if (rangePositionResponse.rangePosition === 'start') {
+    fieldRef = startFieldRef;
+  } else {
+    fieldRef = endFieldRef;
+  }
   const {
-    open,
-    actions,
-    layoutProps,
     providerProps,
     renderCurrentView,
-    fieldProps: pickerFieldProps,
     ownerState
   } = usePicker(_extends({}, pickerParams, {
     props,
-    wrapperVariant: 'mobile',
+    variant: 'mobile',
     autoFocusView: true,
-    fieldRef: rangePosition === 'start' ? startFieldRef : endFieldRef,
-    localeText,
-    additionalViewProps: {
-      rangePosition,
-      onRangePositionChange
-    }
+    fieldRef,
+    localeText
   }));
-  const Field = slots.field;
-  const fieldProps = useSlotProps({
-    elementType: Field,
-    externalSlotProps: innerSlotProps?.field,
-    additionalProps: _extends({
-      // Internal props
-      readOnly: readOnly ?? true,
-      disabled,
-      format,
-      formatDensity,
-      enableAccessibleFieldDOMStructure,
-      selectedSections,
-      onSelectedSectionsChange,
-      timezone
-    }, pickerFieldProps, {
-      // onChange and value
 
-      // Forwarded props
-      className,
-      sx
-    }, fieldType === 'single-input' && !!inputRef && {
-      inputRef
-    }, fieldType === 'single-input' && {
-      name
+  // Temporary hack to hide the opening button on the range pickers until we have migrate them to the new opening logic.
+  providerProps.contextValue.triggerStatus = 'hidden';
+  const Field = slots.field;
+  const _useSlotProps = useSlotProps({
+      elementType: Field,
+      externalSlotProps: innerSlotProps?.field,
+      additionalProps: {
+        // Internal props
+        readOnly: readOnly ?? true
+      },
+      ownerState
     }),
-    ownerState
-  });
+    fieldProps = _objectWithoutPropertiesLoose(_useSlotProps, _excluded2);
   const isToolbarHidden = innerSlotProps?.toolbar?.hidden ?? false;
-  const enrichedFieldProps = useEnrichedRangePickerFieldProps({
-    wrapperVariant: 'mobile',
+  const enrichedFieldResponse = useEnrichedRangePickerField(_extends({
+    variant: 'mobile',
     fieldType,
-    open,
-    actions,
+    // These direct access to `providerProps` will go away once the range fields handle the picker opening
+    contextValue: providerProps.contextValue,
+    fieldPrivateContextValue: providerProps.fieldPrivateContextValue,
     readOnly,
     labelId,
     disableOpenPicker,
-    label,
     localeText,
-    rangePosition,
-    onRangePositionChange,
     pickerSlots: slots,
     pickerSlotProps: innerSlotProps,
     fieldProps,
     startFieldRef,
-    endFieldRef
-  });
-  const slotPropsForLayout = _extends({}, innerSlotProps, {
-    tabs: _extends({}, innerSlotProps?.tabs, {
-      rangePosition,
-      onRangePositionChange
-    }),
-    toolbar: _extends({}, innerSlotProps?.toolbar, {
-      titleId: labelId,
-      rangePosition,
-      onRangePositionChange
-    })
-  });
+    endFieldRef,
+    singleInputFieldRef
+  }, rangePositionResponse));
   const Layout = slots?.layout ?? PickersLayout;
   const finalLocaleText = _extends({}, contextTranslations, localeText);
   let labelledById = pickerParams.valueType === 'date-time' ? `${labelId}-start-toolbar ${labelId}-end-toolbar` : labelId;
@@ -141,21 +106,33 @@ export const useMobileRangePicker = _ref => {
     labelledById = labels.length > 0 ? labels.join(' ') : undefined;
   }
   const slotProps = _extends({}, innerSlotProps, {
+    toolbar: _extends({}, innerSlotProps?.toolbar, {
+      titleId: labelId
+    }),
     mobilePaper: _extends({
       'aria-labelledby': labelledById
     }, innerSlotProps?.mobilePaper)
   });
-  const renderPicker = () => /*#__PURE__*/_jsxs(PickerProvider, _extends({}, providerProps, {
-    children: [/*#__PURE__*/_jsx(Field, _extends({}, enrichedFieldProps)), /*#__PURE__*/_jsx(PickersModalDialog, _extends({}, actions, {
-      open: open,
+  const renderPicker = () => /*#__PURE__*/_jsx(PickerProvider, _extends({}, providerProps, {
+    // This override will go away once the range fields handle the picker opening
+    fieldPrivateContextValue: _extends({}, providerProps.fieldPrivateContextValue, enrichedFieldResponse.fieldPrivateContextValue),
+    children: /*#__PURE__*/_jsx(PickerFieldUIContextProvider, {
       slots: slots,
       slotProps: slotProps,
-      children: /*#__PURE__*/_jsx(Layout, _extends({}, layoutProps, slotProps?.layout, {
-        slots: slots,
-        slotProps: slotPropsForLayout,
-        children: renderCurrentView()
-      }))
-    }))]
+      inputRef: inputRef,
+      children: /*#__PURE__*/_jsxs(PickerRangePositionContext.Provider, {
+        value: rangePositionResponse,
+        children: [/*#__PURE__*/_jsx(Field, _extends({}, enrichedFieldResponse.fieldProps)), /*#__PURE__*/_jsx(PickersModalDialog, {
+          slots: slots,
+          slotProps: slotProps,
+          children: /*#__PURE__*/_jsx(Layout, _extends({}, slotProps?.layout, {
+            slots: slots,
+            slotProps: slotProps,
+            children: renderCurrentView()
+          }))
+        })]
+      })
+    })
   }));
   return {
     renderPicker