@tamagui/core 3.0.0-beta.1479.1 → 3.0.0-beta.1537.1

package/dist/native.cjs

@@ -12843,7 +12843,7 @@ var getSnapshotImpl = function(r) {
 	var isSchemeOnlyChange = !optimizeForFirstRender && supportsDynamicColorIOS && getSetting("fastSchemeChange") && local && parentState && local.scheme !== parentState.scheme && getThemeBaseName(local.name) === getThemeBaseName(parentState.name);
 	var allKeysSchemeOptimized = !optimizeForFirstRender && Boolean(((_keys_current = keys.current) === null || _keys_current === void 0 ? void 0 : _keys_current.size) && (schemeKeys === null || schemeKeys === void 0 ? void 0 : (_schemeKeys_current = schemeKeys.current) === null || _schemeKeys_current === void 0 ? void 0 : _schemeKeys_current.size) === keys.current.size);
 	var canSkipForSchemeChange = Boolean(isSchemeOnlyChange && allKeysSchemeOptimized);
-	var needsUpdate = props.passThrough ? false : optimizeForFirstRender ? true : isRoot || props.name === "light" || props.name === "dark" || props.name === null ? true : !HasRenderedOnce.get(keys) ? true : canSkipForSchemeChange ? false : (keys === null || keys === void 0 ? void 0 : (_keys_current1 = keys.current) === null || _keys_current1 === void 0 ? void 0 : _keys_current1.size) ? true : (_props_needsUpdate = props.needsUpdate) === null || _props_needsUpdate === void 0 ? void 0 : _props_needsUpdate.call(props);
+	var needsUpdate = props.passThrough ? false : optimizeForFirstRender ? true : isRoot || props.forceClassName || props.name === "light" || props.name === "dark" || props.name === null ? true : !HasRenderedOnce.get(keys) ? true : canSkipForSchemeChange ? false : (keys === null || keys === void 0 ? void 0 : (_keys_current1 = keys.current) === null || _keys_current1 === void 0 ? void 0 : _keys_current1.size) ? true : (_props_needsUpdate = props.needsUpdate) === null || _props_needsUpdate === void 0 ? void 0 : _props_needsUpdate.call(props);
 	var [rerender, nextRaw] = getNextState(local, props, propsKey, isRoot, id, parentId, needsUpdate, PendingUpdate.get(id));
 	var next = nextRaw;
 	if (props._themeUpdate && (nextRaw === null || nextRaw === void 0 ? void 0 : nextRaw.theme)) {
@@ -12870,7 +12870,7 @@ var getSnapshotImpl = function(r) {
 var getNextState = function(lastState, props, propsKey) {
 	var isRoot = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false, id = arguments.length > 4 ? arguments[4] : void 0, parentId = arguments.length > 5 ? arguments[5] : void 0, needsUpdate = arguments.length > 6 ? arguments[6] : void 0, pendingUpdate = arguments.length > 7 ? arguments[7] : void 0;
 	var parentState = states.get(parentId);
-	if (props.passThrough) return [false, lastState || parentState || { name: "" }];
+	if (props.passThrough) return [false, parentState || lastState || { name: "" }];
 	themes || (themes = getConfig().themes);
 	var name = !propsKey && (!lastState || !lastState.isNew) ? null : getNewThemeName(parentState === null || parentState === void 0 ? void 0 : parentState.name, props, pendingUpdate === "force" ? true : !!needsUpdate);
 	var authoredName = props.name;
@@ -13516,141 +13516,80 @@ var defaultComponentStateMounted = _objectSpread2(_objectSpread2({}, defaultComp
 _objectSpread2(_objectSpread2({}, defaultComponentState), {}, { unmounted: "should-enter" });
 //#endregion
 //#region ../web/dist/esm/helpers/mainThreadPressEvents.native.js
-var DEFAULT_LONG_PRESS_DELAY = 500;
-var DEFAULT_MIN_PRESS_DURATION = 130;
 function useMainThreadPressEvents(events, viewProps) {
 	var enabled = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : true;
 	arguments.length > 3 && arguments[3];
-	var ref = (0, react.useRef)(null);
-	if (!ref.current) ref.current = {
-		state: "idle",
-		pressInTimer: null,
-		pressOutTimer: null,
-		longPressTimer: null,
-		activateTime: 0,
-		blockedByExternalOwnership: false,
-		pressInOutstanding: false
-	};
-	(0, react.useEffect)(function() {
-		return function() {
-			clearStartTimers();
-			if (ref.current.pressOutTimer) {
-				clearTimeout(ref.current.pressOutTimer);
-				ref.current.pressOutTimer = null;
-			}
-		};
-	}, []);
-	if (!enabled || !events) return;
-	var _events_delayPressIn;
-	var delayPressIn = Math.max(0, (_events_delayPressIn = events.delayPressIn) !== null && _events_delayPressIn !== void 0 ? _events_delayPressIn : 0);
-	var _events_delayPressOut;
-	var delayPressOut = Math.max(0, (_events_delayPressOut = events.delayPressOut) !== null && _events_delayPressOut !== void 0 ? _events_delayPressOut : 0);
-	var _events_delayLongPress;
-	var delayLongPress = Math.max(0, (_events_delayLongPress = events.delayLongPress) !== null && _events_delayLongPress !== void 0 ? _events_delayLongPress : DEFAULT_LONG_PRESS_DELAY);
-	var _events_minPressDuration;
-	var minPressDuration = Math.max(0, (_events_minPressDuration = events.minPressDuration) !== null && _events_minPressDuration !== void 0 ? _events_minPressDuration : DEFAULT_MIN_PRESS_DURATION);
-	function activate(e) {
-		var _events_onPressIn;
-		if (ref.current.pressInOutstanding) return;
-		ref.current.pressInOutstanding = true;
-		ref.current.state = "active";
-		ref.current.activateTime = Date.now();
-		(_events_onPressIn = events.onPressIn) === null || _events_onPressIn === void 0 || _events_onPressIn.call(events, e);
-	}
-	function clearStartTimers() {
-		if (ref.current.pressInTimer) clearTimeout(ref.current.pressInTimer);
-		if (ref.current.longPressTimer) clearTimeout(ref.current.longPressTimer);
-		ref.current.pressInTimer = null;
-		ref.current.longPressTimer = null;
-	}
-	function releasePressOut(e) {
+	var usePressability = require("react-native/Libraries/Pressability/usePressability").default;
+	var initialized = (0, react.useRef)(false);
+	var ownsResponder = (0, react.useRef)(false);
+	var pressActive = (0, react.useRef)(false);
+	var active = enabled && Boolean(events);
+	if (active) initialized.current = true;
+	function endPress(e) {
 		var _events_onPressOut;
-		if (ref.current.pressOutTimer) {
-			clearTimeout(ref.current.pressOutTimer);
-			ref.current.pressOutTimer = null;
-		}
-		if (!ref.current.pressInOutstanding) return;
-		ref.current.pressInOutstanding = false;
-		ref.current.state = "idle";
-		(_events_onPressOut = events.onPressOut) === null || _events_onPressOut === void 0 || _events_onPressOut.call(events, e);
-	}
-	function deactivate(e) {
-		if (!ref.current.pressInOutstanding) return;
-		var pressDuration = Date.now() - ref.current.activateTime;
-		var remaining = Math.max(minPressDuration - pressDuration, delayPressOut);
-		if (remaining > 0) {
-			if (!ref.current.pressOutTimer) ref.current.pressOutTimer = setTimeout(function() {
-				ref.current.pressOutTimer = null;
-				releasePressOut(e);
-			}, remaining);
-		} else releasePressOut(e);
-	}
-	function resetPress(e) {
-		releasePressOut(e);
-		clearStartTimers();
-		ref.current.blockedByExternalOwnership = false;
-	}
+		if (!pressActive.current) return;
+		pressActive.current = false;
+		events === null || events === void 0 || (_events_onPressOut = events.onPressOut) == null || _events_onPressOut.call(events, e);
+	}
+	var handlers = usePressability(initialized.current ? _objectSpread2(_objectSpread2({}, active ? events : {}), {}, {
+		disabled: !active || (events === null || events === void 0 ? void 0 : events.disabled),
+		android_disableSound: true,
+		onPressIn: active ? function(e) {
+			var _events_onPressIn;
+			endPress(e);
+			pressActive.current = true;
+			(_events_onPressIn = events.onPressIn) === null || _events_onPressIn === void 0 || _events_onPressIn.call(events, e);
+		} : void 0,
+		onPressOut: active ? endPress : void 0,
+		hitSlop: viewProps.hitSlop,
+		pressRectOffset: viewProps.pressRetentionOffset
+	}) : null);
+	if (!active || !handlers) return;
 	var userStartShouldSet = viewProps.onStartShouldSetResponder;
 	var userGrant = viewProps.onResponderGrant;
 	var userRelease = viewProps.onResponderRelease;
 	var userTerminate = viewProps.onResponderTerminate;
 	var userTerminationRequest = viewProps.onResponderTerminationRequest;
 	var userMove = viewProps.onResponderMove;
+	var userClick = viewProps.onClick;
 	viewProps.onStartShouldSetResponder = function(e) {
-		if (userStartShouldSet === null || userStartShouldSet === void 0 ? void 0 : userStartShouldSet(e)) return true;
-		return !events.disabled && !hasExternalPressOwnership();
+		return (userStartShouldSet === null || userStartShouldSet === void 0 ? void 0 : userStartShouldSet(e)) || !hasExternalPressOwnership() && handlers.onStartShouldSetResponder();
 	};
 	viewProps.onResponderGrant = function(e) {
-		releasePressOut(e);
-		clearStartTimers();
-		if (hasExternalPressOwnership()) {
-			ref.current.state = "idle";
-			ref.current.blockedByExternalOwnership = true;
-			return;
-		}
+		endPress(e);
+		if (hasExternalPressOwnership()) 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);
-		}, delayPressIn);
-		else activate(e);
-		if (events.onLongPress) ref.current.longPressTimer = setTimeout(function() {
-			if (ref.current.state === "active") {
-				var _events_onLongPress;
-				ref.current.state = "longPressed";
-				(_events_onLongPress = events.onLongPress) === null || _events_onLongPress === void 0 || _events_onLongPress.call(events, e);
-			}
-		}, delayLongPress + delayPressIn);
+		ownsResponder.current = true;
+		return handlers.onResponderGrant(e);
 	};
 	viewProps.onResponderRelease = function(e) {
-		if (ref.current.blockedByExternalOwnership || hasExternalPressOwnership()) {
-			resetPress(e);
+		if (!ownsResponder.current) return;
+		ownsResponder.current = false;
+		if (hasExternalPressOwnership()) {
+			handlers.onResponderTerminate(e);
+			endPress(e);
 			return;
 		}
 		userRelease === null || userRelease === void 0 || userRelease(e);
-		var wasLongPressed = ref.current.state === "longPressed";
-		clearStartTimers();
-		if (ref.current.state === "pressing") activate(e);
-		if (!wasLongPressed) {
-			var _events_onPress;
-			(_events_onPress = events.onPress) === null || _events_onPress === void 0 || _events_onPress.call(events, e);
-		}
-		deactivate(e);
-		ref.current.blockedByExternalOwnership = false;
+		handlers.onResponderRelease(e);
 	};
 	viewProps.onResponderTerminate = function(e) {
 		userTerminate === null || userTerminate === void 0 || userTerminate(e);
-		resetPress(e);
+		if (ownsResponder.current) handlers.onResponderTerminate(e);
+		endPress(e);
+		ownsResponder.current = false;
 	};
 	viewProps.onResponderTerminationRequest = function(e) {
-		if (userTerminationRequest) return userTerminationRequest(e);
-		return events.cancelable !== false;
+		var _userTerminationRequest;
+		return (_userTerminationRequest = userTerminationRequest === null || userTerminationRequest === void 0 ? void 0 : userTerminationRequest(e)) !== null && _userTerminationRequest !== void 0 ? _userTerminationRequest : handlers.onResponderTerminationRequest();
 	};
 	viewProps.onResponderMove = function(e) {
-		var _events_onPressMove;
 		userMove === null || userMove === void 0 || userMove(e);
-		(_events_onPressMove = events.onPressMove) === null || _events_onPressMove === void 0 || _events_onPressMove.call(events, e);
+		if (ownsResponder.current) handlers.onResponderMove(e);
+	};
+	viewProps.onClick = function(e) {
+		userClick === null || userClick === void 0 || userClick(e);
+		if (!hasExternalPressOwnership()) handlers.onClick(e);
 	};
 }
 //#endregion
@@ -13729,7 +13668,7 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
 			if (firePress) (_callbacksRef_current_onPress = (_callbacksRef_current = callbacksRef.current).onPress) === null || _callbacksRef_current_onPress === void 0 || _callbacksRef_current_onPress.call(_callbacksRef_current, e !== null && e !== void 0 ? e : {});
 			(_callbacksRef_current_onPressOut = (_callbacksRef_current1 = callbacksRef.current).onPressOut) === null || _callbacksRef_current_onPressOut === void 0 || _callbacksRef_current_onPressOut.call(_callbacksRef_current1, e !== null && e !== void 0 ? e : {});
 		};
-		useMainThreadPressEvents(events, viewProps, !isInsideNativeMenu && Boolean(hasRealPressEvents || getIsAndroid() && hasPressEvents), debugName);
+		useMainThreadPressEvents(events, viewProps, Boolean(hasRealPressEvents || !isInsideNativeMenu && getIsAndroid() && hasPressEvents), debugName);
 		if (everEnabled) {
 			callbacksRef.current = hasPressEvents ? {
 				onPressIn: events.onPressIn,
@@ -13737,7 +13676,7 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
 				onPress: events.onPress,
 				onLongPress: events.onLongPress
 			} : {};
-			if (hasRealPressEvents && !isInsideNativeMenu) {
+			if (hasRealPressEvents) {
 				endPress();
 				gestureRef.current = null;
 				return null;
@@ -14004,6 +13943,27 @@ var nativeInlineExpansions = {
 	insetInlineStart: ["left"],
 	insetInlineEnd: ["right"]
 };
+var paddingLogicals = ["paddingStart", "paddingEnd"];
+var marginLogicals = ["marginStart", "marginEnd"];
+var nativeShorthandLogicals = {
+	padding: paddingLogicals,
+	paddingHorizontal: paddingLogicals,
+	margin: marginLogicals,
+	marginHorizontal: marginLogicals,
+	borderRadius: [
+		"borderTopStartRadius",
+		"borderTopEndRadius",
+		"borderBottomStartRadius",
+		"borderBottomEndRadius",
+		"borderStartStartRadius",
+		"borderStartEndRadius",
+		"borderEndStartRadius",
+		"borderEndEndRadius"
+	],
+	borderWidth: ["borderStartWidth", "borderEndWidth"],
+	borderColor: ["borderStartColor", "borderEndColor"],
+	gap: ["rowGap", "columnGap"]
+};
 //#endregion
 //#region ../web/dist/esm/helpers/defaultOffset.native.js
 var defaultOffset = {
@@ -16367,24 +16327,34 @@ function emitValue(state, property, raw, cursor, originalValue, contextOnly) {
 		}
 		value3 = variants;
 	}
+	if (!cursor && !state.styleProps.noExpand) {
+		var logicals = nativeShorthandLogicals[property];
+		var slots = state.flatSlots;
+		if (logicals && slots) for (var index1 = 0; index1 < logicals.length; index1++) {
+			var list = slots.get(logicals[index1]);
+			if (!list) continue;
+			for (var entry = list.length; entry--;) if (list[entry][3] === "") list.splice(entry, 1);
+			if (!list.length) clearDirectStyle(state, logicals[index1]);
+		}
+	}
 	var expanded = !state.styleProps.noExpand ? expandStyle(property, value3, state.conf.settings.styleCompat || "web") : null;
 	if (!expanded) {
 		emitProperty(state, property, value3, cursor, originalValue, contextOnly);
 		return;
 	}
-	if (typeof raw === "string" && expanded.length > 1 && expanded.every(function(entry) {
-		return entry[1] === expanded[0][1];
+	if (typeof raw === "string" && expanded.length > 1 && expanded.every(function(entry2) {
+		return entry2[1] === expanded[0][1];
 	})) {
 		var parts1 = splitComponents(raw);
 		if (parts1.length > 0 && parts1.length <= (expanded.length === 4 ? 4 : 2)) {
-			for (var index1 = 0; index1 < expanded.length; index1++) {
-				var partIndex = index1 === 0 || parts1.length === 1 ? 0 : index1 === 1 || index1 === 3 && parts1.length < 4 ? 1 : index1 === 2 && parts1.length < 3 ? 0 : index1;
-				emitResolved(state, expanded[index1][0], parts1[partIndex], cursor, originalValue, contextOnly);
+			for (var index2 = 0; index2 < expanded.length; index2++) {
+				var partIndex = index2 === 0 || parts1.length === 1 ? 0 : index2 === 1 || index2 === 3 && parts1.length < 4 ? 1 : index2 === 2 && parts1.length < 3 ? 0 : index2;
+				emitResolved(state, expanded[index2][0], parts1[partIndex], cursor, originalValue, contextOnly);
 			}
 			return;
 		}
 	}
-	for (var index2 = 0; index2 < expanded.length; index2++) emitProperty(state, expanded[index2][0], expanded[index2][1], cursor, originalValue, contextOnly);
+	for (var index3 = 0; index3 < expanded.length; index3++) emitProperty(state, expanded[index3][0], expanded[index3][1], cursor, originalValue, contextOnly);
 }
 function emitConditionalValue(state, property, payload, condition, source, sink, mode, contextOnly) {
 	if (sink) sink(payload, condition, source);

package/dist/test.native.cjs

@@ -3092,7 +3092,7 @@ var getSnapshotImpl = function(r) {
 	var isSchemeOnlyChange = !optimizeForFirstRender && supportsDynamicColorIOS && getSetting("fastSchemeChange") && local && parentState && local.scheme !== parentState.scheme && getThemeBaseName(local.name) === getThemeBaseName(parentState.name);
 	var allKeysSchemeOptimized = !optimizeForFirstRender && Boolean(((_keys_current = keys.current) === null || _keys_current === void 0 ? void 0 : _keys_current.size) && (schemeKeys === null || schemeKeys === void 0 ? void 0 : (_schemeKeys_current = schemeKeys.current) === null || _schemeKeys_current === void 0 ? void 0 : _schemeKeys_current.size) === keys.current.size);
 	var canSkipForSchemeChange = Boolean(isSchemeOnlyChange && allKeysSchemeOptimized);
-	var needsUpdate = props.passThrough ? false : optimizeForFirstRender ? true : isRoot || props.name === "light" || props.name === "dark" || props.name === null ? true : !HasRenderedOnce.get(keys) ? true : canSkipForSchemeChange ? false : (keys === null || keys === void 0 ? void 0 : (_keys_current1 = keys.current) === null || _keys_current1 === void 0 ? void 0 : _keys_current1.size) ? true : (_props_needsUpdate = props.needsUpdate) === null || _props_needsUpdate === void 0 ? void 0 : _props_needsUpdate.call(props);
+	var needsUpdate = props.passThrough ? false : optimizeForFirstRender ? true : isRoot || props.forceClassName || props.name === "light" || props.name === "dark" || props.name === null ? true : !HasRenderedOnce.get(keys) ? true : canSkipForSchemeChange ? false : (keys === null || keys === void 0 ? void 0 : (_keys_current1 = keys.current) === null || _keys_current1 === void 0 ? void 0 : _keys_current1.size) ? true : (_props_needsUpdate = props.needsUpdate) === null || _props_needsUpdate === void 0 ? void 0 : _props_needsUpdate.call(props);
 	var [rerender, nextRaw] = getNextState(local, props, propsKey, isRoot, id, parentId, needsUpdate, PendingUpdate.get(id));
 	var next = nextRaw;
 	if (props._themeUpdate && (nextRaw === null || nextRaw === void 0 ? void 0 : nextRaw.theme)) {
@@ -3119,7 +3119,7 @@ var getSnapshotImpl = function(r) {
 var getNextState = function(lastState, props, propsKey) {
 	var isRoot = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false, id = arguments.length > 4 ? arguments[4] : void 0, parentId = arguments.length > 5 ? arguments[5] : void 0, needsUpdate = arguments.length > 6 ? arguments[6] : void 0, pendingUpdate = arguments.length > 7 ? arguments[7] : void 0;
 	var parentState = states.get(parentId);
-	if (props.passThrough) return [false, lastState || parentState || { name: "" }];
+	if (props.passThrough) return [false, parentState || lastState || { name: "" }];
 	themes || (themes = getConfig().themes);
 	var name = !propsKey && (!lastState || !lastState.isNew) ? null : getNewThemeName(parentState === null || parentState === void 0 ? void 0 : parentState.name, props, pendingUpdate === "force" ? true : !!needsUpdate);
 	var authoredName = props.name;
@@ -3791,141 +3791,80 @@ var defaultComponentStateMounted = _objectSpread2(_objectSpread2({}, defaultComp
 _objectSpread2(_objectSpread2({}, defaultComponentState), {}, { unmounted: "should-enter" });
 //#endregion
 //#region ../web/dist/esm/helpers/mainThreadPressEvents.native.js
-var DEFAULT_LONG_PRESS_DELAY = 500;
-var DEFAULT_MIN_PRESS_DURATION = 130;
 function useMainThreadPressEvents(events, viewProps) {
 	var enabled = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : true;
 	arguments.length > 3 && arguments[3];
-	var ref = (0, react.useRef)(null);
-	if (!ref.current) ref.current = {
-		state: "idle",
-		pressInTimer: null,
-		pressOutTimer: null,
-		longPressTimer: null,
-		activateTime: 0,
-		blockedByExternalOwnership: false,
-		pressInOutstanding: false
-	};
-	(0, react.useEffect)(function() {
-		return function() {
-			clearStartTimers();
-			if (ref.current.pressOutTimer) {
-				clearTimeout(ref.current.pressOutTimer);
-				ref.current.pressOutTimer = null;
-			}
-		};
-	}, []);
-	if (!enabled || !events) return;
-	var _events_delayPressIn;
-	var delayPressIn = Math.max(0, (_events_delayPressIn = events.delayPressIn) !== null && _events_delayPressIn !== void 0 ? _events_delayPressIn : 0);
-	var _events_delayPressOut;
-	var delayPressOut = Math.max(0, (_events_delayPressOut = events.delayPressOut) !== null && _events_delayPressOut !== void 0 ? _events_delayPressOut : 0);
-	var _events_delayLongPress;
-	var delayLongPress = Math.max(0, (_events_delayLongPress = events.delayLongPress) !== null && _events_delayLongPress !== void 0 ? _events_delayLongPress : DEFAULT_LONG_PRESS_DELAY);
-	var _events_minPressDuration;
-	var minPressDuration = Math.max(0, (_events_minPressDuration = events.minPressDuration) !== null && _events_minPressDuration !== void 0 ? _events_minPressDuration : DEFAULT_MIN_PRESS_DURATION);
-	function activate(e) {
-		var _events_onPressIn;
-		if (ref.current.pressInOutstanding) return;
-		ref.current.pressInOutstanding = true;
-		ref.current.state = "active";
-		ref.current.activateTime = Date.now();
-		(_events_onPressIn = events.onPressIn) === null || _events_onPressIn === void 0 || _events_onPressIn.call(events, e);
-	}
-	function clearStartTimers() {
-		if (ref.current.pressInTimer) clearTimeout(ref.current.pressInTimer);
-		if (ref.current.longPressTimer) clearTimeout(ref.current.longPressTimer);
-		ref.current.pressInTimer = null;
-		ref.current.longPressTimer = null;
-	}
-	function releasePressOut(e) {
+	var usePressability = require("react-native/Libraries/Pressability/usePressability").default;
+	var initialized = (0, react.useRef)(false);
+	var ownsResponder = (0, react.useRef)(false);
+	var pressActive = (0, react.useRef)(false);
+	var active = enabled && Boolean(events);
+	if (active) initialized.current = true;
+	function endPress(e) {
 		var _events_onPressOut;
-		if (ref.current.pressOutTimer) {
-			clearTimeout(ref.current.pressOutTimer);
-			ref.current.pressOutTimer = null;
-		}
-		if (!ref.current.pressInOutstanding) return;
-		ref.current.pressInOutstanding = false;
-		ref.current.state = "idle";
-		(_events_onPressOut = events.onPressOut) === null || _events_onPressOut === void 0 || _events_onPressOut.call(events, e);
-	}
-	function deactivate(e) {
-		if (!ref.current.pressInOutstanding) return;
-		var pressDuration = Date.now() - ref.current.activateTime;
-		var remaining = Math.max(minPressDuration - pressDuration, delayPressOut);
-		if (remaining > 0) {
-			if (!ref.current.pressOutTimer) ref.current.pressOutTimer = setTimeout(function() {
-				ref.current.pressOutTimer = null;
-				releasePressOut(e);
-			}, remaining);
-		} else releasePressOut(e);
-	}
-	function resetPress(e) {
-		releasePressOut(e);
-		clearStartTimers();
-		ref.current.blockedByExternalOwnership = false;
-	}
+		if (!pressActive.current) return;
+		pressActive.current = false;
+		events === null || events === void 0 || (_events_onPressOut = events.onPressOut) == null || _events_onPressOut.call(events, e);
+	}
+	var handlers = usePressability(initialized.current ? _objectSpread2(_objectSpread2({}, active ? events : {}), {}, {
+		disabled: !active || (events === null || events === void 0 ? void 0 : events.disabled),
+		android_disableSound: true,
+		onPressIn: active ? function(e) {
+			var _events_onPressIn;
+			endPress(e);
+			pressActive.current = true;
+			(_events_onPressIn = events.onPressIn) === null || _events_onPressIn === void 0 || _events_onPressIn.call(events, e);
+		} : void 0,
+		onPressOut: active ? endPress : void 0,
+		hitSlop: viewProps.hitSlop,
+		pressRectOffset: viewProps.pressRetentionOffset
+	}) : null);
+	if (!active || !handlers) return;
 	var userStartShouldSet = viewProps.onStartShouldSetResponder;
 	var userGrant = viewProps.onResponderGrant;
 	var userRelease = viewProps.onResponderRelease;
 	var userTerminate = viewProps.onResponderTerminate;
 	var userTerminationRequest = viewProps.onResponderTerminationRequest;
 	var userMove = viewProps.onResponderMove;
+	var userClick = viewProps.onClick;
 	viewProps.onStartShouldSetResponder = function(e) {
-		if (userStartShouldSet === null || userStartShouldSet === void 0 ? void 0 : userStartShouldSet(e)) return true;
-		return !events.disabled && !hasExternalPressOwnership();
+		return (userStartShouldSet === null || userStartShouldSet === void 0 ? void 0 : userStartShouldSet(e)) || !hasExternalPressOwnership() && handlers.onStartShouldSetResponder();
 	};
 	viewProps.onResponderGrant = function(e) {
-		releasePressOut(e);
-		clearStartTimers();
-		if (hasExternalPressOwnership()) {
-			ref.current.state = "idle";
-			ref.current.blockedByExternalOwnership = true;
-			return;
-		}
+		endPress(e);
+		if (hasExternalPressOwnership()) 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);
-		}, delayPressIn);
-		else activate(e);
-		if (events.onLongPress) ref.current.longPressTimer = setTimeout(function() {
-			if (ref.current.state === "active") {
-				var _events_onLongPress;
-				ref.current.state = "longPressed";
-				(_events_onLongPress = events.onLongPress) === null || _events_onLongPress === void 0 || _events_onLongPress.call(events, e);
-			}
-		}, delayLongPress + delayPressIn);
+		ownsResponder.current = true;
+		return handlers.onResponderGrant(e);
 	};
 	viewProps.onResponderRelease = function(e) {
-		if (ref.current.blockedByExternalOwnership || hasExternalPressOwnership()) {
-			resetPress(e);
+		if (!ownsResponder.current) return;
+		ownsResponder.current = false;
+		if (hasExternalPressOwnership()) {
+			handlers.onResponderTerminate(e);
+			endPress(e);
 			return;
 		}
 		userRelease === null || userRelease === void 0 || userRelease(e);
-		var wasLongPressed = ref.current.state === "longPressed";
-		clearStartTimers();
-		if (ref.current.state === "pressing") activate(e);
-		if (!wasLongPressed) {
-			var _events_onPress;
-			(_events_onPress = events.onPress) === null || _events_onPress === void 0 || _events_onPress.call(events, e);
-		}
-		deactivate(e);
-		ref.current.blockedByExternalOwnership = false;
+		handlers.onResponderRelease(e);
 	};
 	viewProps.onResponderTerminate = function(e) {
 		userTerminate === null || userTerminate === void 0 || userTerminate(e);
-		resetPress(e);
+		if (ownsResponder.current) handlers.onResponderTerminate(e);
+		endPress(e);
+		ownsResponder.current = false;
 	};
 	viewProps.onResponderTerminationRequest = function(e) {
-		if (userTerminationRequest) return userTerminationRequest(e);
-		return events.cancelable !== false;
+		var _userTerminationRequest;
+		return (_userTerminationRequest = userTerminationRequest === null || userTerminationRequest === void 0 ? void 0 : userTerminationRequest(e)) !== null && _userTerminationRequest !== void 0 ? _userTerminationRequest : handlers.onResponderTerminationRequest();
 	};
 	viewProps.onResponderMove = function(e) {
-		var _events_onPressMove;
 		userMove === null || userMove === void 0 || userMove(e);
-		(_events_onPressMove = events.onPressMove) === null || _events_onPressMove === void 0 || _events_onPressMove.call(events, e);
+		if (ownsResponder.current) handlers.onResponderMove(e);
+	};
+	viewProps.onClick = function(e) {
+		userClick === null || userClick === void 0 || userClick(e);
+		if (!hasExternalPressOwnership()) handlers.onClick(e);
 	};
 }
 //#endregion
@@ -4004,7 +3943,7 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
 			if (firePress) (_callbacksRef_current_onPress = (_callbacksRef_current = callbacksRef.current).onPress) === null || _callbacksRef_current_onPress === void 0 || _callbacksRef_current_onPress.call(_callbacksRef_current, e !== null && e !== void 0 ? e : {});
 			(_callbacksRef_current_onPressOut = (_callbacksRef_current1 = callbacksRef.current).onPressOut) === null || _callbacksRef_current_onPressOut === void 0 || _callbacksRef_current_onPressOut.call(_callbacksRef_current1, e !== null && e !== void 0 ? e : {});
 		};
-		useMainThreadPressEvents(events, viewProps, !isInsideNativeMenu && Boolean(hasRealPressEvents || getIsAndroid() && hasPressEvents), debugName);
+		useMainThreadPressEvents(events, viewProps, Boolean(hasRealPressEvents || !isInsideNativeMenu && getIsAndroid() && hasPressEvents), debugName);
 		if (everEnabled) {
 			callbacksRef.current = hasPressEvents ? {
 				onPressIn: events.onPressIn,
@@ -4012,7 +3951,7 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
 				onPress: events.onPress,
 				onLongPress: events.onLongPress
 			} : {};
-			if (hasRealPressEvents && !isInsideNativeMenu) {
+			if (hasRealPressEvents) {
 				endPress();
 				gestureRef.current = null;
 				return null;
@@ -4279,6 +4218,27 @@ var nativeInlineExpansions = {
 	insetInlineStart: ["left"],
 	insetInlineEnd: ["right"]
 };
+var paddingLogicals = ["paddingStart", "paddingEnd"];
+var marginLogicals = ["marginStart", "marginEnd"];
+var nativeShorthandLogicals = {
+	padding: paddingLogicals,
+	paddingHorizontal: paddingLogicals,
+	margin: marginLogicals,
+	marginHorizontal: marginLogicals,
+	borderRadius: [
+		"borderTopStartRadius",
+		"borderTopEndRadius",
+		"borderBottomStartRadius",
+		"borderBottomEndRadius",
+		"borderStartStartRadius",
+		"borderStartEndRadius",
+		"borderEndStartRadius",
+		"borderEndEndRadius"
+	],
+	borderWidth: ["borderStartWidth", "borderEndWidth"],
+	borderColor: ["borderStartColor", "borderEndColor"],
+	gap: ["rowGap", "columnGap"]
+};
 //#endregion
 //#region ../web/dist/esm/helpers/defaultOffset.native.js
 var defaultOffset = {
@@ -7262,24 +7222,34 @@ function emitValue(state, property, raw, cursor, originalValue, contextOnly) {
 		}
 		value3 = variants;
 	}
+	if (!cursor && !state.styleProps.noExpand) {
+		var logicals = nativeShorthandLogicals[property];
+		var slots = state.flatSlots;
+		if (logicals && slots) for (var index1 = 0; index1 < logicals.length; index1++) {
+			var list = slots.get(logicals[index1]);
+			if (!list) continue;
+			for (var entry = list.length; entry--;) if (list[entry][3] === "") list.splice(entry, 1);
+			if (!list.length) clearDirectStyle(state, logicals[index1]);
+		}
+	}
 	var expanded = !state.styleProps.noExpand ? expandStyle(property, value3, state.conf.settings.styleCompat || "web") : null;
 	if (!expanded) {
 		emitProperty(state, property, value3, cursor, originalValue, contextOnly);
 		return;
 	}
-	if (typeof raw === "string" && expanded.length > 1 && expanded.every(function(entry) {
-		return entry[1] === expanded[0][1];
+	if (typeof raw === "string" && expanded.length > 1 && expanded.every(function(entry2) {
+		return entry2[1] === expanded[0][1];
 	})) {
 		var parts1 = splitComponents(raw);
 		if (parts1.length > 0 && parts1.length <= (expanded.length === 4 ? 4 : 2)) {
-			for (var index1 = 0; index1 < expanded.length; index1++) {
-				var partIndex = index1 === 0 || parts1.length === 1 ? 0 : index1 === 1 || index1 === 3 && parts1.length < 4 ? 1 : index1 === 2 && parts1.length < 3 ? 0 : index1;
-				emitResolved(state, expanded[index1][0], parts1[partIndex], cursor, originalValue, contextOnly);
+			for (var index2 = 0; index2 < expanded.length; index2++) {
+				var partIndex = index2 === 0 || parts1.length === 1 ? 0 : index2 === 1 || index2 === 3 && parts1.length < 4 ? 1 : index2 === 2 && parts1.length < 3 ? 0 : index2;
+				emitResolved(state, expanded[index2][0], parts1[partIndex], cursor, originalValue, contextOnly);
 			}
 			return;
 		}
 	}
-	for (var index2 = 0; index2 < expanded.length; index2++) emitProperty(state, expanded[index2][0], expanded[index2][1], cursor, originalValue, contextOnly);
+	for (var index3 = 0; index3 < expanded.length; index3++) emitProperty(state, expanded[index3][0], expanded[index3][1], cursor, originalValue, contextOnly);
 }
 function emitConditionalValue(state, property, payload, condition, source, sink, mode, contextOnly) {
 	if (sink) sink(payload, condition, source);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "3.0.0-beta.1479.1",
+  "version": "3.0.0-beta.1537.1",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "license": "MIT",
   "author": {
@@ -137,19 +137,19 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/compose-refs": "3.0.0-beta.1479.1",
-    "@tamagui/constants": "3.0.0-beta.1479.1",
-    "@tamagui/helpers": "3.0.0-beta.1479.1",
-    "@tamagui/react-native-media-driver": "3.0.0-beta.1479.1",
-    "@tamagui/react-native-use-pressable": "3.0.0-beta.1479.1",
-    "@tamagui/use-element-layout": "3.0.0-beta.1479.1",
-    "@tamagui/use-event": "3.0.0-beta.1479.1",
-    "@tamagui/web": "3.0.0-beta.1479.1"
+    "@tamagui/compose-refs": "3.0.0-beta.1537.1",
+    "@tamagui/constants": "3.0.0-beta.1537.1",
+    "@tamagui/helpers": "3.0.0-beta.1537.1",
+    "@tamagui/react-native-media-driver": "3.0.0-beta.1537.1",
+    "@tamagui/react-native-use-pressable": "3.0.0-beta.1537.1",
+    "@tamagui/use-element-layout": "3.0.0-beta.1537.1",
+    "@tamagui/use-event": "3.0.0-beta.1537.1",
+    "@tamagui/web": "3.0.0-beta.1537.1"
   },
   "devDependencies": {
-    "@tamagui/build": "3.0.0-beta.1479.1",
-    "@tamagui/native-bundle": "3.0.0-beta.1479.1",
-    "@tamagui/react-native-web-lite": "3.0.0-beta.1479.1",
+    "@tamagui/build": "3.0.0-beta.1537.1",
+    "@tamagui/native-bundle": "3.0.0-beta.1537.1",
+    "@tamagui/react-native-web-lite": "3.0.0-beta.1537.1",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": "19.2.3",