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

package/DateRangeCalendar/DateRangeCalendar.js

@@ -1,36 +1,43 @@
+"use strict";
 'use client';
 
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-import _extends from "@babel/runtime/helpers/esm/extends";
-const _excluded = ["value", "defaultValue", "referenceDate", "onChange", "className", "classes", "disableFuture", "disablePast", "minDate", "maxDate", "shouldDisableDate", "reduceAnimations", "onMonthChange", "rangePosition", "defaultRangePosition", "onRangePositionChange", "calendars", "currentMonthCalendarPosition", "slots", "slotProps", "loading", "renderLoading", "disableHighlightToday", "readOnly", "disabled", "showDaysOutsideCurrentMonth", "dayOfWeekFormatter", "disableAutoMonthSwitching", "autoFocus", "fixedWeekNumber", "disableDragEditing", "displayWeekNumber", "timezone", "availableRangePositions", "views", "view", "openTo", "onViewChange"],
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DateRangeCalendar = void 0;
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var React = _interopRequireWildcard(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _clsx = _interopRequireDefault(require("clsx"));
+var _useEventCallback = _interopRequireDefault(require("@mui/utils/useEventCallback"));
+var _useMediaQuery = _interopRequireDefault(require("@mui/material/useMediaQuery"));
+var _resolveComponentProps = _interopRequireDefault(require("@mui/utils/resolveComponentProps"));
+var _useSlotProps = _interopRequireDefault(require("@mui/utils/useSlotProps"));
+var _styles = require("@mui/material/styles");
+var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
+var _useId = _interopRequireDefault(require("@mui/utils/useId"));
+var _xLicense = require("@mui/x-license");
+var _internals = require("@mui/x-date-pickers/internals");
+var _warning = require("@mui/x-internals/warning");
+var _releaseInfo = require("../internals/utils/releaseInfo");
+var _dateRangeCalendarClasses = require("./dateRangeCalendarClasses");
+var _dateUtils = require("../internals/utils/date-utils");
+var _dateRangeManager = require("../internals/utils/date-range-manager");
+var _DateRangePickerDay = require("../DateRangePickerDay");
+var _valueManagers = require("../internals/utils/valueManagers");
+var _useDragRange2 = require("./useDragRange");
+var _useRangePosition = require("../internals/hooks/useRangePosition");
+var _dimensions = require("../internals/constants/dimensions");
+var _PickersRangeCalendarHeader = require("../PickersRangeCalendarHeader");
+var _useNullablePickerRangePositionContext = require("../internals/hooks/useNullablePickerRangePositionContext");
+var _jsxRuntime = require("react/jsx-runtime");
+const _excluded = ["value", "defaultValue", "referenceDate", "onChange", "className", "classes", "disableFuture", "disablePast", "minDate", "maxDate", "shouldDisableDate", "reduceAnimations", "onMonthChange", "rangePosition", "defaultRangePosition", "onRangePositionChange", "calendars", "currentMonthCalendarPosition", "slots", "slotProps", "loading", "renderLoading", "disableHighlightToday", "focusedView", "onFocusedViewChange", "readOnly", "disabled", "showDaysOutsideCurrentMonth", "dayOfWeekFormatter", "disableAutoMonthSwitching", "autoFocus", "fixedWeekNumber", "disableDragEditing", "displayWeekNumber", "timezone", "availableRangePositions", "views", "view", "openTo", "onViewChange"],
   _excluded2 = ["isDragging", "rangeDragDay", "draggingDatePosition"];
-import * as React from 'react';
-import PropTypes from 'prop-types';
-import clsx from 'clsx';
-import useEventCallback from '@mui/utils/useEventCallback';
-import useMediaQuery from '@mui/material/useMediaQuery';
-import resolveComponentProps from '@mui/utils/resolveComponentProps';
-import useSlotProps from '@mui/utils/useSlotProps';
-import { styled, useThemeProps } from '@mui/material/styles';
-import composeClasses from '@mui/utils/composeClasses';
-import useId from '@mui/utils/useId';
-import { Watermark } from '@mui/x-license';
-import { applyDefaultDate, DayCalendar, useDefaultReduceAnimations, useCalendarState, useDefaultDates, useUtils, useNow, DEFAULT_DESKTOP_MODE_MEDIA_QUERY, useControlledValueWithTimezone, useViews, usePickerPrivateContext } from '@mui/x-date-pickers/internals';
-import { warnOnce } from '@mui/x-internals/warning';
-import { getReleaseInfo } from "../internals/utils/releaseInfo.js";
-import { dateRangeCalendarClasses, getDateRangeCalendarUtilityClass } from "./dateRangeCalendarClasses.js";
-import { isEndOfRange, isRangeValid, isStartOfRange, isWithinRange } from "../internals/utils/date-utils.js";
-import { calculateRangeChange, calculateRangePreview } from "../internals/utils/date-range-manager.js";
-import { DateRangePickerDay, dateRangePickerDayClasses as dayClasses } from "../DateRangePickerDay/index.js";
-import { rangeValueManager } from "../internals/utils/valueManagers.js";
-import { useDragRange } from "./useDragRange.js";
-import { useRangePosition } from "../internals/hooks/useRangePosition.js";
-import { DAY_RANGE_SIZE, DAY_MARGIN } from "../internals/constants/dimensions.js";
-import { PickersRangeCalendarHeader } from "../PickersRangeCalendarHeader/index.js";
-import { useNullablePickerRangePositionContext } from "../internals/hooks/useNullablePickerRangePositionContext.js";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const releaseInfo = getReleaseInfo();
-const DateRangeCalendarRoot = styled('div', {
+const releaseInfo = (0, _releaseInfo.getReleaseInfo)();
+const DateRangeCalendarRoot = (0, _styles.styled)('div', {
   name: 'MuiDateRangeCalendar',
   slot: 'Root',
   overridesResolver: (_, styles) => styles.root
@@ -38,7 +45,7 @@ const DateRangeCalendarRoot = styled('div', {
   display: 'flex',
   flexDirection: 'row'
 });
-const DateRangeCalendarMonthContainer = styled('div', {
+const DateRangeCalendarMonthContainer = (0, _styles.styled)('div', {
   name: 'MuiDateRangeCalendar',
   slot: 'Container',
   overridesResolver: (_, styles) => styles.monthContainer
@@ -49,22 +56,22 @@ const DateRangeCalendarMonthContainer = styled('div', {
     borderRight: `1px solid ${(theme.vars || theme).palette.divider}`
   }
 }));
-const weeksContainerHeight = (DAY_RANGE_SIZE + DAY_MARGIN * 2) * 6;
-const InnerDayCalendarForRange = styled(DayCalendar)(({
+const weeksContainerHeight = (_dimensions.DAY_RANGE_SIZE + _dimensions.DAY_MARGIN * 2) * 6;
+const InnerDayCalendarForRange = (0, _styles.styled)(_internals.DayCalendar)(({
   theme
 }) => ({
   minWidth: 312,
   minHeight: weeksContainerHeight,
-  [`&.${dateRangeCalendarClasses.dayDragging}`]: {
-    [`& .${dayClasses.day}`]: {
+  [`&.${_dateRangeCalendarClasses.dateRangeCalendarClasses.dayDragging}`]: {
+    [`& .${_DateRangePickerDay.dateRangePickerDayClasses.day}`]: {
       cursor: 'grabbing'
     },
-    [`& .${dayClasses.root}:not(.${dayClasses.rangeIntervalDayHighlightStart}):not(.${dayClasses.rangeIntervalDayHighlightEnd}) .${dayClasses.day}:not(.${dayClasses.notSelectedDate})`]: {
+    [`& .${_DateRangePickerDay.dateRangePickerDayClasses.root}:not(.${_DateRangePickerDay.dateRangePickerDayClasses.rangeIntervalDayHighlightStart}):not(.${_DateRangePickerDay.dateRangePickerDayClasses.rangeIntervalDayHighlightEnd}) .${_DateRangePickerDay.dateRangePickerDayClasses.day}:not(.${_DateRangePickerDay.dateRangePickerDayClasses.notSelectedDate})`]: {
       // we can't override `PickersDay` background color here, because it's styles take precedence
       opacity: 0.6
     }
   },
-  [`&:not(.${dateRangeCalendarClasses.dayDragging}) .${dayClasses.dayOutsideRangeInterval}`]: {
+  [`&:not(.${_dateRangeCalendarClasses.dateRangeCalendarClasses.dayDragging}) .${_DateRangePickerDay.dateRangePickerDayClasses.dayOutsideRangeInterval}`]: {
     '@media (pointer: fine)': {
       '&:hover': {
         border: `1px solid ${(theme.vars || theme).palette.grey[500]}`
@@ -74,25 +81,25 @@ const InnerDayCalendarForRange = styled(DayCalendar)(({
 }));
 const DayCalendarForRange = InnerDayCalendarForRange;
 function useDateRangeCalendarDefaultizedProps(props, name) {
-  const utils = useUtils();
-  const defaultDates = useDefaultDates();
-  const defaultReduceAnimations = useDefaultReduceAnimations();
-  const themeProps = useThemeProps({
+  const utils = (0, _internals.useUtils)();
+  const defaultDates = (0, _internals.useDefaultDates)();
+  const themeProps = (0, _styles.useThemeProps)({
     props,
     name
   });
-  return _extends({}, themeProps, {
-    renderLoading: themeProps.renderLoading ?? (() => /*#__PURE__*/_jsx("span", {
+  const reduceAnimations = (0, _internals.useReduceAnimations)(themeProps.reduceAnimations);
+  return (0, _extends2.default)({}, themeProps, {
+    renderLoading: themeProps.renderLoading ?? (() => /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
       children: "..."
     })),
-    reduceAnimations: themeProps.reduceAnimations ?? defaultReduceAnimations,
+    reduceAnimations,
     loading: props.loading ?? false,
     disablePast: props.disablePast ?? false,
     disableFuture: props.disableFuture ?? false,
     openTo: themeProps.openTo ?? 'day',
     views: themeProps.views ?? ['day'],
-    minDate: applyDefaultDate(utils, themeProps.minDate, defaultDates.minDate),
-    maxDate: applyDefaultDate(utils, themeProps.maxDate, defaultDates.maxDate),
+    minDate: (0, _internals.applyDefaultDate)(utils, themeProps.minDate, defaultDates.minDate),
+    maxDate: (0, _internals.applyDefaultDate)(utils, themeProps.maxDate, defaultDates.maxDate),
     calendars: themeProps.calendars ?? 2,
     disableDragEditing: themeProps.disableDragEditing ?? false,
     availableRangePositions: themeProps.availableRangePositions ?? ['start', 'end']
@@ -104,7 +111,7 @@ const useUtilityClasses = (classes, ownerState) => {
     monthContainer: ['monthContainer'],
     dayCalendar: [ownerState.isDraggingDay && 'dayDragging']
   };
-  return composeClasses(slots, getDateRangeCalendarUtilityClass, classes);
+  return (0, _composeClasses.default)(slots, _dateRangeCalendarClasses.getDateRangeCalendarUtilityClass, classes);
 };
 /**
  * Demos:
@@ -116,9 +123,9 @@ const useUtilityClasses = (classes, ownerState) => {
  *
  * - [DateRangeCalendar API](https://mui.com/x/api/date-pickers/date-range-calendar/)
  */
-const DateRangeCalendar = /*#__PURE__*/React.forwardRef(function DateRangeCalendar(inProps, ref) {
+const DateRangeCalendar = exports.DateRangeCalendar = /*#__PURE__*/React.forwardRef(function DateRangeCalendar(inProps, ref) {
   const props = useDateRangeCalendarDefaultizedProps(inProps, 'MuiDateRangeCalendar');
-  const shouldHavePreview = useMediaQuery(DEFAULT_DESKTOP_MODE_MEDIA_QUERY, {
+  const shouldHavePreview = (0, _useMediaQuery.default)(_internals.DEFAULT_DESKTOP_MODE_MEDIA_QUERY, {
     defaultMatches: false
   });
   const {
@@ -145,6 +152,8 @@ const DateRangeCalendar = /*#__PURE__*/React.forwardRef(function DateRangeCalend
       loading,
       renderLoading,
       disableHighlightToday,
+      focusedView: focusedViewProp,
+      onFocusedViewChange,
       readOnly,
       disabled,
       showDaysOutsideCurrentMonth,
@@ -161,53 +170,56 @@ const DateRangeCalendar = /*#__PURE__*/React.forwardRef(function DateRangeCalend
       openTo,
       onViewChange
     } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded);
-  const rangePositionContext = useNullablePickerRangePositionContext();
+    other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
+  const rangePositionContext = (0, _useNullablePickerRangePositionContext.useNullablePickerRangePositionContext)();
   const {
     value,
     handleValueChange,
     timezone
-  } = useControlledValueWithTimezone({
+  } = (0, _internals.useControlledValue)({
     name: 'DateRangeCalendar',
     timezone: timezoneProp,
     value: valueProp,
     referenceDate,
     defaultValue,
     onChange,
-    valueManager: rangeValueManager
+    valueManager: _valueManagers.rangeValueManager
   });
   const {
-    setValueAndGoToNextView,
-    view
-  } = useViews({
+    view,
+    setFocusedView,
+    focusedView,
+    setValueAndGoToNextView
+  } = (0, _internals.useViews)({
     view: inView,
     views,
     openTo,
     onChange: handleValueChange,
     onViewChange,
-    autoFocus
+    autoFocus,
+    focusedView: focusedViewProp,
+    onFocusedViewChange
   });
-  const utils = useUtils();
-  const now = useNow(timezone);
-  const id = useId();
+  const utils = (0, _internals.useUtils)();
+  const id = (0, _useId.default)();
   const {
     rangePosition,
     setRangePosition
-  } = useRangePosition({
+  } = (0, _useRangePosition.useRangePosition)({
     rangePosition: rangePositionProp ?? rangePositionContext?.rangePosition,
     defaultRangePosition: defaultRangePositionProp,
     onRangePositionChange: onRangePositionChangeProp ?? rangePositionContext?.setRangePosition
   });
-  const handleDatePositionChange = useEventCallback(position => {
+  const handleDatePositionChange = (0, _useEventCallback.default)(position => {
     if (rangePosition !== position) {
       setRangePosition(position);
     }
   });
-  const handleSelectedDayChange = useEventCallback((newDate, selectionState, allowRangeFlip = false) => {
+  const handleSelectedDayChange = (0, _useEventCallback.default)((newDate, selectionState, allowRangeFlip = false) => {
     const {
       nextSelection,
       newRange
-    } = calculateRangeChange({
+    } = (0, _dateRangeManager.calculateRangeChange)({
       newDate,
       utils,
       range: value,
@@ -220,10 +232,10 @@ const DateRangeCalendar = /*#__PURE__*/React.forwardRef(function DateRangeCalend
     if (isNextSectionAvailable) {
       setRangePosition(nextSelection);
     }
-    const isFullRangeSelected = rangePosition === 'end' && isRangeValid(utils, newRange);
+    const isFullRangeSelected = rangePosition === 'end' && (0, _dateUtils.isRangeValid)(utils, newRange);
     setValueAndGoToNextView(newRange, isFullRangeSelected || !isNextSectionAvailable ? 'finish' : 'partial', view);
   });
-  const handleDrop = useEventCallback(newDate => {
+  const handleDrop = (0, _useEventCallback.default)(newDate => {
     handleSelectedDayChange(newDate, undefined, true);
   });
   const shouldDisableDragEditing = disableDragEditing || disabled || readOnly;
@@ -231,7 +243,7 @@ const DateRangeCalendar = /*#__PURE__*/React.forwardRef(function DateRangeCalend
   // Range going for the start of the start day to the end of the end day.
   // This makes sure that `isWithinRange` works with any time in the start and end day.
   const valueDayRange = React.useMemo(() => [!utils.isValid(value[0]) ? value[0] : utils.startOfDay(value[0]), !utils.isValid(value[1]) ? value[1] : utils.endOfDay(value[1])], [value, utils]);
-  const _useDragRange = useDragRange({
+  const _useDragRange = (0, _useDragRange2.useDragRange)({
       disableDragEditing: shouldDisableDragEditing,
       onDrop: handleDrop,
       onDatePositionChange: handleDatePositionChange,
@@ -244,11 +256,11 @@ const DateRangeCalendar = /*#__PURE__*/React.forwardRef(function DateRangeCalend
       rangeDragDay,
       draggingDatePosition
     } = _useDragRange,
-    dragEventHandlers = _objectWithoutPropertiesLoose(_useDragRange, _excluded2);
+    dragEventHandlers = (0, _objectWithoutPropertiesLoose2.default)(_useDragRange, _excluded2);
   const {
     ownerState: pickersOwnerState
-  } = usePickerPrivateContext();
-  const ownerState = _extends({}, pickersOwnerState, {
+  } = (0, _internals.usePickerPrivateContext)();
+  const ownerState = (0, _extends2.default)({}, pickersOwnerState, {
     isDraggingDay: isDragging
   });
   const classes = useUtilityClasses(classesProp, ownerState);
@@ -256,7 +268,7 @@ const DateRangeCalendar = /*#__PURE__*/React.forwardRef(function DateRangeCalend
     if (!valueDayRange[0] || !valueDayRange[1] || !rangeDragDay) {
       return [null, null];
     }
-    const newRange = calculateRangeChange({
+    const newRange = (0, _dateRangeManager.calculateRangeChange)({
       utils,
       range: valueDayRange,
       newDate: rangeDragDay,
@@ -273,25 +285,42 @@ const DateRangeCalendar = /*#__PURE__*/React.forwardRef(function DateRangeCalend
   }, [shouldDisableDate, rangePosition, draggingDatePosition]);
   const {
     calendarState,
-    changeFocusedDay,
-    changeMonth,
-    handleChangeMonth,
+    setVisibleDate,
     onMonthSwitchingAnimationEnd
-  } = useCalendarState({
+  } = (0, _internals.useCalendarState)({
     value: value[0] || value[1],
     referenceDate,
     disableFuture,
     disablePast,
-    disableSwitchToMonthOnDayFocus: true,
     maxDate,
     minDate,
     onMonthChange,
     reduceAnimations,
     shouldDisableDate: wrappedShouldDisableDate,
-    timezone
+    timezone,
+    getCurrentMonthFromVisibleDate: (visibleDate, prevMonth) => {
+      const firstVisibleMonth = utils.addMonths(prevMonth, 1 - currentMonthCalendarPosition);
+      const lastVisibleMonth = utils.endOfMonth(utils.addMonths(firstVisibleMonth, calendars - 1));
+
+      // The new focused day is inside the visible calendars,
+      // Do not change the current month
+      if (utils.isWithinRange(visibleDate, [firstVisibleMonth, lastVisibleMonth])) {
+        return prevMonth;
+      }
+
+      // The new focused day is after the last visible month,
+      // Move the current month so that the new focused day is inside the first visible month
+      if (utils.isAfter(visibleDate, lastVisibleMonth)) {
+        return utils.startOfMonth(utils.addMonths(visibleDate, currentMonthCalendarPosition - 1));
+      }
+
+      // The new focused day is before the first visible month,
+      // Move the current month so that the new focused day is inside the last visible month
+      return utils.startOfMonth(utils.addMonths(visibleDate, currentMonthCalendarPosition - calendars));
+    }
   });
-  const CalendarHeader = slots?.calendarHeader ?? PickersRangeCalendarHeader;
-  const calendarHeaderProps = useSlotProps({
+  const CalendarHeader = slots?.calendarHeader ?? _PickersRangeCalendarHeader.PickersRangeCalendarHeader;
+  const calendarHeaderProps = (0, _useSlotProps.default)({
     elementType: CalendarHeader,
     externalSlotProps: slotProps?.calendarHeader,
     additionalProps: {
@@ -299,9 +328,9 @@ const DateRangeCalendar = /*#__PURE__*/React.forwardRef(function DateRangeCalend
       views: ['day'],
       view: 'day',
       currentMonth: calendarState.currentMonth,
-      onMonthChange: (newMonth, direction) => handleChangeMonth({
-        newMonth,
-        direction
+      onMonthChange: month => setVisibleDate({
+        target: month,
+        reason: 'header-navigation'
       }),
       minDate,
       maxDate,
@@ -315,6 +344,8 @@ const DateRangeCalendar = /*#__PURE__*/React.forwardRef(function DateRangeCalend
     },
     ownerState
   });
+
+  // TODO: Move this logic inside the render instead of using an effect
   const prevValue = React.useRef(null);
   React.useEffect(() => {
     const date = rangePosition === 'start' ? value[0] : value[1];
@@ -336,7 +367,10 @@ const DateRangeCalendar = /*#__PURE__*/React.forwardRef(function DateRangeCalend
       const newMonth = rangePosition === 'start' ? date :
       // If need to focus end, scroll to the state when "end" is displaying in the last calendar
       utils.addMonths(date, -displayingMonthRange);
-      changeMonth(newMonth);
+      setVisibleDate({
+        target: newMonth,
+        reason: 'controlled-value-change'
+      });
     }
   }, [rangePosition, value]); // eslint-disable-line
 
@@ -355,30 +389,36 @@ const DateRangeCalendar = /*#__PURE__*/React.forwardRef(function DateRangeCalend
   const CalendarTransitionProps = React.useMemo(() => ({
     onMouseLeave: () => setRangePreviewDay(null)
   }), []);
-  const previewingRange = calculateRangePreview({
+  const previewingRange = (0, _dateRangeManager.calculateRangePreview)({
     utils,
     range: valueDayRange,
     newDate: rangePreviewDay,
     rangePosition
   });
-  const handleDayMouseEnter = useEventCallback((event, newPreviewRequest) => {
-    if (!isWithinRange(utils, newPreviewRequest, valueDayRange)) {
-      setRangePreviewDay(newPreviewRequest);
+  const handleDayMouseEnter = (0, _useEventCallback.default)((event, newRangePreviewDay) => {
+    let cleanNewRangePreviewDay;
+    if (valueDayRange[0] == null && valueDayRange[1] == null) {
+      cleanNewRangePreviewDay = null;
+    } else if ((0, _dateUtils.isWithinRange)(utils, newRangePreviewDay, valueDayRange)) {
+      cleanNewRangePreviewDay = null;
     } else {
-      setRangePreviewDay(null);
+      cleanNewRangePreviewDay = newRangePreviewDay;
+    }
+    if (!(0, _internals.areDatesEqual)(utils, cleanNewRangePreviewDay, rangePreviewDay)) {
+      setRangePreviewDay(cleanNewRangePreviewDay);
     }
   });
-  const slotsForDayCalendar = _extends({
-    day: DateRangePickerDay
+  const slotsForDayCalendar = (0, _extends2.default)({
+    day: _DateRangePickerDay.DateRangePickerDay
   }, slots);
-  const slotPropsForDayCalendar = _extends({}, slotProps, {
+  const slotPropsForDayCalendar = (0, _extends2.default)({}, slotProps, {
     day: dayOwnerState => {
       const {
         day,
         isDaySelected
       } = dayOwnerState;
-      const isSelectedStartDate = isStartOfRange(utils, day, valueDayRange);
-      const isSelectedEndDate = isEndOfRange(utils, day, valueDayRange);
+      const isSelectedStartDate = (0, _dateUtils.isStartOfRange)(utils, day, valueDayRange);
+      const isSelectedEndDate = (0, _dateUtils.isEndOfRange)(utils, day, valueDayRange);
       const shouldInitDragging = !shouldDisableDragEditing && valueDayRange[0] && valueDayRange[1];
       const isElementDraggable = shouldInitDragging && (isSelectedStartDate || isSelectedEndDate);
       let datePosition;
@@ -387,22 +427,22 @@ const DateRangeCalendar = /*#__PURE__*/React.forwardRef(function DateRangeCalend
       } else if (isSelectedEndDate) {
         datePosition = 'end';
       }
-      const isStartOfHighlighting = isDragging ? isStartOfRange(utils, day, draggingRange) : isSelectedStartDate;
-      const isEndOfHighlighting = isDragging ? isEndOfRange(utils, day, draggingRange) : isSelectedEndDate;
-      return _extends({
-        isPreviewing: shouldHavePreview ? isWithinRange(utils, day, previewingRange) : false,
-        isStartOfPreviewing: shouldHavePreview ? isStartOfRange(utils, day, previewingRange) : false,
-        isEndOfPreviewing: shouldHavePreview ? isEndOfRange(utils, day, previewingRange) : false,
-        isHighlighting: isWithinRange(utils, day, isDragging ? draggingRange : valueDayRange),
+      const isStartOfHighlighting = isDragging ? (0, _dateUtils.isStartOfRange)(utils, day, draggingRange) : isSelectedStartDate;
+      const isEndOfHighlighting = isDragging ? (0, _dateUtils.isEndOfRange)(utils, day, draggingRange) : isSelectedEndDate;
+      return (0, _extends2.default)({
+        isPreviewing: shouldHavePreview ? (0, _dateUtils.isWithinRange)(utils, day, previewingRange) : false,
+        isStartOfPreviewing: shouldHavePreview ? (0, _dateUtils.isStartOfRange)(utils, day, previewingRange) : false,
+        isEndOfPreviewing: shouldHavePreview ? (0, _dateUtils.isEndOfRange)(utils, day, previewingRange) : false,
+        isHighlighting: (0, _dateUtils.isWithinRange)(utils, day, isDragging ? draggingRange : valueDayRange),
         isStartOfHighlighting,
-        isEndOfHighlighting: isDragging ? isEndOfRange(utils, day, draggingRange) : isSelectedEndDate,
+        isEndOfHighlighting: isDragging ? (0, _dateUtils.isEndOfRange)(utils, day, draggingRange) : isSelectedEndDate,
         onMouseEnter: shouldHavePreview ? handleDayMouseEnter : undefined,
         // apply selected styling to the dragging start or end day
         isVisuallySelected: isDaySelected || isDragging && (isStartOfHighlighting || isEndOfHighlighting),
         'data-position': datePosition
       }, dragEventHandlers, {
         draggable: isElementDraggable ? true : undefined
-      }, resolveComponentProps(slotProps?.day, dayOwnerState) ?? {});
+      }, (0, _resolveComponentProps.default)(slotProps?.day, dayOwnerState) ?? {});
     }
   });
   const calendarMonths = React.useMemo(() => Array.from({
@@ -411,7 +451,7 @@ const DateRangeCalendar = /*#__PURE__*/React.forwardRef(function DateRangeCalend
   const visibleMonths = React.useMemo(() => {
     if (process.env.NODE_ENV !== 'production') {
       if (currentMonthCalendarPosition > calendars || currentMonthCalendarPosition < 1) {
-        warnOnce(['MUI X: The `currentMonthCalendarPosition` prop must be an integer between `1` and the amount of calendars rendered.', 'For example if you have 2 calendars rendered, it should be equal to either 1 or 2.']);
+        (0, _warning.warnOnce)(['MUI X: The `currentMonthCalendarPosition` prop must be an integer between `1` and the amount of calendars rendered.', 'For example if you have 2 calendars rendered, it should be equal to either 1 or 2.']);
       }
     }
     const firstMonth = utils.addMonths(calendarState.currentMonth, 1 - currentMonthCalendarPosition);
@@ -419,60 +459,58 @@ const DateRangeCalendar = /*#__PURE__*/React.forwardRef(function DateRangeCalend
       length: calendars
     }).map((_, index) => utils.addMonths(firstMonth, index));
   }, [utils, calendarState.currentMonth, calendars, currentMonthCalendarPosition]);
-  const focusedMonth = React.useMemo(() => {
-    if (!autoFocus) {
-      return null;
-    }
-
-    // The focus priority of the "day" view is as follows:
-    // 1. Month of the `start` date
-    // 2. Month of the `end` date
-    // 3. Month of the current date
-    // 4. First visible month
-
-    if (value[0] != null) {
-      return visibleMonths.find(month => utils.isSameMonth(month, value[0]));
+  const hasFocus = focusedView !== null;
+  const prevOpenViewRef = React.useRef(view);
+  React.useEffect(() => {
+    // If the view change and the focus was on the previous view
+    // Then we update the focus.
+    if (prevOpenViewRef.current === view) {
+      return;
     }
-    if (value[1] != null) {
-      return visibleMonths.find(month => utils.isSameMonth(month, value[1]));
+    if (focusedView === prevOpenViewRef.current) {
+      setFocusedView(view, true);
     }
-    return visibleMonths.find(month => utils.isSameMonth(month, now)) ?? visibleMonths[0];
-  }, [utils, value, visibleMonths, autoFocus, now]);
-  return /*#__PURE__*/_jsxs(DateRangeCalendarRoot, _extends({
+    prevOpenViewRef.current = view;
+  }, [focusedView, setFocusedView, view]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(DateRangeCalendarRoot, (0, _extends2.default)({
     ref: ref,
-    className: clsx(classes.root, className),
+    className: (0, _clsx.default)(classes.root, className),
     ownerState: ownerState
   }, other, {
-    children: [/*#__PURE__*/_jsx(Watermark, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_xLicense.Watermark, {
       packageName: "x-date-pickers-pro",
       releaseInfo: releaseInfo
     }), calendarMonths.map(monthIndex => {
       const month = visibleMonths[monthIndex];
       const labelId = `${id}-grid-${monthIndex}-label`;
-      return /*#__PURE__*/_jsxs(DateRangeCalendarMonthContainer, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsxs)(DateRangeCalendarMonthContainer, {
         className: classes.monthContainer,
-        children: [/*#__PURE__*/_jsx(CalendarHeader, _extends({}, calendarHeaderProps, {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(CalendarHeader, (0, _extends2.default)({}, calendarHeaderProps, {
           month: month,
           monthIndex: monthIndex,
           labelId: labelId
-        })), /*#__PURE__*/_jsx(DayCalendarForRange, _extends({
+        })), /*#__PURE__*/(0, _jsxRuntime.jsx)(DayCalendarForRange, (0, _extends2.default)({
           className: classes.dayCalendar
         }, calendarState, baseDateValidationProps, commonViewProps, {
           onMonthSwitchingAnimationEnd: onMonthSwitchingAnimationEnd,
-          onFocusedDayChange: changeFocusedDay,
+          onFocusedDayChange: focusedDate => setVisibleDate({
+            target: focusedDate,
+            reason: 'cell-interaction'
+          }),
           reduceAnimations: reduceAnimations,
           selectedDays: value,
           onSelectedDaysChange: handleSelectedDayChange,
           currentMonth: month,
           TransitionProps: CalendarTransitionProps,
           shouldDisableDate: wrappedShouldDisableDate,
+          hasFocus: hasFocus,
+          onFocusedViewChange: isViewFocused => setFocusedView('day', isViewFocused),
           showDaysOutsideCurrentMonth: calendars === 1 && showDaysOutsideCurrentMonth,
           dayOfWeekFormatter: dayOfWeekFormatter,
           loading: loading,
           renderLoading: renderLoading,
           slots: slotsForDayCalendar,
           slotProps: slotPropsForDayCalendar,
-          autoFocus: month === focusedMonth,
           fixedWeekNumber: fixedWeekNumber,
           displayWeekNumber: displayWeekNumber,
           timezone: timezone,
@@ -493,7 +531,7 @@ process.env.NODE_ENV !== "production" ? DateRangeCalendar.propTypes = {
    * - the element chosen by the visible view if any (i.e: the selected day on the `day` view).
    * - the `input` element if there is a field rendered.
    */
-  autoFocus: PropTypes.bool,
+  autoFocus: _propTypes.default.bool,
   /**
    * Range positions available for selection.
    * This list is checked against when checking if a next range position can be selected.
@@ -501,100 +539,100 @@ process.env.NODE_ENV !== "production" ? DateRangeCalendar.propTypes = {
    * Used on Date Time Range pickers with current `rangePosition` to force a `finish` selection after just one range position selection.
    * @default ['start', 'end']
    */
-  availableRangePositions: PropTypes.arrayOf(PropTypes.oneOf(['end', 'start']).isRequired),
+  availableRangePositions: _propTypes.default.arrayOf(_propTypes.default.oneOf(['end', 'start']).isRequired),
   /**
    * The number of calendars to render.
    * @default 2
    */
-  calendars: PropTypes.oneOf([1, 2, 3]),
+  calendars: _propTypes.default.oneOf([1, 2, 3]),
   /**
    * Override or extend the styles applied to the component.
    */
-  classes: PropTypes.object,
-  className: PropTypes.string,
+  classes: _propTypes.default.object,
+  className: _propTypes.default.string,
   /**
    * Position the current month is rendered in.
    * @default 1
    */
-  currentMonthCalendarPosition: PropTypes.oneOf([1, 2, 3]),
+  currentMonthCalendarPosition: _propTypes.default.oneOf([1, 2, 3]),
   /**
    * Formats the day of week displayed in the calendar header.
    * @param {PickerValidDate} date The date of the day of week provided by the adapter.
    * @returns {string} The name to display.
    * @default (date: PickerValidDate) => adapter.format(date, 'weekdayShort').charAt(0).toUpperCase()
    */
-  dayOfWeekFormatter: PropTypes.func,
+  dayOfWeekFormatter: _propTypes.default.func,
   /**
    * The initial position in the edited date range.
    * Used when the component is not controlled.
    * @default 'start'
    */
-  defaultRangePosition: PropTypes.oneOf(['end', 'start']),
+  defaultRangePosition: _propTypes.default.oneOf(['end', 'start']),
   /**
    * The default selected value.
    * Used when the component is not controlled.
    */
-  defaultValue: PropTypes.arrayOf(PropTypes.object),
+  defaultValue: _propTypes.default.arrayOf(_propTypes.default.object),
   /**
    * If `true`, after selecting `start` date calendar will not automatically switch to the month of `end` date.
    * @default false
    */
-  disableAutoMonthSwitching: PropTypes.bool,
+  disableAutoMonthSwitching: _propTypes.default.bool,
   /**
    * If `true`, the component is disabled.
    * When disabled, the value cannot be changed and no interaction is possible.
    * @default false
    */
-  disabled: PropTypes.bool,
+  disabled: _propTypes.default.bool,
   /**
    * If `true`, editing dates by dragging is disabled.
    * @default false
    */
-  disableDragEditing: PropTypes.bool,
+  disableDragEditing: _propTypes.default.bool,
   /**
    * If `true`, disable values after the current date for date components, time for time components and both for date time components.
    * @default false
    */
-  disableFuture: PropTypes.bool,
+  disableFuture: _propTypes.default.bool,
   /**
    * If `true`, today's date is rendering without highlighting with circle.
    * @default false
    */
-  disableHighlightToday: PropTypes.bool,
+  disableHighlightToday: _propTypes.default.bool,
   /**
    * If `true`, disable values before the current date for date components, time for time components and both for date time components.
    * @default false
    */
-  disablePast: PropTypes.bool,
+  disablePast: _propTypes.default.bool,
   /**
    * If `true`, the week number will be display in the calendar.
    */
-  displayWeekNumber: PropTypes.bool,
+  displayWeekNumber: _propTypes.default.bool,
   /**
    * 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
    */
-  fixedWeekNumber: PropTypes.number,
+  fixedWeekNumber: _propTypes.default.number,
   /**
    * Controlled focused view.
    */
-  focusedView: PropTypes.oneOf(['day']),
+  focusedView: _propTypes.default.oneOf(['day']),
   /**
    * If `true`, calls `renderLoading` instead of rendering the day calendar.
    * Can be used to preload information and show it in calendar.
    * @default false
    */
-  loading: PropTypes.bool,
+  loading: _propTypes.default.bool,
   /**
    * Maximal selectable date.
    * @default 2099-12-31
    */
-  maxDate: PropTypes.object,
+  maxDate: _propTypes.default.object,
   /**
    * Minimal selectable date.
    * @default 1900-01-01
    */
-  minDate: PropTypes.object,
+  minDate: _propTypes.default.object,
   /**
    * Callback fired when the value changes.
    * @template TValue The value type. It will be the same type as `value` or `null`. It can be in `[start, end]` format in case of range value.
@@ -603,63 +641,63 @@ process.env.NODE_ENV !== "production" ? DateRangeCalendar.propTypes = {
    * @param {PickerSelectionState | undefined} selectionState Indicates if the date selection is complete.
    * @param {TView | undefined} selectedView Indicates the view in which the selection has been made.
    */
-  onChange: PropTypes.func,
+  onChange: _propTypes.default.func,
   /**
    * Callback fired on focused view change.
    * @template TView
    * @param {TView} view The new view to focus or not.
    * @param {boolean} hasFocus `true` if the view should be focused.
    */
-  onFocusedViewChange: PropTypes.func,
+  onFocusedViewChange: _propTypes.default.func,
   /**
    * Callback fired on month change.
    * @param {PickerValidDate} month The new month.
    */
-  onMonthChange: PropTypes.func,
+  onMonthChange: _propTypes.default.func,
   /**
    * Callback fired when the range position changes.
    * @param {RangePosition} rangePosition The new range position.
    */
-  onRangePositionChange: PropTypes.func,
+  onRangePositionChange: _propTypes.default.func,
   /**
    * Callback fired on view change.
    * @template TView
    * @param {TView} view The new view.
    */
-  onViewChange: PropTypes.func,
+  onViewChange: _propTypes.default.func,
   /**
    * The default visible view.
    * Used when the component view is not controlled.
    * Must be a valid option from `views` list.
    */
-  openTo: PropTypes.oneOf(['day']),
+  openTo: _propTypes.default.oneOf(['day']),
   /**
    * The position in the currently edited date range.
    * Used when the component position is controlled.
    */
-  rangePosition: PropTypes.oneOf(['end', 'start']),
+  rangePosition: _propTypes.default.oneOf(['end', 'start']),
   /**
    * If `true`, the component is read-only.
    * When read-only, the value cannot be changed but the user can interact with the interface.
    * @default false
    */
-  readOnly: PropTypes.bool,
+  readOnly: _propTypes.default.bool,
   /**
    * If `true`, disable heavy animations.
    * @default `@media(prefers-reduced-motion: reduce)` || `navigator.userAgent` matches Android <10 or iOS <13
    */
-  reduceAnimations: PropTypes.bool,
+  reduceAnimations: _propTypes.default.bool,
   /**
    * The date used to generate the new value when both `value` and `defaultValue` are empty.
    * @default The closest valid date using the validation props, except callbacks such as `shouldDisableDate`.
    */
-  referenceDate: PropTypes.object,
+  referenceDate: _propTypes.default.object,
   /**
    * Component rendered on the "day" view when `props.loading` is true.
    * @returns {React.ReactNode} The node to render when loading.
    * @default () => "..."
    */
-  renderLoading: PropTypes.func,
+  renderLoading: _propTypes.default.func,
   /**
    * Disable specific date.
    *
@@ -669,7 +707,7 @@ process.env.NODE_ENV !== "production" ? DateRangeCalendar.propTypes = {
    * @param {string} position The date to test, 'start' or 'end'.
    * @returns {boolean} Returns `true` if the date should be disabled.
    */
-  shouldDisableDate: PropTypes.func,
+  shouldDisableDate: _propTypes.default.func,
   /**
    * If `true`, days outside the current month are rendered:
    *
@@ -680,21 +718,21 @@ process.env.NODE_ENV !== "production" ? DateRangeCalendar.propTypes = {
    * - ignored if `calendars` equals more than `1` on range pickers.
    * @default false
    */
-  showDaysOutsideCurrentMonth: PropTypes.bool,
+  showDaysOutsideCurrentMonth: _propTypes.default.bool,
   /**
    * The props used for each component slot.
    * @default {}
    */
-  slotProps: PropTypes.object,
+  slotProps: _propTypes.default.object,
   /**
    * Overridable component slots.
    * @default {}
    */
-  slots: PropTypes.object,
+  slots: _propTypes.default.object,
   /**
    * The system prop that allows defining system overrides as well as additional CSS styles.
    */
-  sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
+  sx: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object, _propTypes.default.bool])), _propTypes.default.func, _propTypes.default.object]),
   /**
    * Choose which timezone to use for the value.
    * Example: "default", "system", "UTC", "America/New_York".
@@ -702,21 +740,20 @@ process.env.NODE_ENV !== "production" ? DateRangeCalendar.propTypes = {
    * @see See the {@link https://mui.com/x/react-date-pickers/timezone/ timezones documentation} for more details.
    * @default The timezone of the `value` or `defaultValue` prop is defined, 'default' otherwise.
    */
-  timezone: PropTypes.string,
+  timezone: _propTypes.default.string,
   /**
    * The selected value.
    * Used when the component is controlled.
    */
-  value: PropTypes.arrayOf(PropTypes.object),
+  value: _propTypes.default.arrayOf(_propTypes.default.object),
   /**
    * The visible view.
    * Used when the component view is controlled.
    * Must be a valid option from `views` list.
    */
-  view: PropTypes.oneOf(['day']),
+  view: _propTypes.default.oneOf(['day']),
   /**
    * Available views.
    */
-  views: PropTypes.arrayOf(PropTypes.oneOf(['day']))
-} : void 0;
-export { DateRangeCalendar };
+  views: _propTypes.default.arrayOf(_propTypes.default.oneOf(['day']))
+} : void 0;