@tamagui/core 2.4.0 → 2.4.1

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 $ tamagui-build
-built @tamagui/core in 710 ms
+built @tamagui/core in 9264 ms
 Running afterBuild script...
-afterBuild completed in 212 ms
+afterBuild completed in 1869 ms

package/dist/native.cjs

@@ -891,15 +891,35 @@ function startGlobalObservers() {
 function rectsEqual(a, b) {
 	return a.x === b.x && a.y === b.y && a.width === b.width && a.height === b.height;
 }
-function registerLayoutNode(node, onChange, disableKey) {
+function emitLayoutIfChanged(node, parentNode, nodeRect, parentRect) {
+	var onLayout = LayoutHandlers.get(node);
+	if (typeof onLayout !== "function") return;
+	var cachedRect = NodeRectCache.get(node);
+	var cachedParentRect = NodeRectCache.get(parentNode);
+	var nodeChanged = !cachedRect || !rectsEqual(cachedRect, nodeRect);
+	var parentChanged = !cachedParentRect || !rectsEqual(cachedParentRect, parentRect);
+	if (!nodeChanged && !parentChanged) return;
+	NodeRectCache.set(node, nodeRect);
+	NodeRectCache.set(parentNode, parentRect);
+	var event = getElementLayoutEvent(nodeRect, parentRect, node);
+	if (avoidUpdates) queuedUpdates.set(node, function() {
+		return onLayout(event);
+	});
+	else onLayout(event);
+}
+function observeLayoutNode(node, disableKey) {
 	Nodes.add(node);
-	LayoutHandlers.set(node, onChange);
 	if (disableKey) LayoutDisableKey.set(node, disableKey);
+	else LayoutDisableKey.delete(node);
 	startGlobalObservers();
 	if (globalIntersectionObserver) {
 		globalIntersectionObserver.observe(node);
 		IntersectionState.set(node, true);
 	}
+}
+function registerLayoutNode(node, onChange, disableKey) {
+	LayoutHandlers.set(node, onChange);
+	observeLayoutNode(node, disableKey);
 	return function() {
 		return cleanupNode(node);
 	};
@@ -912,6 +932,17 @@ function cleanupNode(node) {
 	IntersectionState.delete(node);
 	if (globalIntersectionObserver) globalIntersectionObserver.unobserve(node);
 }
+function emitLayoutSync(node) {
+	var onLayout = LayoutHandlers.get(node);
+	if (typeof onLayout !== "function") return;
+	var parentNode = node.parentElement;
+	if (!parentNode) return;
+	var nodeRect = node.getBoundingClientRect();
+	var parentRect = parentNode.getBoundingClientRect();
+	NodeRectCache.set(node, nodeRect);
+	NodeRectCache.set(parentNode, parentRect);
+	onLayout(getElementLayoutEvent(nodeRect, parentRect, node));
+}
 function useElementLayout$1(ref, onLayout) {
 	var _ref_current;
 	var disableKey = (0, react.useContext)(DisableLayoutContextKey);
@@ -929,35 +960,17 @@ function useElementLayout$1(ref, onLayout) {
 		if (prevNode) cleanupNode(prevNode);
 		PrevHostNode.set(ref, nextNode);
 		if (!nextNode) return;
-		Nodes.add(nextNode);
-		startGlobalObservers();
-		if (globalIntersectionObserver) {
-			globalIntersectionObserver.observe(nextNode);
-			IntersectionState.set(nextNode, true);
-		}
-		var handler = LayoutHandlers.get(nextNode);
-		if (typeof handler !== "function") return;
-		var parentNode = nextNode.parentElement;
-		if (!parentNode) return;
-		var nodeRect = nextNode.getBoundingClientRect();
-		var parentRect = parentNode.getBoundingClientRect();
-		NodeRectCache.set(nextNode, nodeRect);
-		NodeRectCache.set(parentNode, parentRect);
-		handler(getElementLayoutEvent(nodeRect, parentRect, nextNode));
+		LayoutHandlers.set(nextNode, onLayout);
+		observeLayoutNode(nextNode, disableKey);
+		emitLayoutSync(nextNode);
 	});
 	useIsomorphicLayoutEffect(function() {
 		var _ref_current2;
 		if (!onLayout) return;
 		var node2 = (_ref_current2 = ref.current) === null || _ref_current2 === void 0 ? void 0 : _ref_current2.host;
 		if (!node2) return;
-		Nodes.add(node2);
-		startGlobalObservers();
-		if (globalIntersectionObserver) {
-			globalIntersectionObserver.observe(node2);
-			IntersectionState.set(node2, true);
-		}
-		var parentNode = node2.parentNode;
-		if (parentNode) onLayout(getElementLayoutEvent(node2.getBoundingClientRect(), parentNode.getBoundingClientRect(), node2));
+		LayoutHandlers.set(node2, onLayout);
+		observeLayoutNode(node2, disableKey);
 		return function() {
 			cleanupNode(node2);
 			var swappedNode = PrevHostNode.get(ref);
@@ -1033,8 +1046,7 @@ var init_index_native$11 = __esmMin((() => {
 		}
 		function _updateLayoutIfChanged() {
 			_updateLayoutIfChanged = _asyncToGenerator(function* (node) {
-				var onLayout = LayoutHandlers.get(node);
-				if (typeof onLayout !== "function") return;
+				if (typeof LayoutHandlers.get(node) !== "function") return;
 				var parentNode = node.parentElement;
 				if (!parentNode) return;
 				var nodeRect;
@@ -1047,19 +1059,7 @@ var init_index_native$11 = __esmMin((() => {
 					nodeRect = node.getBoundingClientRect();
 					parentRect = parentNode.getBoundingClientRect();
 				}
-				var cachedRect = NodeRectCache.get(node);
-				var cachedParentRect = NodeRectCache.get(parentNode);
-				var nodeChanged = !cachedRect || !rectsEqual(cachedRect, nodeRect);
-				var parentChanged = !cachedParentRect || !rectsEqual(cachedParentRect, parentRect);
-				if (nodeChanged || parentChanged) {
-					NodeRectCache.set(node, nodeRect);
-					NodeRectCache.set(parentNode, parentRect);
-					var event = getElementLayoutEvent(nodeRect, parentRect, node);
-					if (avoidUpdates) queuedUpdates.set(node, function() {
-						return onLayout(event);
-					});
-					else onLayout(event);
-				}
+				emitLayoutIfChanged(node, parentNode, nodeRect, parentRect);
 			});
 			return _updateLayoutIfChanged.apply(this, arguments);
 		}
@@ -13609,6 +13609,10 @@ function resetPressOwner() {
 function resetStaleOwner(now, debugName) {
 	if (now - pressState.timestamp > 2e3) resetPressOwner();
 }
+function hasExternalPressOwnership() {
+	resetStaleOwner(Date.now());
+	return pressState.ownerSource === "external";
+}
 function getGestureHandler() {
 	return {
 		get isEnabled() {
@@ -13739,7 +13743,7 @@ function getGestureHandler() {
 		}
 	};
 }
-var state, GESTURE_ENABLED_FREEZE_KEY$1, pressGestureDebugId, PRESS_MOVE_CANCEL_DISTANCE, PRESS_MOVE_CANCEL_DISTANCE_SQ, pressState;
+var _globalThis, _PRESS_STATE_KEY, state, GESTURE_ENABLED_FREEZE_KEY$1, pressGestureDebugId, PRESS_MOVE_CANCEL_DISTANCE, PRESS_MOVE_CANCEL_DISTANCE_SQ, PRESS_STATE_KEY, _$1, pressState;
 var init_gestureState_native = __esmMin((() => {
 	init_globalState_native();
 	state = createGlobalState(`gesture`, {
@@ -13753,7 +13757,8 @@ var init_gestureState_native = __esmMin((() => {
 	pressGestureDebugId = 0;
 	PRESS_MOVE_CANCEL_DISTANCE = 12;
 	PRESS_MOVE_CANCEL_DISTANCE_SQ = PRESS_MOVE_CANCEL_DISTANCE * PRESS_MOVE_CANCEL_DISTANCE;
-	pressState = {
+	PRESS_STATE_KEY = "__tamagui_press_state__";
+	pressState = (_$1 = (_globalThis = globalThis)[_PRESS_STATE_KEY = PRESS_STATE_KEY]) !== null && _$1 !== void 0 ? _$1 : _globalThis[_PRESS_STATE_KEY] = {
 		owner: null,
 		ownerId: null,
 		ownerSource: null,
@@ -13802,7 +13807,8 @@ function useMainThreadPressEvents(events, viewProps) {
 		pressInTimer: null,
 		pressOutTimer: null,
 		longPressTimer: null,
-		activateTime: 0
+		activateTime: 0,
+		blockedByExternalOwnership: false
 	};
 	if (!enabled || !events) return;
 	var _events_delayPressIn;
@@ -13846,11 +13852,18 @@ function useMainThreadPressEvents(events, viewProps) {
 	var userTerminationRequest = viewProps.onResponderTerminationRequest;
 	var userMove = viewProps.onResponderMove;
 	viewProps.onStartShouldSetResponder = function(e) {
-		return Boolean(userStartShouldSet === null || userStartShouldSet === void 0 ? void 0 : userStartShouldSet(e)) || !events.disabled;
+		if (userStartShouldSet === null || userStartShouldSet === void 0 ? void 0 : userStartShouldSet(e)) return true;
+		return !events.disabled && !hasExternalPressOwnership();
 	};
 	viewProps.onResponderGrant = function(e) {
-		userGrant === null || userGrant === void 0 || userGrant(e);
 		cleanup();
+		if (hasExternalPressOwnership()) {
+			ref.current.state = "idle";
+			ref.current.blockedByExternalOwnership = true;
+			return;
+		}
+		userGrant === null || userGrant === void 0 || userGrant(e);
+		ref.current.blockedByExternalOwnership = false;
 		ref.current.state = "pressing";
 		if (delayPressIn > 0) ref.current.pressInTimer = setTimeout(function() {
 			return activate(e);
@@ -13865,6 +13878,12 @@ function useMainThreadPressEvents(events, viewProps) {
 		}, delayLongPress + delayPressIn);
 	};
 	viewProps.onResponderRelease = function(e) {
+		if (ref.current.blockedByExternalOwnership || hasExternalPressOwnership()) {
+			cleanup();
+			ref.current.blockedByExternalOwnership = false;
+			ref.current.state = "idle";
+			return;
+		}
 		userRelease === null || userRelease === void 0 || userRelease(e);
 		var wasLongPressed = ref.current.state === "longPressed";
 		cleanup();
@@ -13875,12 +13894,14 @@ function useMainThreadPressEvents(events, viewProps) {
 		}
 		deactivate(e);
 		ref.current.state = "idle";
+		ref.current.blockedByExternalOwnership = false;
 	};
 	viewProps.onResponderTerminate = function(e) {
 		userTerminate === null || userTerminate === void 0 || userTerminate(e);
 		cleanup();
 		if (ref.current.state === "active" || ref.current.state === "longPressed") deactivate(e);
 		ref.current.state = "idle";
+		ref.current.blockedByExternalOwnership = false;
 	};
 	viewProps.onResponderTerminationRequest = function(e) {
 		if (userTerminationRequest) return userTerminationRequest(e);
@@ -13894,6 +13915,7 @@ function useMainThreadPressEvents(events, viewProps) {
 }
 var DEFAULT_LONG_PRESS_DELAY, DEFAULT_MIN_PRESS_DURATION;
 var init_mainThreadPressEvents_native = __esmMin((() => {
+	init_index_native$3();
 	DEFAULT_LONG_PRESS_DELAY = 500;
 	DEFAULT_MIN_PRESS_DURATION = 130;
 }));
@@ -13943,7 +13965,7 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
 	if (isUsingRNGH) {
 		var callbacksRef = (0, react.useRef)(isUsingRNGH ? {} : null);
 		var gestureRef = (0, react.useRef)(null);
-		useMainThreadPressEvents(events, viewProps, getIsAndroid() && !(hasRealPressEvents || stateRef.current.hasRealPressEvents) && Boolean(hasPressEvents), debugName);
+		useMainThreadPressEvents(events, viewProps, !isInsideNativeMenu && Boolean(hasRealPressEvents || getIsAndroid() && hasPressEvents), debugName);
 		if (everEnabled) {
 			callbacksRef.current = hasPressEvents ? {
 				onPressIn: events.onPressIn,
@@ -13951,6 +13973,10 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
 				onPress: events.onPress,
 				onLongPress: events.onLongPress
 			} : {};
+			if (hasRealPressEvents && !isInsideNativeMenu) {
+				gestureRef.current = null;
+				return null;
+			}
 			if (!gestureRef.current) {
 				var { Gesture } = gh.state;
 				if (isInsideNativeMenu) gestureRef.current = Gesture.Manual().runOnJS(true).manualActivation(true).onTouchesDown(function() {
@@ -13964,27 +13990,6 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
 					var _callbacksRef_current_onPressOut, _callbacksRef_current;
 					(_callbacksRef_current_onPressOut = (_callbacksRef_current = callbacksRef.current).onPressOut) === null || _callbacksRef_current_onPressOut === void 0 || _callbacksRef_current_onPressOut.call(_callbacksRef_current, {});
 				});
-				else if (hasRealPressEvents || stateRef.current.hasRealPressEvents) gestureRef.current = gh.createPressGesture({
-					debugName,
-					onPressIn: function(e) {
-						var _callbacksRef_current_onPressIn, _callbacksRef_current;
-						return (_callbacksRef_current_onPressIn = (_callbacksRef_current = callbacksRef.current).onPressIn) === null || _callbacksRef_current_onPressIn === void 0 ? void 0 : _callbacksRef_current_onPressIn.call(_callbacksRef_current, e);
-					},
-					onPressOut: function(e) {
-						var _callbacksRef_current_onPressOut, _callbacksRef_current;
-						return (_callbacksRef_current_onPressOut = (_callbacksRef_current = callbacksRef.current).onPressOut) === null || _callbacksRef_current_onPressOut === void 0 ? void 0 : _callbacksRef_current_onPressOut.call(_callbacksRef_current, e);
-					},
-					onPress: function(e) {
-						var _callbacksRef_current_onPress, _callbacksRef_current;
-						return (_callbacksRef_current_onPress = (_callbacksRef_current = callbacksRef.current).onPress) === null || _callbacksRef_current_onPress === void 0 ? void 0 : _callbacksRef_current_onPress.call(_callbacksRef_current, e);
-					},
-					onLongPress: function(e) {
-						var _callbacksRef_current_onLongPress, _callbacksRef_current;
-						return (_callbacksRef_current_onLongPress = (_callbacksRef_current = callbacksRef.current).onLongPress) === null || _callbacksRef_current_onLongPress === void 0 ? void 0 : _callbacksRef_current_onLongPress.call(_callbacksRef_current, e);
-					},
-					delayLongPress: events === null || events === void 0 ? void 0 : events.delayLongPress,
-					hitSlop: viewProps.hitSlop
-				});
 				else if (!getIsAndroid()) gestureRef.current = Gesture.Manual().runOnJS(true).manualActivation(true).onTouchesDown(function(e) {
 					var _callbacksRef_current_onPressIn, _callbacksRef_current;
 					return (_callbacksRef_current_onPressIn = (_callbacksRef_current = callbacksRef.current).onPressIn) === null || _callbacksRef_current_onPressIn === void 0 ? void 0 : _callbacksRef_current_onPressIn.call(_callbacksRef_current, e);
@@ -14004,23 +14009,20 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
 	useMainThreadPressEvents(events, viewProps, hasPressEvents, debugName);
 	return null;
 }
-function wrapWithGestureDetector(content, gesture, stateRef, isHOC, isCompositeComponent) {
+function wrapWithGestureDetector(content, gesture, _stateRef, isHOC, isCompositeComponent, hasRealPressEvents) {
 	if (isHOC || isCompositeComponent) return content;
-	var { GestureDetector, Gesture } = getGestureHandler().state;
-	var shouldWrap = getIsAndroid() ? stateRef.current.hasRealPressEvents : stateRef.current.hasHadEvents;
-	if (!GestureDetector || !shouldWrap) return content;
-	var gestureToUse = gesture || (Gesture === null || Gesture === void 0 ? void 0 : Gesture.Manual());
-	if (!gestureToUse) return content;
-	if (!stateRef.current.hasRealPressEvents) return react.default.createElement(GestureDetector, { gesture: gestureToUse }, content);
+	var { GestureDetector } = getGestureHandler().state;
+	if (!GestureDetector || !gesture) return content;
+	if (!hasRealPressEvents) return react.default.createElement(GestureDetector, { gesture }, content);
 	if (isFabric) {
 		var claimed = react.default.cloneElement(content, { onStartShouldSetResponder: responderClaim });
-		return react.default.createElement(GestureDetector, { gesture: gestureToUse }, claimed);
+		return react.default.createElement(GestureDetector, { gesture }, claimed);
 	}
 	return react.default.createElement(View$2, {
 		collapsable: false,
 		style: responderWrapperStyle,
 		onStartShouldSetResponder: responderClaim
-	}, react.default.createElement(GestureDetector, { gesture: gestureToUse }, content));
+	}, react.default.createElement(GestureDetector, { gesture }, content));
 }
 var isFabric, isAndroidCache, getIsAndroid, isNativeDesktopCache, getIsNativeDesktop, responderClaim, responderWrapperStyle;
 var init_eventHandling_native = __esmMin((() => {
@@ -15079,6 +15081,29 @@ var init_propMapper_native = __esmMin((() => {
 		}
 		var { conf, styleProps, staticConfig } = styleState;
 		var { variants } = staticConfig;
+		if (value === "unset") {
+			var expandedKey = !styleProps.disableExpandShorthands && conf.shorthands[key] || key;
+			var expanded = styleProps.noExpand ? null : expandStyle(expandedKey, value, conf.settings.styleCompat || "web");
+			if (styleState.style) if (expanded) {
+				var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+				try {
+					for (var _iterator = expanded[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+						var [nkey] = _step.value;
+						delete styleState.style[nkey];
+					}
+				} catch (err) {
+					_didIteratorError = true;
+					_iteratorError = err;
+				} finally {
+					try {
+						if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+					} finally {
+						if (_didIteratorError) throw _iteratorError;
+					}
+				}
+			} else delete styleState.style[expandedKey];
+			return;
+		}
 		if (!styleProps.noExpand) {
 			if (variants && key in variants) {
 				var variantValue = resolveVariants(key, value, styleProps, styleState, "");
@@ -15108,20 +15133,20 @@ var init_propMapper_native = __esmMin((() => {
 			var parsed = parseNativeStyle(key, value);
 			if (parsed) {
 				if (key === "textShadow" && Array.isArray(parsed) && Array.isArray(parsed[0])) {
-					var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+					var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
 					try {
-						for (var _iterator = parsed[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-							var [nkey, nvalue] = _step.value;
-							map(nkey, nvalue, originalValue);
+						for (var _iterator1 = parsed[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+							var [nkey1, nvalue] = _step1.value;
+							map(nkey1, nvalue, originalValue);
 						}
 					} catch (err) {
-						_didIteratorError = true;
-						_iteratorError = err;
+						_didIteratorError1 = true;
+						_iteratorError1 = err;
 					} finally {
 						try {
-							if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+							if (!_iteratorNormalCompletion1 && _iterator1.return != null) _iterator1.return();
 						} finally {
-							if (_didIteratorError) throw _iteratorError;
+							if (_didIteratorError1) throw _iteratorError1;
 						}
 					}
 					return;
@@ -15132,12 +15157,12 @@ var init_propMapper_native = __esmMin((() => {
 		if (value != null) {
 			var fontToken = getLastFontFamilyToken();
 			if (key === "fontFamily" && fontToken) styleState.fontFamily = fontToken;
-			var expanded = styleProps.noExpand ? null : expandStyle(key, value, conf.settings.styleCompat || "web");
-			if (expanded) {
-				var max = expanded.length;
+			var expanded1 = styleProps.noExpand ? null : expandStyle(key, value, conf.settings.styleCompat || "web");
+			if (expanded1) {
+				var max = expanded1.length;
 				for (var i = 0; i < max; i++) {
-					var [nkey1, nvalue1, noriginalValue] = expanded[i];
-					map(nkey1, nvalue1, noriginalValue !== null && noriginalValue !== void 0 ? noriginalValue : originalValue);
+					var [nkey2, nvalue1, noriginalValue] = expanded1[i];
+					map(nkey2, nvalue1, noriginalValue !== null && noriginalValue !== void 0 ? noriginalValue : originalValue);
 				}
 			} else map(key, value, originalValue);
 		}
@@ -17036,7 +17061,8 @@ function createComponent(staticConfig) {
 		var propsInWithHref = propsIn;
 		var _props_testID, _ref, _ref1, _ref2, _ref3;
 		var pressDebugName = [componentName, (_ref3 = (_ref2 = (_ref1 = (_ref = (_props_testID = props.testID) !== null && _props_testID !== void 0 ? _props_testID : propsIn.testID) !== null && _ref !== void 0 ? _ref : props.accessibilityLabel) !== null && _ref1 !== void 0 ? _ref1 : propsIn.accessibilityLabel) !== null && _ref2 !== void 0 ? _ref2 : typeof propsWithHref.href === "string" ? propsWithHref.href : null) !== null && _ref3 !== void 0 ? _ref3 : typeof propsInWithHref.href === "string" ? propsInWithHref.href : null].filter(Boolean).join(":") || null;
-		var pressGesture = useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNativeMenu, pressDebugName, !!(onPress || onPressIn || onPressOut || onLongPress));
+		var hasRealPressEvents = !!(onPress || onPressIn || onPressOut || onLongPress);
+		var pressGesture = useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNativeMenu, pressDebugName, hasRealPressEvents);
 		if (asChild) {
 			elementType = Slot;
 			Object.assign(viewProps, {
@@ -17061,7 +17087,7 @@ function createComponent(staticConfig) {
 				content = /* @__PURE__ */ react.default.createElement(elementType, viewProps, content || children);
 			}
 		}
-		content = wrapWithGestureDetector(content, pressGesture, stateRef, isHOC, !isHOC && Component && typeof Component !== "string");
+		content = wrapWithGestureDetector(content, pressGesture, stateRef, isHOC, !isHOC && Component && typeof Component !== "string", hasRealPressEvents);
 		var ResetPresence = animationDriver === null || animationDriver === void 0 ? void 0 : animationDriver.ResetPresence;
 		var needsReset = Boolean(!asChild && splitStyles && !isHOC && ResetPresence && willBeAnimated && (hasEnterStyle || presenceState));
 		var hasEverReset = stateRef.current.hasEverResetPresence;

package/dist/test.native.cjs

@@ -1999,6 +1999,8 @@ function createGlobalState(key, defaultValue) {
 }
 //#endregion
 //#region ../native/dist/esm/gestureState.native.js
+var _globalThis;
+var _PRESS_STATE_KEY;
 var state = createGlobalState(`gesture`, {
 	enabled: false,
 	Gesture: null,
@@ -2031,13 +2033,15 @@ function canChangeGestureHandlerEnabled(nextEnabled, source) {
 var pressGestureDebugId = 0;
 var PRESS_MOVE_CANCEL_DISTANCE = 12;
 var PRESS_MOVE_CANCEL_DISTANCE_SQ = PRESS_MOVE_CANCEL_DISTANCE * PRESS_MOVE_CANCEL_DISTANCE;
+var PRESS_STATE_KEY = "__tamagui_press_state__";
 function getEventPointerId(e) {
 	var _e_pointer, _e_event, _e_event_pointer, _e_event1, _e_nativeEvent, _e_nativeEvent1, _e_event_nativeEvent, _e_event2, _e_event_nativeEvent1, _e_event3;
 	var _e_pointerId, _ref, _ref1, _ref2, _ref3, _ref4, _ref5, _ref6;
 	var pointerId = (_ref6 = (_ref5 = (_ref4 = (_ref3 = (_ref2 = (_ref1 = (_ref = (_e_pointerId = e === null || e === void 0 ? void 0 : e.pointerId) !== null && _e_pointerId !== void 0 ? _e_pointerId : e === null || e === void 0 ? void 0 : (_e_pointer = e.pointer) === null || _e_pointer === void 0 ? void 0 : _e_pointer.id) !== null && _ref !== void 0 ? _ref : e === null || e === void 0 ? void 0 : (_e_event = e.event) === null || _e_event === void 0 ? void 0 : _e_event.pointerId) !== null && _ref1 !== void 0 ? _ref1 : e === null || e === void 0 ? void 0 : (_e_event1 = e.event) === null || _e_event1 === void 0 ? void 0 : (_e_event_pointer = _e_event1.pointer) === null || _e_event_pointer === void 0 ? void 0 : _e_event_pointer.id) !== null && _ref2 !== void 0 ? _ref2 : e === null || e === void 0 ? void 0 : (_e_nativeEvent = e.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.pointerId) !== null && _ref3 !== void 0 ? _ref3 : e === null || e === void 0 ? void 0 : (_e_nativeEvent1 = e.nativeEvent) === null || _e_nativeEvent1 === void 0 ? void 0 : _e_nativeEvent1.id) !== null && _ref4 !== void 0 ? _ref4 : e === null || e === void 0 ? void 0 : (_e_event2 = e.event) === null || _e_event2 === void 0 ? void 0 : (_e_event_nativeEvent = _e_event2.nativeEvent) === null || _e_event_nativeEvent === void 0 ? void 0 : _e_event_nativeEvent.pointerId) !== null && _ref5 !== void 0 ? _ref5 : e === null || e === void 0 ? void 0 : (_e_event3 = e.event) === null || _e_event3 === void 0 ? void 0 : (_e_event_nativeEvent1 = _e_event3.nativeEvent) === null || _e_event_nativeEvent1 === void 0 ? void 0 : _e_event_nativeEvent1.id) !== null && _ref6 !== void 0 ? _ref6 : null;
 	return pointerId == null || Number.isNaN(pointerId) ? null : Number(pointerId);
 }
-var pressState = {
+var _$1;
+var pressState = (_$1 = (_globalThis = globalThis)[_PRESS_STATE_KEY = PRESS_STATE_KEY]) !== null && _$1 !== void 0 ? _$1 : _globalThis[_PRESS_STATE_KEY] = {
 	owner: null,
 	ownerId: null,
 	ownerSource: null,
@@ -2054,6 +2058,10 @@ function resetPressOwner() {
 function resetStaleOwner(now, debugName) {
 	if (now - pressState.timestamp > 2e3) resetPressOwner();
 }
+function hasExternalPressOwnership() {
+	resetStaleOwner(Date.now());
+	return pressState.ownerSource === "external";
+}
 function getGestureHandler() {
 	return {
 		get isEnabled() {
@@ -2214,7 +2222,8 @@ function useMainThreadPressEvents(events, viewProps) {
 		pressInTimer: null,
 		pressOutTimer: null,
 		longPressTimer: null,
-		activateTime: 0
+		activateTime: 0,
+		blockedByExternalOwnership: false
 	};
 	if (!enabled || !events) return;
 	var _events_delayPressIn;
@@ -2258,11 +2267,18 @@ function useMainThreadPressEvents(events, viewProps) {
 	var userTerminationRequest = viewProps.onResponderTerminationRequest;
 	var userMove = viewProps.onResponderMove;
 	viewProps.onStartShouldSetResponder = function(e) {
-		return Boolean(userStartShouldSet === null || userStartShouldSet === void 0 ? void 0 : userStartShouldSet(e)) || !events.disabled;
+		if (userStartShouldSet === null || userStartShouldSet === void 0 ? void 0 : userStartShouldSet(e)) return true;
+		return !events.disabled && !hasExternalPressOwnership();
 	};
 	viewProps.onResponderGrant = function(e) {
-		userGrant === null || userGrant === void 0 || userGrant(e);
 		cleanup();
+		if (hasExternalPressOwnership()) {
+			ref.current.state = "idle";
+			ref.current.blockedByExternalOwnership = true;
+			return;
+		}
+		userGrant === null || userGrant === void 0 || userGrant(e);
+		ref.current.blockedByExternalOwnership = false;
 		ref.current.state = "pressing";
 		if (delayPressIn > 0) ref.current.pressInTimer = setTimeout(function() {
 			return activate(e);
@@ -2277,6 +2293,12 @@ function useMainThreadPressEvents(events, viewProps) {
 		}, delayLongPress + delayPressIn);
 	};
 	viewProps.onResponderRelease = function(e) {
+		if (ref.current.blockedByExternalOwnership || hasExternalPressOwnership()) {
+			cleanup();
+			ref.current.blockedByExternalOwnership = false;
+			ref.current.state = "idle";
+			return;
+		}
 		userRelease === null || userRelease === void 0 || userRelease(e);
 		var wasLongPressed = ref.current.state === "longPressed";
 		cleanup();
@@ -2287,12 +2309,14 @@ function useMainThreadPressEvents(events, viewProps) {
 		}
 		deactivate(e);
 		ref.current.state = "idle";
+		ref.current.blockedByExternalOwnership = false;
 	};
 	viewProps.onResponderTerminate = function(e) {
 		userTerminate === null || userTerminate === void 0 || userTerminate(e);
 		cleanup();
 		if (ref.current.state === "active" || ref.current.state === "longPressed") deactivate(e);
 		ref.current.state = "idle";
+		ref.current.blockedByExternalOwnership = false;
 	};
 	viewProps.onResponderTerminationRequest = function(e) {
 		if (userTerminationRequest) return userTerminationRequest(e);
@@ -2365,7 +2389,7 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
 	if (isUsingRNGH) {
 		var callbacksRef = (0, react.useRef)(isUsingRNGH ? {} : null);
 		var gestureRef = (0, react.useRef)(null);
-		useMainThreadPressEvents(events, viewProps, getIsAndroid() && !(hasRealPressEvents || stateRef.current.hasRealPressEvents) && Boolean(hasPressEvents), debugName);
+		useMainThreadPressEvents(events, viewProps, !isInsideNativeMenu && Boolean(hasRealPressEvents || getIsAndroid() && hasPressEvents), debugName);
 		if (everEnabled) {
 			callbacksRef.current = hasPressEvents ? {
 				onPressIn: events.onPressIn,
@@ -2373,6 +2397,10 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
 				onPress: events.onPress,
 				onLongPress: events.onLongPress
 			} : {};
+			if (hasRealPressEvents && !isInsideNativeMenu) {
+				gestureRef.current = null;
+				return null;
+			}
 			if (!gestureRef.current) {
 				var { Gesture } = gh.state;
 				if (isInsideNativeMenu) gestureRef.current = Gesture.Manual().runOnJS(true).manualActivation(true).onTouchesDown(function() {
@@ -2386,27 +2414,6 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
 					var _callbacksRef_current_onPressOut, _callbacksRef_current;
 					(_callbacksRef_current_onPressOut = (_callbacksRef_current = callbacksRef.current).onPressOut) === null || _callbacksRef_current_onPressOut === void 0 || _callbacksRef_current_onPressOut.call(_callbacksRef_current, {});
 				});
-				else if (hasRealPressEvents || stateRef.current.hasRealPressEvents) gestureRef.current = gh.createPressGesture({
-					debugName,
-					onPressIn: function(e) {
-						var _callbacksRef_current_onPressIn, _callbacksRef_current;
-						return (_callbacksRef_current_onPressIn = (_callbacksRef_current = callbacksRef.current).onPressIn) === null || _callbacksRef_current_onPressIn === void 0 ? void 0 : _callbacksRef_current_onPressIn.call(_callbacksRef_current, e);
-					},
-					onPressOut: function(e) {
-						var _callbacksRef_current_onPressOut, _callbacksRef_current;
-						return (_callbacksRef_current_onPressOut = (_callbacksRef_current = callbacksRef.current).onPressOut) === null || _callbacksRef_current_onPressOut === void 0 ? void 0 : _callbacksRef_current_onPressOut.call(_callbacksRef_current, e);
-					},
-					onPress: function(e) {
-						var _callbacksRef_current_onPress, _callbacksRef_current;
-						return (_callbacksRef_current_onPress = (_callbacksRef_current = callbacksRef.current).onPress) === null || _callbacksRef_current_onPress === void 0 ? void 0 : _callbacksRef_current_onPress.call(_callbacksRef_current, e);
-					},
-					onLongPress: function(e) {
-						var _callbacksRef_current_onLongPress, _callbacksRef_current;
-						return (_callbacksRef_current_onLongPress = (_callbacksRef_current = callbacksRef.current).onLongPress) === null || _callbacksRef_current_onLongPress === void 0 ? void 0 : _callbacksRef_current_onLongPress.call(_callbacksRef_current, e);
-					},
-					delayLongPress: events === null || events === void 0 ? void 0 : events.delayLongPress,
-					hitSlop: viewProps.hitSlop
-				});
 				else if (!getIsAndroid()) gestureRef.current = Gesture.Manual().runOnJS(true).manualActivation(true).onTouchesDown(function(e) {
 					var _callbacksRef_current_onPressIn, _callbacksRef_current;
 					return (_callbacksRef_current_onPressIn = (_callbacksRef_current = callbacksRef.current).onPressIn) === null || _callbacksRef_current_onPressIn === void 0 ? void 0 : _callbacksRef_current_onPressIn.call(_callbacksRef_current, e);
@@ -2426,23 +2433,20 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
 	useMainThreadPressEvents(events, viewProps, hasPressEvents, debugName);
 	return null;
 }
-function wrapWithGestureDetector(content, gesture, stateRef, isHOC, isCompositeComponent) {
+function wrapWithGestureDetector(content, gesture, _stateRef, isHOC, isCompositeComponent, hasRealPressEvents) {
 	if (isHOC || isCompositeComponent) return content;
-	var { GestureDetector, Gesture } = getGestureHandler().state;
-	var shouldWrap = getIsAndroid() ? stateRef.current.hasRealPressEvents : stateRef.current.hasHadEvents;
-	if (!GestureDetector || !shouldWrap) return content;
-	var gestureToUse = gesture || (Gesture === null || Gesture === void 0 ? void 0 : Gesture.Manual());
-	if (!gestureToUse) return content;
-	if (!stateRef.current.hasRealPressEvents) return react.default.createElement(GestureDetector, { gesture: gestureToUse }, content);
+	var { GestureDetector } = getGestureHandler().state;
+	if (!GestureDetector || !gesture) return content;
+	if (!hasRealPressEvents) return react.default.createElement(GestureDetector, { gesture }, content);
 	if (isFabric) {
 		var claimed = react.default.cloneElement(content, { onStartShouldSetResponder: responderClaim });
-		return react.default.createElement(GestureDetector, { gesture: gestureToUse }, claimed);
+		return react.default.createElement(GestureDetector, { gesture }, claimed);
 	}
 	return react.default.createElement(react_native.View, {
 		collapsable: false,
 		style: responderWrapperStyle,
 		onStartShouldSetResponder: responderClaim
-	}, react.default.createElement(GestureDetector, { gesture: gestureToUse }, content));
+	}, react.default.createElement(GestureDetector, { gesture }, content));
 }
 //#endregion
 //#region ../web/dist/esm/helpers/getDefaultProps.native.js
@@ -3584,6 +3588,29 @@ var propMapper = function(key, value, styleState, disabled, map) {
 	}
 	var { conf, styleProps, staticConfig } = styleState;
 	var { variants } = staticConfig;
+	if (value === "unset") {
+		var expandedKey = !styleProps.disableExpandShorthands && conf.shorthands[key] || key;
+		var expanded = styleProps.noExpand ? null : expandStyle(expandedKey, value, conf.settings.styleCompat || "web");
+		if (styleState.style) if (expanded) {
+			var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+			try {
+				for (var _iterator = expanded[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+					var [nkey] = _step.value;
+					delete styleState.style[nkey];
+				}
+			} catch (err) {
+				_didIteratorError = true;
+				_iteratorError = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+				} finally {
+					if (_didIteratorError) throw _iteratorError;
+				}
+			}
+		} else delete styleState.style[expandedKey];
+		return;
+	}
 	if (!styleProps.noExpand) {
 		if (variants && key in variants) {
 			var variantValue = resolveVariants(key, value, styleProps, styleState, "");
@@ -3613,20 +3640,20 @@ var propMapper = function(key, value, styleState, disabled, map) {
 		var parsed = parseNativeStyle(key, value);
 		if (parsed) {
 			if (key === "textShadow" && Array.isArray(parsed) && Array.isArray(parsed[0])) {
-				var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+				var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
 				try {
-					for (var _iterator = parsed[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-						var [nkey, nvalue] = _step.value;
-						map(nkey, nvalue, originalValue);
+					for (var _iterator1 = parsed[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+						var [nkey1, nvalue] = _step1.value;
+						map(nkey1, nvalue, originalValue);
 					}
 				} catch (err) {
-					_didIteratorError = true;
-					_iteratorError = err;
+					_didIteratorError1 = true;
+					_iteratorError1 = err;
 				} finally {
 					try {
-						if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+						if (!_iteratorNormalCompletion1 && _iterator1.return != null) _iterator1.return();
 					} finally {
-						if (_didIteratorError) throw _iteratorError;
+						if (_didIteratorError1) throw _iteratorError1;
 					}
 				}
 				return;
@@ -3637,12 +3664,12 @@ var propMapper = function(key, value, styleState, disabled, map) {
 	if (value != null) {
 		var fontToken = getLastFontFamilyToken();
 		if (key === "fontFamily" && fontToken) styleState.fontFamily = fontToken;
-		var expanded = styleProps.noExpand ? null : expandStyle(key, value, conf.settings.styleCompat || "web");
-		if (expanded) {
-			var max = expanded.length;
+		var expanded1 = styleProps.noExpand ? null : expandStyle(key, value, conf.settings.styleCompat || "web");
+		if (expanded1) {
+			var max = expanded1.length;
 			for (var i = 0; i < max; i++) {
-				var [nkey1, nvalue1, noriginalValue] = expanded[i];
-				map(nkey1, nvalue1, noriginalValue !== null && noriginalValue !== void 0 ? noriginalValue : originalValue);
+				var [nkey2, nvalue1, noriginalValue] = expanded1[i];
+				map(nkey2, nvalue1, noriginalValue !== null && noriginalValue !== void 0 ? noriginalValue : originalValue);
 			}
 		} else map(key, value, originalValue);
 	}
@@ -5109,10 +5136,11 @@ function createComponent(staticConfig) {
 				BaseView = baseViews.View;
 			}
 		}
-		if (propsIn["data-test-renders"]) {
-			var _propsIn_datatestrenders_current;
-			propsIn["data-test-renders"]["current"] = (_propsIn_datatestrenders_current = propsIn["data-test-renders"]["current"]) !== null && _propsIn_datatestrenders_current !== void 0 ? _propsIn_datatestrenders_current : 0;
-			propsIn["data-test-renders"]["current"] += 1;
+		var testRenderCount = propsIn["data-test-renders"];
+		if (testRenderCount && (typeof testRenderCount === "undefined" ? "undefined" : _type_of$1(testRenderCount)) === "object" && !Object.isFrozen(testRenderCount)) {
+			var _testRenderCount_current;
+			testRenderCount.current = (_testRenderCount_current = testRenderCount.current) !== null && _testRenderCount_current !== void 0 ? _testRenderCount_current : 0;
+			testRenderCount.current += 1;
 		}
 		var { context, isReactNative } = staticConfig;
 		var debugProp = propsIn["debug"];
@@ -5554,7 +5582,8 @@ function createComponent(staticConfig) {
 		var propsInWithHref = propsIn;
 		var _props_testID, _ref, _ref1, _ref2, _ref3;
 		var pressDebugName = [componentName, (_ref3 = (_ref2 = (_ref1 = (_ref = (_props_testID = props.testID) !== null && _props_testID !== void 0 ? _props_testID : propsIn.testID) !== null && _ref !== void 0 ? _ref : props.accessibilityLabel) !== null && _ref1 !== void 0 ? _ref1 : propsIn.accessibilityLabel) !== null && _ref2 !== void 0 ? _ref2 : typeof propsWithHref.href === "string" ? propsWithHref.href : null) !== null && _ref3 !== void 0 ? _ref3 : typeof propsInWithHref.href === "string" ? propsInWithHref.href : null].filter(Boolean).join(":") || null;
-		var pressGesture = useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNativeMenu, pressDebugName, !!(onPress || onPressIn || onPressOut || onLongPress));
+		var hasRealPressEvents = !!(onPress || onPressIn || onPressOut || onLongPress);
+		var pressGesture = useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNativeMenu, pressDebugName, hasRealPressEvents);
 		if (asChild) {
 			elementType = Slot;
 			Object.assign(viewProps, {
@@ -5579,7 +5608,7 @@ function createComponent(staticConfig) {
 				content = /* @__PURE__ */ react.default.createElement(elementType, viewProps, content || children);
 			}
 		}
-		content = wrapWithGestureDetector(content, pressGesture, stateRef, isHOC, !isHOC && Component && typeof Component !== "string");
+		content = wrapWithGestureDetector(content, pressGesture, stateRef, isHOC, !isHOC && Component && typeof Component !== "string", hasRealPressEvents);
 		var ResetPresence = animationDriver === null || animationDriver === void 0 ? void 0 : animationDriver.ResetPresence;
 		var needsReset = Boolean(!asChild && splitStyles && !isHOC && ResetPresence && willBeAnimated && (hasEnterStyle || presenceState));
 		var hasEverReset = stateRef.current.hasEverResetPresence;
@@ -7152,8 +7181,7 @@ if (ENABLE) {
 	}
 	function _updateLayoutIfChanged() {
 		_updateLayoutIfChanged = _asyncToGenerator(function* (node) {
-			var onLayout = LayoutHandlers.get(node);
-			if (typeof onLayout !== "function") return;
+			if (typeof LayoutHandlers.get(node) !== "function") return;
 			var parentNode = node.parentElement;
 			if (!parentNode) return;
 			var nodeRect;
@@ -7166,19 +7194,7 @@ if (ENABLE) {
 				nodeRect = node.getBoundingClientRect();
 				parentRect = parentNode.getBoundingClientRect();
 			}
-			var cachedRect = NodeRectCache.get(node);
-			var cachedParentRect = NodeRectCache.get(parentNode);
-			var nodeChanged = !cachedRect || !rectsEqual(cachedRect, nodeRect);
-			var parentChanged = !cachedParentRect || !rectsEqual(cachedParentRect, parentRect);
-			if (nodeChanged || parentChanged) {
-				NodeRectCache.set(node, nodeRect);
-				NodeRectCache.set(parentNode, parentRect);
-				var event = getElementLayoutEvent(nodeRect, parentRect, node);
-				if (avoidUpdates) queuedUpdates.set(node, function() {
-					return onLayout(event);
-				});
-				else onLayout(event);
-			}
+			emitLayoutIfChanged(node, parentNode, nodeRect, parentRect);
 		});
 		return _updateLayoutIfChanged.apply(this, arguments);
 	}
@@ -7309,15 +7325,35 @@ var getRelativeDimensions = function(a, b, aNode) {
 		pageY: a.top
 	};
 };
-function registerLayoutNode(node, onChange, disableKey) {
+function emitLayoutIfChanged(node, parentNode, nodeRect, parentRect) {
+	var onLayout = LayoutHandlers.get(node);
+	if (typeof onLayout !== "function") return;
+	var cachedRect = NodeRectCache.get(node);
+	var cachedParentRect = NodeRectCache.get(parentNode);
+	var nodeChanged = !cachedRect || !rectsEqual(cachedRect, nodeRect);
+	var parentChanged = !cachedParentRect || !rectsEqual(cachedParentRect, parentRect);
+	if (!nodeChanged && !parentChanged) return;
+	NodeRectCache.set(node, nodeRect);
+	NodeRectCache.set(parentNode, parentRect);
+	var event = getElementLayoutEvent(nodeRect, parentRect, node);
+	if (avoidUpdates) queuedUpdates.set(node, function() {
+		return onLayout(event);
+	});
+	else onLayout(event);
+}
+function observeLayoutNode(node, disableKey) {
 	Nodes.add(node);
-	LayoutHandlers.set(node, onChange);
 	if (disableKey) LayoutDisableKey.set(node, disableKey);
+	else LayoutDisableKey.delete(node);
 	startGlobalObservers();
 	if (globalIntersectionObserver) {
 		globalIntersectionObserver.observe(node);
 		IntersectionState.set(node, true);
 	}
+}
+function registerLayoutNode(node, onChange, disableKey) {
+	LayoutHandlers.set(node, onChange);
+	observeLayoutNode(node, disableKey);
 	return function() {
 		return cleanupNode(node);
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "license": "MIT",
   "author": {
@@ -79,17 +79,17 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/helpers": "2.4.0",
-    "@tamagui/react-native-media-driver": "2.4.0",
-    "@tamagui/react-native-use-pressable": "2.4.0",
-    "@tamagui/use-element-layout": "2.4.0",
-    "@tamagui/use-event": "2.4.0",
-    "@tamagui/web": "2.4.0"
+    "@tamagui/helpers": "2.4.1",
+    "@tamagui/react-native-media-driver": "2.4.1",
+    "@tamagui/react-native-use-pressable": "2.4.1",
+    "@tamagui/use-element-layout": "2.4.1",
+    "@tamagui/use-event": "2.4.1",
+    "@tamagui/web": "2.4.1"
   },
   "devDependencies": {
-    "@tamagui/build": "2.4.0",
-    "@tamagui/native-bundle": "2.4.0",
-    "@tamagui/react-native-web-lite": "2.4.0",
+    "@tamagui/build": "2.4.1",
+    "@tamagui/native-bundle": "2.4.1",
+    "@tamagui/react-native-web-lite": "2.4.1",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": ">=19",