@tamagui/web 2.0.0-rc.41 → 2.0.0-rc.41-1776298929157
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/cjs/eventHandling.native.js +19 -9
- package/dist/cjs/eventHandling.native.js.map +1 -1
- package/dist/esm/eventHandling.native.js +19 -9
- package/dist/esm/eventHandling.native.js.map +1 -1
- package/package.json +13 -13
- package/src/eventHandling.native.ts +30 -10
- package/types/eventHandling.native.d.ts.map +1 -1
|
@@ -43,6 +43,7 @@ module.exports = __toCommonJS(eventHandling_native_exports);
|
|
|
43
43
|
var import_helpers = require("@tamagui/helpers");
|
|
44
44
|
var import_native = require("@tamagui/native");
|
|
45
45
|
var import_react = __toESM(require("react"), 1);
|
|
46
|
+
var import_react_native = require("react-native");
|
|
46
47
|
var import_mainThreadPressEvents = require("./helpers/mainThreadPressEvents.native.js");
|
|
47
48
|
function getWebEvents() {
|
|
48
49
|
return {};
|
|
@@ -155,14 +156,6 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
|
|
|
155
156
|
});
|
|
156
157
|
}
|
|
157
158
|
}
|
|
158
|
-
if (hasPressEvents) {
|
|
159
|
-
viewProps.onStartShouldSetResponder = function () {
|
|
160
|
-
return true;
|
|
161
|
-
};
|
|
162
|
-
viewProps.onResponderTerminationRequest = function () {
|
|
163
|
-
return false;
|
|
164
|
-
};
|
|
165
|
-
}
|
|
166
159
|
return gestureRef.current;
|
|
167
160
|
}
|
|
168
161
|
return null;
|
|
@@ -187,8 +180,25 @@ function wrapWithGestureDetector(content, gesture, stateRef, isHOC, isCompositeC
|
|
|
187
180
|
if (!gestureToUse) {
|
|
188
181
|
return content;
|
|
189
182
|
}
|
|
190
|
-
|
|
183
|
+
var detector = import_react.default.createElement(GestureDetector, {
|
|
191
184
|
gesture: gestureToUse
|
|
192
185
|
}, content);
|
|
186
|
+
return import_react.default.createElement(import_react_native.View, {
|
|
187
|
+
collapsable: false,
|
|
188
|
+
// display: contents keeps the wrapper transparent to layout (new arch /
|
|
189
|
+
// Fabric) so it doesn't become an extra flex child and shift siblings.
|
|
190
|
+
style: responderWrapperStyle,
|
|
191
|
+
onStartShouldSetResponder: responderClaim,
|
|
192
|
+
onResponderTerminationRequest: responderDeny
|
|
193
|
+
}, detector);
|
|
193
194
|
}
|
|
195
|
+
var responderClaim = function () {
|
|
196
|
+
return true;
|
|
197
|
+
};
|
|
198
|
+
var responderDeny = function () {
|
|
199
|
+
return false;
|
|
200
|
+
};
|
|
201
|
+
var responderWrapperStyle = {
|
|
202
|
+
display: "contents"
|
|
203
|
+
};
|
|
194
204
|
//# sourceMappingURL=eventHandling.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["eventHandling_native_exports","__export","getWebEvents","useEvents","wrapWithGestureDetector","module","exports","__toCommonJS","import_helpers","require","import_native","import_react","__toESM","import_mainThreadPressEvents","events","viewProps","stateRef","staticConfig","isHOC","isInsideNativeMenu","debugName","onFocus","onBlur","hasPressEvents","onPress","hasAnyPressCallbacks","Boolean","onPressIn","onPressOut","onLongPress","gh","getGestureHandler","current","hasHadEvents","everEnabled","isUsingRNGH","isEnabled","isInput","inputEvents","composeEventHandlers","Object","assign","isCompositeComponent","Component","onPressIn1","onPressOut1","onPress1","delayLongPress","callbacksRef","useRef","gestureRef","Gesture","state","manual","Manual","runOnJS","manualActivation","onTouchesDown","_callbacksRef_current_onPressIn","_callbacksRef_current","call","onTouchesUp","_callbacksRef_current_onPress","_callbacksRef_current_onPressOut","_callbacksRef_current1","onTouchesCancelled","createPressGesture","e","_callbacksRef_current_onLongPress","hitSlop","
|
|
1
|
+
{"version":3,"names":["eventHandling_native_exports","__export","getWebEvents","useEvents","wrapWithGestureDetector","module","exports","__toCommonJS","import_helpers","require","import_native","import_react","__toESM","import_react_native","import_mainThreadPressEvents","events","viewProps","stateRef","staticConfig","isHOC","isInsideNativeMenu","debugName","onFocus","onBlur","hasPressEvents","onPress","hasAnyPressCallbacks","Boolean","onPressIn","onPressOut","onLongPress","gh","getGestureHandler","current","hasHadEvents","everEnabled","isUsingRNGH","isEnabled","isInput","inputEvents","composeEventHandlers","Object","assign","isCompositeComponent","Component","onPressIn1","onPressOut1","onPress1","delayLongPress","callbacksRef","useRef","gestureRef","Gesture","state","manual","Manual","runOnJS","manualActivation","onTouchesDown","_callbacksRef_current_onPressIn","_callbacksRef_current","call","onTouchesUp","_callbacksRef_current_onPress","_callbacksRef_current_onPressOut","_callbacksRef_current1","onTouchesCancelled","createPressGesture","e","_callbacksRef_current_onLongPress","hitSlop","useMainThreadPressEvents","content","gesture","GestureDetector","shouldWrap","gestureToUse","detector","default","createElement","View","collapsable","style","responderWrapperStyle","onStartShouldSetResponder","responderClaim","onResponderTerminationRequest","responderDeny","display"],"sources":["../../src/eventHandling.native.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { composeEventHandlers } from "@tamagui/helpers";
|
|
2
2
|
import { getGestureHandler } from "@tamagui/native";
|
|
3
3
|
import React, { useRef } from "react";
|
|
4
|
+
import { View } from "react-native";
|
|
4
5
|
import { useMainThreadPressEvents } from "./helpers/mainThreadPressEvents.native.js";
|
|
5
6
|
function getWebEvents() {
|
|
6
7
|
return {};
|
|
@@ -113,14 +114,6 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
|
|
|
113
114
|
});
|
|
114
115
|
}
|
|
115
116
|
}
|
|
116
|
-
if (hasPressEvents) {
|
|
117
|
-
viewProps.onStartShouldSetResponder = function () {
|
|
118
|
-
return true;
|
|
119
|
-
};
|
|
120
|
-
viewProps.onResponderTerminationRequest = function () {
|
|
121
|
-
return false;
|
|
122
|
-
};
|
|
123
|
-
}
|
|
124
117
|
return gestureRef.current;
|
|
125
118
|
}
|
|
126
119
|
return null;
|
|
@@ -145,9 +138,26 @@ function wrapWithGestureDetector(content, gesture, stateRef, isHOC, isCompositeC
|
|
|
145
138
|
if (!gestureToUse) {
|
|
146
139
|
return content;
|
|
147
140
|
}
|
|
148
|
-
|
|
141
|
+
var detector = React.createElement(GestureDetector, {
|
|
149
142
|
gesture: gestureToUse
|
|
150
143
|
}, content);
|
|
144
|
+
return React.createElement(View, {
|
|
145
|
+
collapsable: false,
|
|
146
|
+
// display: contents keeps the wrapper transparent to layout (new arch /
|
|
147
|
+
// Fabric) so it doesn't become an extra flex child and shift siblings.
|
|
148
|
+
style: responderWrapperStyle,
|
|
149
|
+
onStartShouldSetResponder: responderClaim,
|
|
150
|
+
onResponderTerminationRequest: responderDeny
|
|
151
|
+
}, detector);
|
|
151
152
|
}
|
|
153
|
+
var responderClaim = function () {
|
|
154
|
+
return true;
|
|
155
|
+
};
|
|
156
|
+
var responderDeny = function () {
|
|
157
|
+
return false;
|
|
158
|
+
};
|
|
159
|
+
var responderWrapperStyle = {
|
|
160
|
+
display: "contents"
|
|
161
|
+
};
|
|
152
162
|
export { getWebEvents, useEvents, wrapWithGestureDetector };
|
|
153
163
|
//# sourceMappingURL=eventHandling.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["composeEventHandlers","getGestureHandler","React","useRef","useMainThreadPressEvents","getWebEvents","useEvents","events","viewProps","stateRef","staticConfig","isHOC","isInsideNativeMenu","debugName","onFocus","onBlur","hasPressEvents","onPress","hasAnyPressCallbacks","Boolean","onPressIn","onPressOut","onLongPress","gh","current","hasHadEvents","everEnabled","isUsingRNGH","isEnabled","isInput","inputEvents","Object","assign","isCompositeComponent","Component","onPressIn1","onPressOut1","onPress1","delayLongPress","callbacksRef","gestureRef","Gesture","state","manual","Manual","runOnJS","manualActivation","onTouchesDown","_callbacksRef_current_onPressIn","_callbacksRef_current","call","onTouchesUp","_callbacksRef_current_onPress","_callbacksRef_current_onPressOut","_callbacksRef_current1","onTouchesCancelled","createPressGesture","e","_callbacksRef_current_onLongPress","hitSlop","
|
|
1
|
+
{"version":3,"names":["composeEventHandlers","getGestureHandler","React","useRef","View","useMainThreadPressEvents","getWebEvents","useEvents","events","viewProps","stateRef","staticConfig","isHOC","isInsideNativeMenu","debugName","onFocus","onBlur","hasPressEvents","onPress","hasAnyPressCallbacks","Boolean","onPressIn","onPressOut","onLongPress","gh","current","hasHadEvents","everEnabled","isUsingRNGH","isEnabled","isInput","inputEvents","Object","assign","isCompositeComponent","Component","onPressIn1","onPressOut1","onPress1","delayLongPress","callbacksRef","gestureRef","Gesture","state","manual","Manual","runOnJS","manualActivation","onTouchesDown","_callbacksRef_current_onPressIn","_callbacksRef_current","call","onTouchesUp","_callbacksRef_current_onPress","_callbacksRef_current_onPressOut","_callbacksRef_current1","onTouchesCancelled","createPressGesture","e","_callbacksRef_current_onLongPress","hitSlop","wrapWithGestureDetector","content","gesture","GestureDetector","shouldWrap","gestureToUse","detector","createElement","collapsable","style","responderWrapperStyle","onStartShouldSetResponder","responderClaim","onResponderTerminationRequest","responderDeny","display"],"sources":["../../src/eventHandling.native.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "2.0.0-rc.41",
|
|
3
|
+
"version": "2.0.0-rc.41-1776298929157",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Nate Wienert"
|
|
@@ -51,20 +51,20 @@
|
|
|
51
51
|
"test:web": "vitest --typecheck --run"
|
|
52
52
|
},
|
|
53
53
|
"dependencies": {
|
|
54
|
-
"@tamagui/compose-refs": "2.0.0-rc.41",
|
|
55
|
-
"@tamagui/constants": "2.0.0-rc.41",
|
|
56
|
-
"@tamagui/helpers": "2.0.0-rc.41",
|
|
57
|
-
"@tamagui/is-equal-shallow": "2.0.0-rc.41",
|
|
58
|
-
"@tamagui/native": "2.0.0-rc.41",
|
|
59
|
-
"@tamagui/normalize-css-color": "2.0.0-rc.41",
|
|
60
|
-
"@tamagui/timer": "2.0.0-rc.41",
|
|
61
|
-
"@tamagui/types": "2.0.0-rc.41",
|
|
62
|
-
"@tamagui/use-did-finish-ssr": "2.0.0-rc.41",
|
|
63
|
-
"@tamagui/use-event": "2.0.0-rc.41",
|
|
64
|
-
"@tamagui/use-force-update": "2.0.0-rc.41"
|
|
54
|
+
"@tamagui/compose-refs": "2.0.0-rc.41-1776298929157",
|
|
55
|
+
"@tamagui/constants": "2.0.0-rc.41-1776298929157",
|
|
56
|
+
"@tamagui/helpers": "2.0.0-rc.41-1776298929157",
|
|
57
|
+
"@tamagui/is-equal-shallow": "2.0.0-rc.41-1776298929157",
|
|
58
|
+
"@tamagui/native": "2.0.0-rc.41-1776298929157",
|
|
59
|
+
"@tamagui/normalize-css-color": "2.0.0-rc.41-1776298929157",
|
|
60
|
+
"@tamagui/timer": "2.0.0-rc.41-1776298929157",
|
|
61
|
+
"@tamagui/types": "2.0.0-rc.41-1776298929157",
|
|
62
|
+
"@tamagui/use-did-finish-ssr": "2.0.0-rc.41-1776298929157",
|
|
63
|
+
"@tamagui/use-event": "2.0.0-rc.41-1776298929157",
|
|
64
|
+
"@tamagui/use-force-update": "2.0.0-rc.41-1776298929157"
|
|
65
65
|
},
|
|
66
66
|
"devDependencies": {
|
|
67
|
-
"@tamagui/build": "2.0.0-rc.41",
|
|
67
|
+
"@tamagui/build": "2.0.0-rc.41-1776298929157",
|
|
68
68
|
"@testing-library/react": "^16.1.0",
|
|
69
69
|
"csstype": "^3.0.10",
|
|
70
70
|
"react": ">=19",
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
import { composeEventHandlers } from '@tamagui/helpers'
|
|
6
6
|
import { getGestureHandler } from '@tamagui/native'
|
|
7
7
|
import React, { useRef } from 'react'
|
|
8
|
-
import { Platform } from 'react-native'
|
|
8
|
+
import { Platform, View } from 'react-native'
|
|
9
9
|
import { useMainThreadPressEvents } from './helpers/mainThreadPressEvents'
|
|
10
10
|
import type { StaticConfig, TamaguiComponentStateRef } from './types'
|
|
11
11
|
|
|
@@ -154,14 +154,6 @@ export function useEvents(
|
|
|
154
154
|
}
|
|
155
155
|
// TODO update viewProps.hitSlop / events.delayLongPress!
|
|
156
156
|
|
|
157
|
-
// Claim responder to block parent RN Pressable/TouchableOpacity from firing.
|
|
158
|
-
// RNGH handles the actual press, but we need to tell the responder system
|
|
159
|
-
// that we're handling this touch to prevent it bubbling to parent pressables.
|
|
160
|
-
if (hasPressEvents) {
|
|
161
|
-
viewProps.onStartShouldSetResponder = () => true
|
|
162
|
-
viewProps.onResponderTerminationRequest = () => false
|
|
163
|
-
}
|
|
164
|
-
|
|
165
157
|
return gestureRef.current
|
|
166
158
|
}
|
|
167
159
|
|
|
@@ -203,5 +195,33 @@ export function wrapWithGestureDetector(
|
|
|
203
195
|
return content
|
|
204
196
|
}
|
|
205
197
|
|
|
206
|
-
|
|
198
|
+
const detector = React.createElement(
|
|
199
|
+
GestureDetector,
|
|
200
|
+
{ gesture: gestureToUse },
|
|
201
|
+
content
|
|
202
|
+
)
|
|
203
|
+
|
|
204
|
+
// wrap in a responder-claiming View OUTSIDE the GestureDetector.
|
|
205
|
+
// this blocks parent RN Pressable/TouchableOpacity from firing when
|
|
206
|
+
// a press lands on this component, without causing the RNGH deadlock
|
|
207
|
+
// that happens when responder claims are applied to a view inside
|
|
208
|
+
// the gesture-managed subtree (RNGH intercepts UIManager.setJSResponder
|
|
209
|
+
// globally — when the claimant is one of its own gesture targets it
|
|
210
|
+
// creates a coordination conflict, especially at scale on first mount).
|
|
211
|
+
return React.createElement(
|
|
212
|
+
View,
|
|
213
|
+
{
|
|
214
|
+
collapsable: false,
|
|
215
|
+
// display: contents keeps the wrapper transparent to layout (new arch /
|
|
216
|
+
// Fabric) so it doesn't become an extra flex child and shift siblings.
|
|
217
|
+
style: responderWrapperStyle,
|
|
218
|
+
onStartShouldSetResponder: responderClaim,
|
|
219
|
+
onResponderTerminationRequest: responderDeny,
|
|
220
|
+
},
|
|
221
|
+
detector
|
|
222
|
+
)
|
|
207
223
|
}
|
|
224
|
+
|
|
225
|
+
const responderClaim = () => true
|
|
226
|
+
const responderDeny = () => false
|
|
227
|
+
const responderWrapperStyle = { display: 'contents' } as const
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eventHandling.native.d.ts","sourceRoot":"","sources":["../src/eventHandling.native.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"eventHandling.native.d.ts","sourceRoot":"","sources":["../src/eventHandling.native.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,OAAO,KAAK,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAA;AAGrE,wBAAgB,YAAY,OAE3B;AAED,wBAAgB,SAAS,CACvB,MAAM,EAAE,GAAG,EACX,SAAS,EAAE,GAAG,EACd,QAAQ,EAAE;IAAE,OAAO,EAAE,wBAAwB,CAAA;CAAE,EAC/C,YAAY,EAAE,YAAY,EAC1B,KAAK,CAAC,EAAE,OAAO,EACf,kBAAkB,CAAC,EAAE,OAAO,EAC5B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,OA8I1B;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE;IAAE,OAAO,EAAE,wBAAwB,CAAA;CAAE,EAC/C,KAAK,CAAC,EAAE,OAAO,EACf,oBAAoB,CAAC,EAAE,OAAO,OAkD/B"}
|