@react-aria/calendar 3.0.0-nightly.2238 → 3.0.0-nightly.2258

package/dist/import.mjs

@@ -1,7 +1,7 @@
 import {announce as $amWdn$announce} from "@react-aria/live-announcer";
-import {filterDOMProps as $amWdn$filterDOMProps, useUpdateEffect as $amWdn$useUpdateEffect, useSlotId as $amWdn$useSlotId, useLabels as $amWdn$useLabels, mergeProps as $amWdn$mergeProps, useEvent as $amWdn$useEvent, useDescription as $amWdn$useDescription, focusWithoutScrolling as $amWdn$focusWithoutScrolling, scrollIntoViewport as $amWdn$scrollIntoViewport, getScrollParent as $amWdn$getScrollParent} from "@react-aria/utils";
+import {filterDOMProps as $amWdn$filterDOMProps, useUpdateEffect as $amWdn$useUpdateEffect, useSlotId as $amWdn$useSlotId, useLabels as $amWdn$useLabels, mergeProps as $amWdn$mergeProps, useEvent as $amWdn$useEvent, useDeepMemo as $amWdn$useDeepMemo, useDescription as $amWdn$useDescription, focusWithoutScrolling as $amWdn$focusWithoutScrolling, scrollIntoViewport as $amWdn$scrollIntoViewport, getScrollParent as $amWdn$getScrollParent} from "@react-aria/utils";
 import {useLocalizedStringFormatter as $amWdn$useLocalizedStringFormatter, useDateFormatter as $amWdn$useDateFormatter, useLocale as $amWdn$useLocale} from "@react-aria/i18n";
-import {useRef as $amWdn$useRef, useMemo as $amWdn$useMemo, useEffect as $amWdn$useEffect} from "react";
+import {useState as $amWdn$useState, useMemo as $amWdn$useMemo, useRef as $amWdn$useRef, useEffect as $amWdn$useEffect} from "react";
 import {isSameDay as $amWdn$isSameDay, startOfMonth as $amWdn$startOfMonth, endOfMonth as $amWdn$endOfMonth, startOfWeek as $amWdn$startOfWeek, today as $amWdn$today, isEqualDay as $amWdn$isEqualDay, isToday as $amWdn$isToday} from "@internationalized/date";
 import {usePress as $amWdn$usePress, getInteractionModality as $amWdn$getInteractionModality} from "@react-aria/interactions";
 
@@ -810,16 +810,16 @@ function $c4acc1de3ab169cf$export$d652b3ea2d672d5b(props, state) {
         selectedDateDescription: selectedDateDescription
     });
     // If the next or previous buttons become disabled while they are focused, move focus to the calendar body.
-    let nextFocused = (0, $amWdn$useRef)(false);
+    let [nextFocused, setNextFocused] = (0, $amWdn$useState)(false);
     let nextDisabled = props.isDisabled || state.isNextVisibleRangeInvalid();
-    if (nextDisabled && nextFocused.current) {
-        nextFocused.current = false;
+    if (nextDisabled && nextFocused) {
+        setNextFocused(false);
         state.setFocused(true);
     }
-    let previousFocused = (0, $amWdn$useRef)(false);
+    let [previousFocused, setPreviousFocused] = (0, $amWdn$useState)(false);
     let previousDisabled = props.isDisabled || state.isPreviousVisibleRangeInvalid();
-    if (previousDisabled && previousFocused.current) {
-        previousFocused.current = false;
+    if (previousDisabled && previousFocused) {
+        setPreviousFocused(false);
         state.setFocused(true);
     }
     let labelProps = (0, $amWdn$useLabels)({
@@ -839,15 +839,13 @@ function $c4acc1de3ab169cf$export$d652b3ea2d672d5b(props, state) {
             onPress: ()=>state.focusNextPage(),
             "aria-label": stringFormatter.format("next"),
             isDisabled: nextDisabled,
-            onFocus: ()=>nextFocused.current = true,
-            onBlur: ()=>nextFocused.current = false
+            onFocusChange: setNextFocused
         },
         prevButtonProps: {
             onPress: ()=>state.focusPreviousPage(),
             "aria-label": stringFormatter.format("previous"),
             isDisabled: previousDisabled,
-            onFocus: ()=>previousFocused.current = true,
-            onBlur: ()=>previousFocused.current = false
+            onFocusChange: setPreviousFocused
         },
         errorMessageProps: {
             id: errorMessageId
@@ -1083,9 +1081,7 @@ function $36a0ac60f04457c5$export$136073280381448e(props, state, ref) {
     if (isInvalid) isSelected = true;
     // For performance, reuse the same date object as before if the new date prop is the same.
     // This allows subsequent useMemo results to be reused.
-    let lastDate = (0, $amWdn$useRef)(null);
-    if (lastDate.current && (0, $amWdn$isEqualDay)(date, lastDate.current)) date = lastDate.current;
-    lastDate.current = date;
+    date = (0, $amWdn$useDeepMemo)(date, (0, $amWdn$isEqualDay));
     let nativeDate = (0, $amWdn$useMemo)(()=>date.toDate(state.timeZone), [
         date,
         state.timeZone
@@ -1236,8 +1232,11 @@ function $36a0ac60f04457c5$export$136073280381448e(props, state, ref) {
             // Scroll into view if navigating with a keyboard, otherwise
             // try not to shift the view under the user's mouse/finger.
             // If in a overlay, scrollIntoViewport will only cause scrolling
-            // up to the overlay scroll body to prevent overlay shifting
-            if ((0, $amWdn$getInteractionModality)() !== "pointer") (0, $amWdn$scrollIntoViewport)(ref.current, {
+            // up to the overlay scroll body to prevent overlay shifting.
+            // Also only scroll into view if the cell actually got focused.
+            // There are some cases where the cell might be disabled or inside,
+            // an inert container and we don't want to scroll then.
+            if ((0, $amWdn$getInteractionModality)() !== "pointer" && document.activeElement === ref.current) (0, $amWdn$scrollIntoViewport)(ref.current, {
                 containingElement: (0, $amWdn$getScrollParent)(ref.current)
             });
         }

package/dist/main.js

@@ -818,16 +818,16 @@ function $02ef492a56b91cb2$export$d652b3ea2d672d5b(props, state) {
         selectedDateDescription: selectedDateDescription
     });
     // If the next or previous buttons become disabled while they are focused, move focus to the calendar body.
-    let nextFocused = (0, $jzHdg$react.useRef)(false);
+    let [nextFocused, setNextFocused] = (0, $jzHdg$react.useState)(false);
     let nextDisabled = props.isDisabled || state.isNextVisibleRangeInvalid();
-    if (nextDisabled && nextFocused.current) {
-        nextFocused.current = false;
+    if (nextDisabled && nextFocused) {
+        setNextFocused(false);
         state.setFocused(true);
     }
-    let previousFocused = (0, $jzHdg$react.useRef)(false);
+    let [previousFocused, setPreviousFocused] = (0, $jzHdg$react.useState)(false);
     let previousDisabled = props.isDisabled || state.isPreviousVisibleRangeInvalid();
-    if (previousDisabled && previousFocused.current) {
-        previousFocused.current = false;
+    if (previousDisabled && previousFocused) {
+        setPreviousFocused(false);
         state.setFocused(true);
     }
     let labelProps = (0, $jzHdg$reactariautils.useLabels)({
@@ -847,15 +847,13 @@ function $02ef492a56b91cb2$export$d652b3ea2d672d5b(props, state) {
             onPress: ()=>state.focusNextPage(),
             "aria-label": stringFormatter.format("next"),
             isDisabled: nextDisabled,
-            onFocus: ()=>nextFocused.current = true,
-            onBlur: ()=>nextFocused.current = false
+            onFocusChange: setNextFocused
         },
         prevButtonProps: {
             onPress: ()=>state.focusPreviousPage(),
             "aria-label": stringFormatter.format("previous"),
             isDisabled: previousDisabled,
-            onFocus: ()=>previousFocused.current = true,
-            onBlur: ()=>previousFocused.current = false
+            onFocusChange: setPreviousFocused
         },
         errorMessageProps: {
             id: errorMessageId
@@ -1091,9 +1089,7 @@ function $4d833327a32c9193$export$136073280381448e(props, state, ref) {
     if (isInvalid) isSelected = true;
     // For performance, reuse the same date object as before if the new date prop is the same.
     // This allows subsequent useMemo results to be reused.
-    let lastDate = (0, $jzHdg$react.useRef)(null);
-    if (lastDate.current && (0, $jzHdg$internationalizeddate.isEqualDay)(date, lastDate.current)) date = lastDate.current;
-    lastDate.current = date;
+    date = (0, $jzHdg$reactariautils.useDeepMemo)(date, (0, $jzHdg$internationalizeddate.isEqualDay));
     let nativeDate = (0, $jzHdg$react.useMemo)(()=>date.toDate(state.timeZone), [
         date,
         state.timeZone
@@ -1244,8 +1240,11 @@ function $4d833327a32c9193$export$136073280381448e(props, state, ref) {
             // Scroll into view if navigating with a keyboard, otherwise
             // try not to shift the view under the user's mouse/finger.
             // If in a overlay, scrollIntoViewport will only cause scrolling
-            // up to the overlay scroll body to prevent overlay shifting
-            if ((0, $jzHdg$reactariainteractions.getInteractionModality)() !== "pointer") (0, $jzHdg$reactariautils.scrollIntoViewport)(ref.current, {
+            // up to the overlay scroll body to prevent overlay shifting.
+            // Also only scroll into view if the cell actually got focused.
+            // There are some cases where the cell might be disabled or inside,
+            // an inert container and we don't want to scroll then.
+            if ((0, $jzHdg$reactariainteractions.getInteractionModality)() !== "pointer" && document.activeElement === ref.current) (0, $jzHdg$reactariautils.scrollIntoViewport)(ref.current, {
                 containingElement: (0, $jzHdg$reactariautils.getScrollParent)(ref.current)
             });
         }