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

package/PickersTextField/PickersInputBase/PickersInputBase.js

@@ -112,7 +112,8 @@ const PickersInputBaseSection = styled(PickersSectionListSection, {
   letterSpacing: 'inherit',
   lineHeight: '1.4375em',
   // 23px
-  display: 'flex'
+  display: 'inline-block',
+  whiteSpace: 'nowrap'
 }));
 const PickersInputBaseSectionContent = styled(PickersSectionListSectionContent, {
   name: 'MuiPickersInputBase',

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-date-pickers v8.0.0-alpha.10
+ * @mui/x-date-pickers v8.0.0-alpha.11
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/modern/DateCalendar/DateCalendar.js

@@ -96,7 +96,6 @@ export const DateCalendar = /*#__PURE__*/React.forwardRef(function DateCalendar(
       disableFuture,
       disablePast,
       onChange,
-      onYearChange,
       onMonthChange,
       reduceAnimations,
       shouldDisableDate,
@@ -112,7 +111,7 @@ export const DateCalendar = /*#__PURE__*/React.forwardRef(function DateCalendar(
       minDate,
       maxDate,
       disableHighlightToday,
-      focusedView: inFocusedView,
+      focusedView: focusedViewProp,
       onFocusedViewChange,
       showDaysOutsideCurrentMonth,
       fixedWeekNumber,
@@ -155,15 +154,13 @@ export const DateCalendar = /*#__PURE__*/React.forwardRef(function DateCalendar(
     onChange: handleValueChange,
     onViewChange,
     autoFocus,
-    focusedView: inFocusedView,
+    focusedView: focusedViewProp,
     onFocusedViewChange
   });
   const {
     referenceDate,
     calendarState,
-    changeFocusedDay,
-    changeMonth,
-    handleChangeMonth,
+    setVisibleDate,
     isDateDisabled,
     onMonthSwitchingAnimationEnd
   } = useCalendarState({
@@ -176,7 +173,13 @@ export const DateCalendar = /*#__PURE__*/React.forwardRef(function DateCalendar(
     shouldDisableDate,
     disablePast,
     disableFuture,
-    timezone
+    timezone,
+    getCurrentMonthFromVisibleDate: (visibleDate, prevMonth) => {
+      if (utils.isSameMonth(visibleDate, prevMonth)) {
+        return prevMonth;
+      }
+      return utils.startOfMonth(visibleDate);
+    }
   });
 
   // When disabled, limit the view to the selected date
@@ -193,9 +196,9 @@ export const DateCalendar = /*#__PURE__*/React.forwardRef(function DateCalendar(
       view,
       currentMonth: calendarState.currentMonth,
       onViewChange: setView,
-      onMonthChange: (newMonth, direction) => handleChangeMonth({
-        newMonth,
-        direction
+      onMonthChange: month => setVisibleDate({
+        target: month,
+        reason: 'header-navigation'
       }),
       minDate: minDateWithDisabled,
       maxDate: maxDateWithDisabled,
@@ -223,12 +226,17 @@ export const DateCalendar = /*#__PURE__*/React.forwardRef(function DateCalendar(
     }) : newDate;
     if (closestEnabledDate) {
       setValueAndGoToNextView(closestEnabledDate, 'finish');
-      onMonthChange?.(startOfMonth);
+      setVisibleDate({
+        target: closestEnabledDate,
+        reason: 'cell-interaction'
+      });
     } else {
       goToNextView();
-      changeMonth(startOfMonth);
+      setVisibleDate({
+        target: startOfMonth,
+        reason: 'cell-interaction'
+      });
     }
-    changeFocusedDay(closestEnabledDate, true);
   });
   const handleDateYearChange = useEventCallback(newDate => {
     const startOfYear = utils.startOfYear(newDate);
@@ -245,12 +253,17 @@ export const DateCalendar = /*#__PURE__*/React.forwardRef(function DateCalendar(
     }) : newDate;
     if (closestEnabledDate) {
       setValueAndGoToNextView(closestEnabledDate, 'finish');
-      onYearChange?.(closestEnabledDate);
+      setVisibleDate({
+        target: closestEnabledDate,
+        reason: 'cell-interaction'
+      });
     } else {
       goToNextView();
-      changeMonth(startOfYear);
+      setVisibleDate({
+        target: startOfYear,
+        reason: 'cell-interaction'
+      });
     }
-    changeFocusedDay(closestEnabledDate, true);
   });
   const handleSelectedDayChange = useEventCallback(day => {
     if (day) {
@@ -261,7 +274,10 @@ export const DateCalendar = /*#__PURE__*/React.forwardRef(function DateCalendar(
   });
   React.useEffect(() => {
     if (utils.isValid(value)) {
-      changeMonth(value);
+      setVisibleDate({
+        target: value,
+        reason: 'controlled-value-change'
+      });
     }
   }, [value]); // eslint-disable-line
 
@@ -328,7 +344,10 @@ export const DateCalendar = /*#__PURE__*/React.forwardRef(function DateCalendar(
           referenceDate: referenceDate
         })), view === 'day' && /*#__PURE__*/_jsx(DayCalendar, _extends({}, calendarState, baseDateValidationProps, commonViewProps, {
           onMonthSwitchingAnimationEnd: onMonthSwitchingAnimationEnd,
-          onFocusedDayChange: changeFocusedDay,
+          onFocusedDayChange: focusedDate => setVisibleDate({
+            target: focusedDate,
+            reason: 'cell-interaction'
+          }),
           reduceAnimations: reduceAnimations,
           selectedDays: selectedDays,
           onSelectedDaysChange: handleSelectedDayChange,

package/modern/DateCalendar/DayCalendar.js

@@ -2,7 +2,7 @@
 
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
-const _excluded = ["parentProps", "day", "focusableDay", "selectedDays", "isDateDisabled", "currentMonthNumber", "isViewFocused"],
+const _excluded = ["parentProps", "day", "focusedDay", "selectedDays", "isDateDisabled", "currentMonthNumber", "isViewFocused"],
   _excluded2 = ["ownerState"];
 import * as React from 'react';
 import useEventCallback from '@mui/utils/useEventCallback';
@@ -10,7 +10,7 @@ import Typography from '@mui/material/Typography';
 import useSlotProps from '@mui/utils/useSlotProps';
 import { useRtl } from '@mui/system/RtlProvider';
 import { styled, useThemeProps } from '@mui/material/styles';
-import { unstable_composeClasses as composeClasses, unstable_useControlled as useControlled } from '@mui/utils';
+import composeClasses from '@mui/utils/composeClasses';
 import clsx from 'clsx';
 import { PickersDay } from "../PickersDay/PickersDay.js";
 import { usePickerTranslations } from "../hooks/usePickerTranslations.js";
@@ -137,7 +137,7 @@ function WrappedDay(_ref) {
   let {
       parentProps,
       day,
-      focusableDay,
+      focusedDay,
       selectedDays,
       isDateDisabled,
       currentMonthNumber,
@@ -158,7 +158,8 @@ function WrappedDay(_ref) {
   const {
     ownerState
   } = usePickerPrivateContext();
-  const isFocusableDay = focusableDay !== null && utils.isSameDay(day, focusableDay);
+  const isFocusableDay = focusedDay != null && utils.isSameDay(day, focusedDay);
+  const isFocusedDay = isViewFocused && isFocusableDay;
   const isSelected = selectedDays.some(selectedDay => utils.isSameDay(selectedDay, day));
   const isToday = utils.isSameDay(day, now);
   const isDisabled = React.useMemo(() => disabled || isDateDisabled(day), [disabled, isDateDisabled, day]);
@@ -200,7 +201,7 @@ function WrappedDay(_ref) {
   return /*#__PURE__*/_jsx(Day, _extends({}, dayProps, {
     day: day,
     disabled: isDisabled,
-    autoFocus: isViewFocused && isFocusableDay,
+    autoFocus: !outsideCurrentMonth && isFocusedDay,
     today: isToday,
     outsideCurrentMonth: outsideCurrentMonth,
     isFirstVisibleCell: isFirstVisibleCell,
@@ -251,7 +252,6 @@ export function DayCalendar(inProps) {
     gridLabelId,
     displayWeekNumber,
     fixedWeekNumber,
-    autoFocus,
     timezone
   } = props;
   const now = useNow(timezone);
@@ -268,13 +268,6 @@ export function DayCalendar(inProps) {
     timezone
   });
   const translations = usePickerTranslations();
-  const [internalHasFocus, setInternalHasFocus] = useControlled({
-    name: 'DayCalendar',
-    state: 'hasFocus',
-    controlled: hasFocus,
-    default: autoFocus ?? false
-  });
-  const [internalFocusedDay, setInternalFocusedDay] = React.useState(() => focusedDay || now);
   const handleDaySelect = useEventCallback(day => {
     if (readOnly) {
       return;
@@ -284,9 +277,7 @@ export function DayCalendar(inProps) {
   const focusDay = day => {
     if (!isDateDisabled(day)) {
       onFocusedDayChange(day);
-      setInternalFocusedDay(day);
       onFocusedViewChange?.(true);
-      setInternalHasFocus(true);
     }
   };
   const handleKeyDown = useEventCallback((event, day) => {
@@ -353,7 +344,7 @@ export function DayCalendar(inProps) {
   });
   const handleFocus = useEventCallback((event, day) => focusDay(day));
   const handleBlur = useEventCallback((event, day) => {
-    if (internalHasFocus && utils.isSameDay(internalFocusedDay, day)) {
+    if (focusedDay != null && utils.isSameDay(focusedDay, day)) {
       onFocusedViewChange?.(false);
     }
   });
@@ -365,23 +356,6 @@ export function DayCalendar(inProps) {
   const transitionKey = `${currentYearNumber}-${currentMonthNumber}`;
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const slideNodeRef = React.useMemo(() => /*#__PURE__*/React.createRef(), [transitionKey]);
-  const focusableDay = React.useMemo(() => {
-    const startOfMonth = utils.startOfMonth(currentMonth);
-    const endOfMonth = utils.endOfMonth(currentMonth);
-    if (isDateDisabled(internalFocusedDay) || utils.isAfterDay(internalFocusedDay, endOfMonth) || utils.isBeforeDay(internalFocusedDay, startOfMonth)) {
-      return findClosestEnabledDate({
-        utils,
-        date: internalFocusedDay,
-        minDate: startOfMonth,
-        maxDate: endOfMonth,
-        disablePast,
-        disableFuture,
-        isDateDisabled,
-        timezone
-      });
-    }
-    return internalFocusedDay;
-  }, [currentMonth, disableFuture, disablePast, internalFocusedDay, isDateDisabled, utils, timezone]);
   const weeksToDisplay = React.useMemo(() => {
     const toDisplay = utils.getWeekArray(currentMonth);
     let nextMonth = utils.addMonths(currentMonth, 1);
@@ -448,14 +422,14 @@ export function DayCalendar(inProps) {
             parentProps: props,
             day: day,
             selectedDays: validSelectedDays,
-            focusableDay: focusableDay,
+            isViewFocused: hasFocus,
+            focusedDay: focusedDay,
             onKeyDown: handleKeyDown,
             onFocus: handleFocus,
             onBlur: handleBlur,
             onDaySelect: handleDaySelect,
             isDateDisabled: isDateDisabled,
-            currentMonthNumber: currentMonthNumber,
-            isViewFocused: internalHasFocus
+            currentMonthNumber: currentMonthNumber
             // fix issue of announcing column 1 as column 2 when `displayWeekNumber` is enabled
             ,
             "aria-colindex": dayIndex + 1

package/modern/DateCalendar/useCalendarState.js

@@ -7,13 +7,15 @@ import { useIsDateDisabled } from "./useIsDateDisabled.js";
 import { useUtils } from "../internals/hooks/useUtils.js";
 import { singleItemValueManager } from "../internals/utils/valueManagers.js";
 import { SECTION_TYPE_GRANULARITY } from "../internals/utils/getDefaultReferenceDate.js";
-export const createCalendarStateReducer = (reduceAnimations, disableSwitchToMonthOnDayFocus, utils) => (state, action) => {
+import { findClosestEnabledDate } from "../internals/utils/date-utils.js";
+const createCalendarStateReducer = (reduceAnimations, utils) => (state, action) => {
   switch (action.type) {
-    case 'changeMonth':
+    case 'setVisibleDate':
       return _extends({}, state, {
         slideDirection: action.direction,
-        currentMonth: action.newMonth,
-        isMonthSwitchingAnimating: !reduceAnimations
+        currentMonth: action.month,
+        isMonthSwitchingAnimating: !utils.isSameMonth(action.month, state.currentMonth) && !reduceAnimations && !action.skipAnimation,
+        focusedDay: action.focusedDay
       });
     case 'changeMonthTimezone':
       {
@@ -33,19 +35,6 @@ export const createCalendarStateReducer = (reduceAnimations, disableSwitchToMont
       return _extends({}, state, {
         isMonthSwitchingAnimating: false
       });
-    case 'changeFocusedDay':
-      {
-        if (state.focusedDay != null && action.focusedDay != null && utils.isSameDay(action.focusedDay, state.focusedDay)) {
-          return state;
-        }
-        const needMonthSwitch = action.focusedDay != null && !disableSwitchToMonthOnDayFocus && !utils.isSameMonth(state.currentMonth, action.focusedDay);
-        return _extends({}, state, {
-          focusedDay: action.focusedDay,
-          isMonthSwitchingAnimating: needMonthSwitch && !reduceAnimations && !action.withoutMonthSwitchingAnimation,
-          currentMonth: needMonthSwitch ? utils.startOfMonth(action.focusedDay) : state.currentMonth,
-          slideDirection: action.focusedDay != null && utils.isAfterDay(action.focusedDay, state.currentMonth) ? 'left' : 'right'
-        });
-      }
     default:
       throw new Error('missing support');
   }
@@ -56,16 +45,17 @@ export const useCalendarState = params => {
     referenceDate: referenceDateProp,
     disableFuture,
     disablePast,
-    disableSwitchToMonthOnDayFocus = false,
     maxDate,
     minDate,
     onMonthChange,
+    onYearChange,
     reduceAnimations,
     shouldDisableDate,
-    timezone
+    timezone,
+    getCurrentMonthFromVisibleDate
   } = params;
   const utils = useUtils();
-  const reducerFn = React.useRef(createCalendarStateReducer(Boolean(reduceAnimations), disableSwitchToMonthOnDayFocus, utils)).current;
+  const reducerFn = React.useRef(createCalendarStateReducer(Boolean(reduceAnimations), utils)).current;
   const referenceDate = React.useMemo(() => {
     return singleItemValueManager.getInitialReferenceValue({
       value,
@@ -85,6 +75,14 @@ export const useCalendarState = params => {
     currentMonth: utils.startOfMonth(referenceDate),
     slideDirection: 'left'
   });
+  const isDateDisabled = useIsDateDisabled({
+    shouldDisableDate,
+    minDate,
+    maxDate,
+    disableFuture,
+    disablePast,
+    timezone
+  });
 
   // Ensure that `calendarState.currentMonth` timezone is updated when `referenceDate` (or timezone changes)
   // https://github.com/mui/mui-x/issues/10804
@@ -94,53 +92,65 @@ export const useCalendarState = params => {
       newTimezone: utils.getTimezone(referenceDate)
     });
   }, [referenceDate, utils]);
-  const handleChangeMonth = React.useCallback(payload => {
-    dispatch(_extends({
-      type: 'changeMonth'
-    }, payload));
-    if (onMonthChange) {
-      onMonthChange(payload.newMonth);
-    }
-  }, [onMonthChange]);
-  const changeMonth = React.useCallback(newDate => {
-    const newDateRequested = newDate;
-    if (utils.isSameMonth(newDateRequested, calendarState.currentMonth)) {
+  const setVisibleDate = useEventCallback(({
+    target,
+    reason
+  }) => {
+    if (reason === 'cell-interaction' && calendarState.focusedDay != null && utils.isSameDay(target, calendarState.focusedDay)) {
       return;
     }
-    handleChangeMonth({
-      newMonth: utils.startOfMonth(newDateRequested),
-      direction: utils.isAfterDay(newDateRequested, calendarState.currentMonth) ? 'left' : 'right'
+    const skipAnimation = reason === 'cell-interaction';
+    let month;
+    let focusedDay;
+    if (reason === 'cell-interaction') {
+      month = getCurrentMonthFromVisibleDate(target, calendarState.currentMonth);
+      focusedDay = target;
+    } else {
+      month = utils.isSameMonth(target, calendarState.currentMonth) ? calendarState.currentMonth : utils.startOfMonth(target);
+      focusedDay = target;
+
+      // If the date is disabled, we try to find a non-disabled date inside the same month.
+      if (isDateDisabled(focusedDay)) {
+        const startOfMonth = utils.startOfMonth(target);
+        const endOfMonth = utils.endOfMonth(target);
+        focusedDay = findClosestEnabledDate({
+          utils,
+          date: focusedDay,
+          minDate: utils.isBefore(minDate, startOfMonth) ? startOfMonth : minDate,
+          maxDate: utils.isAfter(maxDate, endOfMonth) ? endOfMonth : maxDate,
+          disablePast,
+          disableFuture,
+          isDateDisabled,
+          timezone
+        });
+      }
+    }
+    const hasChangedMonth = !utils.isSameMonth(calendarState.currentMonth, month);
+    const hasChangedYear = !utils.isSameYear(calendarState.currentMonth, month);
+    if (hasChangedMonth) {
+      onMonthChange?.(month);
+    }
+    if (hasChangedYear) {
+      onYearChange?.(utils.startOfYear(month));
+    }
+    dispatch({
+      type: 'setVisibleDate',
+      month,
+      direction: utils.isAfterDay(month, calendarState.currentMonth) ? 'left' : 'right',
+      focusedDay: calendarState.focusedDay != null && focusedDay != null && utils.isSameDay(focusedDay, calendarState.focusedDay) ? calendarState.focusedDay : focusedDay,
+      skipAnimation
     });
-  }, [calendarState.currentMonth, handleChangeMonth, utils]);
-  const isDateDisabled = useIsDateDisabled({
-    shouldDisableDate,
-    minDate,
-    maxDate,
-    disableFuture,
-    disablePast,
-    timezone
   });
   const onMonthSwitchingAnimationEnd = React.useCallback(() => {
     dispatch({
       type: 'finishMonthSwitchingAnimation'
     });
   }, []);
-  const changeFocusedDay = useEventCallback((newFocusedDate, withoutMonthSwitchingAnimation) => {
-    if (!isDateDisabled(newFocusedDate)) {
-      dispatch({
-        type: 'changeFocusedDay',
-        focusedDay: newFocusedDate,
-        withoutMonthSwitchingAnimation
-      });
-    }
-  });
   return {
     referenceDate,
     calendarState,
-    changeMonth,
-    changeFocusedDay,
+    setVisibleDate,
     isDateDisabled,
-    onMonthSwitchingAnimationEnd,
-    handleChangeMonth
+    onMonthSwitchingAnimationEnd
   };
 };

package/modern/PickersCalendarHeader/PickersCalendarHeader.js

@@ -159,8 +159,8 @@ const PickersCalendarHeader = /*#__PURE__*/React.forwardRef(function PickersCale
       className: classes.switchViewIcon
     }),
     switchViewIconProps = _objectWithoutPropertiesLoose(_useSlotProps, _excluded2);
-  const selectNextMonth = () => onMonthChange(utils.addMonths(month, 1), 'left');
-  const selectPreviousMonth = () => onMonthChange(utils.addMonths(month, -1), 'right');
+  const selectNextMonth = () => onMonthChange(utils.addMonths(month, 1));
+  const selectPreviousMonth = () => onMonthChange(utils.addMonths(month, -1));
   const isNextMonthDisabled = useNextMonthDisabled(month, {
     disableFuture,
     maxDate,

package/modern/PickersTextField/PickersInputBase/PickersInputBase.js

@@ -112,7 +112,8 @@ const PickersInputBaseSection = styled(PickersSectionListSection, {
   letterSpacing: 'inherit',
   lineHeight: '1.4375em',
   // 23px
-  display: 'flex'
+  display: 'inline-block',
+  whiteSpace: 'nowrap'
 }));
 const PickersInputBaseSectionContent = styled(PickersSectionListSectionContent, {
   name: 'MuiPickersInputBase',

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-date-pickers v8.0.0-alpha.10
+ * @mui/x-date-pickers v8.0.0-alpha.11
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/node/DateCalendar/DateCalendar.js

@@ -103,7 +103,6 @@ const DateCalendar = exports.DateCalendar = /*#__PURE__*/React.forwardRef(functi
       disableFuture,
       disablePast,
       onChange,
-      onYearChange,
       onMonthChange,
       reduceAnimations,
       shouldDisableDate,
@@ -119,7 +118,7 @@ const DateCalendar = exports.DateCalendar = /*#__PURE__*/React.forwardRef(functi
       minDate,
       maxDate,
       disableHighlightToday,
-      focusedView: inFocusedView,
+      focusedView: focusedViewProp,
       onFocusedViewChange,
       showDaysOutsideCurrentMonth,
       fixedWeekNumber,
@@ -162,15 +161,13 @@ const DateCalendar = exports.DateCalendar = /*#__PURE__*/React.forwardRef(functi
     onChange: handleValueChange,
     onViewChange,
     autoFocus,
-    focusedView: inFocusedView,
+    focusedView: focusedViewProp,
     onFocusedViewChange
   });
   const {
     referenceDate,
     calendarState,
-    changeFocusedDay,
-    changeMonth,
-    handleChangeMonth,
+    setVisibleDate,
     isDateDisabled,
     onMonthSwitchingAnimationEnd
   } = (0, _useCalendarState.useCalendarState)({
@@ -183,7 +180,13 @@ const DateCalendar = exports.DateCalendar = /*#__PURE__*/React.forwardRef(functi
     shouldDisableDate,
     disablePast,
     disableFuture,
-    timezone
+    timezone,
+    getCurrentMonthFromVisibleDate: (visibleDate, prevMonth) => {
+      if (utils.isSameMonth(visibleDate, prevMonth)) {
+        return prevMonth;
+      }
+      return utils.startOfMonth(visibleDate);
+    }
   });
 
   // When disabled, limit the view to the selected date
@@ -200,9 +203,9 @@ const DateCalendar = exports.DateCalendar = /*#__PURE__*/React.forwardRef(functi
       view,
       currentMonth: calendarState.currentMonth,
       onViewChange: setView,
-      onMonthChange: (newMonth, direction) => handleChangeMonth({
-        newMonth,
-        direction
+      onMonthChange: month => setVisibleDate({
+        target: month,
+        reason: 'header-navigation'
       }),
       minDate: minDateWithDisabled,
       maxDate: maxDateWithDisabled,
@@ -230,12 +233,17 @@ const DateCalendar = exports.DateCalendar = /*#__PURE__*/React.forwardRef(functi
     }) : newDate;
     if (closestEnabledDate) {
       setValueAndGoToNextView(closestEnabledDate, 'finish');
-      onMonthChange?.(startOfMonth);
+      setVisibleDate({
+        target: closestEnabledDate,
+        reason: 'cell-interaction'
+      });
     } else {
       goToNextView();
-      changeMonth(startOfMonth);
+      setVisibleDate({
+        target: startOfMonth,
+        reason: 'cell-interaction'
+      });
     }
-    changeFocusedDay(closestEnabledDate, true);
   });
   const handleDateYearChange = (0, _utils.unstable_useEventCallback)(newDate => {
     const startOfYear = utils.startOfYear(newDate);
@@ -252,12 +260,17 @@ const DateCalendar = exports.DateCalendar = /*#__PURE__*/React.forwardRef(functi
     }) : newDate;
     if (closestEnabledDate) {
       setValueAndGoToNextView(closestEnabledDate, 'finish');
-      onYearChange?.(closestEnabledDate);
+      setVisibleDate({
+        target: closestEnabledDate,
+        reason: 'cell-interaction'
+      });
     } else {
       goToNextView();
-      changeMonth(startOfYear);
+      setVisibleDate({
+        target: startOfYear,
+        reason: 'cell-interaction'
+      });
     }
-    changeFocusedDay(closestEnabledDate, true);
   });
   const handleSelectedDayChange = (0, _utils.unstable_useEventCallback)(day => {
     if (day) {
@@ -268,7 +281,10 @@ const DateCalendar = exports.DateCalendar = /*#__PURE__*/React.forwardRef(functi
   });
   React.useEffect(() => {
     if (utils.isValid(value)) {
-      changeMonth(value);
+      setVisibleDate({
+        target: value,
+        reason: 'controlled-value-change'
+      });
     }
   }, [value]); // eslint-disable-line
 
@@ -335,7 +351,10 @@ const DateCalendar = exports.DateCalendar = /*#__PURE__*/React.forwardRef(functi
           referenceDate: referenceDate
         })), view === 'day' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_DayCalendar.DayCalendar, (0, _extends2.default)({}, calendarState, baseDateValidationProps, commonViewProps, {
           onMonthSwitchingAnimationEnd: onMonthSwitchingAnimationEnd,
-          onFocusedDayChange: changeFocusedDay,
+          onFocusedDayChange: focusedDate => setVisibleDate({
+            target: focusedDate,
+            reason: 'cell-interaction'
+          }),
           reduceAnimations: reduceAnimations,
           selectedDays: selectedDays,
           onSelectedDaysChange: handleSelectedDayChange,