@react-aria/interactions 3.13.1 → 3.15.0

package/dist/module.js

@@ -1,5 +1,6 @@
 import {mergeProps as $bx7SL$mergeProps, useSyncRef as $bx7SL$useSyncRef, useGlobalListeners as $bx7SL$useGlobalListeners, isVirtualClick as $bx7SL$isVirtualClick, focusWithoutScrolling as $bx7SL$focusWithoutScrolling, isVirtualPointerEvent as $bx7SL$isVirtualPointerEvent, isIOS as $bx7SL$isIOS, runAfterTransition as $bx7SL$runAfterTransition, useLayoutEffect as $bx7SL$useLayoutEffect, isMac as $bx7SL$isMac, useEvent as $bx7SL$useEvent, useDescription as $bx7SL$useDescription} from "@react-aria/utils";
 import $bx7SL$react, {useRef as $bx7SL$useRef, useContext as $bx7SL$useContext, useState as $bx7SL$useState, useMemo as $bx7SL$useMemo, useEffect as $bx7SL$useEffect, useCallback as $bx7SL$useCallback} from "react";
+import {useIsSSR as $bx7SL$useIsSSR} from "@react-aria/ssr";
 
 /*
  * Copyright 2020 Adobe. All rights reserved.
@@ -770,7 +771,9 @@ function $a1ea59d68270f0dd$export$f8168d8dd8fd66e6(props) {
     ]);
     const onSyntheticFocus = (0, $8a9cb279dc87e130$export$715c682d09d639cc)(onBlur);
     const onFocus = (0, $bx7SL$useCallback)((e)=>{
-        if (e.target === e.currentTarget) {
+        // Double check that document.activeElement actually matches e.target in case a previously chained
+        // focus handler already moved focus somewhere else.
+        if (e.target === e.currentTarget && document.activeElement === e.target) {
             if (onFocusProp) onFocusProp(e);
             if (onFocusChange) onFocusChange(true);
             onSyntheticFocus(e);
@@ -783,7 +786,7 @@ function $a1ea59d68270f0dd$export$f8168d8dd8fd66e6(props) {
     return {
         focusProps: {
             onFocus: !isDisabled && (onFocusProp || onFocusChange || onBlurProp) ? onFocus : undefined,
-            onBlur: !isDisabled && (onBlurProp || onFocusChange) ? onBlur : null
+            onBlur: !isDisabled && (onBlurProp || onFocusChange) ? onBlur : undefined
         }
     };
 }
@@ -805,6 +808,7 @@ function $a1ea59d68270f0dd$export$f8168d8dd8fd66e6(props) {
 // See https://github.com/facebook/react/tree/cc7c1aece46a6b69b41958d731e0fd27c94bfc6c/packages/react-interactions
 
 
+
 let $507fabe10e71c6fb$var$currentModality = null;
 let $507fabe10e71c6fb$var$changeHandlers = new Set();
 let $507fabe10e71c6fb$var$hasSetupGlobalListeners = false;
@@ -921,7 +925,7 @@ function $507fabe10e71c6fb$export$98e20ec92f614cfe() {
             $507fabe10e71c6fb$var$changeHandlers.delete(handler);
         };
     }, []);
-    return modality;
+    return (0, $bx7SL$useIsSSR)() ? null : modality;
 }
 /**
  * If this is attached to text input component, return if the event is a focus event (Tab/Escape keys pressed) so that
@@ -996,7 +1000,9 @@ function $9ab94262bd0047c7$export$420e68273165f4ec(props) {
     ]);
     let onSyntheticFocus = (0, $8a9cb279dc87e130$export$715c682d09d639cc)(onBlur);
     let onFocus = (0, $bx7SL$useCallback)((e)=>{
-        if (!state.current.isFocusWithin) {
+        // Double check that document.activeElement actually matches e.target in case a previously chained
+        // focus handler already moved focus somewhere else.
+        if (!state.current.isFocusWithin && document.activeElement === e.target) {
             if (onFocusWithin) onFocusWithin(e);
             if (onFocusWithinChange) onFocusWithinChange(true);
             state.current.isFocusWithin = true;
@@ -1192,10 +1198,8 @@ function $e0b6e0b68ec7f50f$export$872b660ac5a1ff98(props) {
         // Use pointer events if available. Otherwise, fall back to mouse and touch events.
         if (typeof PointerEvent !== "undefined") {
             let onPointerUp = (e)=>{
-                if (state.isPointerDown && state.onInteractOutside && $e0b6e0b68ec7f50f$var$isValidEvent(e, ref)) {
-                    state.isPointerDown = false;
-                    state.onInteractOutside(e);
-                }
+                if (state.isPointerDown && state.onInteractOutside && $e0b6e0b68ec7f50f$var$isValidEvent(e, ref)) state.onInteractOutside(e);
+                state.isPointerDown = false;
             };
             // changing these to capture phase fixed combobox
             document.addEventListener("pointerdown", onPointerDown, true);
@@ -1207,17 +1211,13 @@ function $e0b6e0b68ec7f50f$export$872b660ac5a1ff98(props) {
         } else {
             let onMouseUp = (e)=>{
                 if (state.ignoreEmulatedMouseEvents) state.ignoreEmulatedMouseEvents = false;
-                else if (state.isPointerDown && state.onInteractOutside && $e0b6e0b68ec7f50f$var$isValidEvent(e, ref)) {
-                    state.isPointerDown = false;
-                    state.onInteractOutside(e);
-                }
+                else if (state.isPointerDown && state.onInteractOutside && $e0b6e0b68ec7f50f$var$isValidEvent(e, ref)) state.onInteractOutside(e);
+                state.isPointerDown = false;
             };
             let onTouchEnd = (e)=>{
                 state.ignoreEmulatedMouseEvents = true;
-                if (state.onInteractOutside && state.isPointerDown && $e0b6e0b68ec7f50f$var$isValidEvent(e, ref)) {
-                    state.isPointerDown = false;
-                    state.onInteractOutside(e);
-                }
+                if (state.onInteractOutside && state.isPointerDown && $e0b6e0b68ec7f50f$var$isValidEvent(e, ref)) state.onInteractOutside(e);
+                state.isPointerDown = false;
             };
             document.addEventListener("mousedown", onPointerDown, true);
             document.addEventListener("mouseup", onMouseUp, true);
@@ -1238,10 +1238,12 @@ function $e0b6e0b68ec7f50f$export$872b660ac5a1ff98(props) {
 }
 function $e0b6e0b68ec7f50f$var$isValidEvent(event, ref) {
     if (event.button > 0) return false;
-    // if the event target is no longer in the document
     if (event.target) {
+        // if the event target is no longer in the document, ignore
         const ownerDocument = event.target.ownerDocument;
         if (!ownerDocument || !ownerDocument.documentElement.contains(event.target)) return false;
+        // If the target is within a top layer element (e.g. toasts), ignore.
+        if (event.target.closest("[data-react-aria-top-layer]")) return false;
     }
     return ref.current && !ref.current.contains(event.target);
 }