@react-aria/interactions 3.16.0 → 3.17.0

package/dist/module.js

@@ -1,5 +1,8 @@
 import {mergeProps as $bx7SL$mergeProps, useSyncRef as $bx7SL$useSyncRef, useGlobalListeners as $bx7SL$useGlobalListeners, useEffectEvent as $bx7SL$useEffectEvent, 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 {_ as $bx7SL$_} from "@swc/helpers/_/_class_private_field_get";
+import {_ as $bx7SL$_1} from "@swc/helpers/_/_class_private_field_init";
+import {_ as $bx7SL$_2} from "@swc/helpers/_/_class_private_field_set";
 import {useIsSSR as $bx7SL$useIsSSR} from "@react-aria/ssr";
 
 /*
@@ -37,6 +40,9 @@ import {useIsSSR as $bx7SL$useIsSSR} from "@react-aria/ssr";
 // Original licensing for the following can be found in the
 // NOTICE file in the root directory of this source tree.
 // See https://github.com/facebook/react/tree/cc7c1aece46a6b69b41958d731e0fd27c94bfc6c/packages/react-interactions
+
+
+
 /*
  * Copyright 2020 Adobe. All rights reserved.
  * This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -128,6 +134,29 @@ function $f6c31cce2adf654f$var$usePressResponderContext(props) {
     (0, $bx7SL$useSyncRef)(context, props.ref);
     return props;
 }
+var $f6c31cce2adf654f$var$_shouldStopPropagation = /*#__PURE__*/ new WeakMap();
+class $f6c31cce2adf654f$var$PressEvent {
+    continuePropagation() {
+        (0, $bx7SL$_2)(this, $f6c31cce2adf654f$var$_shouldStopPropagation, false);
+    }
+    get shouldStopPropagation() {
+        return (0, $bx7SL$_)(this, $f6c31cce2adf654f$var$_shouldStopPropagation);
+    }
+    constructor(type, pointerType, originalEvent){
+        (0, $bx7SL$_1)(this, $f6c31cce2adf654f$var$_shouldStopPropagation, {
+            writable: true,
+            value: void 0
+        });
+        (0, $bx7SL$_2)(this, $f6c31cce2adf654f$var$_shouldStopPropagation, true);
+        this.type = type;
+        this.pointerType = pointerType;
+        this.target = originalEvent.currentTarget;
+        this.shiftKey = originalEvent.shiftKey;
+        this.metaKey = originalEvent.metaKey;
+        this.ctrlKey = originalEvent.ctrlKey;
+        this.altKey = originalEvent.altKey;
+    }
+}
 function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
     let { onPress: onPress , onPressChange: onPressChange , onPressStart: onPressStart , onPressEnd: onPressEnd , onPressUp: onPressUp , isDisabled: isDisabled , isPressed: isPressedProp , preventFocusOnPress: preventFocusOnPress , shouldCancelOnPointerExit: shouldCancelOnPointerExit , allowTextSelectionOnPress: allowTextSelectionOnPress , // eslint-disable-next-line @typescript-eslint/no-unused-vars
     ref: _ , ...domProps } = $f6c31cce2adf654f$var$usePressResponderContext(props);
@@ -146,56 +175,45 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
     let triggerPressStart = (0, $bx7SL$useEffectEvent)((originalEvent, pointerType)=>{
         let state = ref.current;
         if (isDisabled || state.didFirePressStart) return;
-        if (onPressStart) onPressStart({
-            type: "pressstart",
-            pointerType: pointerType,
-            target: originalEvent.currentTarget,
-            shiftKey: originalEvent.shiftKey,
-            metaKey: originalEvent.metaKey,
-            ctrlKey: originalEvent.ctrlKey,
-            altKey: originalEvent.altKey
-        });
+        let shouldStopPropagation = true;
+        if (onPressStart) {
+            let event = new $f6c31cce2adf654f$var$PressEvent("pressstart", pointerType, originalEvent);
+            onPressStart(event);
+            shouldStopPropagation = event.shouldStopPropagation;
+        }
         if (onPressChange) onPressChange(true);
         state.didFirePressStart = true;
         setPressed(true);
+        return shouldStopPropagation;
     });
     let triggerPressEnd = (0, $bx7SL$useEffectEvent)((originalEvent, pointerType, wasPressed = true)=>{
         let state = ref.current;
         if (!state.didFirePressStart) return;
         state.ignoreClickAfterPress = true;
         state.didFirePressStart = false;
-        if (onPressEnd) onPressEnd({
-            type: "pressend",
-            pointerType: pointerType,
-            target: originalEvent.currentTarget,
-            shiftKey: originalEvent.shiftKey,
-            metaKey: originalEvent.metaKey,
-            ctrlKey: originalEvent.ctrlKey,
-            altKey: originalEvent.altKey
-        });
+        let shouldStopPropagation = true;
+        if (onPressEnd) {
+            let event = new $f6c31cce2adf654f$var$PressEvent("pressend", pointerType, originalEvent);
+            onPressEnd(event);
+            shouldStopPropagation = event.shouldStopPropagation;
+        }
         if (onPressChange) onPressChange(false);
         setPressed(false);
-        if (onPress && wasPressed && !isDisabled) onPress({
-            type: "press",
-            pointerType: pointerType,
-            target: originalEvent.currentTarget,
-            shiftKey: originalEvent.shiftKey,
-            metaKey: originalEvent.metaKey,
-            ctrlKey: originalEvent.ctrlKey,
-            altKey: originalEvent.altKey
-        });
+        if (onPress && wasPressed && !isDisabled) {
+            let event = new $f6c31cce2adf654f$var$PressEvent("press", pointerType, originalEvent);
+            onPress(event);
+            shouldStopPropagation && (shouldStopPropagation = event.shouldStopPropagation);
+        }
+        return shouldStopPropagation;
     });
     let triggerPressUp = (0, $bx7SL$useEffectEvent)((originalEvent, pointerType)=>{
         if (isDisabled) return;
-        if (onPressUp) onPressUp({
-            type: "pressup",
-            pointerType: pointerType,
-            target: originalEvent.currentTarget,
-            shiftKey: originalEvent.shiftKey,
-            metaKey: originalEvent.metaKey,
-            ctrlKey: originalEvent.ctrlKey,
-            altKey: originalEvent.altKey
-        });
+        if (onPressUp) {
+            let event = new $f6c31cce2adf654f$var$PressEvent("pressup", pointerType, originalEvent);
+            onPressUp(event);
+            return event.shouldStopPropagation;
+        }
+        return true;
     });
     let cancel = (0, $bx7SL$useEffectEvent)((e)=>{
         let state = ref.current;
@@ -218,18 +236,19 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
             onKeyDown (e) {
                 if ($f6c31cce2adf654f$var$isValidKeyboardEvent(e.nativeEvent, e.currentTarget) && e.currentTarget.contains(e.target)) {
                     if ($f6c31cce2adf654f$var$shouldPreventDefaultKeyboard(e.target, e.key)) e.preventDefault();
-                    e.stopPropagation();
                     // If the event is repeating, it may have started on a different element
                     // after which focus moved to the current element. Ignore these events and
                     // only handle the first key down event.
+                    let shouldStopPropagation = true;
                     if (!state.isPressed && !e.repeat) {
                         state.target = e.currentTarget;
                         state.isPressed = true;
-                        triggerPressStart(e, "keyboard");
+                        shouldStopPropagation = triggerPressStart(e, "keyboard");
                         // Focus may move before the key up event, so register the event on the document
                         // instead of the same element where the key down event occurred.
                         addGlobalListener(document, "keyup", onKeyUp, false);
                     }
+                    if (shouldStopPropagation) e.stopPropagation();
                 } else if (e.key === "Enter" && $f6c31cce2adf654f$var$isHTMLAnchorLink(e.currentTarget)) // If the target is a link, we won't have handled this above because we want the default
                 // browser behavior to open the link when pressing Enter. But we still need to prevent
                 // default so that elements above do not also handle it (e.g. table row).
@@ -241,30 +260,32 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
             onClick (e) {
                 if (e && !e.currentTarget.contains(e.target)) return;
                 if (e && e.button === 0) {
-                    e.stopPropagation();
+                    let shouldStopPropagation = true;
                     if (isDisabled) e.preventDefault();
                     // If triggered from a screen reader or by using element.click(),
                     // trigger as if it were a keyboard click.
                     if (!state.ignoreClickAfterPress && !state.ignoreEmulatedMouseEvents && (state.pointerType === "virtual" || (0, $bx7SL$isVirtualClick)(e.nativeEvent))) {
                         // Ensure the element receives focus (VoiceOver on iOS does not do this)
                         if (!isDisabled && !preventFocusOnPress) (0, $bx7SL$focusWithoutScrolling)(e.currentTarget);
-                        triggerPressStart(e, "virtual");
-                        triggerPressUp(e, "virtual");
-                        triggerPressEnd(e, "virtual");
+                        let stopPressStart = triggerPressStart(e, "virtual");
+                        let stopPressUp = triggerPressUp(e, "virtual");
+                        let stopPressEnd = triggerPressEnd(e, "virtual");
+                        shouldStopPropagation = stopPressStart && stopPressUp && stopPressEnd;
                     }
                     state.ignoreEmulatedMouseEvents = false;
                     state.ignoreClickAfterPress = false;
+                    if (shouldStopPropagation) e.stopPropagation();
                 }
             }
         };
         let onKeyUp = (e)=>{
             if (state.isPressed && $f6c31cce2adf654f$var$isValidKeyboardEvent(e, state.target)) {
                 if ($f6c31cce2adf654f$var$shouldPreventDefaultKeyboard(e.target, e.key)) e.preventDefault();
-                e.stopPropagation();
                 state.isPressed = false;
                 let target = e.target;
-                triggerPressEnd($f6c31cce2adf654f$var$createEvent(state.target, e), "keyboard", state.target.contains(target));
+                let shouldStopPropagation = triggerPressEnd($f6c31cce2adf654f$var$createEvent(state.target, e), "keyboard", state.target.contains(target));
                 removeAllGlobalListeners();
+                if (shouldStopPropagation) e.stopPropagation();
                 // If the target is a link, trigger the click method to open the URL,
                 // but defer triggering pressEnd until onClick event handler.
                 if (state.target instanceof HTMLElement && state.target.contains(target) && ($f6c31cce2adf654f$var$isHTMLAnchorLink(state.target) || state.target.getAttribute("role") === "link")) state.target.click();
@@ -286,7 +307,7 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                 // default on pointer down and handle focusing the pressable element ourselves.
                 if ($f6c31cce2adf654f$var$shouldPreventDefault(e.currentTarget)) e.preventDefault();
                 state.pointerType = e.pointerType;
-                e.stopPropagation();
+                let shouldStopPropagation = true;
                 if (!state.isPressed) {
                     state.isPressed = true;
                     state.isOverTarget = true;
@@ -294,11 +315,12 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                     state.target = e.currentTarget;
                     if (!isDisabled && !preventFocusOnPress) (0, $bx7SL$focusWithoutScrolling)(e.currentTarget);
                     if (!allowTextSelectionOnPress) (0, $14c0b72509d70225$export$16a4697467175487)(state.target);
-                    triggerPressStart(e, state.pointerType);
+                    shouldStopPropagation = triggerPressStart(e, state.pointerType);
                     addGlobalListener(document, "pointermove", onPointerMove, false);
                     addGlobalListener(document, "pointerup", onPointerUp, false);
                     addGlobalListener(document, "pointercancel", onPointerCancel, false);
                 }
+                if (shouldStopPropagation) e.stopPropagation();
             };
             pressProps.onMouseDown = (e)=>{
                 if (!e.currentTarget.contains(e.target)) return;
@@ -361,32 +383,37 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                 // Due to browser inconsistencies, especially on mobile browsers, we prevent
                 // default on mouse down and handle focusing the pressable element ourselves.
                 if ($f6c31cce2adf654f$var$shouldPreventDefault(e.currentTarget)) e.preventDefault();
-                e.stopPropagation();
-                if (state.ignoreEmulatedMouseEvents) return;
+                if (state.ignoreEmulatedMouseEvents) {
+                    e.stopPropagation();
+                    return;
+                }
                 state.isPressed = true;
                 state.isOverTarget = true;
                 state.target = e.currentTarget;
                 state.pointerType = (0, $bx7SL$isVirtualClick)(e.nativeEvent) ? "virtual" : "mouse";
                 if (!isDisabled && !preventFocusOnPress) (0, $bx7SL$focusWithoutScrolling)(e.currentTarget);
-                triggerPressStart(e, state.pointerType);
+                let shouldStopPropagation = triggerPressStart(e, state.pointerType);
+                if (shouldStopPropagation) e.stopPropagation();
                 addGlobalListener(document, "mouseup", onMouseUp, false);
             };
             pressProps.onMouseEnter = (e)=>{
                 if (!e.currentTarget.contains(e.target)) return;
-                e.stopPropagation();
+                let shouldStopPropagation = true;
                 if (state.isPressed && !state.ignoreEmulatedMouseEvents) {
                     state.isOverTarget = true;
-                    triggerPressStart(e, state.pointerType);
+                    shouldStopPropagation = triggerPressStart(e, state.pointerType);
                 }
+                if (shouldStopPropagation) e.stopPropagation();
             };
             pressProps.onMouseLeave = (e)=>{
                 if (!e.currentTarget.contains(e.target)) return;
-                e.stopPropagation();
+                let shouldStopPropagation = true;
                 if (state.isPressed && !state.ignoreEmulatedMouseEvents) {
                     state.isOverTarget = false;
-                    triggerPressEnd(e, state.pointerType, false);
+                    shouldStopPropagation = triggerPressEnd(e, state.pointerType, false);
                     cancelOnPointerExit(e);
                 }
+                if (shouldStopPropagation) e.stopPropagation();
             };
             pressProps.onMouseUp = (e)=>{
                 if (!e.currentTarget.contains(e.target)) return;
@@ -407,7 +434,6 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
             };
             pressProps.onTouchStart = (e)=>{
                 if (!e.currentTarget.contains(e.target)) return;
-                e.stopPropagation();
                 let touch = $f6c31cce2adf654f$var$getTouchFromEvent(e.nativeEvent);
                 if (!touch) return;
                 state.activePointerId = touch.identifier;
@@ -420,34 +446,43 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                 // on the emulated mouse event and handle focusing the pressable element ourselves.
                 if (!isDisabled && !preventFocusOnPress) (0, $bx7SL$focusWithoutScrolling)(e.currentTarget);
                 if (!allowTextSelectionOnPress) (0, $14c0b72509d70225$export$16a4697467175487)(state.target);
-                triggerPressStart(e, state.pointerType);
+                let shouldStopPropagation = triggerPressStart(e, state.pointerType);
+                if (shouldStopPropagation) e.stopPropagation();
                 addGlobalListener(window, "scroll", onScroll, true);
             };
             pressProps.onTouchMove = (e)=>{
                 if (!e.currentTarget.contains(e.target)) return;
-                e.stopPropagation();
-                if (!state.isPressed) return;
+                if (!state.isPressed) {
+                    e.stopPropagation();
+                    return;
+                }
                 let touch = $f6c31cce2adf654f$var$getTouchById(e.nativeEvent, state.activePointerId);
+                let shouldStopPropagation = true;
                 if (touch && $f6c31cce2adf654f$var$isOverTarget(touch, e.currentTarget)) {
                     if (!state.isOverTarget) {
                         state.isOverTarget = true;
-                        triggerPressStart(e, state.pointerType);
+                        shouldStopPropagation = triggerPressStart(e, state.pointerType);
                     }
                 } else if (state.isOverTarget) {
                     state.isOverTarget = false;
-                    triggerPressEnd(e, state.pointerType, false);
+                    shouldStopPropagation = triggerPressEnd(e, state.pointerType, false);
                     cancelOnPointerExit(e);
                 }
+                if (shouldStopPropagation) e.stopPropagation();
             };
             pressProps.onTouchEnd = (e)=>{
                 if (!e.currentTarget.contains(e.target)) return;
-                e.stopPropagation();
-                if (!state.isPressed) return;
+                if (!state.isPressed) {
+                    e.stopPropagation();
+                    return;
+                }
                 let touch = $f6c31cce2adf654f$var$getTouchById(e.nativeEvent, state.activePointerId);
+                let shouldStopPropagation = true;
                 if (touch && $f6c31cce2adf654f$var$isOverTarget(touch, e.currentTarget)) {
                     triggerPressUp(e, state.pointerType);
-                    triggerPressEnd(e, state.pointerType);
-                } else if (state.isOverTarget) triggerPressEnd(e, state.pointerType, false);
+                    shouldStopPropagation = triggerPressEnd(e, state.pointerType);
+                } else if (state.isOverTarget) shouldStopPropagation = triggerPressEnd(e, state.pointerType, false);
+                if (shouldStopPropagation) e.stopPropagation();
                 state.isPressed = false;
                 state.activePointerId = null;
                 state.isOverTarget = false;
@@ -566,7 +601,7 @@ function $f6c31cce2adf654f$var$shouldPreventDefault(target) {
 }
 function $f6c31cce2adf654f$var$shouldPreventDefaultKeyboard(target, key) {
     if (target instanceof HTMLInputElement) return !$f6c31cce2adf654f$var$isValidInputKey(target, key);
-    if (target instanceof HTMLButtonElement) return target.type !== "submit";
+    if (target instanceof HTMLButtonElement) return target.type !== "submit" && target.type !== "reset";
     return true;
 }
 const $f6c31cce2adf654f$var$nonTextInputTypes = new Set([
@@ -1584,6 +1619,7 @@ function $8a26561d2877236e$export$c24ed0104d07eab9(props) {
     let { pressProps: pressProps  } = (0, $f6c31cce2adf654f$export$45712eceda6fad21)({
         isDisabled: isDisabled,
         onPressStart (e) {
+            e.continuePropagation();
             if (e.pointerType === "mouse" || e.pointerType === "touch") {
                 if (onLongPressStart) onLongPressStart({
                     ...e,