@react-aria/interactions 3.13.1 → 3.14.0

package/package.json

@@ -1,10 +1,15 @@
 {
   "name": "@react-aria/interactions",
-  "version": "3.13.1",
+  "version": "3.14.0",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "dist/main.js",
   "module": "dist/module.js",
+  "exports": {
+    "types": "./dist/types.d.ts",
+    "import": "./dist/import.mjs",
+    "require": "./dist/main.js"
+  },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
   "files": [
@@ -17,8 +22,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/utils": "^3.14.2",
-    "@react-types/shared": "^3.16.0",
+    "@react-aria/utils": "^3.15.0",
+    "@react-types/shared": "^3.17.0",
     "@swc/helpers": "^0.4.14"
   },
   "peerDependencies": {
@@ -27,5 +32,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5480d76bd815e239366f92852c76b6831ad2a4fd"
+  "gitHead": "a0efee84aa178cb1a202951dfd6d8de02b292307"
 }

package/src/useFocus.ts

@@ -75,7 +75,7 @@ export function useFocus(props: FocusProps): FocusResult {
   return {
     focusProps: {
       onFocus: (!isDisabled && (onFocusProp || onFocusChange || onBlurProp)) ? onFocus : undefined,
-      onBlur: (!isDisabled && (onBlurProp || onFocusChange)) ? onBlur : null
+      onBlur: (!isDisabled && (onBlurProp || onFocusChange)) ? onBlur : undefined
     }
   };
 }

package/src/useInteractOutside.ts

@@ -59,9 +59,9 @@ export function useInteractOutside(props: InteractOutsideProps) {
     if (typeof PointerEvent !== 'undefined') {
       let onPointerUp = (e) => {
         if (state.isPointerDown && state.onInteractOutside && isValidEvent(e, ref)) {
-          state.isPointerDown = false;
           state.onInteractOutside(e);
         }
+        state.isPointerDown = false;
       };
 
       // changing these to capture phase fixed combobox
@@ -77,17 +77,17 @@ export function useInteractOutside(props: InteractOutsideProps) {
         if (state.ignoreEmulatedMouseEvents) {
           state.ignoreEmulatedMouseEvents = false;
         } else if (state.isPointerDown && state.onInteractOutside && isValidEvent(e, ref)) {
-          state.isPointerDown = false;
           state.onInteractOutside(e);
         }
+        state.isPointerDown = false;
       };
 
       let onTouchEnd = (e) => {
         state.ignoreEmulatedMouseEvents = true;
         if (state.onInteractOutside && state.isPointerDown && isValidEvent(e, ref)) {
-          state.isPointerDown = false;
           state.onInteractOutside(e);
         }
+        state.isPointerDown = false;
       };
 
       document.addEventListener('mousedown', onPointerDown, true);
@@ -110,12 +110,17 @@ function isValidEvent(event, ref) {
     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);