@react-aria/interactions 3.25.5 → 3.26.0

package/dist/usePress.module.js

@@ -4,9 +4,9 @@ import {PressResponderContext as $ae1eeba8b9eafd08$export$5165eccb35aaadb5} from
 import {_ as $7mdmh$_} from "@swc/helpers/_/_class_private_field_get";
 import {_ as $7mdmh$_1} from "@swc/helpers/_/_class_private_field_init";
 import {_ as $7mdmh$_2} from "@swc/helpers/_/_class_private_field_set";
-import {mergeProps as $7mdmh$mergeProps, useSyncRef as $7mdmh$useSyncRef, useGlobalListeners as $7mdmh$useGlobalListeners, useEffectEvent as $7mdmh$useEffectEvent, nodeContains as $7mdmh$nodeContains, getEventTarget as $7mdmh$getEventTarget, getOwnerDocument as $7mdmh$getOwnerDocument, chain as $7mdmh$chain, isMac as $7mdmh$isMac, openLink as $7mdmh$openLink, isVirtualClick as $7mdmh$isVirtualClick, isVirtualPointerEvent as $7mdmh$isVirtualPointerEvent, focusWithoutScrolling as $7mdmh$focusWithoutScrolling, getOwnerWindow as $7mdmh$getOwnerWindow} from "@react-aria/utils";
+import {mergeProps as $7mdmh$mergeProps, useSyncRef as $7mdmh$useSyncRef, useGlobalListeners as $7mdmh$useGlobalListeners, useEffectEvent as $7mdmh$useEffectEvent, useLayoutEffect as $7mdmh$useLayoutEffect, getEventTarget as $7mdmh$getEventTarget, nodeContains as $7mdmh$nodeContains, openLink as $7mdmh$openLink, chain as $7mdmh$chain, getOwnerDocument as $7mdmh$getOwnerDocument, focusWithoutScrolling as $7mdmh$focusWithoutScrolling, getOwnerWindow as $7mdmh$getOwnerWindow, isMac as $7mdmh$isMac, isVirtualClick as $7mdmh$isVirtualClick, isVirtualPointerEvent as $7mdmh$isVirtualPointerEvent} from "@react-aria/utils";
 import {flushSync as $7mdmh$flushSync} from "react-dom";
-import {useContext as $7mdmh$useContext, useState as $7mdmh$useState, useRef as $7mdmh$useRef, useMemo as $7mdmh$useMemo, useEffect as $7mdmh$useEffect} from "react";
+import {useContext as $7mdmh$useContext, useState as $7mdmh$useState, useRef as $7mdmh$useRef, useCallback as $7mdmh$useCallback, useMemo as $7mdmh$useMemo, useEffect as $7mdmh$useEffect} from "react";
 
 /*
  * Copyright 2020 Adobe. All rights reserved.
@@ -102,8 +102,8 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
         pointerType: null,
         disposables: []
     });
-    let { addGlobalListener: addGlobalListener, removeAllGlobalListeners: removeAllGlobalListeners } = (0, $7mdmh$useGlobalListeners)();
-    let triggerPressStart = (0, $7mdmh$useEffectEvent)((originalEvent, pointerType)=>{
+    let { addGlobalListener: addGlobalListener, removeAllGlobalListeners: removeAllGlobalListeners, removeGlobalListener: removeGlobalListener } = (0, $7mdmh$useGlobalListeners)();
+    let triggerPressStart = (0, $7mdmh$useCallback)((originalEvent, pointerType)=>{
         let state = ref.current;
         if (isDisabled || state.didFirePressStart) return false;
         let shouldStopPropagation = true;
@@ -118,8 +118,12 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
         state.didFirePressStart = true;
         setPressed(true);
         return shouldStopPropagation;
-    });
-    let triggerPressEnd = (0, $7mdmh$useEffectEvent)((originalEvent, pointerType, wasPressed = true)=>{
+    }, [
+        isDisabled,
+        onPressStart,
+        onPressChange
+    ]);
+    let triggerPressEnd = (0, $7mdmh$useCallback)((originalEvent, pointerType, wasPressed = true)=>{
         let state = ref.current;
         if (!state.didFirePressStart) return false;
         state.didFirePressStart = false;
@@ -139,8 +143,14 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
         }
         state.isTriggeringEvent = false;
         return shouldStopPropagation;
-    });
-    let triggerPressUp = (0, $7mdmh$useEffectEvent)((originalEvent, pointerType)=>{
+    }, [
+        isDisabled,
+        onPressEnd,
+        onPressChange,
+        onPress
+    ]);
+    let triggerPressEndEvent = (0, $7mdmh$useEffectEvent)(triggerPressEnd);
+    let triggerPressUp = (0, $7mdmh$useCallback)((originalEvent, pointerType)=>{
         let state = ref.current;
         if (isDisabled) return false;
         if (onPressUp) {
@@ -151,12 +161,17 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
             return event.shouldStopPropagation;
         }
         return true;
-    });
-    let cancel = (0, $7mdmh$useEffectEvent)((e)=>{
+    }, [
+        isDisabled,
+        onPressUp
+    ]);
+    let triggerPressUpEvent = (0, $7mdmh$useEffectEvent)(triggerPressUp);
+    let cancel = (0, $7mdmh$useCallback)((e)=>{
         let state = ref.current;
         if (state.isPressed && state.target) {
             if (state.didFirePressStart && state.pointerType != null) triggerPressEnd($f6c31cce2adf654f$var$createEvent(state.target, e), state.pointerType, false);
             state.isPressed = false;
+            setIsPointerPressed(null);
             state.isOverTarget = false;
             state.activePointerId = null;
             state.pointerType = null;
@@ -165,14 +180,27 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
             for (let dispose of state.disposables)dispose();
             state.disposables = [];
         }
-    });
-    let cancelOnPointerExit = (0, $7mdmh$useEffectEvent)((e)=>{
+    }, [
+        allowTextSelectionOnPress,
+        removeAllGlobalListeners,
+        triggerPressEnd
+    ]);
+    let cancelEvent = (0, $7mdmh$useEffectEvent)(cancel);
+    let cancelOnPointerExit = (0, $7mdmh$useCallback)((e)=>{
         if (shouldCancelOnPointerExit) cancel(e);
-    });
-    let triggerClick = (0, $7mdmh$useEffectEvent)((e)=>{
+    }, [
+        shouldCancelOnPointerExit,
+        cancel
+    ]);
+    let triggerClick = (0, $7mdmh$useCallback)((e)=>{
+        if (isDisabled) return;
         onClick === null || onClick === void 0 ? void 0 : onClick(e);
-    });
-    let triggerSyntheticClick = (0, $7mdmh$useEffectEvent)((e, target)=>{
+    }, [
+        isDisabled,
+        onClick
+    ]);
+    let triggerSyntheticClick = (0, $7mdmh$useCallback)((e, target)=>{
+        if (isDisabled) return;
         // Some third-party libraries pass in onClick instead of onPress.
         // Create a fake mouse event and trigger onClick as well.
         // This matches the browser's native activation behavior for certain elements (e.g. button).
@@ -183,7 +211,147 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
             (0, $8a9cb279dc87e130$export$c2b7abe5d61ec696)(event, target);
             onClick((0, $8a9cb279dc87e130$export$525bc4921d56d4a)(event));
         }
-    });
+    }, [
+        isDisabled,
+        onClick
+    ]);
+    let triggerSyntheticClickEvent = (0, $7mdmh$useEffectEvent)(triggerSyntheticClick);
+    let [isElemKeyPressed, setIsElemKeyPressed] = (0, $7mdmh$useState)(false);
+    (0, $7mdmh$useLayoutEffect)(()=>{
+        let state = ref.current;
+        if (isElemKeyPressed) {
+            let onKeyUp = (e)=>{
+                var _state_metaKeyEvents;
+                if (state.isPressed && state.target && $f6c31cce2adf654f$var$isValidKeyboardEvent(e, state.target)) {
+                    var _state_metaKeyEvents1;
+                    if ($f6c31cce2adf654f$var$shouldPreventDefaultKeyboard((0, $7mdmh$getEventTarget)(e), e.key)) e.preventDefault();
+                    let target = (0, $7mdmh$getEventTarget)(e);
+                    let wasPressed = (0, $7mdmh$nodeContains)(state.target, (0, $7mdmh$getEventTarget)(e));
+                    triggerPressEndEvent($f6c31cce2adf654f$var$createEvent(state.target, e), 'keyboard', wasPressed);
+                    if (wasPressed) triggerSyntheticClickEvent(e, state.target);
+                    removeAllGlobalListeners();
+                    // If a link was triggered with a key other than Enter, open the URL ourselves.
+                    // This means the link has a role override, and the default browser behavior
+                    // only applies when using the Enter key.
+                    if (e.key !== 'Enter' && $f6c31cce2adf654f$var$isHTMLAnchorLink(state.target) && (0, $7mdmh$nodeContains)(state.target, target) && !e[$f6c31cce2adf654f$var$LINK_CLICKED]) {
+                        // Store a hidden property on the event so we only trigger link click once,
+                        // even if there are multiple usePress instances attached to the element.
+                        e[$f6c31cce2adf654f$var$LINK_CLICKED] = true;
+                        (0, $7mdmh$openLink)(state.target, e, false);
+                    }
+                    state.isPressed = false;
+                    setIsElemKeyPressed(false);
+                    (_state_metaKeyEvents1 = state.metaKeyEvents) === null || _state_metaKeyEvents1 === void 0 ? void 0 : _state_metaKeyEvents1.delete(e.key);
+                } else if (e.key === 'Meta' && ((_state_metaKeyEvents = state.metaKeyEvents) === null || _state_metaKeyEvents === void 0 ? void 0 : _state_metaKeyEvents.size)) {
+                    var _state_target;
+                    // If we recorded keydown events that occurred while the Meta key was pressed,
+                    // and those haven't received keyup events already, fire keyup events ourselves.
+                    // See comment above for more info about the macOS bug causing this.
+                    let events = state.metaKeyEvents;
+                    state.metaKeyEvents = undefined;
+                    for (let event of events.values())(_state_target = state.target) === null || _state_target === void 0 ? void 0 : _state_target.dispatchEvent(new KeyboardEvent('keyup', event));
+                }
+            };
+            // 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. Make it capturing so that it will trigger
+            // before stopPropagation from useKeyboard on a child element may happen and thus we can still call triggerPress for the parent element.
+            let originalTarget = state.target;
+            let pressUp = (e)=>{
+                if (originalTarget && $f6c31cce2adf654f$var$isValidKeyboardEvent(e, originalTarget) && !e.repeat && (0, $7mdmh$nodeContains)(originalTarget, (0, $7mdmh$getEventTarget)(e)) && state.target) triggerPressUpEvent($f6c31cce2adf654f$var$createEvent(state.target, e), 'keyboard');
+            };
+            let listener = (0, $7mdmh$chain)(pressUp, onKeyUp);
+            addGlobalListener((0, $7mdmh$getOwnerDocument)(state.target), 'keyup', listener, true);
+            return ()=>{
+                removeGlobalListener((0, $7mdmh$getOwnerDocument)(state.target), 'keyup', listener, true);
+            };
+        }
+    }, [
+        isElemKeyPressed,
+        addGlobalListener,
+        removeAllGlobalListeners,
+        removeGlobalListener
+    ]);
+    let [isPointerPressed, setIsPointerPressed] = (0, $7mdmh$useState)(null);
+    (0, $7mdmh$useLayoutEffect)(()=>{
+        let state = ref.current;
+        if (isPointerPressed === 'pointer') {
+            let onPointerUp = (e)=>{
+                if (e.pointerId === state.activePointerId && state.isPressed && e.button === 0 && state.target) {
+                    if ((0, $7mdmh$nodeContains)(state.target, (0, $7mdmh$getEventTarget)(e)) && state.pointerType != null) {
+                        // Wait for onClick to fire onPress. This avoids browser issues when the DOM
+                        // is mutated between onPointerUp and onClick, and is more compatible with third party libraries.
+                        // https://github.com/adobe/react-spectrum/issues/1513
+                        // https://issues.chromium.org/issues/40732224
+                        // However, iOS and Android do not focus or fire onClick after a long press.
+                        // We work around this by triggering a click ourselves after a timeout.
+                        // This timeout is canceled during the click event in case the real one fires first.
+                        // The timeout must be at least 32ms, because Safari on iOS delays the click event on
+                        // non-form elements without certain ARIA roles (for hover emulation).
+                        // https://github.com/WebKit/WebKit/blob/dccfae42bb29bd4bdef052e469f604a9387241c0/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm#L875-L892
+                        let clicked = false;
+                        let timeout = setTimeout(()=>{
+                            if (state.isPressed && state.target instanceof HTMLElement) {
+                                if (clicked) cancelEvent(e);
+                                else {
+                                    (0, $7mdmh$focusWithoutScrolling)(state.target);
+                                    state.target.click();
+                                }
+                            }
+                        }, 80);
+                        // Use a capturing listener to track if a click occurred.
+                        // If stopPropagation is called it may never reach our handler.
+                        addGlobalListener(e.currentTarget, 'click', ()=>clicked = true, true);
+                        state.disposables.push(()=>clearTimeout(timeout));
+                    } else cancelEvent(e);
+                    // Ignore subsequent onPointerLeave event before onClick on touch devices.
+                    state.isOverTarget = false;
+                }
+            };
+            let onPointerCancel = (e)=>{
+                cancelEvent(e);
+            };
+            addGlobalListener((0, $7mdmh$getOwnerDocument)(state.target), 'pointerup', onPointerUp, false);
+            addGlobalListener((0, $7mdmh$getOwnerDocument)(state.target), 'pointercancel', onPointerCancel, false);
+            return ()=>{
+                removeGlobalListener((0, $7mdmh$getOwnerDocument)(state.target), 'pointerup', onPointerUp, false);
+                removeGlobalListener((0, $7mdmh$getOwnerDocument)(state.target), 'pointercancel', onPointerCancel, false);
+            };
+        } else if (isPointerPressed === 'mouse' && process.env.NODE_ENV === 'test') {
+            let onMouseUp = (e)=>{
+                // Only handle left clicks
+                if (e.button !== 0) return;
+                if (state.ignoreEmulatedMouseEvents) {
+                    state.ignoreEmulatedMouseEvents = false;
+                    return;
+                }
+                if (state.target && state.target.contains(e.target) && state.pointerType != null) ;
+                else cancelEvent(e);
+                state.isOverTarget = false;
+            };
+            addGlobalListener((0, $7mdmh$getOwnerDocument)(state.target), 'mouseup', onMouseUp, false);
+            return ()=>{
+                removeGlobalListener((0, $7mdmh$getOwnerDocument)(state.target), 'mouseup', onMouseUp, false);
+            };
+        } else if (isPointerPressed === 'touch' && process.env.NODE_ENV === 'test') {
+            let onScroll = (e)=>{
+                if (state.isPressed && (0, $7mdmh$nodeContains)((0, $7mdmh$getEventTarget)(e), state.target)) cancelEvent({
+                    currentTarget: state.target,
+                    shiftKey: false,
+                    ctrlKey: false,
+                    metaKey: false,
+                    altKey: false
+                });
+            };
+            addGlobalListener((0, $7mdmh$getOwnerWindow)(state.target), 'scroll', onScroll, true);
+            return ()=>{
+                removeGlobalListener((0, $7mdmh$getOwnerWindow)(state.target), 'scroll', onScroll, true);
+            };
+        }
+    }, [
+        isPointerPressed,
+        addGlobalListener,
+        removeGlobalListener
+    ]);
     let pressProps = (0, $7mdmh$useMemo)(()=>{
         let state = ref.current;
         let pressProps = {
@@ -198,16 +366,9 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                     if (!state.isPressed && !e.repeat) {
                         state.target = e.currentTarget;
                         state.isPressed = true;
+                        setIsElemKeyPressed(true);
                         state.pointerType = '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. Make it capturing so that it will trigger
-                        // before stopPropagation from useKeyboard on a child element may happen and thus we can still call triggerPress for the parent element.
-                        let originalTarget = e.currentTarget;
-                        let pressUp = (e)=>{
-                            if ($f6c31cce2adf654f$var$isValidKeyboardEvent(e, originalTarget) && !e.repeat && (0, $7mdmh$nodeContains)(originalTarget, (0, $7mdmh$getEventTarget)(e)) && state.target) triggerPressUp($f6c31cce2adf654f$var$createEvent(state.target, e), 'keyboard');
-                        };
-                        addGlobalListener((0, $7mdmh$getOwnerDocument)(e.currentTarget), 'keyup', (0, $7mdmh$chain)(pressUp, onKeyUp), true);
                     }
                     if (shouldStopPropagation) e.stopPropagation();
                     // Keep track of the keydown events that occur while the Meta (e.g. Command) key is held.
@@ -247,37 +408,6 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                 }
             }
         };
-        let onKeyUp = (e)=>{
-            var _state_metaKeyEvents;
-            if (state.isPressed && state.target && $f6c31cce2adf654f$var$isValidKeyboardEvent(e, state.target)) {
-                var _state_metaKeyEvents1;
-                if ($f6c31cce2adf654f$var$shouldPreventDefaultKeyboard((0, $7mdmh$getEventTarget)(e), e.key)) e.preventDefault();
-                let target = (0, $7mdmh$getEventTarget)(e);
-                let wasPressed = (0, $7mdmh$nodeContains)(state.target, (0, $7mdmh$getEventTarget)(e));
-                triggerPressEnd($f6c31cce2adf654f$var$createEvent(state.target, e), 'keyboard', wasPressed);
-                if (wasPressed) triggerSyntheticClick(e, state.target);
-                removeAllGlobalListeners();
-                // If a link was triggered with a key other than Enter, open the URL ourselves.
-                // This means the link has a role override, and the default browser behavior
-                // only applies when using the Enter key.
-                if (e.key !== 'Enter' && $f6c31cce2adf654f$var$isHTMLAnchorLink(state.target) && (0, $7mdmh$nodeContains)(state.target, target) && !e[$f6c31cce2adf654f$var$LINK_CLICKED]) {
-                    // Store a hidden property on the event so we only trigger link click once,
-                    // even if there are multiple usePress instances attached to the element.
-                    e[$f6c31cce2adf654f$var$LINK_CLICKED] = true;
-                    (0, $7mdmh$openLink)(state.target, e, false);
-                }
-                state.isPressed = false;
-                (_state_metaKeyEvents1 = state.metaKeyEvents) === null || _state_metaKeyEvents1 === void 0 ? void 0 : _state_metaKeyEvents1.delete(e.key);
-            } else if (e.key === 'Meta' && ((_state_metaKeyEvents = state.metaKeyEvents) === null || _state_metaKeyEvents === void 0 ? void 0 : _state_metaKeyEvents.size)) {
-                var _state_target;
-                // If we recorded keydown events that occurred while the Meta key was pressed,
-                // and those haven't received keyup events already, fire keyup events ourselves.
-                // See comment above for more info about the macOS bug causing this.
-                let events = state.metaKeyEvents;
-                state.metaKeyEvents = undefined;
-                for (let event of events.values())(_state_target = state.target) === null || _state_target === void 0 ? void 0 : _state_target.dispatchEvent(new KeyboardEvent('keyup', event));
-            }
-        };
         if (typeof PointerEvent !== 'undefined') {
             pressProps.onPointerDown = (e)=>{
                 // Only handle left clicks, and ignore events that bubbled through portals.
@@ -294,6 +424,7 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                 let shouldStopPropagation = true;
                 if (!state.isPressed) {
                     state.isPressed = true;
+                    setIsPointerPressed('pointer');
                     state.isOverTarget = true;
                     state.activePointerId = e.pointerId;
                     state.target = e.currentTarget;
@@ -303,8 +434,6 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                     // This enables onPointerLeave and onPointerEnter to fire.
                     let target = (0, $7mdmh$getEventTarget)(e.nativeEvent);
                     if ('releasePointerCapture' in target) target.releasePointerCapture(e.pointerId);
-                    addGlobalListener((0, $7mdmh$getOwnerDocument)(e.currentTarget), 'pointerup', onPointerUp, false);
-                    addGlobalListener((0, $7mdmh$getOwnerDocument)(e.currentTarget), 'pointercancel', onPointerCancel, false);
                 }
                 if (shouldStopPropagation) e.stopPropagation();
             };
@@ -337,41 +466,6 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                     cancelOnPointerExit(e);
                 }
             };
-            let onPointerUp = (e)=>{
-                if (e.pointerId === state.activePointerId && state.isPressed && e.button === 0 && state.target) {
-                    if ((0, $7mdmh$nodeContains)(state.target, (0, $7mdmh$getEventTarget)(e)) && state.pointerType != null) {
-                        // Wait for onClick to fire onPress. This avoids browser issues when the DOM
-                        // is mutated between onPointerUp and onClick, and is more compatible with third party libraries.
-                        // https://github.com/adobe/react-spectrum/issues/1513
-                        // https://issues.chromium.org/issues/40732224
-                        // However, iOS and Android do not focus or fire onClick after a long press.
-                        // We work around this by triggering a click ourselves after a timeout.
-                        // This timeout is canceled during the click event in case the real one fires first.
-                        // The timeout must be at least 32ms, because Safari on iOS delays the click event on
-                        // non-form elements without certain ARIA roles (for hover emulation).
-                        // https://github.com/WebKit/WebKit/blob/dccfae42bb29bd4bdef052e469f604a9387241c0/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm#L875-L892
-                        let clicked = false;
-                        let timeout = setTimeout(()=>{
-                            if (state.isPressed && state.target instanceof HTMLElement) {
-                                if (clicked) cancel(e);
-                                else {
-                                    (0, $7mdmh$focusWithoutScrolling)(state.target);
-                                    state.target.click();
-                                }
-                            }
-                        }, 80);
-                        // Use a capturing listener to track if a click occurred.
-                        // If stopPropagation is called it may never reach our handler.
-                        addGlobalListener(e.currentTarget, 'click', ()=>clicked = true, true);
-                        state.disposables.push(()=>clearTimeout(timeout));
-                    } else cancel(e);
-                    // Ignore subsequent onPointerLeave event before onClick on touch devices.
-                    state.isOverTarget = false;
-                }
-            };
-            let onPointerCancel = (e)=>{
-                cancel(e);
-            };
             pressProps.onDragStart = (e)=>{
                 if (!(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
                 // Safari does not call onPointerCancel when a drag starts, whereas Chrome and Firefox do.
@@ -388,6 +482,7 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                     return;
                 }
                 state.isPressed = true;
+                setIsPointerPressed('mouse');
                 state.isOverTarget = true;
                 state.target = e.currentTarget;
                 state.pointerType = (0, $7mdmh$isVirtualClick)(e.nativeEvent) ? 'virtual' : 'mouse';
@@ -398,7 +493,6 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                     let dispose = (0, $8a9cb279dc87e130$export$cabe61c495ee3649)(e.target);
                     if (dispose) state.disposables.push(dispose);
                 }
-                addGlobalListener((0, $7mdmh$getOwnerDocument)(e.currentTarget), 'mouseup', onMouseUp, false);
             };
             pressProps.onMouseEnter = (e)=>{
                 if (!(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
@@ -423,17 +517,6 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                 if (!(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
                 if (!state.ignoreEmulatedMouseEvents && e.button === 0 && !state.isPressed) triggerPressUp(e, state.pointerType || 'mouse');
             };
-            let onMouseUp = (e)=>{
-                // Only handle left clicks
-                if (e.button !== 0) return;
-                if (state.ignoreEmulatedMouseEvents) {
-                    state.ignoreEmulatedMouseEvents = false;
-                    return;
-                }
-                if (state.target && state.target.contains(e.target) && state.pointerType != null) ;
-                else cancel(e);
-                state.isOverTarget = false;
-            };
             pressProps.onTouchStart = (e)=>{
                 if (!(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
                 let touch = $f6c31cce2adf654f$var$getTouchFromEvent(e.nativeEvent);
@@ -442,12 +525,12 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                 state.ignoreEmulatedMouseEvents = true;
                 state.isOverTarget = true;
                 state.isPressed = true;
+                setIsPointerPressed('touch');
                 state.target = e.currentTarget;
                 state.pointerType = 'touch';
                 if (!allowTextSelectionOnPress) (0, $14c0b72509d70225$export$16a4697467175487)(state.target);
                 let shouldStopPropagation = triggerPressStart($f6c31cce2adf654f$var$createTouchEvent(state.target, e), state.pointerType);
                 if (shouldStopPropagation) e.stopPropagation();
-                addGlobalListener((0, $7mdmh$getOwnerWindow)(e.currentTarget), 'scroll', onScroll, true);
             };
             pressProps.onTouchMove = (e)=>{
                 if (!(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
@@ -484,6 +567,7 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                 } else if (state.isOverTarget && state.pointerType != null) shouldStopPropagation = triggerPressEnd($f6c31cce2adf654f$var$createTouchEvent(state.target, e), state.pointerType, false);
                 if (shouldStopPropagation) e.stopPropagation();
                 state.isPressed = false;
+                setIsPointerPressed(null);
                 state.activePointerId = null;
                 state.isOverTarget = false;
                 state.ignoreEmulatedMouseEvents = true;
@@ -495,15 +579,6 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                 e.stopPropagation();
                 if (state.isPressed) cancel($f6c31cce2adf654f$var$createTouchEvent(state.target, e));
             };
-            let onScroll = (e)=>{
-                if (state.isPressed && (0, $7mdmh$nodeContains)((0, $7mdmh$getEventTarget)(e), state.target)) cancel({
-                    currentTarget: state.target,
-                    shiftKey: false,
-                    ctrlKey: false,
-                    metaKey: false,
-                    altKey: false
-                });
-            };
             pressProps.onDragStart = (e)=>{
                 if (!(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
                 cancel(e);
@@ -511,7 +586,6 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
         }
         return pressProps;
     }, [
-        addGlobalListener,
         isDisabled,
         preventFocusOnPress,
         removeAllGlobalListeners,