@react-aria/interactions 3.22.5 → 3.24.0

package/dist/usePress.module.js

@@ -1,9 +1,11 @@
 import {disableTextSelection as $14c0b72509d70225$export$16a4697467175487, restoreTextSelection as $14c0b72509d70225$export$b0d6fa1ab32e3295} from "./textSelection.module.js";
 import {PressResponderContext as $ae1eeba8b9eafd08$export$5165eccb35aaadb5} from "./context.module.js";
+import {preventFocus as $8a9cb279dc87e130$export$cabe61c495ee3649} from "./utils.module.js";
 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, getOwnerDocument as $7mdmh$getOwnerDocument, chain as $7mdmh$chain, isMac as $7mdmh$isMac, openLink as $7mdmh$openLink, isVirtualClick as $7mdmh$isVirtualClick, focusWithoutScrolling as $7mdmh$focusWithoutScrolling, isVirtualPointerEvent as $7mdmh$isVirtualPointerEvent, 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, 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 {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";
 
 /*
@@ -27,6 +29,8 @@ import {useContext as $7mdmh$useContext, useState as $7mdmh$useState, useRef as
 
 
 
+
+
 function $f6c31cce2adf654f$var$usePressResponderContext(props) {
     // Consume context from <PressResponder> and merge with props.
     let context = (0, $7mdmh$useContext)((0, $ae1eeba8b9eafd08$export$5165eccb35aaadb5));
@@ -89,13 +93,13 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
     let ref = (0, $7mdmh$useRef)({
         isPressed: false,
         ignoreEmulatedMouseEvents: false,
-        ignoreClickAfterPress: false,
         didFirePressStart: false,
         isTriggeringEvent: false,
         activePointerId: null,
         target: null,
         isOverTarget: false,
-        pointerType: null
+        pointerType: null,
+        disposables: []
     });
     let { addGlobalListener: addGlobalListener, removeAllGlobalListeners: removeAllGlobalListeners } = (0, $7mdmh$useGlobalListeners)();
     let triggerPressStart = (0, $7mdmh$useEffectEvent)((originalEvent, pointerType)=>{
@@ -117,7 +121,6 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
     let triggerPressEnd = (0, $7mdmh$useEffectEvent)((originalEvent, pointerType, wasPressed = true)=>{
         let state = ref.current;
         if (!state.didFirePressStart) return false;
-        state.ignoreClickAfterPress = true;
         state.didFirePressStart = false;
         state.isTriggeringEvent = true;
         let shouldStopPropagation = true;
@@ -151,13 +154,15 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
     let cancel = (0, $7mdmh$useEffectEvent)((e)=>{
         let state = ref.current;
         if (state.isPressed && state.target) {
-            if (state.isOverTarget && state.pointerType != null) triggerPressEnd($f6c31cce2adf654f$var$createEvent(state.target, e), state.pointerType, false);
+            if (state.didFirePressStart && state.pointerType != null) triggerPressEnd($f6c31cce2adf654f$var$createEvent(state.target, e), state.pointerType, false);
             state.isPressed = false;
             state.isOverTarget = false;
             state.activePointerId = null;
             state.pointerType = null;
             removeAllGlobalListeners();
             if (!allowTextSelectionOnPress) (0, $14c0b72509d70225$export$b0d6fa1ab32e3295)(state.target);
+            for (let dispose of state.disposables)dispose();
+            state.disposables = [];
         }
     });
     let cancelOnPointerExit = (0, $7mdmh$useEffectEvent)((e)=>{
@@ -167,9 +172,9 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
         let state = ref.current;
         let pressProps = {
             onKeyDown (e) {
-                if ($f6c31cce2adf654f$var$isValidKeyboardEvent(e.nativeEvent, e.currentTarget) && e.currentTarget.contains(e.target)) {
+                if ($f6c31cce2adf654f$var$isValidKeyboardEvent(e.nativeEvent, e.currentTarget) && (0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) {
                     var _state_metaKeyEvents;
-                    if ($f6c31cce2adf654f$var$shouldPreventDefaultKeyboard(e.target, e.key)) e.preventDefault();
+                    if ($f6c31cce2adf654f$var$shouldPreventDefaultKeyboard((0, $7mdmh$getEventTarget)(e.nativeEvent), e.key)) e.preventDefault();
                     // 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.
@@ -177,13 +182,14 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                     if (!state.isPressed && !e.repeat) {
                         state.target = e.currentTarget;
                         state.isPressed = 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 && originalTarget.contains(e.target) && state.target) triggerPressUp($f6c31cce2adf654f$var$createEvent(state.target, e), 'keyboard');
+                            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);
                     }
@@ -199,22 +205,24 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                 } else if (e.key === 'Meta') state.metaKeyEvents = new Map();
             },
             onClick (e) {
-                if (e && !e.currentTarget.contains(e.target)) return;
+                if (e && !(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
                 if (e && e.button === 0 && !state.isTriggeringEvent && !(0, $7mdmh$openLink).isOpening) {
                     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.isPressed && (state.pointerType === 'virtual' || (0, $7mdmh$isVirtualClick)(e.nativeEvent))) {
-                        // Ensure the element receives focus (VoiceOver on iOS does not do this)
-                        if (!isDisabled && !preventFocusOnPress) (0, $7mdmh$focusWithoutScrolling)(e.currentTarget);
+                    if (!state.ignoreEmulatedMouseEvents && !state.isPressed && (state.pointerType === 'virtual' || (0, $7mdmh$isVirtualClick)(e.nativeEvent))) {
                         let stopPressStart = triggerPressStart(e, 'virtual');
                         let stopPressUp = triggerPressUp(e, 'virtual');
                         let stopPressEnd = triggerPressEnd(e, 'virtual');
                         shouldStopPropagation = stopPressStart && stopPressUp && stopPressEnd;
+                    } else if (state.isPressed && state.pointerType !== 'keyboard') {
+                        let pointerType = state.pointerType || e.nativeEvent.pointerType || 'virtual';
+                        shouldStopPropagation = triggerPressEnd($f6c31cce2adf654f$var$createEvent(e.currentTarget, e), pointerType, true);
+                        state.isOverTarget = false;
+                        cancel(e);
                     }
                     state.ignoreEmulatedMouseEvents = false;
-                    state.ignoreClickAfterPress = false;
                     if (shouldStopPropagation) e.stopPropagation();
                 }
             }
@@ -223,14 +231,14 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
             var _state_metaKeyEvents;
             if (state.isPressed && state.target && $f6c31cce2adf654f$var$isValidKeyboardEvent(e, state.target)) {
                 var _state_metaKeyEvents1;
-                if ($f6c31cce2adf654f$var$shouldPreventDefaultKeyboard(e.target, e.key)) e.preventDefault();
-                let target = e.target;
-                triggerPressEnd($f6c31cce2adf654f$var$createEvent(state.target, e), 'keyboard', state.target.contains(target));
+                if ($f6c31cce2adf654f$var$shouldPreventDefaultKeyboard((0, $7mdmh$getEventTarget)(e), e.key)) e.preventDefault();
+                let target = (0, $7mdmh$getEventTarget)(e);
+                triggerPressEnd($f6c31cce2adf654f$var$createEvent(state.target, e), 'keyboard', (0, $7mdmh$nodeContains)(state.target, (0, $7mdmh$getEventTarget)(e)));
                 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) && state.target.contains(target) && !e[$f6c31cce2adf654f$var$LINK_CLICKED]) {
+                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;
@@ -251,7 +259,7 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
         if (typeof PointerEvent !== 'undefined') {
             pressProps.onPointerDown = (e)=>{
                 // Only handle left clicks, and ignore events that bubbled through portals.
-                if (e.button !== 0 || !e.currentTarget.contains(e.target)) return;
+                if (e.button !== 0 || !(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
                 // iOS safari fires pointer events from VoiceOver with incorrect coordinates/target.
                 // Ignore and let the onClick handler take care of it instead.
                 // https://bugs.webkit.org/show_bug.cgi?id=222627
@@ -260,9 +268,6 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                     state.pointerType = 'virtual';
                     return;
                 }
-                // Due to browser inconsistencies, especially on mobile browsers, we prevent
-                // default on pointer down and handle focusing the pressable element ourselves.
-                if ($f6c31cce2adf654f$var$shouldPreventDefaultDown(e.currentTarget)) e.preventDefault();
                 state.pointerType = e.pointerType;
                 let shouldStopPropagation = true;
                 if (!state.isPressed) {
@@ -270,44 +275,41 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                     state.isOverTarget = true;
                     state.activePointerId = e.pointerId;
                     state.target = e.currentTarget;
-                    if (!isDisabled && !preventFocusOnPress) (0, $7mdmh$focusWithoutScrolling)(e.currentTarget);
                     if (!allowTextSelectionOnPress) (0, $14c0b72509d70225$export$16a4697467175487)(state.target);
                     shouldStopPropagation = triggerPressStart(e, state.pointerType);
-                    addGlobalListener((0, $7mdmh$getOwnerDocument)(e.currentTarget), 'pointermove', onPointerMove, false);
+                    // Release pointer capture so that touch interactions can leave the original target.
+                    // 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();
             };
             pressProps.onMouseDown = (e)=>{
-                if (!e.currentTarget.contains(e.target)) return;
+                if (!(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
                 if (e.button === 0) {
-                    // Chrome and Firefox on touch Windows devices require mouse down events
-                    // to be canceled in addition to pointer events, or an extra asynchronous
-                    // focus event will be fired.
-                    if ($f6c31cce2adf654f$var$shouldPreventDefaultDown(e.currentTarget)) e.preventDefault();
+                    if (preventFocusOnPress) {
+                        let dispose = (0, $8a9cb279dc87e130$export$cabe61c495ee3649)(e.target);
+                        if (dispose) state.disposables.push(dispose);
+                    }
                     e.stopPropagation();
                 }
             };
             pressProps.onPointerUp = (e)=>{
                 // iOS fires pointerup with zero width and height, so check the pointerType recorded during pointerdown.
-                if (!e.currentTarget.contains(e.target) || state.pointerType === 'virtual') return;
+                if (!(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent)) || state.pointerType === 'virtual') return;
                 // Only handle left clicks
-                // Safari on iOS sometimes fires pointerup events, even
-                // when the touch isn't over the target, so double check.
-                if (e.button === 0 && $f6c31cce2adf654f$var$isOverTarget(e, e.currentTarget)) triggerPressUp(e, state.pointerType || e.pointerType);
+                if (e.button === 0) triggerPressUp(e, state.pointerType || e.pointerType);
             };
-            // Safari on iOS < 13.2 does not implement pointerenter/pointerleave events correctly.
-            // Use pointer move events instead to implement our own hit testing.
-            // See https://bugs.webkit.org/show_bug.cgi?id=199803
-            let onPointerMove = (e)=>{
-                if (e.pointerId !== state.activePointerId) return;
-                if (state.target && $f6c31cce2adf654f$var$isOverTarget(e, state.target)) {
-                    if (!state.isOverTarget && state.pointerType != null) {
-                        state.isOverTarget = true;
-                        triggerPressStart($f6c31cce2adf654f$var$createEvent(state.target, e), state.pointerType);
-                    }
-                } else if (state.target && state.isOverTarget && state.pointerType != null) {
+            pressProps.onPointerEnter = (e)=>{
+                if (e.pointerId === state.activePointerId && state.target && !state.isOverTarget && state.pointerType != null) {
+                    state.isOverTarget = true;
+                    triggerPressStart($f6c31cce2adf654f$var$createEvent(state.target, e), state.pointerType);
+                }
+            };
+            pressProps.onPointerLeave = (e)=>{
+                if (e.pointerId === state.activePointerId && state.target && state.isOverTarget && state.pointerType != null) {
                     state.isOverTarget = false;
                     triggerPressEnd($f6c31cce2adf654f$var$createEvent(state.target, e), state.pointerType, false);
                     cancelOnPointerExit(e);
@@ -315,46 +317,50 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
             };
             let onPointerUp = (e)=>{
                 if (e.pointerId === state.activePointerId && state.isPressed && e.button === 0 && state.target) {
-                    if ($f6c31cce2adf654f$var$isOverTarget(e, state.target) && state.pointerType != null) triggerPressEnd($f6c31cce2adf654f$var$createEvent(state.target, e), state.pointerType);
-                    else if (state.isOverTarget && state.pointerType != null) triggerPressEnd($f6c31cce2adf654f$var$createEvent(state.target, e), state.pointerType, false);
-                    state.isPressed = false;
+                    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;
-                    state.activePointerId = null;
-                    state.pointerType = null;
-                    removeAllGlobalListeners();
-                    if (!allowTextSelectionOnPress) (0, $14c0b72509d70225$export$b0d6fa1ab32e3295)(state.target);
-                    // Prevent subsequent touchend event from triggering onClick on unrelated elements on Android. See below.
-                    // Both 'touch' and 'pen' pointerTypes trigger onTouchEnd, but 'mouse' does not.
-                    if ('ontouchend' in state.target && e.pointerType !== 'mouse') addGlobalListener(state.target, 'touchend', onTouchEnd, {
-                        once: true
-                    });
                 }
             };
-            // This is a workaround for an Android Chrome/Firefox issue where click events are fired on an incorrect element
-            // if the original target is removed during onPointerUp (before onClick).
-            // https://github.com/adobe/react-spectrum/issues/1513
-            // https://issues.chromium.org/issues/40732224
-            // Note: this event must be registered directly on the element, not via React props in order to work.
-            // https://github.com/facebook/react/issues/9809
-            let onTouchEnd = (e)=>{
-                // Don't preventDefault if we actually want the default (e.g. submit/link click).
-                if ($f6c31cce2adf654f$var$shouldPreventDefaultUp(e.currentTarget)) e.preventDefault();
-            };
             let onPointerCancel = (e)=>{
                 cancel(e);
             };
             pressProps.onDragStart = (e)=>{
-                if (!e.currentTarget.contains(e.target)) return;
+                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.
                 cancel(e);
             };
         } else {
+            // NOTE: this fallback branch is almost entirely used by unit tests.
+            // All browsers now support pointer events, but JSDOM still does not.
             pressProps.onMouseDown = (e)=>{
                 // Only handle left clicks
-                if (e.button !== 0 || !e.currentTarget.contains(e.target)) return;
-                // Due to browser inconsistencies, especially on mobile browsers, we prevent
-                // default on mouse down and handle focusing the pressable element ourselves.
-                if ($f6c31cce2adf654f$var$shouldPreventDefaultDown(e.currentTarget)) e.preventDefault();
+                if (e.button !== 0 || !(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
                 if (state.ignoreEmulatedMouseEvents) {
                     e.stopPropagation();
                     return;
@@ -363,13 +369,17 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                 state.isOverTarget = true;
                 state.target = e.currentTarget;
                 state.pointerType = (0, $7mdmh$isVirtualClick)(e.nativeEvent) ? 'virtual' : 'mouse';
-                if (!isDisabled && !preventFocusOnPress) (0, $7mdmh$focusWithoutScrolling)(e.currentTarget);
-                let shouldStopPropagation = triggerPressStart(e, state.pointerType);
+                // Flush sync so that focus moved during react re-renders occurs before we yield back to the browser.
+                let shouldStopPropagation = (0, $7mdmh$flushSync)(()=>triggerPressStart(e, state.pointerType));
                 if (shouldStopPropagation) e.stopPropagation();
+                if (preventFocusOnPress) {
+                    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 (!e.currentTarget.contains(e.target)) return;
+                if (!(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
                 let shouldStopPropagation = true;
                 if (state.isPressed && !state.ignoreEmulatedMouseEvents && state.pointerType != null) {
                     state.isOverTarget = true;
@@ -378,7 +388,7 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                 if (shouldStopPropagation) e.stopPropagation();
             };
             pressProps.onMouseLeave = (e)=>{
-                if (!e.currentTarget.contains(e.target)) return;
+                if (!(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
                 let shouldStopPropagation = true;
                 if (state.isPressed && !state.ignoreEmulatedMouseEvents && state.pointerType != null) {
                     state.isOverTarget = false;
@@ -388,24 +398,22 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                 if (shouldStopPropagation) e.stopPropagation();
             };
             pressProps.onMouseUp = (e)=>{
-                if (!e.currentTarget.contains(e.target)) return;
+                if (!(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
                 if (!state.ignoreEmulatedMouseEvents && e.button === 0) triggerPressUp(e, state.pointerType || 'mouse');
             };
             let onMouseUp = (e)=>{
                 // Only handle left clicks
                 if (e.button !== 0) return;
-                state.isPressed = false;
-                removeAllGlobalListeners();
                 if (state.ignoreEmulatedMouseEvents) {
                     state.ignoreEmulatedMouseEvents = false;
                     return;
                 }
-                if (state.target && $f6c31cce2adf654f$var$isOverTarget(e, state.target) && state.pointerType != null) triggerPressEnd($f6c31cce2adf654f$var$createEvent(state.target, e), state.pointerType);
-                else if (state.target && state.isOverTarget && state.pointerType != null) triggerPressEnd($f6c31cce2adf654f$var$createEvent(state.target, e), state.pointerType, false);
+                if (state.target && state.target.contains(e.target) && state.pointerType != null) ;
+                else cancel(e);
                 state.isOverTarget = false;
             };
             pressProps.onTouchStart = (e)=>{
-                if (!e.currentTarget.contains(e.target)) return;
+                if (!(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
                 let touch = $f6c31cce2adf654f$var$getTouchFromEvent(e.nativeEvent);
                 if (!touch) return;
                 state.activePointerId = touch.identifier;
@@ -414,16 +422,13 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                 state.isPressed = true;
                 state.target = e.currentTarget;
                 state.pointerType = 'touch';
-                // Due to browser inconsistencies, especially on mobile browsers, we prevent default
-                // on the emulated mouse event and handle focusing the pressable element ourselves.
-                if (!isDisabled && !preventFocusOnPress) (0, $7mdmh$focusWithoutScrolling)(e.currentTarget);
                 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 (!e.currentTarget.contains(e.target)) return;
+                if (!(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
                 if (!state.isPressed) {
                     e.stopPropagation();
                     return;
@@ -443,7 +448,7 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                 if (shouldStopPropagation) e.stopPropagation();
             };
             pressProps.onTouchEnd = (e)=>{
-                if (!e.currentTarget.contains(e.target)) return;
+                if (!(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
                 if (!state.isPressed) {
                     e.stopPropagation();
                     return;
@@ -463,12 +468,12 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                 removeAllGlobalListeners();
             };
             pressProps.onTouchCancel = (e)=>{
-                if (!e.currentTarget.contains(e.target)) return;
+                if (!(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
                 e.stopPropagation();
                 if (state.isPressed) cancel($f6c31cce2adf654f$var$createTouchEvent(state.target, e));
             };
             let onScroll = (e)=>{
-                if (state.isPressed && e.target.contains(state.target)) cancel({
+                if (state.isPressed && (0, $7mdmh$nodeContains)((0, $7mdmh$getEventTarget)(e), state.target)) cancel({
                     currentTarget: state.target,
                     shiftKey: false,
                     ctrlKey: false,
@@ -477,7 +482,7 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
                 });
             };
             pressProps.onDragStart = (e)=>{
-                if (!e.currentTarget.contains(e.target)) return;
+                if (!(0, $7mdmh$nodeContains)(e.currentTarget, (0, $7mdmh$getEventTarget)(e.nativeEvent))) return;
                 cancel(e);
             };
         }
@@ -496,10 +501,12 @@ function $f6c31cce2adf654f$export$45712eceda6fad21(props) {
     ]);
     // Remove user-select: none in case component unmounts immediately after pressStart
     (0, $7mdmh$useEffect)(()=>{
+        let state = ref.current;
         return ()=>{
-            var _ref_current_target;
-            if (!allowTextSelectionOnPress) // eslint-disable-next-line react-hooks/exhaustive-deps
-            (0, $14c0b72509d70225$export$b0d6fa1ab32e3295)((_ref_current_target = ref.current.target) !== null && _ref_current_target !== void 0 ? _ref_current_target : undefined);
+            var _state_target;
+            if (!allowTextSelectionOnPress) (0, $14c0b72509d70225$export$b0d6fa1ab32e3295)((_state_target = state.target) !== null && _state_target !== void 0 ? _state_target : undefined);
+            for (let dispose of state.disposables)dispose();
+            state.disposables = [];
         };
     }, [
         allowTextSelectionOnPress
@@ -590,10 +597,6 @@ function $f6c31cce2adf654f$var$isOverTarget(point, target) {
     let pointRect = $f6c31cce2adf654f$var$getPointClientRect(point);
     return $f6c31cce2adf654f$var$areRectanglesOverlapping(rect, pointRect);
 }
-function $f6c31cce2adf654f$var$shouldPreventDefaultDown(target) {
-    // We cannot prevent default if the target is a draggable element.
-    return !(target instanceof HTMLElement) || !target.hasAttribute('draggable');
-}
 function $f6c31cce2adf654f$var$shouldPreventDefaultUp(target) {
     if (target instanceof HTMLInputElement) return false;
     if (target instanceof HTMLButtonElement) return target.type !== 'submit' && target.type !== 'reset';