@mui/x-date-pickers-pro 8.0.0-alpha.7 → 8.0.0-alpha.9

package/modern/hooks/useMultiInputRangeField/useMultiInputRangeFieldTextFieldProps.js

@@ -0,0 +1,59 @@
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+const _excluded = ["clearable", "onClear"];
+import { useDateManager, useDateTimeManager, useTimeManager } from '@mui/x-date-pickers/managers';
+import { useSplitFieldProps } from '@mui/x-date-pickers/hooks';
+import { useField, useFieldInternalPropsWithDefaults } from '@mui/x-date-pickers/internals';
+/**
+ * @ignore - internal hook.
+ */
+export function useMultiInputRangeFieldTextFieldProps(parameters) {
+  const {
+    fieldProps,
+    valueType
+  } = parameters;
+  let useManager;
+  switch (valueType) {
+    case 'date':
+      {
+        useManager = useDateManager;
+        break;
+      }
+    case 'time':
+      {
+        useManager = useTimeManager;
+        break;
+      }
+    case 'date-time':
+      {
+        useManager = useDateTimeManager;
+        break;
+      }
+    default:
+      {
+        throw new Error(`Unknown valueType: ${valueType}`);
+      }
+  }
+  const manager = useManager({
+    enableAccessibleFieldDOMStructure: fieldProps.enableAccessibleFieldDOMStructure
+  });
+  const {
+    forwardedProps,
+    internalProps
+  } = useSplitFieldProps(fieldProps, 'date');
+  const internalPropsWithDefaults = useFieldInternalPropsWithDefaults({
+    manager,
+    internalProps
+  });
+  const _ref = useField({
+      forwardedProps,
+      internalProps: internalPropsWithDefaults,
+      valueManager: manager.internal_valueManager,
+      fieldValueManager: manager.internal_fieldValueManager,
+      validator: manager.validator,
+      valueType: manager.valueType,
+      // TODO v8: Add a real aria label before moving the opening logic to the field on range pickers.
+      getOpenPickerButtonAriaLabel: () => ''
+    }),
+    fieldResponse = _objectWithoutPropertiesLoose(_ref, _excluded);
+  return fieldResponse;
+}

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-date-pickers-pro v8.0.0-alpha.7
+ * @mui/x-date-pickers-pro v8.0.0-alpha.9
  *
  * @license MUI X Commercial
  * This source code is licensed under the commercial license found in the

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

@@ -5,8 +5,8 @@ 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, PickersPopper, 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";
@@ -23,24 +23,16 @@ export const useDesktopRangePicker = _ref => {
     slotProps,
     className,
     sx,
-    format,
-    formatDensity,
-    enableAccessibleFieldDOMStructure,
-    selectedSections,
-    onSelectedSectionsChange,
-    timezone,
     label,
     inputRef,
     name,
     readOnly,
-    disabled,
     autoFocus,
     disableOpenPicker,
     localeText,
     reduceAnimations
   } = 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);
@@ -60,7 +52,6 @@ export const useDesktopRangePicker = _ref => {
     providerProps,
     renderCurrentView,
     shouldRestoreFocus,
-    fieldProps: pickerFieldProps,
     ownerState
   } = usePicker(_extends({}, pickerParams, {
     props,
@@ -69,6 +60,9 @@ export const useDesktopRangePicker = _ref => {
     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 (providerProps.contextValue.view) {
       initialView.current = providerProps.contextValue.view;
@@ -92,17 +86,7 @@ export const useDesktopRangePicker = _ref => {
     additionalProps: _extends({
       // Internal props
       readOnly,
-      disabled,
-      format,
-      formatDensity,
-      enableAccessibleFieldDOMStructure,
-      selectedSections,
-      onSelectedSectionsChange,
-      timezone,
-      autoFocus: autoFocus && !props.open
-    }, pickerFieldProps, {
-      // onChange and value
-
+      autoFocus: autoFocus && !props.open,
       // Forwarded props
       className,
       sx,
@@ -114,12 +98,12 @@ export const useDesktopRangePicker = _ref => {
     }),
     ownerState
   });
-  const enrichedFieldProps = useEnrichedRangePickerFieldProps(_extends({
+  const enrichedFieldResponse = useEnrichedRangePickerField(_extends({
     variant: 'desktop',
     fieldType,
     // These direct access to `providerProps` will go away once the range fields handle the picker opening
-    open: providerProps.contextValue.open,
-    setOpen: providerProps.contextValue.setOpen,
+    contextValue: providerProps.contextValue,
+    fieldPrivateContextValue: providerProps.fieldPrivateContextValue,
     readOnly,
     disableOpenPicker,
     label,
@@ -128,7 +112,7 @@ export const useDesktopRangePicker = _ref => {
     pickerSlotProps: slotProps,
     pickerSlots: slots,
     fieldProps,
-    anchorRef,
+    anchorRef: providerProps.contextValue.triggerRef,
     startFieldRef,
     endFieldRef,
     singleInputFieldRef,
@@ -137,24 +121,30 @@ export const useDesktopRangePicker = _ref => {
   }, rangePositionResponse));
   const Layout = slots?.layout ?? PickersLayout;
   const renderPicker = () => /*#__PURE__*/_jsx(PickerProvider, _extends({}, providerProps, {
-    children: /*#__PURE__*/_jsxs(PickerRangePositionContext.Provider, {
-      value: rangePositionResponse,
-      children: [/*#__PURE__*/_jsx(Field, _extends({}, enrichedFieldProps)), /*#__PURE__*/_jsx(PickersPopper, {
-        role: "tooltip",
-        placement: "bottom-start",
-        containerRef: popperRef,
-        anchorEl: anchorRef.current,
-        onBlur: handleBlur,
-        slots: slots,
-        slotProps: slotProps,
-        shouldRestoreFocus: shouldRestoreFocus,
-        reduceAnimations: reduceAnimations,
-        children: /*#__PURE__*/_jsx(Layout, _extends({}, slotProps?.layout, {
+    // 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__*/_jsxs(PickerRangePositionContext.Provider, {
+        value: rangePositionResponse,
+        children: [/*#__PURE__*/_jsx(Field, _extends({}, enrichedFieldResponse.fieldProps)), /*#__PURE__*/_jsx(PickersPopper, {
+          role: "tooltip",
+          placement: "bottom-start",
+          containerRef: popperRef,
+          anchorEl: providerProps.contextValue.triggerRef.current,
+          onBlur: handleBlur,
           slots: slots,
           slotProps: slotProps,
-          children: renderCurrentView()
-        }))
-      })]
+          shouldRestoreFocus: shouldRestoreFocus,
+          reduceAnimations: reduceAnimations,
+          children: /*#__PURE__*/_jsx(Layout, _extends({}, slotProps?.layout, {
+            slots: slots,
+            slotProps: slotProps,
+            children: renderCurrentView()
+          }))
+        })]
+      })
     })
   }));
   return {

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 = ({
+  contextValue,
   variant,
-  open,
-  setOpen,
   readOnly,
   labelId,
   disableOpenPicker,
   onBlur,
   rangePosition,
-  onRangePositionChange,
+  setRangePosition,
   localeText: inLocaleText,
   pickerSlotProps,
   pickerSlots,
@@ -24,7 +23,6 @@ const useMultiInputFieldSlotProps = ({
   anchorRef,
   currentView,
   initialView,
-  setView,
   startFieldRef,
   endFieldRef
 }) => {
@@ -33,7 +31,7 @@ const useMultiInputFieldSlotProps = ({
   const handleEndFieldRef = useForkRef(fieldProps.unstableEndFieldRef, endFieldRef);
   const previousRangePosition = React.useRef(rangePosition);
   React.useEffect(() => {
-    if (!open || variant === 'mobile') {
+    if (!contextValue.open || variant === 'mobile') {
       return;
     }
     const currentFieldRef = rangePosition === 'start' ? startFieldRef : endFieldRef;
@@ -49,36 +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, variant]);
+  }, [rangePosition, contextValue.open, currentView, startFieldRef, endFieldRef, variant]);
   const openRangeStartSelection = event => {
     event.stopPropagation();
-    onRangePositionChange('start');
+    setRangePosition('start');
     if (!readOnly && !disableOpenPicker) {
       event.preventDefault();
-      setOpen(true);
+      contextValue.setOpen(true);
     }
   };
   const openRangeEndSelection = event => {
     event.stopPropagation();
-    onRangePositionChange('end');
+    setRangePosition('end');
     if (!readOnly && !disableOpenPicker) {
       event.preventDefault();
-      setOpen(true);
+      contextValue.setOpen(true);
     }
   };
   const handleFocusStart = () => {
-    if (open) {
-      onRangePositionChange('start');
+    if (contextValue.open) {
+      setRangePosition('start');
       if (previousRangePosition.current !== 'start' && initialView) {
-        setView?.(initialView);
+        contextValue.setView?.(initialView);
       }
     }
   };
   const handleFocusEnd = () => {
-    if (open) {
-      onRangePositionChange('end');
+    if (contextValue.open) {
+      setRangePosition('end');
       if (previousRangePosition.current !== 'end' && initialView) {
-        setView?.(initialView);
+        contextValue.setView?.(initialView);
       }
     }
   };
@@ -97,8 +95,8 @@ 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
         }, variant === 'mobile' && {
           readOnly: true
@@ -113,8 +111,8 @@ 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
         }, variant === 'mobile' && {
           readOnly: true
@@ -145,29 +143,29 @@ const useMultiInputFieldSlotProps = ({
     slots,
     slotProps
   });
-  return enrichedFieldProps;
+  return {
+    fieldProps: enrichedFieldProps,
+    fieldPrivateContextValue: {}
+  };
 };
 const useSingleInputFieldSlotProps = ({
+  contextValue,
+  fieldPrivateContextValue,
   variant,
-  open,
-  setOpen,
   readOnly,
   labelId,
   disableOpenPicker,
   label,
   onBlur,
   rangePosition,
-  onRangePositionChange,
+  setRangePosition,
   singleInputFieldRef,
-  pickerSlots,
-  pickerSlotProps,
   fieldProps,
-  anchorRef,
   currentView
 }) => {
   const handleFieldRef = useForkRef(fieldProps.unstableFieldRef, singleInputFieldRef);
   React.useEffect(() => {
-    if (!open || !singleInputFieldRef.current || variant === 'mobile') {
+    if (!contextValue.open || !singleInputFieldRef.current || variant === 'mobile') {
       return;
     }
     if (singleInputFieldRef.current.isFieldFocused()) {
@@ -180,7 +178,7 @@ const useSingleInputFieldSlotProps = ({
       const newSelectedSection = rangePosition === 'start' ? sections.indexOf(currentView) : sections.lastIndexOf(currentView);
       singleInputFieldRef.current?.focusField(newSelectedSection);
     }
-  }, [rangePosition, open, currentView, singleInputFieldRef, variant]);
+  }, [rangePosition, contextValue.open, currentView, singleInputFieldRef, variant]);
   const updateRangePosition = () => {
     if (!singleInputFieldRef.current?.isFieldFocused()) {
       return;
@@ -189,52 +187,41 @@ const useSingleInputFieldSlotProps = ({
     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) {
       event.preventDefault();
-      setOpen(true);
+      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
   }, 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

@@ -5,10 +5,10 @@ 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";
@@ -25,17 +25,10 @@ export const useMobileRangePicker = _ref => {
     slotProps: innerSlotProps,
     className,
     sx,
-    format,
-    formatDensity,
-    enableAccessibleFieldDOMStructure,
-    selectedSections,
-    onSelectedSectionsChange,
-    timezone,
     label,
     inputRef,
     name,
     readOnly,
-    disabled,
     disableOpenPicker,
     localeText
   } = props;
@@ -57,7 +50,6 @@ export const useMobileRangePicker = _ref => {
   const {
     providerProps,
     renderCurrentView,
-    fieldProps: pickerFieldProps,
     ownerState
   } = usePicker(_extends({}, pickerParams, {
     props,
@@ -66,6 +58,9 @@ export const useMobileRangePicker = _ref => {
     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';
   const Field = slots.field;
   const fieldProps = useSlotProps({
     elementType: Field,
@@ -73,16 +68,6 @@ export const useMobileRangePicker = _ref => {
     additionalProps: _extends({
       // Internal props
       readOnly: readOnly ?? true,
-      disabled,
-      format,
-      formatDensity,
-      enableAccessibleFieldDOMStructure,
-      selectedSections,
-      onSelectedSectionsChange,
-      timezone
-    }, pickerFieldProps, {
-      // onChange and value
-
       // Forwarded props
       className,
       sx
@@ -94,12 +79,12 @@ export const useMobileRangePicker = _ref => {
     ownerState
   });
   const isToolbarHidden = innerSlotProps?.toolbar?.hidden ?? false;
-  const enrichedFieldProps = useEnrichedRangePickerFieldProps(_extends({
+  const enrichedFieldResponse = useEnrichedRangePickerField(_extends({
     variant: 'mobile',
     fieldType,
     // These direct access to `providerProps` will go away once the range fields handle the picker opening
-    open: providerProps.contextValue.open,
-    setOpen: providerProps.contextValue.setOpen,
+    contextValue: providerProps.contextValue,
+    fieldPrivateContextValue: providerProps.fieldPrivateContextValue,
     readOnly,
     labelId,
     disableOpenPicker,
@@ -138,17 +123,23 @@ export const useMobileRangePicker = _ref => {
     }, innerSlotProps?.mobilePaper)
   });
   const renderPicker = () => /*#__PURE__*/_jsx(PickerProvider, _extends({}, providerProps, {
-    children: /*#__PURE__*/_jsxs(PickerRangePositionContext.Provider, {
-      value: rangePositionResponse,
-      children: [/*#__PURE__*/_jsx(Field, _extends({}, enrichedFieldProps)), /*#__PURE__*/_jsx(PickersModalDialog, {
-        slots: slots,
-        slotProps: slotProps,
-        children: /*#__PURE__*/_jsx(Layout, _extends({}, slotProps?.layout, {
+    // 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__*/_jsxs(PickerRangePositionContext.Provider, {
+        value: rangePositionResponse,
+        children: [/*#__PURE__*/_jsx(Field, _extends({}, enrichedFieldResponse.fieldProps)), /*#__PURE__*/_jsx(PickersModalDialog, {
           slots: slots,
           slotProps: slotProps,
-          children: renderCurrentView()
-        }))
-      })]
+          children: /*#__PURE__*/_jsx(Layout, _extends({}, slotProps?.layout, {
+            slots: slots,
+            slotProps: slotProps,
+            children: renderCurrentView()
+          }))
+        })]
+      })
     })
   }));
   return {

package/modern/internals/hooks/useRangePosition.js

@@ -25,6 +25,6 @@ export const useRangePosition = (props, singleInputFieldRef) => {
   });
   return {
     rangePosition,
-    onRangePositionChange: handleRangePositionChange
+    setRangePosition: handleRangePositionChange
   };
 };

package/modern/internals/models/index.js

@@ -1,4 +1,3 @@
 export * from "./dateRange.js";
 export * from "./dateTimeRange.js";
-export * from "./timeRange.js";
 export * from "./rangePickerProps.js";