@mui/x-date-pickers-pro 8.0.0-alpha.1 → 8.0.0-alpha.11

package/DateTimeRangePicker/DateTimeRangePickerTabs.js

@@ -7,11 +7,12 @@ import { styled, useThemeProps } from '@mui/material/styles';
 import composeClasses from '@mui/utils/composeClasses';
 import useEventCallback from '@mui/utils/useEventCallback';
 import { TimeIcon, DateRangeIcon, ArrowLeftIcon, ArrowRightIcon } from '@mui/x-date-pickers/icons';
-import { isDatePickerView } from '@mui/x-date-pickers/internals';
-import { usePickerTranslations } from '@mui/x-date-pickers/hooks';
+import { isDatePickerView, usePickerPrivateContext } from '@mui/x-date-pickers/internals';
+import { usePickerContext, usePickerTranslations } from '@mui/x-date-pickers/hooks';
 import IconButton from '@mui/material/IconButton';
 import Button from '@mui/material/Button';
 import { getDateTimeRangePickerTabsUtilityClass } from "./dateTimeRangePickerTabsClasses.js";
+import { usePickerRangePositionContext } from "../hooks/index.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const viewToTab = (view, rangePosition) => {
   if (isDatePickerView(view)) {
@@ -25,10 +26,7 @@ const tabToView = tab => {
   }
   return 'hours';
 };
-const useUtilityClasses = ownerState => {
-  const {
-    classes
-  } = ownerState;
+const useUtilityClasses = classes => {
   const slots = {
     root: ['root'],
     tabButton: ['tabButton'],
@@ -72,18 +70,26 @@ const DateTimeRangePickerTabs = function DateTimeRangePickerTabs(inProps) {
   });
   const {
     dateIcon = /*#__PURE__*/_jsx(DateRangeIcon, {}),
-    onViewChange,
     timeIcon = /*#__PURE__*/_jsx(TimeIcon, {}),
-    view,
     hidden = typeof window === 'undefined' || window.innerHeight < 667,
-    rangePosition,
-    onRangePositionChange,
     className,
+    classes: classesProp,
     sx
   } = props;
   const translations = usePickerTranslations();
-  const classes = useUtilityClasses(props);
-  const value = React.useMemo(() => viewToTab(view, rangePosition), [view, rangePosition]);
+  const {
+    ownerState
+  } = usePickerPrivateContext();
+  const {
+    view,
+    setView
+  } = usePickerContext();
+  const classes = useUtilityClasses(classesProp);
+  const {
+    rangePosition,
+    setRangePosition
+  } = usePickerRangePositionContext();
+  const value = React.useMemo(() => view == null ? null : viewToTab(view, rangePosition), [view, rangePosition]);
   const isPreviousHidden = value === 'start-date';
   const isNextHidden = value === 'end-time';
   const tabLabel = React.useMemo(() => {
@@ -102,26 +108,34 @@ const DateTimeRangePickerTabs = function DateTimeRangePickerTabs(inProps) {
   }, [translations.endDate, translations.endTime, translations.startDate, translations.startTime, value]);
   const handleRangePositionChange = useEventCallback(newTab => {
     if (newTab.includes('start')) {
-      onRangePositionChange('start');
+      setRangePosition('start');
     } else {
-      onRangePositionChange('end');
+      setRangePosition('end');
     }
   });
   const changeToPreviousTab = useEventCallback(() => {
-    const previousTab = tabOptions[tabOptions.indexOf(value) - 1];
-    onViewChange(tabToView(previousTab));
+    const previousTab = value == null ? tabOptions[0] : tabOptions[tabOptions.indexOf(value) - 1];
+    setView(tabToView(previousTab));
     handleRangePositionChange(previousTab);
   });
   const changeToNextTab = useEventCallback(() => {
-    const nextTab = tabOptions[tabOptions.indexOf(value) + 1];
-    onViewChange(tabToView(nextTab));
+    const nextTab = value == null ? tabOptions[0] : tabOptions[tabOptions.indexOf(value) + 1];
+    setView(tabToView(nextTab));
     handleRangePositionChange(nextTab);
   });
   if (hidden) {
     return null;
   }
+  let startIcon;
+  if (view == null) {
+    startIcon = null;
+  } else if (isDatePickerView(view)) {
+    startIcon = dateIcon;
+  } else {
+    startIcon = timeIcon;
+  }
   return /*#__PURE__*/_jsxs(DateTimeRangePickerTabsRoot, {
-    ownerState: props,
+    ownerState: ownerState,
     className: clsx(classes.root, className),
     sx: sx,
     children: [!isPreviousHidden ? /*#__PURE__*/_jsx(IconButton, {
@@ -132,7 +146,7 @@ const DateTimeRangePickerTabs = function DateTimeRangePickerTabs(inProps) {
     }) : /*#__PURE__*/_jsx(DateTimeRangePickerTabFiller, {
       className: classes.filler
     }), /*#__PURE__*/_jsx(DateTimeRangePickerTab, {
-      startIcon: isDatePickerView(view) ? dateIcon : timeIcon,
+      startIcon: startIcon,
       className: classes.tabButton,
       size: "large",
       children: tabLabel
@@ -166,14 +180,6 @@ process.env.NODE_ENV !== "production" ? DateTimeRangePickerTabs.propTypes = {
    * @default `window.innerHeight < 667` for `DesktopDateTimeRangePicker` and `MobileDateTimeRangePicker`
    */
   hidden: PropTypes.bool,
-  onRangePositionChange: PropTypes.func.isRequired,
-  /**
-   * Callback called when a tab is clicked.
-   * @template TView
-   * @param {TView} view The view to open
-   */
-  onViewChange: PropTypes.func.isRequired,
-  rangePosition: PropTypes.oneOf(['end', 'start']).isRequired,
   /**
    * The system prop that allows defining system overrides as well as additional CSS styles.
    */
@@ -182,10 +188,6 @@ process.env.NODE_ENV !== "production" ? DateTimeRangePickerTabs.propTypes = {
    * Time tab icon.
    * @default TimeIcon
    */
-  timeIcon: PropTypes.element,
-  /**
-   * Currently visible picker view.
-   */
-  view: PropTypes.oneOf(['day', 'hours', 'meridiem', 'minutes', 'month', 'seconds', 'year']).isRequired
+  timeIcon: PropTypes.element
 } : void 0;
 export { DateTimeRangePickerTabs };

package/DateTimeRangePicker/DateTimeRangePickerTimeWrapper.d.ts

@@ -1,19 +1,17 @@
-import * as React from 'react';
 import { DefaultizedProps } from '@mui/x-internals/types';
 import { PickerSelectionState, PickerViewRenderer, TimeViewWithMeridiem, BaseClockProps, PickerRangeValue } from '@mui/x-date-pickers/internals';
-import { UseRangePositionResponse } from '../internals/hooks/useRangePosition';
-export type DateTimeRangePickerTimeWrapperProps<TView extends TimeViewWithMeridiem, TComponentProps extends DefaultizedProps<Omit<BaseClockProps<TView>, 'value' | 'defaultValue' | 'onChange'>, 'views'>> = Pick<UseRangePositionResponse, 'rangePosition' | 'onRangePositionChange'> & Omit<TComponentProps, 'views' | 'view' | 'onViewChange' | 'value' | 'defaultValue' | 'onChange'> & {
-    view: TView;
-    onViewChange?: (view: TView) => void;
-    views: readonly TView[];
+export type DateTimeRangePickerTimeWrapperProps<TComponentProps extends DefaultizedProps<Omit<BaseClockProps<TimeViewWithMeridiem>, 'value' | 'defaultValue' | 'onChange'>, 'views'>> = Omit<TComponentProps, 'views' | 'view' | 'onViewChange' | 'value' | 'defaultValue' | 'onChange'> & {
+    view: TimeViewWithMeridiem;
+    onViewChange?: (view: TimeViewWithMeridiem) => void;
+    views: readonly TimeViewWithMeridiem[];
     value?: PickerRangeValue;
     defaultValue?: PickerRangeValue;
-    onChange?: (value: PickerRangeValue, selectionState: PickerSelectionState, selectedView: TView) => void;
-    viewRenderer?: PickerViewRenderer<PickerRangeValue, TView, TComponentProps, any> | null;
-    openTo?: TView;
+    onChange?: (value: PickerRangeValue, selectionState: PickerSelectionState, selectedView: TimeViewWithMeridiem) => void;
+    viewRenderer?: PickerViewRenderer<PickerRangeValue, TComponentProps> | null;
+    openTo?: TimeViewWithMeridiem;
 };
 /**
  * @ignore - internal component.
  */
-declare function DateTimeRangePickerTimeWrapper<TView extends TimeViewWithMeridiem, TComponentProps extends DefaultizedProps<Omit<BaseClockProps<TView>, 'value' | 'defaultValue' | 'onChange'>, 'views'>>(props: DateTimeRangePickerTimeWrapperProps<TView, TComponentProps>, ref: React.Ref<HTMLDivElement>): React.ReactNode;
+declare function DateTimeRangePickerTimeWrapper<TComponentProps extends DefaultizedProps<Omit<BaseClockProps<TimeViewWithMeridiem>, 'value' | 'defaultValue' | 'onChange'>, 'views'>>(props: DateTimeRangePickerTimeWrapperProps<TComponentProps>): import("react").ReactNode;
 export { DateTimeRangePickerTimeWrapper };

package/DateTimeRangePicker/DateTimeRangePickerTimeWrapper.js

@@ -1,17 +1,16 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["rangePosition", "onRangePositionChange", "viewRenderer", "value", "onChange", "defaultValue", "onViewChange", "views", "className"];
+const _excluded = ["viewRenderer", "value", "onChange", "defaultValue", "onViewChange", "views", "className"];
 import { isInternalTimeView, useUtils } from '@mui/x-date-pickers/internals';
 import { isRangeValid } from "../internals/utils/date-utils.js";
 import { calculateRangeChange } from "../internals/utils/date-range-manager.js";
+import { usePickerRangePositionContext } from "../hooks/index.js";
 /**
  * @ignore - internal component.
  */
-function DateTimeRangePickerTimeWrapper(props, ref) {
+function DateTimeRangePickerTimeWrapper(props) {
   const utils = useUtils();
   const {
-      rangePosition,
-      onRangePositionChange,
       viewRenderer,
       value,
       onChange,
@@ -20,6 +19,10 @@ function DateTimeRangePickerTimeWrapper(props, ref) {
       views
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
+  const {
+    rangePosition,
+    setRangePosition
+  } = usePickerRangePositionContext();
   if (!viewRenderer) {
     return null;
   }
@@ -42,12 +45,11 @@ function DateTimeRangePickerTimeWrapper(props, ref) {
     // reset view to the first time view and swap range position after selecting the last time view (start or end position)
     if (selectedView === timeViews[timeViews.length - 1] && onViewChange) {
       onViewChange(views[0]);
-      onRangePositionChange(rangePosition === 'start' ? 'end' : 'start');
+      setRangePosition(rangePosition === 'start' ? 'end' : 'start');
     }
     onChange(newRange, isFullRangeSelected ? 'finish' : 'partial', selectedView);
   };
   return viewRenderer(_extends({}, other, {
-    ref,
     views,
     onViewChange,
     value: currentValue,

package/DateTimeRangePicker/DateTimeRangePickerToolbar.d.ts

@@ -1,11 +1,8 @@
 import * as React from 'react';
-import { BaseToolbarProps, ExportedBaseToolbarProps, DateOrTimeViewWithMeridiem, PickerVariant, PickerRangeValue } from '@mui/x-date-pickers/internals';
-import { UseRangePositionResponse } from '../internals/hooks/useRangePosition';
+import { BaseToolbarProps, ExportedBaseToolbarProps } from '@mui/x-date-pickers/internals';
 import { DateTimeRangePickerToolbarClasses } from './dateTimeRangePickerToolbarClasses';
-type DateTimeRangeViews = Exclude<DateOrTimeViewWithMeridiem, 'year' | 'month'>;
-export interface DateTimeRangePickerToolbarProps extends BaseToolbarProps<PickerRangeValue, DateTimeRangeViews>, Pick<UseRangePositionResponse, 'rangePosition' | 'onRangePositionChange'>, ExportedDateTimeRangePickerToolbarProps {
+export interface DateTimeRangePickerToolbarProps extends BaseToolbarProps, ExportedDateTimeRangePickerToolbarProps {
     ampm?: boolean;
-    toolbarVariant?: PickerVariant;
 }
 export interface ExportedDateTimeRangePickerToolbarProps extends ExportedBaseToolbarProps {
     /**

package/DateTimeRangePicker/DateTimeRangePickerToolbar.js

@@ -2,22 +2,20 @@
 
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["value", "rangePosition", "onRangePositionChange", "className", "onViewChange", "toolbarVariant", "onChange", "classes", "view", "isLandscape", "views", "ampm", "hidden", "toolbarFormat", "toolbarPlaceholder", "titleId", "sx"];
+const _excluded = ["className", "classes", "classes", "ampm", "hidden", "toolbarFormat", "toolbarPlaceholder", "titleId", "sx"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import { styled, useThemeProps } from '@mui/material/styles';
 import composeClasses from '@mui/utils/composeClasses';
-import { useUtils } from '@mui/x-date-pickers/internals';
+import { useUtils, useToolbarOwnerState, DateTimePickerToolbarOverrideContext } from '@mui/x-date-pickers/internals';
 import { usePickerContext, usePickerTranslations } from '@mui/x-date-pickers/hooks';
 import { DateTimePickerToolbar } from '@mui/x-date-pickers/DateTimePicker';
 import { getDateTimeRangePickerToolbarUtilityClass } from "./dateTimeRangePickerToolbarClasses.js";
 import { calculateRangeChange } from "../internals/utils/date-range-manager.js";
+import { usePickerRangePositionContext } from "../hooks/index.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const useUtilityClasses = ownerState => {
-  const {
-    classes
-  } = ownerState;
+const useUtilityClasses = classes => {
   const slots = {
     root: ['root'],
     startToolbar: ['startToolbar'],
@@ -39,36 +37,13 @@ const DateTimeRangePickerToolbarStart = styled(DateTimePickerToolbar, {
   overridesResolver: (_, styles) => styles.startToolbar
 })({
   borderBottom: 'none',
-  variants: [{
-    props: ({
-      toolbarVariant
-    }) => toolbarVariant !== 'desktop',
-    style: {
-      padding: '12px 8px 0 12px'
-    }
-  }, {
-    props: {
-      toolbarVariant: 'desktop'
-    },
-    style: {
-      paddingBottom: 0
-    }
-  }]
+  paddingBottom: 0
 });
 const DateTimeRangePickerToolbarEnd = styled(DateTimePickerToolbar, {
   name: 'MuiDateTimeRangePickerToolbar',
   slot: 'EndToolbar',
   overridesResolver: (_, styles) => styles.endToolbar
-})({
-  variants: [{
-    props: ({
-      toolbarVariant
-    }) => toolbarVariant !== 'desktop',
-    style: {
-      padding: '12px 8px 12px 12px'
-    }
-  }]
-});
+})({});
 const DateTimeRangePickerToolbar = /*#__PURE__*/React.forwardRef(function DateTimeRangePickerToolbar(inProps, ref) {
   const props = useThemeProps({
     props: inProps,
@@ -76,15 +51,8 @@ const DateTimeRangePickerToolbar = /*#__PURE__*/React.forwardRef(function DateTi
   });
   const utils = useUtils();
   const {
-      value: [start, end],
-      rangePosition,
-      onRangePositionChange,
       className,
-      onViewChange,
-      onChange,
-      view,
-      isLandscape,
-      views,
+      classes: classesProp,
       ampm,
       hidden,
       toolbarFormat,
@@ -94,11 +62,22 @@ const DateTimeRangePickerToolbar = /*#__PURE__*/React.forwardRef(function DateTi
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const {
+    value,
+    setValue,
     disabled,
-    readOnly
+    readOnly,
+    view,
+    setView,
+    views
   } = usePickerContext();
+  const translations = usePickerTranslations();
+  const ownerState = useToolbarOwnerState();
+  const {
+    rangePosition,
+    setRangePosition
+  } = usePickerRangePositionContext();
+  const classes = useUtilityClasses(classesProp);
   const commonToolbarProps = {
-    isLandscape,
     views,
     ampm,
     disabled,
@@ -107,41 +86,58 @@ const DateTimeRangePickerToolbar = /*#__PURE__*/React.forwardRef(function DateTi
     toolbarFormat,
     toolbarPlaceholder
   };
-  const translations = usePickerTranslations();
-  const ownerState = props;
-  const classes = useUtilityClasses(ownerState);
-  const handleStartRangeViewChange = React.useCallback(newView => {
-    if (newView === 'year' || newView === 'month') {
-      return;
-    }
-    if (rangePosition !== 'start') {
-      onRangePositionChange('start');
-    }
-    onViewChange(newView);
-  }, [onRangePositionChange, onViewChange, rangePosition]);
-  const handleEndRangeViewChange = React.useCallback(newView => {
-    if (newView === 'year' || newView === 'month') {
-      return;
-    }
-    if (rangePosition !== 'end') {
-      onRangePositionChange('end');
-    }
-    onViewChange(newView);
-  }, [onRangePositionChange, onViewChange, rangePosition]);
-  const handleOnChange = React.useCallback(newDate => {
+  const wrappedSetValue = React.useCallback(newDate => {
     const {
       nextSelection,
       newRange
     } = calculateRangeChange({
       newDate,
       utils,
-      range: props.value,
+      range: value,
       rangePosition,
       allowRangeFlip: true
     });
-    onRangePositionChange(nextSelection);
-    onChange(newRange);
-  }, [onChange, onRangePositionChange, props.value, rangePosition, utils]);
+    setRangePosition(nextSelection);
+    setValue(newRange, {
+      changeImportance: 'set'
+    });
+  }, [setValue, setRangePosition, value, rangePosition, utils]);
+  const startOverrides = React.useMemo(() => {
+    const handleStartRangeViewChange = newView => {
+      if (newView === 'year' || newView === 'month') {
+        return;
+      }
+      if (rangePosition !== 'start') {
+        setRangePosition('start');
+      }
+      setView(newView);
+    };
+    return {
+      value: value[0],
+      setValue: wrappedSetValue,
+      forceDesktopVariant: true,
+      setView: handleStartRangeViewChange,
+      view: rangePosition === 'start' ? view : null
+    };
+  }, [value, wrappedSetValue, rangePosition, view, setRangePosition, setView]);
+  const endOverrides = React.useMemo(() => {
+    const handleEndRangeViewChange = newView => {
+      if (newView === 'year' || newView === 'month') {
+        return;
+      }
+      if (rangePosition !== 'end') {
+        setRangePosition('end');
+      }
+      setView(newView);
+    };
+    return {
+      value: value[1],
+      setValue: wrappedSetValue,
+      forceDesktopVariant: true,
+      setView: handleEndRangeViewChange,
+      view: rangePosition === 'end' ? view : null
+    };
+  }, [value, wrappedSetValue, rangePosition, view, setRangePosition, setView]);
   if (hidden) {
     return null;
   }
@@ -151,27 +147,23 @@ const DateTimeRangePickerToolbar = /*#__PURE__*/React.forwardRef(function DateTi
     ref: ref,
     sx: sx
   }, other, {
-    children: [/*#__PURE__*/_jsx(DateTimeRangePickerToolbarStart, _extends({
-      value: start,
-      onViewChange: handleStartRangeViewChange,
-      toolbarTitle: translations.start,
-      ownerState: ownerState,
-      toolbarVariant: "desktop",
-      view: rangePosition === 'start' ? view : undefined,
-      className: classes.startToolbar,
-      onChange: handleOnChange,
-      titleId: titleId ? `${titleId}-start-toolbar` : undefined
-    }, commonToolbarProps)), /*#__PURE__*/_jsx(DateTimeRangePickerToolbarEnd, _extends({
-      value: end,
-      onViewChange: handleEndRangeViewChange,
-      toolbarTitle: translations.end,
-      ownerState: ownerState,
-      toolbarVariant: "desktop",
-      view: rangePosition === 'end' ? view : undefined,
-      className: classes.endToolbar,
-      onChange: handleOnChange,
-      titleId: titleId ? `${titleId}-end-toolbar` : undefined
-    }, commonToolbarProps))]
+    children: [/*#__PURE__*/_jsx(DateTimePickerToolbarOverrideContext.Provider, {
+      value: startOverrides,
+      children: /*#__PURE__*/_jsx(DateTimeRangePickerToolbarStart, _extends({
+        toolbarTitle: translations.start,
+        ownerState: ownerState,
+        className: classes.startToolbar,
+        titleId: titleId ? `${titleId}-start-toolbar` : undefined
+      }, commonToolbarProps))
+    }), /*#__PURE__*/_jsx(DateTimePickerToolbarOverrideContext.Provider, {
+      value: endOverrides,
+      children: /*#__PURE__*/_jsx(DateTimeRangePickerToolbarEnd, _extends({
+        toolbarTitle: translations.end,
+        ownerState: ownerState,
+        className: classes.endToolbar,
+        titleId: titleId ? `${titleId}-end-toolbar` : undefined
+      }, commonToolbarProps))
+    })]
   }));
 });
 process.env.NODE_ENV !== "production" ? DateTimeRangePickerToolbar.propTypes = {
@@ -190,16 +182,6 @@ process.env.NODE_ENV !== "production" ? DateTimeRangePickerToolbar.propTypes = {
    * @default `true` for Desktop, `false` for Mobile.
    */
   hidden: PropTypes.bool,
-  isLandscape: PropTypes.bool.isRequired,
-  onChange: PropTypes.func.isRequired,
-  onRangePositionChange: PropTypes.func.isRequired,
-  /**
-   * Callback called when a toolbar is clicked
-   * @template TView
-   * @param {TView} view The view to open
-   */
-  onViewChange: PropTypes.func.isRequired,
-  rangePosition: PropTypes.oneOf(['end', 'start']).isRequired,
   /**
    * The system prop that allows defining system overrides as well as additional CSS styles.
    */
@@ -213,16 +195,6 @@ process.env.NODE_ENV !== "production" ? DateTimeRangePickerToolbar.propTypes = {
    * Toolbar value placeholder—it is displayed when the value is empty.
    * @default "––"
    */
-  toolbarPlaceholder: PropTypes.node,
-  toolbarVariant: PropTypes.oneOf(['desktop', 'mobile']),
-  value: PropTypes.arrayOf(PropTypes.object).isRequired,
-  /**
-   * Currently visible picker view.
-   */
-  view: PropTypes.oneOf(['day', 'hours', 'meridiem', 'minutes', 'seconds']).isRequired,
-  /**
-   * Available views.
-   */
-  views: PropTypes.arrayOf(PropTypes.oneOf(['day', 'hours', 'meridiem', 'minutes', 'seconds']).isRequired).isRequired
+  toolbarPlaceholder: PropTypes.node
 } : void 0;
 export { DateTimeRangePickerToolbar };

package/DateTimeRangePicker/shared.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { DefaultizedProps } from '@mui/x-internals/types';
 import { LocalizedComponent } from '@mui/x-date-pickers/locales';
-import { BaseDateValidationProps, BasePickerInputProps, PickerViewRendererLookup, BaseClockProps, DesktopOnlyTimePickerProps, TimeViewWithMeridiem, UseViewsOptions, DateTimeValidationProps, DateOrTimeViewWithMeridiem, PickerRangeValue } from '@mui/x-date-pickers/internals';
+import { BasePickerInputProps, PickerViewRendererLookup, BaseClockProps, DesktopOnlyTimePickerProps, TimeViewWithMeridiem, UseViewsOptions, DateOrTimeViewWithMeridiem, PickerRangeValue } from '@mui/x-date-pickers/internals';
 import { TimeViewRendererProps } from '@mui/x-date-pickers/timeViewRenderers';
 import { DigitalClockSlots, DigitalClockSlotProps } from '@mui/x-date-pickers/DigitalClock';
 import { MultiSectionDigitalClockSlots, MultiSectionDigitalClockSlotProps } from '@mui/x-date-pickers/MultiSectionDigitalClock';
@@ -11,6 +11,7 @@ import { DateRangeCalendarSlots, DateRangeCalendarSlotProps, ExportedDateRangeCa
 import { DateTimeRangePickerToolbarProps, ExportedDateTimeRangePickerToolbarProps } from './DateTimeRangePickerToolbar';
 import { DateRangeViewRendererProps } from '../dateRangeViewRenderers';
 import { DateTimeRangePickerTabsProps, ExportedDateTimeRangePickerTabsProps } from './DateTimeRangePickerTabs';
+import { ExportedValidateDateTimeRangeProps, ValidateDateTimeRangePropsToDefault } from '../validation/validateDateTimeRange';
 export interface BaseDateTimeRangePickerSlots extends DateRangeCalendarSlots, DigitalClockSlots, MultiSectionDigitalClockSlots {
     /**
      * Tabs enabling toggling between date and time pickers.
@@ -33,10 +34,10 @@ export interface BaseDateTimeRangePickerSlotProps extends DateRangeCalendarSlotP
      */
     toolbar?: ExportedDateTimeRangePickerToolbarProps;
 }
-export type DateTimeRangePickerRenderers<TView extends DateOrTimeViewWithMeridiem, TAdditionalProps extends {} = {}> = PickerViewRendererLookup<PickerRangeValue, TView, Omit<DateRangeViewRendererProps<'day'>, 'view' | 'slots' | 'slotProps'> & Omit<TimeViewRendererProps<TimeViewWithMeridiem, BaseClockProps<TimeViewWithMeridiem>>, 'view' | 'slots' | 'slotProps'> & {
+export type DateTimeRangePickerRenderers<TView extends DateOrTimeViewWithMeridiem> = PickerViewRendererLookup<PickerRangeValue, TView, Omit<DateRangeViewRendererProps<'day'>, 'view' | 'slots' | 'slotProps'> & Omit<TimeViewRendererProps<TimeViewWithMeridiem, BaseClockProps<TimeViewWithMeridiem>>, 'view' | 'slots' | 'slotProps'> & {
     view: TView;
-}, TAdditionalProps>;
-export interface BaseDateTimeRangePickerProps extends Omit<BasePickerInputProps<PickerRangeValue, DateTimeRangePickerView, DateTimeRangeValidationError>, 'orientation' | 'views' | 'openTo'>, ExportedDateRangeCalendarProps, BaseDateValidationProps, DesktopOnlyTimePickerProps, Partial<Pick<UseViewsOptions<PickerRangeValue, DateTimeRangePickerViewExternal>, 'openTo' | 'views'>>, DateTimeValidationProps {
+}>;
+export interface BaseDateTimeRangePickerProps extends Omit<BasePickerInputProps<PickerRangeValue, DateTimeRangePickerView, DateTimeRangeValidationError>, 'orientation' | 'views' | 'openTo'>, ExportedDateRangeCalendarProps, ExportedValidateDateTimeRangeProps, DesktopOnlyTimePickerProps, Partial<Pick<UseViewsOptions<PickerRangeValue, DateTimeRangePickerViewExternal>, 'openTo' | 'views'>> {
     /**
      * Overridable component slots.
      * @default {}
@@ -54,7 +55,7 @@ export interface BaseDateTimeRangePickerProps extends Omit<BasePickerInputProps<
      */
     viewRenderers?: Partial<DateTimeRangePickerRenderers<DateTimeRangePickerView>>;
 }
-type UseDateTimeRangePickerDefaultizedProps<Props extends BaseDateTimeRangePickerProps> = LocalizedComponent<Omit<DefaultizedProps<Props, 'openTo' | 'ampm' | keyof BaseDateValidationProps>, 'views'>> & {
+type UseDateTimeRangePickerDefaultizedProps<Props extends BaseDateTimeRangePickerProps> = LocalizedComponent<Omit<DefaultizedProps<Props, 'openTo' | 'ampm' | ValidateDateTimeRangePropsToDefault>, 'views'>> & {
     shouldRenderTimeInASingleColumn: boolean;
     views: readonly DateTimeRangePickerView[];
 };

package/DesktopDateRangePicker/DesktopDateRangePicker.js

@@ -13,6 +13,8 @@ import { renderDateRangeViewCalendar } from "../dateRangeViewRenderers/index.js"
 import { MultiInputDateRangeField } from "../MultiInputDateRangeField/index.js";
 import { useDesktopRangePicker } from "../internals/hooks/useDesktopRangePicker/index.js";
 import { validateDateRange } from "../validation/index.js";
+const emptyActions = [];
+
 /**
  * Demos:
  *
@@ -32,6 +34,7 @@ const DesktopDateRangePicker = /*#__PURE__*/React.forwardRef(function DesktopDat
     day: renderDateRangeViewCalendar
   }, defaultizedProps.viewRenderers);
   const props = _extends({}, defaultizedProps, {
+    closeOnSelect: defaultizedProps.closeOnSelect ?? true,
     viewRenderers,
     format: utils.formats.keyboardDate,
     calendars: defaultizedProps.calendars ?? 2,
@@ -41,17 +44,19 @@ const DesktopDateRangePicker = /*#__PURE__*/React.forwardRef(function DesktopDat
       field: MultiInputDateRangeField
     }, defaultizedProps.slots),
     slotProps: _extends({}, defaultizedProps.slotProps, {
-      field: ownerState => _extends({}, resolveComponentProps(defaultizedProps.slotProps?.field, ownerState), extractValidationProps(defaultizedProps), {
-        ref
-      }),
+      field: ownerState => _extends({}, resolveComponentProps(defaultizedProps.slotProps?.field, ownerState), extractValidationProps(defaultizedProps)),
       toolbar: _extends({
         hidden: true
-      }, defaultizedProps.slotProps?.toolbar)
+      }, defaultizedProps.slotProps?.toolbar),
+      actionBar: ownerState => _extends({
+        actions: emptyActions
+      }, resolveComponentProps(defaultizedProps.slotProps?.actionBar, ownerState))
     })
   });
   const {
     renderPicker
   } = useDesktopRangePicker({
+    ref,
     props,
     valueManager: rangeValueManager,
     valueType: 'date',
@@ -78,8 +83,8 @@ DesktopDateRangePicker.propTypes = {
   calendars: PropTypes.oneOf([1, 2, 3]),
   className: PropTypes.string,
   /**
-   * If `true`, the popover or modal will close after submitting the full date.
-   * @default `true` for desktop, `false` for mobile (based on the chosen wrapper and `desktopModeMediaQuery` prop).
+   * If `true`, the Picker will close after submitting the full date.
+   * @default true
    */
   closeOnSelect: PropTypes.bool,
   /**
@@ -167,12 +172,10 @@ DesktopDateRangePicker.propTypes = {
   formatDensity: PropTypes.oneOf(['dense', 'spacious']),
   /**
    * Pass a ref to the `input` element.
-   * Ignored if the field has several inputs.
    */
   inputRef: refType,
   /**
    * The label content.
-   * Ignored if the field has several inputs.
    */
   label: PropTypes.node,
   /**
@@ -198,7 +201,6 @@ DesktopDateRangePicker.propTypes = {
   minDate: PropTypes.object,
   /**
    * Name attribute used by the `input` element in the Field.
-   * Ignored if the field has several inputs.
    */
   name: PropTypes.string,
   /**

package/DesktopDateRangePicker/DesktopDateRangePicker.types.d.ts

@@ -1,9 +1,9 @@
 import { MakeOptional } from '@mui/x-internals/types';
 import { UseDesktopRangePickerSlots, UseDesktopRangePickerSlotProps, DesktopRangeOnlyPickerProps } from '../internals/hooks/useDesktopRangePicker';
 import { BaseDateRangePickerProps, BaseDateRangePickerSlots, BaseDateRangePickerSlotProps } from '../DateRangePicker/shared';
-export interface DesktopDateRangePickerSlots extends BaseDateRangePickerSlots, MakeOptional<UseDesktopRangePickerSlots<'day'>, 'field'> {
+export interface DesktopDateRangePickerSlots extends BaseDateRangePickerSlots, MakeOptional<UseDesktopRangePickerSlots, 'field'> {
 }
-export interface DesktopDateRangePickerSlotProps<TEnableAccessibleFieldDOMStructure extends boolean> extends BaseDateRangePickerSlotProps, Omit<UseDesktopRangePickerSlotProps<'day', TEnableAccessibleFieldDOMStructure>, 'tabs' | 'toolbar'> {
+export interface DesktopDateRangePickerSlotProps<TEnableAccessibleFieldDOMStructure extends boolean> extends BaseDateRangePickerSlotProps, Omit<UseDesktopRangePickerSlotProps<TEnableAccessibleFieldDOMStructure>, 'tabs' | 'toolbar'> {
 }
 export interface DesktopDateRangePickerProps<TEnableAccessibleFieldDOMStructure extends boolean = true> extends BaseDateRangePickerProps, DesktopRangeOnlyPickerProps {
     /**
@@ -21,4 +21,9 @@ export interface DesktopDateRangePickerProps<TEnableAccessibleFieldDOMStructure
      * @default {}
      */
     slotProps?: DesktopDateRangePickerSlotProps<TEnableAccessibleFieldDOMStructure>;
+    /**
+     * If `true`, the Picker will close after submitting the full date.
+     * @default true
+     */
+    closeOnSelect?: boolean;
 }