@react-aria/calendar 3.3.0 → 3.4.1

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";
 
@@ -51,7 +51,7 @@ function $parcel$interopDefault(a) {
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */ 
-var $0fbdc3429b133a50$exports = {};
+var $3904726b442bd9b2$exports = {};
 var $39324ace0d945f59$exports = {};
 $39324ace0d945f59$exports = {
     "dateRange": (args)=>`${args.startDate} إلى ${args.endDate}`,
@@ -599,7 +599,7 @@ $82649816f530bb1b$exports = {
 var $628e140a43dfb330$exports = {};
 $628e140a43dfb330$exports = {
     "dateRange": (args)=>`${args.startDate} 至 ${args.endDate}`,
-    "dateSelected": (args)=>`已选定 ${args.date}`,
+    "dateSelected": (args)=>`已选择 ${args.date}`,
     "finishRangeSelectionPrompt": `单击以完成选择日期范围`,
     "maximumDate": `最后一个可用日期`,
     "minimumDate": `第一个可用日期`,
@@ -609,7 +609,7 @@ $628e140a43dfb330$exports = {
     "selectedRangeDescription": (args)=>`选定的范围：${args.dateRange}`,
     "startRangeSelectionPrompt": `单击以开始选择日期范围`,
     "todayDate": (args)=>`今天，即 ${args.date}`,
-    "todayDateSelected": (args)=>`已选定今天，即 ${args.date}`
+    "todayDateSelected": (args)=>`已选择今天，即 ${args.date}`
 };
 
 
@@ -630,7 +630,7 @@ $745937250cd4679c$exports = {
 };
 
 
-$0fbdc3429b133a50$exports = {
+$3904726b442bd9b2$exports = {
     "ar-AE": $39324ace0d945f59$exports,
     "bg-BG": $1830a539e98c7baf$exports,
     "cs-CZ": $f4b92528965aab97$exports,
@@ -675,7 +675,7 @@ function $a074e1e2d0f0a665$export$134cbb7fb09a9522(date) {
     return (date === null || date === void 0 ? void 0 : date.calendar.identifier) === "gregory" && date.era === "BC" ? "short" : undefined;
 }
 function $a074e1e2d0f0a665$export$b6df97c887c38e1a(state) {
-    let stringFormatter = (0, $amWdn$useLocalizedStringFormatter)((0, (/*@__PURE__*/$parcel$interopDefault($0fbdc3429b133a50$exports))));
+    let stringFormatter = (0, $amWdn$useLocalizedStringFormatter)((0, (/*@__PURE__*/$parcel$interopDefault($3904726b442bd9b2$exports))));
     let start, end;
     if ("highlightedRange" in state) ({ start: start , end: end  } = state.highlightedRange || {});
     else start = end = state.value;
@@ -716,7 +716,7 @@ function $a074e1e2d0f0a665$export$b6df97c887c38e1a(state) {
     ]);
 }
 function $a074e1e2d0f0a665$export$31afe65d91ef6e8(startDate, endDate, timeZone, isAria) {
-    let stringFormatter = (0, $amWdn$useLocalizedStringFormatter)((0, (/*@__PURE__*/$parcel$interopDefault($0fbdc3429b133a50$exports))));
+    let stringFormatter = (0, $amWdn$useLocalizedStringFormatter)((0, (/*@__PURE__*/$parcel$interopDefault($3904726b442bd9b2$exports))));
     let era = $a074e1e2d0f0a665$export$134cbb7fb09a9522(startDate) || $a074e1e2d0f0a665$export$134cbb7fb09a9522(endDate);
     let monthFormatter = (0, $amWdn$useDateFormatter)({
         month: "long",
@@ -764,9 +764,9 @@ function $a074e1e2d0f0a665$var$formatRange(dateFormatter, stringFormatter, start
     // Now we can combine the parts into start and end strings.
     let startValue = "";
     let endValue = "";
-    for(let i1 = 0; i1 < parts.length; i1++){
-        if (i1 < separatorIndex) startValue += parts[i1].value;
-        else if (i1 > separatorIndex) endValue += parts[i1].value;
+    for(let i = 0; i < parts.length; i++){
+        if (i < separatorIndex) startValue += parts[i].value;
+        else if (i > separatorIndex) endValue += parts[i].value;
     }
     return stringFormatter.format("dateRange", {
         startDate: startValue,
@@ -779,7 +779,7 @@ function $a074e1e2d0f0a665$var$formatRange(dateFormatter, stringFormatter, start
 
 
 function $c4acc1de3ab169cf$export$d652b3ea2d672d5b(props, state) {
-    let stringFormatter = (0, $amWdn$useLocalizedStringFormatter)((0, (/*@__PURE__*/$parcel$interopDefault($0fbdc3429b133a50$exports))));
+    let stringFormatter = (0, $amWdn$useLocalizedStringFormatter)((0, (/*@__PURE__*/$parcel$interopDefault($3904726b442bd9b2$exports))));
     let domProps = (0, $amWdn$filterDOMProps)(props);
     let title = (0, $a074e1e2d0f0a665$export$31afe65d91ef6e8)(state.visibleRange.start, state.visibleRange.end, state.timeZone, false);
     let visibleRangeDescription = (0, $a074e1e2d0f0a665$export$31afe65d91ef6e8)(state.visibleRange.start, state.visibleRange.end, state.timeZone, true);
@@ -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)({
@@ -832,22 +832,20 @@ function $c4acc1de3ab169cf$export$d652b3ea2d672d5b(props, state) {
     });
     return {
         calendarProps: (0, $amWdn$mergeProps)(domProps, labelProps, {
-            role: "group",
+            role: "application",
             "aria-describedby": props["aria-describedby"] || undefined
         }),
         nextButtonProps: {
             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
@@ -1061,11 +1059,10 @@ function $e3031d1f8c9d64eb$export$cb95147730a423f5(props, state) {
 
 
 
-
 function $36a0ac60f04457c5$export$136073280381448e(props, state, ref) {
     let { date: date , isDisabled: isDisabled  } = props;
     let { errorMessageId: errorMessageId , selectedDateDescription: selectedDateDescription  } = (0, $a074e1e2d0f0a665$export$653eddfc964b0f8a).get(state);
-    let stringFormatter = (0, $amWdn$useLocalizedStringFormatter)((0, (/*@__PURE__*/$parcel$interopDefault($0fbdc3429b133a50$exports))));
+    let stringFormatter = (0, $amWdn$useLocalizedStringFormatter)((0, (/*@__PURE__*/$parcel$interopDefault($3904726b442bd9b2$exports))));
     let dateFormatter = (0, $amWdn$useDateFormatter)({
         weekday: "long",
         day: "numeric",
@@ -1083,9 +1080,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 +1231,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

@@ -59,7 +59,7 @@ $parcel$export(module.exports, "useCalendarCell", () => $4d833327a32c9193$export
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */ 
-var $f87cd00fb2ba0f23$exports = {};
+var $bd6dc95a3c5ee5cd$exports = {};
 var $1fedb39dedbf7c51$exports = {};
 $1fedb39dedbf7c51$exports = {
     "dateRange": (args)=>`${args.startDate} إلى ${args.endDate}`,
@@ -607,7 +607,7 @@ $16bef71241a84fd2$exports = {
 var $c80940728ad8dc0d$exports = {};
 $c80940728ad8dc0d$exports = {
     "dateRange": (args)=>`${args.startDate} 至 ${args.endDate}`,
-    "dateSelected": (args)=>`已选定 ${args.date}`,
+    "dateSelected": (args)=>`已选择 ${args.date}`,
     "finishRangeSelectionPrompt": `单击以完成选择日期范围`,
     "maximumDate": `最后一个可用日期`,
     "minimumDate": `第一个可用日期`,
@@ -617,7 +617,7 @@ $c80940728ad8dc0d$exports = {
     "selectedRangeDescription": (args)=>`选定的范围：${args.dateRange}`,
     "startRangeSelectionPrompt": `单击以开始选择日期范围`,
     "todayDate": (args)=>`今天，即 ${args.date}`,
-    "todayDateSelected": (args)=>`已选定今天，即 ${args.date}`
+    "todayDateSelected": (args)=>`已选择今天，即 ${args.date}`
 };
 
 
@@ -638,7 +638,7 @@ $ec192a5a83cfafeb$exports = {
 };
 
 
-$f87cd00fb2ba0f23$exports = {
+$bd6dc95a3c5ee5cd$exports = {
     "ar-AE": $1fedb39dedbf7c51$exports,
     "bg-BG": $524ada6153e36bf5$exports,
     "cs-CZ": $181053d31fc585a6$exports,
@@ -683,7 +683,7 @@ function $df1d8e967e73ec8e$export$134cbb7fb09a9522(date) {
     return (date === null || date === void 0 ? void 0 : date.calendar.identifier) === "gregory" && date.era === "BC" ? "short" : undefined;
 }
 function $df1d8e967e73ec8e$export$b6df97c887c38e1a(state) {
-    let stringFormatter = (0, $jzHdg$reactariai18n.useLocalizedStringFormatter)((0, (/*@__PURE__*/$parcel$interopDefault($f87cd00fb2ba0f23$exports))));
+    let stringFormatter = (0, $jzHdg$reactariai18n.useLocalizedStringFormatter)((0, (/*@__PURE__*/$parcel$interopDefault($bd6dc95a3c5ee5cd$exports))));
     let start, end;
     if ("highlightedRange" in state) ({ start: start , end: end  } = state.highlightedRange || {});
     else start = end = state.value;
@@ -724,7 +724,7 @@ function $df1d8e967e73ec8e$export$b6df97c887c38e1a(state) {
     ]);
 }
 function $df1d8e967e73ec8e$export$31afe65d91ef6e8(startDate, endDate, timeZone, isAria) {
-    let stringFormatter = (0, $jzHdg$reactariai18n.useLocalizedStringFormatter)((0, (/*@__PURE__*/$parcel$interopDefault($f87cd00fb2ba0f23$exports))));
+    let stringFormatter = (0, $jzHdg$reactariai18n.useLocalizedStringFormatter)((0, (/*@__PURE__*/$parcel$interopDefault($bd6dc95a3c5ee5cd$exports))));
     let era = $df1d8e967e73ec8e$export$134cbb7fb09a9522(startDate) || $df1d8e967e73ec8e$export$134cbb7fb09a9522(endDate);
     let monthFormatter = (0, $jzHdg$reactariai18n.useDateFormatter)({
         month: "long",
@@ -772,9 +772,9 @@ function $df1d8e967e73ec8e$var$formatRange(dateFormatter, stringFormatter, start
     // Now we can combine the parts into start and end strings.
     let startValue = "";
     let endValue = "";
-    for(let i1 = 0; i1 < parts.length; i1++){
-        if (i1 < separatorIndex) startValue += parts[i1].value;
-        else if (i1 > separatorIndex) endValue += parts[i1].value;
+    for(let i = 0; i < parts.length; i++){
+        if (i < separatorIndex) startValue += parts[i].value;
+        else if (i > separatorIndex) endValue += parts[i].value;
     }
     return stringFormatter.format("dateRange", {
         startDate: startValue,
@@ -787,7 +787,7 @@ function $df1d8e967e73ec8e$var$formatRange(dateFormatter, stringFormatter, start
 
 
 function $02ef492a56b91cb2$export$d652b3ea2d672d5b(props, state) {
-    let stringFormatter = (0, $jzHdg$reactariai18n.useLocalizedStringFormatter)((0, (/*@__PURE__*/$parcel$interopDefault($f87cd00fb2ba0f23$exports))));
+    let stringFormatter = (0, $jzHdg$reactariai18n.useLocalizedStringFormatter)((0, (/*@__PURE__*/$parcel$interopDefault($bd6dc95a3c5ee5cd$exports))));
     let domProps = (0, $jzHdg$reactariautils.filterDOMProps)(props);
     let title = (0, $df1d8e967e73ec8e$export$31afe65d91ef6e8)(state.visibleRange.start, state.visibleRange.end, state.timeZone, false);
     let visibleRangeDescription = (0, $df1d8e967e73ec8e$export$31afe65d91ef6e8)(state.visibleRange.start, state.visibleRange.end, state.timeZone, true);
@@ -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)({
@@ -840,22 +840,20 @@ function $02ef492a56b91cb2$export$d652b3ea2d672d5b(props, state) {
     });
     return {
         calendarProps: (0, $jzHdg$reactariautils.mergeProps)(domProps, labelProps, {
-            role: "group",
+            role: "application",
             "aria-describedby": props["aria-describedby"] || undefined
         }),
         nextButtonProps: {
             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
@@ -1069,11 +1067,10 @@ function $a07388a797d86b95$export$cb95147730a423f5(props, state) {
 
 
 
-
 function $4d833327a32c9193$export$136073280381448e(props, state, ref) {
     let { date: date , isDisabled: isDisabled  } = props;
     let { errorMessageId: errorMessageId , selectedDateDescription: selectedDateDescription  } = (0, $df1d8e967e73ec8e$export$653eddfc964b0f8a).get(state);
-    let stringFormatter = (0, $jzHdg$reactariai18n.useLocalizedStringFormatter)((0, (/*@__PURE__*/$parcel$interopDefault($f87cd00fb2ba0f23$exports))));
+    let stringFormatter = (0, $jzHdg$reactariai18n.useLocalizedStringFormatter)((0, (/*@__PURE__*/$parcel$interopDefault($bd6dc95a3c5ee5cd$exports))));
     let dateFormatter = (0, $jzHdg$reactariai18n.useDateFormatter)({
         weekday: "long",
         day: "numeric",
@@ -1091,9 +1088,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 +1239,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)
             });
         }