tamagui 2.4.0 → 2.4.1

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 $ tamagui-build
-built tamagui in 930 ms
+built tamagui in 3983 ms
 Running afterBuild script...
-afterBuild completed in 265 ms
+afterBuild completed in 747 ms

package/dist/native.cjs

@@ -42,8 +42,8 @@ let react_native_safe_area_context = require("react-native-safe-area-context");
 if (typeof globalThis["__DEV__"] === "undefined") globalThis["__DEV__"] = false;
 //#endregion
 //#region src/setup.ts
-var _globalThis;
-(_globalThis = globalThis)["React"] || (_globalThis["React"] = react$1);
+var _globalThis$1;
+(_globalThis$1 = globalThis)["React"] || (_globalThis$1["React"] = react$1);
 if (typeof requestAnimationFrame === "undefined") globalThis["requestAnimationFrame"] = typeof setImmediate === "undefined" ? setTimeout : setImmediate;
 //#endregion
 //#region \0@oxc-project+runtime@0.130.0/helpers/typeof.js
@@ -901,15 +901,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);
 	};
@@ -922,6 +942,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$1.useContext)(DisableLayoutContextKey);
@@ -939,35 +970,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);
@@ -1043,8 +1056,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;
@@ -1057,19 +1069,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);
 		}
@@ -13665,6 +13665,10 @@ function releaseExternalPressOwnership(token, debugName) {
 	if (!token || pressState.owner !== token) return;
 	resetPressOwner();
 }
+function hasExternalPressOwnership() {
+	resetStaleOwner(Date.now());
+	return pressState.ownerSource === "external";
+}
 function getGestureHandler() {
 	return {
 		get isEnabled() {
@@ -13795,7 +13799,7 @@ function getGestureHandler() {
 		}
 	};
 }
-var state$6, GESTURE_ENABLED_FREEZE_KEY$1, pressGestureDebugId, externalPressDebugId, PRESS_MOVE_CANCEL_DISTANCE, PRESS_MOVE_CANCEL_DISTANCE_SQ, pressState;
+var _globalThis, _PRESS_STATE_KEY, state$6, GESTURE_ENABLED_FREEZE_KEY$1, pressGestureDebugId, externalPressDebugId, PRESS_MOVE_CANCEL_DISTANCE, PRESS_MOVE_CANCEL_DISTANCE_SQ, PRESS_STATE_KEY, _$1, pressState;
 var init_gestureState_native = __esmMin((() => {
 	init_globalState_native();
 	state$6 = createGlobalState(`gesture`, {
@@ -13810,7 +13814,8 @@ var init_gestureState_native = __esmMin((() => {
 	externalPressDebugId = 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,
@@ -14037,6 +14042,7 @@ var index_native_exports = /* @__PURE__ */ __exportAll({
 	isKeyboardControllerEnabled: () => isKeyboardControllerEnabled$1,
 	setKeyboardControllerState: () => setKeyboardControllerState,
 	unstable_claimExternalPressOwnership: () => claimExternalPressOwnership,
+	unstable_hasExternalPressOwnership: () => hasExternalPressOwnership,
 	unstable_releaseExternalPressOwnership: () => releaseExternalPressOwnership
 });
 var init_index_native$3 = __esmMin((() => {
@@ -14080,7 +14086,8 @@ function useMainThreadPressEvents(events, viewProps) {
 		pressInTimer: null,
 		pressOutTimer: null,
 		longPressTimer: null,
-		activateTime: 0
+		activateTime: 0,
+		blockedByExternalOwnership: false
 	};
 	if (!enabled || !events) return;
 	var _events_delayPressIn;
@@ -14124,11 +14131,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);
@@ -14143,6 +14157,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();
@@ -14153,12 +14173,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);
@@ -14172,6 +14194,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;
 }));
@@ -14221,7 +14244,7 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
 	if (isUsingRNGH) {
 		var callbacksRef = (0, react$1.useRef)(isUsingRNGH ? {} : null);
 		var gestureRef = (0, react$1.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,
@@ -14229,6 +14252,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() {
@@ -14242,27 +14269,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);
@@ -14282,23 +14288,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$1.default.createElement(GestureDetector, { gesture: gestureToUse }, content);
+	var { GestureDetector } = getGestureHandler().state;
+	if (!GestureDetector || !gesture) return content;
+	if (!hasRealPressEvents) return react$1.default.createElement(GestureDetector, { gesture }, content);
 	if (isFabric) {
 		var claimed = react$1.default.cloneElement(content, { onStartShouldSetResponder: responderClaim });
-		return react$1.default.createElement(GestureDetector, { gesture: gestureToUse }, claimed);
+		return react$1.default.createElement(GestureDetector, { gesture }, claimed);
 	}
 	return react$1.default.createElement(View$2, {
 		collapsable: false,
 		style: responderWrapperStyle,
 		onStartShouldSetResponder: responderClaim
-	}, react$1.default.createElement(GestureDetector, { gesture: gestureToUse }, content));
+	}, react$1.default.createElement(GestureDetector, { gesture }, content));
 }
 var isFabric, isAndroidCache, getIsAndroid, isNativeDesktopCache, getIsNativeDesktop, responderClaim, responderWrapperStyle;
 var init_eventHandling_native = __esmMin((() => {
@@ -15353,6 +15356,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, "");
@@ -15382,20 +15408,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;
@@ -15406,12 +15432,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);
 		}
@@ -17299,7 +17325,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, {
@@ -17324,7 +17351,7 @@ function createComponent(staticConfig) {
 				content = /* @__PURE__ */ react$1.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;
@@ -20055,6 +20082,13 @@ var getFontSized = function() {
 	if (!font) return { fontSize: sizeTokenIn };
 	var sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn;
 	var style = {};
+	if (typeof sizeToken === "number") {
+		style.fontSize = sizeToken;
+		if (fontFamily) style.fontFamily = fontFamily;
+		if (props.fontStyle) style.fontStyle = props.fontStyle;
+		if (props.color) style.color = props.color;
+		return style;
+	}
 	var fontSize = font.size[sizeToken];
 	var lineHeight = (_font_lineHeight = font.lineHeight) === null || _font_lineHeight === void 0 ? void 0 : _font_lineHeight[sizeToken];
 	var fontWeight = (_font_weight = font.weight) === null || _font_weight === void 0 ? void 0 : _font_weight[sizeToken];
@@ -20732,7 +20766,7 @@ function PortalHostNonNative(props) {
 		return next;
 	}));
 	return render(state.map(function(item) {
-		return item.node;
+		return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react$1.default.Fragment, { children: item.node }, item.name);
 	}));
 }
 //#endregion
@@ -22053,11 +22087,9 @@ var [createAvatarContext, createAvatarScope] = createContextScope(AVATAR_NAME);
 var [AvatarProvider, useAvatarContext] = createAvatarContext(AVATAR_NAME);
 var IMAGE_NAME = "AvatarImage";
 var AvatarImage = /* @__PURE__ */ react$1.forwardRef(function(props, forwardedRef) {
-	var _getShapeSize;
 	var { __scopeAvatar, src, source, onLoadingStatusChange = function() {} } = props, imageProps = _objectWithoutProperties(props, _excluded$40);
 	var context = useAvatarContext(IMAGE_NAME, __scopeAvatar);
 	var [status, setStatus] = react$1.useState("idle");
-	var shapeSize = getVariableValue((_getShapeSize = getShapeSize(context.size, { tokens: getTokens() })) === null || _getShapeSize === void 0 ? void 0 : _getShapeSize.width);
 	var resolvedSrc = src || (source && (typeof source === "undefined" ? "undefined" : _type_of$3(source)) === "object" && "uri" in source ? source.uri : source);
 	react$1.useEffect(function() {
 		if (!resolvedSrc) setStatus("error");
@@ -22071,17 +22103,16 @@ var AvatarImage = /* @__PURE__ */ react$1.forwardRef(function(props, forwardedRe
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(YStack, {
 		fullscreen: true,
 		zIndex: 1,
-		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Image, _objectSpread2(_objectSpread2(_objectSpread2({
+		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Image, _objectSpread2(_objectSpread2({
 			position: "absolute",
 			top: 0,
 			left: 0,
 			right: 0,
 			bottom: 0,
-			objectFit: "cover"
-		}, typeof shapeSize === "number" && !Number.isNaN(shapeSize) && {
-			width: shapeSize,
-			height: shapeSize
-		}), imageProps), {}, {
+			objectFit: "cover",
+			width: "100%",
+			height: "100%"
+		}, imageProps), {}, {
 			ref: forwardedRef,
 			src: resolvedSrc,
 			onError: function() {
@@ -28680,11 +28711,17 @@ var SheetInsideSheetContext = react$1.default.createContext(null);
 //#endregion
 //#region ../sheet/dist/esm/gestureState.native.js
 init_index_native$3();
+var SHEET_GESTURE_STATE_KEY = "__tamagui_sheet_gesture_state__";
+function getSheetGestureHandlerState() {
+	var g = globalThis;
+	var _g_SHEET_GESTURE_STATE_KEY;
+	return (_g_SHEET_GESTURE_STATE_KEY = g[SHEET_GESTURE_STATE_KEY]) !== null && _g_SHEET_GESTURE_STATE_KEY !== void 0 ? _g_SHEET_GESTURE_STATE_KEY : getGestureHandler().state;
+}
 function isGestureHandlerEnabled() {
-	return getGestureHandler().isEnabled;
+	return getSheetGestureHandlerState().enabled;
 }
 function getGestureHandlerState() {
-	return getGestureHandler().state;
+	return getSheetGestureHandlerState();
 }
 //#endregion
 //#region ../sheet/dist/esm/GestureDetectorWrapper.native.js
@@ -30047,13 +30084,17 @@ function createSheet(param) {
 		var { __scopeSheet } = propsIn, props = _objectWithoutProperties(propsIn, _excluded2$7);
 		var context = useSheetContext(SHEET_OVERLAY_NAME, __scopeSheet);
 		var element = (0, react$1.useMemo)(function() {
-			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Overlay, _objectSpread2(_objectSpread2({}, props), {}, { onPress: composeEventHandlers(props.onPress, context.dismissOnOverlayPress ? function() {
-				context.setOpen(false);
-			} : void 0) }));
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Overlay, _objectSpread2(_objectSpread2({}, props), {}, {
+				ref,
+				onPress: composeEventHandlers(props.onPress, context.dismissOnOverlayPress ? function() {
+					context.setOpen(false);
+				} : void 0)
+			}));
 		}, [
-			props.onPress,
-			props.opacity,
-			context.dismissOnOverlayPress
+			props,
+			ref,
+			context.dismissOnOverlayPress,
+			context.setOpen
 		]);
 		useIsomorphicLayoutEffect(function() {
 			var _context_onOverlayComponent;
@@ -33280,6 +33321,8 @@ exports.textAreaSizeVariant = textAreaSizeVariant;
 exports.themeable = themeable;
 exports.themeableVariants = themeableVariants;
 exports.tokenCategories = tokenCategories;
+exports.unstable_getSheetGestureHandlerState = getGestureHandlerState;
+exports.unstable_isSheetGestureHandlerEnabled = isGestureHandlerEnabled;
 exports.updateTheme = updateTheme;
 exports.useAdaptContext = useAdaptContext;
 exports.useAdaptIsActive = useAdaptIsActive;

package/dist/test.cjs

@@ -42,8 +42,8 @@ let react_native_safe_area_context = require("react-native-safe-area-context");
 if (typeof globalThis["__DEV__"] === "undefined") globalThis["__DEV__"] = false;
 //#endregion
 //#region src/setup.ts
-var _globalThis;
-(_globalThis = globalThis)["React"] || (_globalThis["React"] = react$1);
+var _globalThis$1;
+(_globalThis$1 = globalThis)["React"] || (_globalThis$1["React"] = react$1);
 if (typeof requestAnimationFrame === "undefined") globalThis["requestAnimationFrame"] = typeof setImmediate === "undefined" ? setTimeout : setImmediate;
 //#endregion
 //#region \0@oxc-project+runtime@0.130.0/helpers/typeof.js
@@ -901,15 +901,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);
 	};
@@ -922,6 +942,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$1.useContext)(DisableLayoutContextKey);
@@ -939,35 +970,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);
@@ -1043,8 +1056,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;
@@ -1057,19 +1069,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);
 		}
@@ -13843,6 +13843,10 @@ function releaseExternalPressOwnership(token, debugName) {
 	if (!token || pressState.owner !== token) return;
 	resetPressOwner();
 }
+function hasExternalPressOwnership() {
+	resetStaleOwner(Date.now());
+	return pressState.ownerSource === "external";
+}
 function getGestureHandler() {
 	return {
 		get isEnabled() {
@@ -13973,7 +13977,7 @@ function getGestureHandler() {
 		}
 	};
 }
-var state$6, GESTURE_ENABLED_FREEZE_KEY$1, pressGestureDebugId, externalPressDebugId, PRESS_MOVE_CANCEL_DISTANCE, PRESS_MOVE_CANCEL_DISTANCE_SQ, pressState;
+var _globalThis, _PRESS_STATE_KEY, state$6, GESTURE_ENABLED_FREEZE_KEY$1, pressGestureDebugId, externalPressDebugId, PRESS_MOVE_CANCEL_DISTANCE, PRESS_MOVE_CANCEL_DISTANCE_SQ, PRESS_STATE_KEY, _$1, pressState;
 var init_gestureState_native = __esmMin((() => {
 	init_globalState_native();
 	state$6 = createGlobalState(`gesture`, {
@@ -13988,7 +13992,8 @@ var init_gestureState_native = __esmMin((() => {
 	externalPressDebugId = 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,
@@ -14215,6 +14220,7 @@ var index_native_exports = /* @__PURE__ */ __exportAll({
 	isKeyboardControllerEnabled: () => isKeyboardControllerEnabled$1,
 	setKeyboardControllerState: () => setKeyboardControllerState,
 	unstable_claimExternalPressOwnership: () => claimExternalPressOwnership,
+	unstable_hasExternalPressOwnership: () => hasExternalPressOwnership,
 	unstable_releaseExternalPressOwnership: () => releaseExternalPressOwnership
 });
 var init_index_native$3 = __esmMin((() => {
@@ -14258,7 +14264,8 @@ function useMainThreadPressEvents(events, viewProps) {
 		pressInTimer: null,
 		pressOutTimer: null,
 		longPressTimer: null,
-		activateTime: 0
+		activateTime: 0,
+		blockedByExternalOwnership: false
 	};
 	if (!enabled || !events) return;
 	var _events_delayPressIn;
@@ -14302,11 +14309,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);
@@ -14321,6 +14335,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();
@@ -14331,12 +14351,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);
@@ -14350,6 +14372,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;
 }));
@@ -14399,7 +14422,7 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
 	if (isUsingRNGH) {
 		var callbacksRef = (0, react$1.useRef)(isUsingRNGH ? {} : null);
 		var gestureRef = (0, react$1.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,
@@ -14407,6 +14430,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() {
@@ -14420,27 +14447,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);
@@ -14460,23 +14466,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$1.default.createElement(GestureDetector, { gesture: gestureToUse }, content);
+	var { GestureDetector } = getGestureHandler().state;
+	if (!GestureDetector || !gesture) return content;
+	if (!hasRealPressEvents) return react$1.default.createElement(GestureDetector, { gesture }, content);
 	if (isFabric) {
 		var claimed = react$1.default.cloneElement(content, { onStartShouldSetResponder: responderClaim });
-		return react$1.default.createElement(GestureDetector, { gesture: gestureToUse }, claimed);
+		return react$1.default.createElement(GestureDetector, { gesture }, claimed);
 	}
 	return react$1.default.createElement(View$2, {
 		collapsable: false,
 		style: responderWrapperStyle,
 		onStartShouldSetResponder: responderClaim
-	}, react$1.default.createElement(GestureDetector, { gesture: gestureToUse }, content));
+	}, react$1.default.createElement(GestureDetector, { gesture }, content));
 }
 var isFabric, isAndroidCache, getIsAndroid, isNativeDesktopCache, getIsNativeDesktop, responderClaim, responderWrapperStyle;
 var init_eventHandling_native = __esmMin((() => {
@@ -15532,6 +15535,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, "");
@@ -15561,20 +15587,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;
@@ -15585,12 +15611,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);
 		}
@@ -17039,10 +17065,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$7(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"];
@@ -17484,7 +17511,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, {
@@ -17509,7 +17537,7 @@ function createComponent(staticConfig) {
 				content = /* @__PURE__ */ react$1.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;
@@ -20121,6 +20149,13 @@ var getFontSized = function() {
 	if (!font) return { fontSize: sizeTokenIn };
 	var sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn;
 	var style = {};
+	if (typeof sizeToken === "number") {
+		style.fontSize = sizeToken;
+		if (fontFamily) style.fontFamily = fontFamily;
+		if (props.fontStyle) style.fontStyle = props.fontStyle;
+		if (props.color) style.color = props.color;
+		return style;
+	}
 	var fontSize = font.size[sizeToken];
 	var lineHeight = (_font_lineHeight = font.lineHeight) === null || _font_lineHeight === void 0 ? void 0 : _font_lineHeight[sizeToken];
 	var fontWeight = (_font_weight = font.weight) === null || _font_weight === void 0 ? void 0 : _font_weight[sizeToken];
@@ -20798,7 +20833,7 @@ function PortalHostNonNative(props) {
 		return next;
 	}));
 	return render(state.map(function(item) {
-		return item.node;
+		return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react$1.default.Fragment, { children: item.node }, item.name);
 	}));
 }
 //#endregion
@@ -22119,11 +22154,9 @@ var [createAvatarContext, createAvatarScope] = createContextScope(AVATAR_NAME);
 var [AvatarProvider, useAvatarContext] = createAvatarContext(AVATAR_NAME);
 var IMAGE_NAME = "AvatarImage";
 var AvatarImage = /* @__PURE__ */ react$1.forwardRef(function(props, forwardedRef) {
-	var _getShapeSize;
 	var { __scopeAvatar, src, source, onLoadingStatusChange = function() {} } = props, imageProps = _objectWithoutProperties(props, _excluded$40);
 	var context = useAvatarContext(IMAGE_NAME, __scopeAvatar);
 	var [status, setStatus] = react$1.useState("idle");
-	var shapeSize = getVariableValue((_getShapeSize = getShapeSize(context.size, { tokens: getTokens() })) === null || _getShapeSize === void 0 ? void 0 : _getShapeSize.width);
 	var resolvedSrc = src || (source && (typeof source === "undefined" ? "undefined" : _type_of$3(source)) === "object" && "uri" in source ? source.uri : source);
 	react$1.useEffect(function() {
 		if (!resolvedSrc) setStatus("error");
@@ -22137,17 +22170,16 @@ var AvatarImage = /* @__PURE__ */ react$1.forwardRef(function(props, forwardedRe
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(YStack, {
 		fullscreen: true,
 		zIndex: 1,
-		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Image, _objectSpread2(_objectSpread2(_objectSpread2({
+		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Image, _objectSpread2(_objectSpread2({
 			position: "absolute",
 			top: 0,
 			left: 0,
 			right: 0,
 			bottom: 0,
-			objectFit: "cover"
-		}, typeof shapeSize === "number" && !Number.isNaN(shapeSize) && {
-			width: shapeSize,
-			height: shapeSize
-		}), imageProps), {}, {
+			objectFit: "cover",
+			width: "100%",
+			height: "100%"
+		}, imageProps), {}, {
 			ref: forwardedRef,
 			src: resolvedSrc,
 			onError: function() {
@@ -28746,11 +28778,17 @@ var SheetInsideSheetContext = react$1.default.createContext(null);
 //#endregion
 //#region ../sheet/dist/esm/gestureState.native.js
 init_index_native$3();
+var SHEET_GESTURE_STATE_KEY = "__tamagui_sheet_gesture_state__";
+function getSheetGestureHandlerState() {
+	var g = globalThis;
+	var _g_SHEET_GESTURE_STATE_KEY;
+	return (_g_SHEET_GESTURE_STATE_KEY = g[SHEET_GESTURE_STATE_KEY]) !== null && _g_SHEET_GESTURE_STATE_KEY !== void 0 ? _g_SHEET_GESTURE_STATE_KEY : getGestureHandler().state;
+}
 function isGestureHandlerEnabled() {
-	return getGestureHandler().isEnabled;
+	return getSheetGestureHandlerState().enabled;
 }
 function getGestureHandlerState() {
-	return getGestureHandler().state;
+	return getSheetGestureHandlerState();
 }
 //#endregion
 //#region ../sheet/dist/esm/GestureDetectorWrapper.native.js
@@ -30113,13 +30151,17 @@ function createSheet(param) {
 		var { __scopeSheet } = propsIn, props = _objectWithoutProperties(propsIn, _excluded2$7);
 		var context = useSheetContext(SHEET_OVERLAY_NAME, __scopeSheet);
 		var element = (0, react$1.useMemo)(function() {
-			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Overlay, _objectSpread2(_objectSpread2({}, props), {}, { onPress: composeEventHandlers(props.onPress, context.dismissOnOverlayPress ? function() {
-				context.setOpen(false);
-			} : void 0) }));
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Overlay, _objectSpread2(_objectSpread2({}, props), {}, {
+				ref,
+				onPress: composeEventHandlers(props.onPress, context.dismissOnOverlayPress ? function() {
+					context.setOpen(false);
+				} : void 0)
+			}));
 		}, [
-			props.onPress,
-			props.opacity,
-			context.dismissOnOverlayPress
+			props,
+			ref,
+			context.dismissOnOverlayPress,
+			context.setOpen
 		]);
 		useIsomorphicLayoutEffect(function() {
 			var _context_onOverlayComponent;
@@ -33346,6 +33388,8 @@ exports.textAreaSizeVariant = textAreaSizeVariant;
 exports.themeable = themeable;
 exports.themeableVariants = themeableVariants;
 exports.tokenCategories = tokenCategories;
+exports.unstable_getSheetGestureHandlerState = getGestureHandlerState;
+exports.unstable_isSheetGestureHandlerEnabled = isGestureHandlerEnabled;
 exports.updateTheme = updateTheme;
 exports.useAdaptContext = useAdaptContext;
 exports.useAdaptIsActive = useAdaptIsActive;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tamagui",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "description": "Style and UI for React (web and native) meet an optimizing compiler",
   "repository": {
@@ -77,72 +77,72 @@
     "check-circular-deps": "npx madge --circular ./src/index.ts"
   },
   "dependencies": {
-    "@tamagui/accordion": "2.4.0",
-    "@tamagui/adapt": "2.4.0",
-    "@tamagui/alert-dialog": "2.4.0",
-    "@tamagui/animate": "2.4.0",
-    "@tamagui/animate-presence": "2.4.0",
-    "@tamagui/avatar": "2.4.0",
-    "@tamagui/button": "2.4.0",
-    "@tamagui/card": "2.4.0",
-    "@tamagui/checkbox": "2.4.0",
-    "@tamagui/collapsible": "2.4.0",
-    "@tamagui/compose-refs": "2.4.0",
-    "@tamagui/constants": "2.4.0",
-    "@tamagui/context-menu": "2.4.0",
-    "@tamagui/core": "2.4.0",
-    "@tamagui/create-context": "2.4.0",
-    "@tamagui/create-menu": "2.4.0",
-    "@tamagui/dialog": "2.4.0",
-    "@tamagui/element": "2.4.0",
-    "@tamagui/elements": "2.4.0",
-    "@tamagui/fake-react-native": "2.4.0",
-    "@tamagui/focusable": "2.4.0",
-    "@tamagui/form": "2.4.0",
-    "@tamagui/get-button-sized": "2.4.0",
-    "@tamagui/get-font-sized": "2.4.0",
-    "@tamagui/get-token": "2.4.0",
-    "@tamagui/group": "2.4.0",
-    "@tamagui/helpers-tamagui": "2.4.0",
-    "@tamagui/image": "2.4.0",
-    "@tamagui/input": "2.4.0",
-    "@tamagui/label": "2.4.0",
-    "@tamagui/linear-gradient": "2.4.0",
-    "@tamagui/list-item": "2.4.0",
-    "@tamagui/menu": "2.4.0",
-    "@tamagui/polyfill-dev": "2.4.0",
-    "@tamagui/popover": "2.4.0",
-    "@tamagui/popper": "2.4.0",
-    "@tamagui/portal": "2.4.0",
-    "@tamagui/progress": "2.4.0",
-    "@tamagui/radio-group": "2.4.0",
-    "@tamagui/react-native-media-driver": "2.4.0",
-    "@tamagui/scroll-view": "2.4.0",
-    "@tamagui/select": "2.4.0",
-    "@tamagui/separator": "2.4.0",
-    "@tamagui/shapes": "2.4.0",
-    "@tamagui/sheet": "2.4.0",
-    "@tamagui/slider": "2.4.0",
-    "@tamagui/spacer": "2.4.0",
-    "@tamagui/spinner": "2.4.0",
-    "@tamagui/stacks": "2.4.0",
-    "@tamagui/switch": "2.4.0",
-    "@tamagui/tabs": "2.4.0",
-    "@tamagui/text": "2.4.0",
-    "@tamagui/theme": "2.4.0",
-    "@tamagui/toast": "2.4.0",
-    "@tamagui/toggle-group": "2.4.0",
-    "@tamagui/tooltip": "2.4.0",
-    "@tamagui/use-controllable-state": "2.4.0",
-    "@tamagui/use-debounce": "2.4.0",
-    "@tamagui/use-force-update": "2.4.0",
-    "@tamagui/use-window-dimensions": "2.4.0",
-    "@tamagui/visually-hidden": "2.4.0",
-    "@tamagui/font-size": "2.4.0",
-    "@tamagui/z-index-stack": "2.4.0"
+    "@tamagui/accordion": "2.4.1",
+    "@tamagui/adapt": "2.4.1",
+    "@tamagui/alert-dialog": "2.4.1",
+    "@tamagui/animate": "2.4.1",
+    "@tamagui/animate-presence": "2.4.1",
+    "@tamagui/avatar": "2.4.1",
+    "@tamagui/button": "2.4.1",
+    "@tamagui/card": "2.4.1",
+    "@tamagui/checkbox": "2.4.1",
+    "@tamagui/collapsible": "2.4.1",
+    "@tamagui/compose-refs": "2.4.1",
+    "@tamagui/constants": "2.4.1",
+    "@tamagui/context-menu": "2.4.1",
+    "@tamagui/core": "2.4.1",
+    "@tamagui/create-context": "2.4.1",
+    "@tamagui/create-menu": "2.4.1",
+    "@tamagui/dialog": "2.4.1",
+    "@tamagui/element": "2.4.1",
+    "@tamagui/elements": "2.4.1",
+    "@tamagui/fake-react-native": "2.4.1",
+    "@tamagui/focusable": "2.4.1",
+    "@tamagui/form": "2.4.1",
+    "@tamagui/get-button-sized": "2.4.1",
+    "@tamagui/get-font-sized": "2.4.1",
+    "@tamagui/get-token": "2.4.1",
+    "@tamagui/group": "2.4.1",
+    "@tamagui/helpers-tamagui": "2.4.1",
+    "@tamagui/image": "2.4.1",
+    "@tamagui/input": "2.4.1",
+    "@tamagui/label": "2.4.1",
+    "@tamagui/linear-gradient": "2.4.1",
+    "@tamagui/list-item": "2.4.1",
+    "@tamagui/menu": "2.4.1",
+    "@tamagui/polyfill-dev": "2.4.1",
+    "@tamagui/popover": "2.4.1",
+    "@tamagui/popper": "2.4.1",
+    "@tamagui/portal": "2.4.1",
+    "@tamagui/progress": "2.4.1",
+    "@tamagui/radio-group": "2.4.1",
+    "@tamagui/react-native-media-driver": "2.4.1",
+    "@tamagui/scroll-view": "2.4.1",
+    "@tamagui/select": "2.4.1",
+    "@tamagui/separator": "2.4.1",
+    "@tamagui/shapes": "2.4.1",
+    "@tamagui/sheet": "2.4.1",
+    "@tamagui/slider": "2.4.1",
+    "@tamagui/spacer": "2.4.1",
+    "@tamagui/spinner": "2.4.1",
+    "@tamagui/stacks": "2.4.1",
+    "@tamagui/switch": "2.4.1",
+    "@tamagui/tabs": "2.4.1",
+    "@tamagui/text": "2.4.1",
+    "@tamagui/theme": "2.4.1",
+    "@tamagui/toast": "2.4.1",
+    "@tamagui/toggle-group": "2.4.1",
+    "@tamagui/tooltip": "2.4.1",
+    "@tamagui/use-controllable-state": "2.4.1",
+    "@tamagui/use-debounce": "2.4.1",
+    "@tamagui/use-force-update": "2.4.1",
+    "@tamagui/use-window-dimensions": "2.4.1",
+    "@tamagui/visually-hidden": "2.4.1",
+    "@tamagui/font-size": "2.4.1",
+    "@tamagui/z-index-stack": "2.4.1"
   },
   "devDependencies": {
-    "@tamagui/build": "2.4.0",
+    "@tamagui/build": "2.4.1",
     "react": ">=19",
     "react-native": "0.83.2",
     "react-native-web": "^0.21.0"