@react-aria/interactions 3.16.0 → 3.17.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/import.mjs +100 -64
- package/dist/main.js +100 -64
- package/dist/main.js.map +1 -1
- package/dist/module.js +100 -64
- package/dist/module.js.map +1 -1
- package/dist/types.d.ts.map +1 -1
- package/package.json +5 -5
- package/src/useLongPress.ts +1 -0
- package/src/usePress.ts +112 -62
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"mappings":";;AEuBA,2BAA4B,SAAQ,WAAW;IAC7C,+FAA+F;IAC/F,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,mDAAmD;IACnD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,4DAA4D;IAC5D,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;;;OAKG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,yEAAyE;IACzE,yBAAyB,CAAC,EAAE,OAAO,CAAA;CACpC;AAED,+BAAgC,SAAQ,UAAU;IAChD,mCAAmC;IACnC,GAAG,CAAC,EAAE,UAAU,OAAO,CAAC,CAAA;CACzB;AAsBD;IACE,+CAA+C;IAC/C,SAAS,EAAE,OAAO,CAAC;IACnB,6CAA6C;IAC7C,UAAU,EAAE,aAAa,CAAA;CAC1B;
|
|
1
|
+
{"mappings":";;AEuBA,2BAA4B,SAAQ,WAAW;IAC7C,+FAA+F;IAC/F,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,mDAAmD;IACnD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,4DAA4D;IAC5D,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;;;OAKG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,yEAAyE;IACzE,yBAAyB,CAAC,EAAE,OAAO,CAAA;CACpC;AAED,+BAAgC,SAAQ,UAAU;IAChD,mCAAmC;IACnC,GAAG,CAAC,EAAE,UAAU,OAAO,CAAC,CAAA;CACzB;AAsBD;IACE,+CAA+C;IAC/C,SAAS,EAAE,OAAO,CAAC;IACnB,6CAA6C;IAC7C,UAAU,EAAE,aAAa,CAAA;CAC1B;AA4CD;;;;GAIG;AACH,yBAAyB,KAAK,EAAE,cAAc,GAAG,WAAW,CA8lB3D;ACrsBD,wBAAyB,SAAQ,UAAU;IACzC,QAAQ,EAAE,aAAa,aAAa,EAAE,MAAM,CAAC,CAAA;CAC9C;AAED,OAAO,MAAM,yFAUX,CAAC;ACbH,6BAA8B,SAAQ,UAAU;IAC9C,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED,OAAO,MAAM,4GA+BX,CAAC;AEhCH,4BAA4B,MAAM,GAAG,gBAAgB,CAAE,SAAQ,YAAY,MAAM,CAAC;IAChF,mDAAmD;IACnD,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AAED,6BAA6B,MAAM,GAAG,gBAAgB;IACpD,+CAA+C;IAC/C,UAAU,EAAE,cAAc,MAAM,CAAC,CAAA;CAClC;AAED;;;GAGG;AACH,yBAAyB,MAAM,SAAS,gBAAgB,GAAG,gBAAgB,EAAE,KAAK,EAAE,WAAW,MAAM,CAAC,GAAG,YAAY,MAAM,CAAC,CA+C3H;AC7DD,uBAAuB,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;AAG1D,kCAAkC,CAAC,gBAAgB,OAAO,KAAK,IAAI,CAAC;AACpE;IACE,2CAA2C;IAC3C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gDAAgD;IAChD,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED;IACE,kDAAkD;IAClD,gBAAgB,OAAO,CAAA;CACxB;AA8HD;;GAEG;AACH,kCAAkC,OAAO,CAExC;AAED,0CAA0C,QAAQ,CAEjD;AAED,uCAAuC,QAAQ,EAAE,QAAQ,QAGxD;AAED;;GAEG;AACH,0CAA0C,QAAQ,CAgBjD;AAUD;;GAEG;AACH,gCAAgC,KAAK,GAAE,iBAAsB,GAAG,kBAAkB,CAQjF;AAED;;GAEG;AACH,wCAAwC,EAAE,EAAE,mBAAmB,EAAE,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAC,GAAG,IAAI,CAgB/H;ACzND;IACE,0DAA0D;IAC1D,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,qFAAqF;IACrF,aAAa,CAAC,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;IACxC,qFAAqF;IACrF,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;IACvC,sEAAsE;IACtE,mBAAmB,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,KAAK,IAAI,CAAA;CACvD;AAED;IACE,+CAA+C;IAC/C,gBAAgB,EAAE,aAAa,CAAA;CAChC;AAED;;GAEG;AACH,+BAA+B,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CA6DzE;ACjFD,2BAA4B,SAAQ,WAAW;IAC7C,mDAAmD;IACnD,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AAED;IACE,6CAA6C;IAC7C,UAAU,EAAE,aAAa,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAA;CACnB;AAoDD;;;GAGG;AACH,yBAAyB,KAAK,EAAE,UAAU,GAAG,WAAW,CAwHvD;ACzLD;IACE,GAAG,EAAE,UAAU,OAAO,CAAC,CAAC;IACxB,iBAAiB,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAChD,sBAAsB,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IACrD,8DAA8D;IAC9D,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AAED;;;GAGG;AACH,mCAAmC,KAAK,EAAE,oBAAoB,QA4E7D;AE7FD,8BAA+B,SAAQ,cAAc;IACnD,sDAAsD;IACtD,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AAED;IACE,+CAA+C;IAC/C,aAAa,EAAE,aAAa,CAAA;CAC7B;AAED;;GAEG;AACH,4BAA4B,KAAK,EAAE,aAAa,GAAG,cAAc,CAOhE;AClBD;IACE,6CAA6C;IAC7C,SAAS,EAAE,aAAa,CAAA;CACzB;AASD;;;;GAIG;AACH,wBAAwB,KAAK,EAAE,UAAU,GAAG,UAAU,CAoMrD;ACtND,iCAAkC,SAAQ,YAAY;IACpD,sDAAsD;IACtD,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AAGD,+BAA+B,KAAK,EAAE,gBAAgB,EAAE,GAAG,EAAE,UAAU,WAAW,CAAC,GAAG,IAAI,CAkBzF;ACvBD;IACE,oDAAoD;IACpD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAC/C;;;OAGG;IACH,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAC7C;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAC1C;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAA;CAClC;AAED;IACE,6CAA6C;IAC7C,cAAc,EAAE,aAAa,CAAA;CAC9B;AAID;;;GAGG;AACH,6BAA6B,KAAK,EAAE,cAAc,GAAG,eAAe,CAyEnE;ACzFD,YAAY,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC","sources":["packages/@react-aria/interactions/src/packages/@react-aria/interactions/src/textSelection.ts","packages/@react-aria/interactions/src/packages/@react-aria/interactions/src/context.ts","packages/@react-aria/interactions/src/packages/@react-aria/interactions/src/usePress.ts","packages/@react-aria/interactions/src/packages/@react-aria/interactions/src/Pressable.tsx","packages/@react-aria/interactions/src/packages/@react-aria/interactions/src/PressResponder.tsx","packages/@react-aria/interactions/src/packages/@react-aria/interactions/src/utils.ts","packages/@react-aria/interactions/src/packages/@react-aria/interactions/src/useFocus.ts","packages/@react-aria/interactions/src/packages/@react-aria/interactions/src/useFocusVisible.ts","packages/@react-aria/interactions/src/packages/@react-aria/interactions/src/useFocusWithin.ts","packages/@react-aria/interactions/src/packages/@react-aria/interactions/src/useHover.ts","packages/@react-aria/interactions/src/packages/@react-aria/interactions/src/useInteractOutside.ts","packages/@react-aria/interactions/src/packages/@react-aria/interactions/src/createEventHandler.ts","packages/@react-aria/interactions/src/packages/@react-aria/interactions/src/useKeyboard.ts","packages/@react-aria/interactions/src/packages/@react-aria/interactions/src/useMove.ts","packages/@react-aria/interactions/src/packages/@react-aria/interactions/src/useScrollWheel.ts","packages/@react-aria/interactions/src/packages/@react-aria/interactions/src/useLongPress.ts","packages/@react-aria/interactions/src/packages/@react-aria/interactions/src/index.ts","packages/@react-aria/interactions/src/index.ts"],"sourcesContent":[null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,"/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nexport {Pressable} from './Pressable';\nexport {PressResponder} from './PressResponder';\nexport {useFocus} from './useFocus';\nexport {\n isFocusVisible,\n getInteractionModality,\n setInteractionModality,\n useInteractionModality,\n useFocusVisible,\n useFocusVisibleListener\n} from './useFocusVisible';\nexport {useFocusWithin} from './useFocusWithin';\nexport {useHover} from './useHover';\nexport {useInteractOutside} from './useInteractOutside';\nexport {useKeyboard} from './useKeyboard';\nexport {useMove} from './useMove';\nexport {usePress} from './usePress';\nexport {useScrollWheel} from './useScrollWheel';\nexport {useLongPress} from './useLongPress';\n\nexport type {FocusProps, FocusResult} from './useFocus';\nexport type {FocusVisibleHandler, FocusVisibleProps, FocusVisibleResult, Modality} from './useFocusVisible';\nexport type {FocusWithinProps, FocusWithinResult} from './useFocusWithin';\nexport type {HoverProps, HoverResult} from './useHover';\nexport type {InteractOutsideProps} from './useInteractOutside';\nexport type {KeyboardProps, KeyboardResult} from './useKeyboard';\nexport type {PressProps, PressHookProps, PressResult} from './usePress';\nexport type {MoveEvents} from '@react-types/shared';\nexport type {MoveResult} from './useMove';\nexport type {LongPressProps, LongPressResult} from './useLongPress';\nexport type {ScrollWheelProps} from './useScrollWheel';\n"],"names":[],"version":3,"file":"types.d.ts.map"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-aria/interactions",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.17.0",
|
|
4
4
|
"description": "Spectrum UI components in React",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"main": "dist/main.js",
|
|
@@ -22,9 +22,9 @@
|
|
|
22
22
|
"url": "https://github.com/adobe/react-spectrum"
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@react-aria/ssr": "^3.7.
|
|
26
|
-
"@react-aria/utils": "^3.
|
|
27
|
-
"@react-types/shared": "^3.
|
|
25
|
+
"@react-aria/ssr": "^3.7.1",
|
|
26
|
+
"@react-aria/utils": "^3.19.0",
|
|
27
|
+
"@react-types/shared": "^3.19.0",
|
|
28
28
|
"@swc/helpers": "^0.5.0"
|
|
29
29
|
},
|
|
30
30
|
"peerDependencies": {
|
|
@@ -33,5 +33,5 @@
|
|
|
33
33
|
"publishConfig": {
|
|
34
34
|
"access": "public"
|
|
35
35
|
},
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "d4dfe4bb842a914f10045ee63fc6b92f034c5b30"
|
|
37
37
|
}
|
package/src/useLongPress.ts
CHANGED
|
@@ -69,6 +69,7 @@ export function useLongPress(props: LongPressProps): LongPressResult {
|
|
|
69
69
|
let {pressProps} = usePress({
|
|
70
70
|
isDisabled,
|
|
71
71
|
onPressStart(e) {
|
|
72
|
+
e.continuePropagation();
|
|
72
73
|
if (e.pointerType === 'mouse' || e.pointerType === 'touch') {
|
|
73
74
|
if (onLongPressStart) {
|
|
74
75
|
onLongPressStart({
|
package/src/usePress.ts
CHANGED
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
// See https://github.com/facebook/react/tree/cc7c1aece46a6b69b41958d731e0fd27c94bfc6c/packages/react-interactions
|
|
17
17
|
|
|
18
18
|
import {disableTextSelection, restoreTextSelection} from './textSelection';
|
|
19
|
-
import {DOMAttributes, FocusableElement, PointerType, PressEvents} from '@react-types/shared';
|
|
19
|
+
import {DOMAttributes, FocusableElement, PressEvent as IPressEvent, PointerType, PressEvents} from '@react-types/shared';
|
|
20
20
|
import {focusWithoutScrolling, isVirtualClick, isVirtualPointerEvent, mergeProps, useEffectEvent, useGlobalListeners, useSyncRef} from '@react-aria/utils';
|
|
21
21
|
import {PressResponderContext} from './context';
|
|
22
22
|
import {RefObject, useContext, useEffect, useMemo, useRef, useState} from 'react';
|
|
@@ -84,6 +84,35 @@ function usePressResponderContext(props: PressHookProps): PressHookProps {
|
|
|
84
84
|
return props;
|
|
85
85
|
}
|
|
86
86
|
|
|
87
|
+
class PressEvent implements IPressEvent {
|
|
88
|
+
type: IPressEvent['type'];
|
|
89
|
+
pointerType: PointerType;
|
|
90
|
+
target: Element;
|
|
91
|
+
shiftKey: boolean;
|
|
92
|
+
ctrlKey: boolean;
|
|
93
|
+
metaKey: boolean;
|
|
94
|
+
altKey: boolean;
|
|
95
|
+
#shouldStopPropagation = true;
|
|
96
|
+
|
|
97
|
+
constructor(type: IPressEvent['type'], pointerType: PointerType, originalEvent: EventBase) {
|
|
98
|
+
this.type = type;
|
|
99
|
+
this.pointerType = pointerType;
|
|
100
|
+
this.target = originalEvent.currentTarget as Element;
|
|
101
|
+
this.shiftKey = originalEvent.shiftKey;
|
|
102
|
+
this.metaKey = originalEvent.metaKey;
|
|
103
|
+
this.ctrlKey = originalEvent.ctrlKey;
|
|
104
|
+
this.altKey = originalEvent.altKey;
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
continuePropagation() {
|
|
108
|
+
this.#shouldStopPropagation = false;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
get shouldStopPropagation() {
|
|
112
|
+
return this.#shouldStopPropagation;
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
|
|
87
116
|
/**
|
|
88
117
|
* Handles press interactions across mouse, touch, keyboard, and screen readers.
|
|
89
118
|
* It normalizes behavior across browsers and platforms, and handles many nuances
|
|
@@ -126,16 +155,11 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
126
155
|
return;
|
|
127
156
|
}
|
|
128
157
|
|
|
158
|
+
let shouldStopPropagation = true;
|
|
129
159
|
if (onPressStart) {
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
target: originalEvent.currentTarget as Element,
|
|
134
|
-
shiftKey: originalEvent.shiftKey,
|
|
135
|
-
metaKey: originalEvent.metaKey,
|
|
136
|
-
ctrlKey: originalEvent.ctrlKey,
|
|
137
|
-
altKey: originalEvent.altKey
|
|
138
|
-
});
|
|
160
|
+
let event = new PressEvent('pressstart', pointerType, originalEvent);
|
|
161
|
+
onPressStart(event);
|
|
162
|
+
shouldStopPropagation = event.shouldStopPropagation;
|
|
139
163
|
}
|
|
140
164
|
|
|
141
165
|
if (onPressChange) {
|
|
@@ -144,6 +168,7 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
144
168
|
|
|
145
169
|
state.didFirePressStart = true;
|
|
146
170
|
setPressed(true);
|
|
171
|
+
return shouldStopPropagation;
|
|
147
172
|
});
|
|
148
173
|
|
|
149
174
|
let triggerPressEnd = useEffectEvent((originalEvent: EventBase, pointerType: PointerType, wasPressed = true) => {
|
|
@@ -155,16 +180,11 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
155
180
|
state.ignoreClickAfterPress = true;
|
|
156
181
|
state.didFirePressStart = false;
|
|
157
182
|
|
|
183
|
+
let shouldStopPropagation = true;
|
|
158
184
|
if (onPressEnd) {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
target: originalEvent.currentTarget as Element,
|
|
163
|
-
shiftKey: originalEvent.shiftKey,
|
|
164
|
-
metaKey: originalEvent.metaKey,
|
|
165
|
-
ctrlKey: originalEvent.ctrlKey,
|
|
166
|
-
altKey: originalEvent.altKey
|
|
167
|
-
});
|
|
185
|
+
let event = new PressEvent('pressend', pointerType, originalEvent);
|
|
186
|
+
onPressEnd(event);
|
|
187
|
+
shouldStopPropagation = event.shouldStopPropagation;
|
|
168
188
|
}
|
|
169
189
|
|
|
170
190
|
if (onPressChange) {
|
|
@@ -174,16 +194,12 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
174
194
|
setPressed(false);
|
|
175
195
|
|
|
176
196
|
if (onPress && wasPressed && !isDisabled) {
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
target: originalEvent.currentTarget as Element,
|
|
181
|
-
shiftKey: originalEvent.shiftKey,
|
|
182
|
-
metaKey: originalEvent.metaKey,
|
|
183
|
-
ctrlKey: originalEvent.ctrlKey,
|
|
184
|
-
altKey: originalEvent.altKey
|
|
185
|
-
});
|
|
197
|
+
let event = new PressEvent('press', pointerType, originalEvent);
|
|
198
|
+
onPress(event);
|
|
199
|
+
shouldStopPropagation &&= event.shouldStopPropagation;
|
|
186
200
|
}
|
|
201
|
+
|
|
202
|
+
return shouldStopPropagation;
|
|
187
203
|
});
|
|
188
204
|
|
|
189
205
|
let triggerPressUp = useEffectEvent((originalEvent: EventBase, pointerType: PointerType) => {
|
|
@@ -192,16 +208,12 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
192
208
|
}
|
|
193
209
|
|
|
194
210
|
if (onPressUp) {
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
target: originalEvent.currentTarget as Element,
|
|
199
|
-
shiftKey: originalEvent.shiftKey,
|
|
200
|
-
metaKey: originalEvent.metaKey,
|
|
201
|
-
ctrlKey: originalEvent.ctrlKey,
|
|
202
|
-
altKey: originalEvent.altKey
|
|
203
|
-
});
|
|
211
|
+
let event = new PressEvent('pressup', pointerType, originalEvent);
|
|
212
|
+
onPressUp(event);
|
|
213
|
+
return event.shouldStopPropagation;
|
|
204
214
|
}
|
|
215
|
+
|
|
216
|
+
return true;
|
|
205
217
|
});
|
|
206
218
|
|
|
207
219
|
let cancel = useEffectEvent((e: EventBase) => {
|
|
@@ -235,20 +247,24 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
235
247
|
if (shouldPreventDefaultKeyboard(e.target as Element, e.key)) {
|
|
236
248
|
e.preventDefault();
|
|
237
249
|
}
|
|
238
|
-
e.stopPropagation();
|
|
239
250
|
|
|
240
251
|
// If the event is repeating, it may have started on a different element
|
|
241
252
|
// after which focus moved to the current element. Ignore these events and
|
|
242
253
|
// only handle the first key down event.
|
|
254
|
+
let shouldStopPropagation = true;
|
|
243
255
|
if (!state.isPressed && !e.repeat) {
|
|
244
256
|
state.target = e.currentTarget;
|
|
245
257
|
state.isPressed = true;
|
|
246
|
-
triggerPressStart(e, 'keyboard');
|
|
258
|
+
shouldStopPropagation = triggerPressStart(e, 'keyboard');
|
|
247
259
|
|
|
248
260
|
// Focus may move before the key up event, so register the event on the document
|
|
249
261
|
// instead of the same element where the key down event occurred.
|
|
250
262
|
addGlobalListener(document, 'keyup', onKeyUp, false);
|
|
251
263
|
}
|
|
264
|
+
|
|
265
|
+
if (shouldStopPropagation) {
|
|
266
|
+
e.stopPropagation();
|
|
267
|
+
}
|
|
252
268
|
} else if (e.key === 'Enter' && isHTMLAnchorLink(e.currentTarget)) {
|
|
253
269
|
// If the target is a link, we won't have handled this above because we want the default
|
|
254
270
|
// browser behavior to open the link when pressing Enter. But we still need to prevent
|
|
@@ -267,7 +283,7 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
267
283
|
}
|
|
268
284
|
|
|
269
285
|
if (e && e.button === 0) {
|
|
270
|
-
|
|
286
|
+
let shouldStopPropagation = true;
|
|
271
287
|
if (isDisabled) {
|
|
272
288
|
e.preventDefault();
|
|
273
289
|
}
|
|
@@ -280,13 +296,17 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
280
296
|
focusWithoutScrolling(e.currentTarget);
|
|
281
297
|
}
|
|
282
298
|
|
|
283
|
-
triggerPressStart(e, 'virtual');
|
|
284
|
-
triggerPressUp(e, 'virtual');
|
|
285
|
-
triggerPressEnd(e, 'virtual');
|
|
299
|
+
let stopPressStart = triggerPressStart(e, 'virtual');
|
|
300
|
+
let stopPressUp = triggerPressUp(e, 'virtual');
|
|
301
|
+
let stopPressEnd = triggerPressEnd(e, 'virtual');
|
|
302
|
+
shouldStopPropagation = stopPressStart && stopPressUp && stopPressEnd;
|
|
286
303
|
}
|
|
287
304
|
|
|
288
305
|
state.ignoreEmulatedMouseEvents = false;
|
|
289
306
|
state.ignoreClickAfterPress = false;
|
|
307
|
+
if (shouldStopPropagation) {
|
|
308
|
+
e.stopPropagation();
|
|
309
|
+
}
|
|
290
310
|
}
|
|
291
311
|
}
|
|
292
312
|
};
|
|
@@ -296,13 +316,16 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
296
316
|
if (shouldPreventDefaultKeyboard(e.target as Element, e.key)) {
|
|
297
317
|
e.preventDefault();
|
|
298
318
|
}
|
|
299
|
-
e.stopPropagation();
|
|
300
319
|
|
|
301
320
|
state.isPressed = false;
|
|
302
321
|
let target = e.target as Element;
|
|
303
|
-
triggerPressEnd(createEvent(state.target, e), 'keyboard', state.target.contains(target));
|
|
322
|
+
let shouldStopPropagation = triggerPressEnd(createEvent(state.target, e), 'keyboard', state.target.contains(target));
|
|
304
323
|
removeAllGlobalListeners();
|
|
305
324
|
|
|
325
|
+
if (shouldStopPropagation) {
|
|
326
|
+
e.stopPropagation();
|
|
327
|
+
}
|
|
328
|
+
|
|
306
329
|
// If the target is a link, trigger the click method to open the URL,
|
|
307
330
|
// but defer triggering pressEnd until onClick event handler.
|
|
308
331
|
if (state.target instanceof HTMLElement && state.target.contains(target) && (isHTMLAnchorLink(state.target) || state.target.getAttribute('role') === 'link')) {
|
|
@@ -335,7 +358,7 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
335
358
|
|
|
336
359
|
state.pointerType = e.pointerType;
|
|
337
360
|
|
|
338
|
-
|
|
361
|
+
let shouldStopPropagation = true;
|
|
339
362
|
if (!state.isPressed) {
|
|
340
363
|
state.isPressed = true;
|
|
341
364
|
state.isOverTarget = true;
|
|
@@ -350,12 +373,16 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
350
373
|
disableTextSelection(state.target);
|
|
351
374
|
}
|
|
352
375
|
|
|
353
|
-
triggerPressStart(e, state.pointerType);
|
|
376
|
+
shouldStopPropagation = triggerPressStart(e, state.pointerType);
|
|
354
377
|
|
|
355
378
|
addGlobalListener(document, 'pointermove', onPointerMove, false);
|
|
356
379
|
addGlobalListener(document, 'pointerup', onPointerUp, false);
|
|
357
380
|
addGlobalListener(document, 'pointercancel', onPointerCancel, false);
|
|
358
381
|
}
|
|
382
|
+
|
|
383
|
+
if (shouldStopPropagation) {
|
|
384
|
+
e.stopPropagation();
|
|
385
|
+
}
|
|
359
386
|
};
|
|
360
387
|
|
|
361
388
|
pressProps.onMouseDown = (e) => {
|
|
@@ -453,8 +480,8 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
453
480
|
e.preventDefault();
|
|
454
481
|
}
|
|
455
482
|
|
|
456
|
-
e.stopPropagation();
|
|
457
483
|
if (state.ignoreEmulatedMouseEvents) {
|
|
484
|
+
e.stopPropagation();
|
|
458
485
|
return;
|
|
459
486
|
}
|
|
460
487
|
|
|
@@ -467,7 +494,10 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
467
494
|
focusWithoutScrolling(e.currentTarget);
|
|
468
495
|
}
|
|
469
496
|
|
|
470
|
-
triggerPressStart(e, state.pointerType);
|
|
497
|
+
let shouldStopPropagation = triggerPressStart(e, state.pointerType);
|
|
498
|
+
if (shouldStopPropagation) {
|
|
499
|
+
e.stopPropagation();
|
|
500
|
+
}
|
|
471
501
|
|
|
472
502
|
addGlobalListener(document, 'mouseup', onMouseUp, false);
|
|
473
503
|
};
|
|
@@ -477,10 +507,14 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
477
507
|
return;
|
|
478
508
|
}
|
|
479
509
|
|
|
480
|
-
|
|
510
|
+
let shouldStopPropagation = true;
|
|
481
511
|
if (state.isPressed && !state.ignoreEmulatedMouseEvents) {
|
|
482
512
|
state.isOverTarget = true;
|
|
483
|
-
triggerPressStart(e, state.pointerType);
|
|
513
|
+
shouldStopPropagation = triggerPressStart(e, state.pointerType);
|
|
514
|
+
}
|
|
515
|
+
|
|
516
|
+
if (shouldStopPropagation) {
|
|
517
|
+
e.stopPropagation();
|
|
484
518
|
}
|
|
485
519
|
};
|
|
486
520
|
|
|
@@ -489,12 +523,16 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
489
523
|
return;
|
|
490
524
|
}
|
|
491
525
|
|
|
492
|
-
|
|
526
|
+
let shouldStopPropagation = true;
|
|
493
527
|
if (state.isPressed && !state.ignoreEmulatedMouseEvents) {
|
|
494
528
|
state.isOverTarget = false;
|
|
495
|
-
triggerPressEnd(e, state.pointerType, false);
|
|
529
|
+
shouldStopPropagation = triggerPressEnd(e, state.pointerType, false);
|
|
496
530
|
cancelOnPointerExit(e);
|
|
497
531
|
}
|
|
532
|
+
|
|
533
|
+
if (shouldStopPropagation) {
|
|
534
|
+
e.stopPropagation();
|
|
535
|
+
}
|
|
498
536
|
};
|
|
499
537
|
|
|
500
538
|
pressProps.onMouseUp = (e) => {
|
|
@@ -535,7 +573,6 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
535
573
|
return;
|
|
536
574
|
}
|
|
537
575
|
|
|
538
|
-
e.stopPropagation();
|
|
539
576
|
let touch = getTouchFromEvent(e.nativeEvent);
|
|
540
577
|
if (!touch) {
|
|
541
578
|
return;
|
|
@@ -557,7 +594,10 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
557
594
|
disableTextSelection(state.target);
|
|
558
595
|
}
|
|
559
596
|
|
|
560
|
-
triggerPressStart(e, state.pointerType);
|
|
597
|
+
let shouldStopPropagation = triggerPressStart(e, state.pointerType);
|
|
598
|
+
if (shouldStopPropagation) {
|
|
599
|
+
e.stopPropagation();
|
|
600
|
+
}
|
|
561
601
|
|
|
562
602
|
addGlobalListener(window, 'scroll', onScroll, true);
|
|
563
603
|
};
|
|
@@ -567,22 +607,27 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
567
607
|
return;
|
|
568
608
|
}
|
|
569
609
|
|
|
570
|
-
e.stopPropagation();
|
|
571
610
|
if (!state.isPressed) {
|
|
611
|
+
e.stopPropagation();
|
|
572
612
|
return;
|
|
573
613
|
}
|
|
574
614
|
|
|
575
615
|
let touch = getTouchById(e.nativeEvent, state.activePointerId);
|
|
616
|
+
let shouldStopPropagation = true;
|
|
576
617
|
if (touch && isOverTarget(touch, e.currentTarget)) {
|
|
577
618
|
if (!state.isOverTarget) {
|
|
578
619
|
state.isOverTarget = true;
|
|
579
|
-
triggerPressStart(e, state.pointerType);
|
|
620
|
+
shouldStopPropagation = triggerPressStart(e, state.pointerType);
|
|
580
621
|
}
|
|
581
622
|
} else if (state.isOverTarget) {
|
|
582
623
|
state.isOverTarget = false;
|
|
583
|
-
triggerPressEnd(e, state.pointerType, false);
|
|
624
|
+
shouldStopPropagation = triggerPressEnd(e, state.pointerType, false);
|
|
584
625
|
cancelOnPointerExit(e);
|
|
585
626
|
}
|
|
627
|
+
|
|
628
|
+
if (shouldStopPropagation) {
|
|
629
|
+
e.stopPropagation();
|
|
630
|
+
}
|
|
586
631
|
};
|
|
587
632
|
|
|
588
633
|
pressProps.onTouchEnd = (e) => {
|
|
@@ -590,17 +635,22 @@ export function usePress(props: PressHookProps): PressResult {
|
|
|
590
635
|
return;
|
|
591
636
|
}
|
|
592
637
|
|
|
593
|
-
e.stopPropagation();
|
|
594
638
|
if (!state.isPressed) {
|
|
639
|
+
e.stopPropagation();
|
|
595
640
|
return;
|
|
596
641
|
}
|
|
597
642
|
|
|
598
643
|
let touch = getTouchById(e.nativeEvent, state.activePointerId);
|
|
644
|
+
let shouldStopPropagation = true;
|
|
599
645
|
if (touch && isOverTarget(touch, e.currentTarget)) {
|
|
600
646
|
triggerPressUp(e, state.pointerType);
|
|
601
|
-
triggerPressEnd(e, state.pointerType);
|
|
647
|
+
shouldStopPropagation = triggerPressEnd(e, state.pointerType);
|
|
602
648
|
} else if (state.isOverTarget) {
|
|
603
|
-
triggerPressEnd(e, state.pointerType, false);
|
|
649
|
+
shouldStopPropagation = triggerPressEnd(e, state.pointerType, false);
|
|
650
|
+
}
|
|
651
|
+
|
|
652
|
+
if (shouldStopPropagation) {
|
|
653
|
+
e.stopPropagation();
|
|
604
654
|
}
|
|
605
655
|
|
|
606
656
|
state.isPressed = false;
|
|
@@ -788,7 +838,7 @@ function shouldPreventDefaultKeyboard(target: Element, key: string) {
|
|
|
788
838
|
}
|
|
789
839
|
|
|
790
840
|
if (target instanceof HTMLButtonElement) {
|
|
791
|
-
return target.type !== 'submit';
|
|
841
|
+
return target.type !== 'submit' && target.type !== 'reset';
|
|
792
842
|
}
|
|
793
843
|
|
|
794
844
|
return true;
|