tamagui 2.7.2 → 2.7.3

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 $ tamagui-build
-built tamagui in 2855 ms
+built tamagui in 1301 ms
 Running afterBuild script...
-afterBuild completed in 1055 ms
+afterBuild completed in 292 ms

package/dist/native.cjs

@@ -876,6 +876,7 @@ function _instanceof$7(left, right) {
 }
 function setOnLayoutStrategy(state) {
 	strategy = state;
+	resumeLayoutLoop === null || resumeLayoutLoop === void 0 || resumeLayoutLoop();
 }
 function enable() {
 	if (avoidUpdates) {
@@ -926,6 +927,7 @@ function observeLayoutNode(node, disableKey) {
 		globalIntersectionObserver.observe(node);
 		IntersectionState.set(node, true);
 	}
+	resumeLayoutLoop === null || resumeLayoutLoop === void 0 || resumeLayoutLoop();
 }
 function registerLayoutNode(node, onChange, disableKey) {
 	LayoutHandlers.set(node, onChange);
@@ -1003,7 +1005,7 @@ function createMeasureLayout(node) {
 		return measureLayout$1(node, relativeTo, callback);
 	};
 }
-var LayoutHandlers, LayoutDisableKey, Nodes, IntersectionState, usePretransformDimensions, DisableLayoutContextValues, DisableLayoutContextKey, ENABLE, LayoutMeasurementController, globalIntersectionObserver, strategy, NodeRectCache, avoidUpdates, queuedUpdates, BoundingRects, rectFetchObserver, rectFetchResolve, rectFetchStartTime, lastCallbackDelay, rAF, userSkipVal, BASE_SKIP_FRAMES, MAX_SKIP_FRAMES, skipFrames, frameCount, getElementLayoutEvent, getPreTransformDimensions, getRelativeDimensions, PrevHostNode, getBoundingClientRectAsync, measureNode, measure, measureInWindow, createMeasureInWindow, measureLayout$1;
+var LayoutHandlers, LayoutDisableKey, Nodes, IntersectionState, usePretransformDimensions, DisableLayoutContextValues, DisableLayoutContextKey, ENABLE, LayoutMeasurementController, globalIntersectionObserver, strategy, resumeLayoutLoop, NodeRectCache, avoidUpdates, queuedUpdates, BoundingRects, rectFetchObserver, rectFetchResolve, rectFetchStartTime, lastCallbackDelay, rAF, userSkipVal, BASE_SKIP_FRAMES, MAX_SKIP_FRAMES, skipFrames, frameCount, frameScheduled, getElementLayoutEvent, getPreTransformDimensions, getRelativeDimensions, PrevHostNode, getBoundingClientRectAsync, measureNode, measure, measureInWindow, createMeasureInWindow, measureLayout$1;
 var init_index_native$11 = __esmMin((() => {
 	init_index_native$7();
 	init_asyncToGenerator();
@@ -1045,6 +1047,10 @@ var init_index_native$11 = __esmMin((() => {
 				}
 			}, { threshold: 0 });
 			return rectFetchObserver;
+		}, scheduleLayoutFrame2 = function() {
+			if (frameScheduled || strategy === "off" || Nodes.size === 0 || document.hidden) return;
+			frameScheduled = true;
+			rAF ? rAF(layoutOnAnimationFrame) : setTimeout(layoutOnAnimationFrame, 16);
 		};
 		BoundingRects = /* @__PURE__ */ new WeakMap();
 		rectFetchObserver = null;
@@ -1079,13 +1085,15 @@ var init_index_native$11 = __esmMin((() => {
 		MAX_SKIP_FRAMES = 20;
 		skipFrames = BASE_SKIP_FRAMES;
 		frameCount = 0;
+		frameScheduled = false;
 		function layoutOnAnimationFrame() {
 			return _layoutOnAnimationFrame.apply(this, arguments);
 		}
 		function _layoutOnAnimationFrame() {
 			_layoutOnAnimationFrame = _asyncToGenerator(function* () {
 				if (frameCount++ % skipFrames !== 0) {
-					rAF ? rAF(layoutOnAnimationFrame) : setTimeout(layoutOnAnimationFrame, 16);
+					frameScheduled = false;
+					scheduleLayoutFrame2();
 					return;
 				}
 				if (frameCount >= Number.MAX_SAFE_INTEGER) frameCount = 0;
@@ -1162,11 +1170,14 @@ var init_index_native$11 = __esmMin((() => {
 						for (var i2 = 0; i2 < visibleNodes.length; i2++) updateLayoutIfChanged(visibleNodes[i2]);
 					}
 				}
-				rAF ? rAF(layoutOnAnimationFrame) : setTimeout(layoutOnAnimationFrame, 16);
+				frameScheduled = false;
+				scheduleLayoutFrame2();
 			});
 			return _layoutOnAnimationFrame.apply(this, arguments);
 		}
-		layoutOnAnimationFrame();
+		resumeLayoutLoop = scheduleLayoutFrame2;
+		document.addEventListener("visibilitychange", scheduleLayoutFrame2);
+		scheduleLayoutFrame2();
 	}
 	getElementLayoutEvent = function(nodeRect, parentRect, node) {
 		return {
@@ -16199,6 +16210,14 @@ var init_getSplitStyles_native = __esmMin((() => {
 					}
 					var priority = mediaStylesSeen;
 					mediaStylesSeen += 1;
+					if (process.env.IS_STATIC === "is_static" && isMedia === true) {
+						var _styleState3;
+						var mediaStyle = getSubStyle(styleState, key6, val2, true);
+						(_styleState3 = styleState).style || (_styleState3.style = {});
+						var existing = styleState.style[key6];
+						styleState.style[key6] = existing ? Object.assign(existing, mediaStyle) : mediaStyle;
+						return;
+					}
 					if (shouldDoClasses) {
 						var mediaStyles = getCSSStylesAtomic(getSubStyle(styleState, key6, val2, false));
 						var _iteratorNormalCompletion12 = true, _didIteratorError12 = false, _iteratorError12 = void 0;
@@ -16231,7 +16250,7 @@ var init_getSplitStyles_native = __esmMin((() => {
 								return;
 							}
 							(_styleState4 = styleState).style || (_styleState4.style = {});
-							if (mergeMediaByImportance(styleState, mediaKeyShort, key7, val3, mediaState$1[mediaKeyShort], importanceBump, debug, originalVal2) && key7 === "fontFamily") styleState.fontFamily = mediaStyle1.fontFamily;
+							if (mergeMediaByImportance(styleState, mediaKeyShort, key7, val3, mediaState$1[mediaKeyShort], importanceBump, debug, originalVal2) && key7 === "fontFamily") styleState.fontFamily = mediaStyle2.fontFamily;
 						};
 						var isThemeMedia = isMedia === "theme";
 						var isGroupMedia = isMedia === "group";
@@ -16239,34 +16258,34 @@ var init_getSplitStyles_native = __esmMin((() => {
 						if (!isThemeMedia && !isPlatformMedia && !isGroupMedia) {
 							if (!mediaState$1[mediaKeyShort]) return;
 						}
-						var mediaStyle1 = getSubStyle(styleState, key6, val2, true);
+						var mediaStyle2 = getSubStyle(styleState, key6, val2, true);
 						var importanceBump = 0;
 						if (isThemeMedia) if (supportsDynamicColorIOS && getSetting("fastSchemeChange")) {
-							var _styleState3;
-							(_styleState3 = styleState).style || (_styleState3.style = {});
+							var _styleState12;
+							(_styleState12 = styleState).style || (_styleState12.style = {});
 							var scheme = mediaKeyShort;
 							var oppositeScheme = getOppositeScheme(mediaKeyShort);
-							var themeOriginalValues = styleOriginalValues.get(mediaStyle1);
+							var themeOriginalValues = styleOriginalValues.get(mediaStyle2);
 							var isCurrentScheme = themeName === scheme || themeName.startsWith(scheme);
-							for (var subKey1 in mediaStyle1) {
-								var _$val1 = extractValueFromDynamic(mediaStyle1[subKey1], scheme);
-								var existing = styleState.style[subKey1];
+							for (var subKey1 in mediaStyle2) {
+								var _$val1 = extractValueFromDynamic(mediaStyle2[subKey1], scheme);
+								var existing1 = styleState.style[subKey1];
 								if (!isColorStyleKey(subKey1)) {
 									dynamicThemeAccess = true;
-									if (isCurrentScheme) mediaStyle1[subKey1] = _$val1;
-									else delete mediaStyle1[subKey1];
+									if (isCurrentScheme) mediaStyle2[subKey1] = _$val1;
+									else delete mediaStyle2[subKey1];
 									continue;
 								}
-								if (existing === null || existing === void 0 ? void 0 : existing.dynamic) {
-									existing.dynamic[scheme] = _$val1;
-									mediaStyle1[subKey1] = existing;
+								if (existing1 === null || existing1 === void 0 ? void 0 : existing1.dynamic) {
+									existing1.dynamic[scheme] = _$val1;
+									mediaStyle2[subKey1] = existing1;
 								} else {
-									mediaStyle1[subKey1] = getDynamicVal({
+									mediaStyle2[subKey1] = getDynamicVal({
 										scheme,
 										val: _$val1,
-										oppositeVal: extractValueFromDynamic(existing, oppositeScheme)
+										oppositeVal: extractValueFromDynamic(existing1, oppositeScheme)
 									});
-									mergeStyle(styleState, subKey1, mediaStyle1[subKey1], priority, false, themeOriginalValues === null || themeOriginalValues === void 0 ? void 0 : themeOriginalValues[subKey1]);
+									mergeStyle(styleState, subKey1, mediaStyle2[subKey1], priority, false, themeOriginalValues === null || themeOriginalValues === void 0 ? void 0 : themeOriginalValues[subKey1]);
 								}
 							}
 						} else {
@@ -16293,7 +16312,7 @@ var init_getSplitStyles_native = __esmMin((() => {
 								var isActive = mediaState1 === null || mediaState1 === void 0 ? void 0 : mediaState1[groupMediaKey];
 								if (!mediaState1 && groupState.layout) isActive = mediaKeyMatch(groupMediaKey, groupState.layout);
 								if (!isActive) {
-									for (var pkey1 in mediaStyle1) applyDefaultStyle(pkey1, styleState);
+									for (var pkey1 in mediaStyle2) applyDefaultStyle(pkey1, styleState);
 									return;
 								}
 								importanceBump = 2;
@@ -16306,19 +16325,19 @@ var init_getSplitStyles_native = __esmMin((() => {
 								var isActive1 = componentGroupPseudoState === null || componentGroupPseudoState === void 0 ? void 0 : componentGroupPseudoState[groupPseudoKey];
 								var priority1 = pseudoPriorities[groupPseudoKey];
 								if (!isActive1) {
-									for (var pkey2 in mediaStyle1) applyDefaultStyle(pkey2, styleState);
+									for (var pkey2 in mediaStyle2) applyDefaultStyle(pkey2, styleState);
 									return;
 								}
 								importanceBump = priority1;
 							}
 						} else if (isPlatformMedia) importanceBump = getPlatformSpecificityBump(mediaKeyShort);
-						var mediaOriginalValues = styleOriginalValues.get(mediaStyle1);
-						if (isGroupMedia && mediaStyle1.transition) {
-							var _styleState12;
-							(_styleState12 = styleState).pseudoTransitions || (_styleState12.pseudoTransitions = {});
-							styleState.pseudoTransitions[`$${mediaKeyShort}`] = mediaStyle1.transition;
+						var mediaOriginalValues = styleOriginalValues.get(mediaStyle2);
+						if (isGroupMedia && mediaStyle2.transition) {
+							var _styleState22;
+							(_styleState22 = styleState).pseudoTransitions || (_styleState22.pseudoTransitions = {});
+							styleState.pseudoTransitions[`$${mediaKeyShort}`] = mediaStyle2.transition;
 						}
-						for (var subKey2 in mediaStyle1) {
+						for (var subKey2 in mediaStyle2) {
 							if (subKey2 === "space") continue;
 							if (subKey2[0] === "$") {
 								var subMediaType = getMediaKey(subKey2);
@@ -16329,7 +16348,7 @@ var init_getSplitStyles_native = __esmMin((() => {
 								} else if (subMediaType === true) {
 									if (!mediaState$1[subKey2.slice(1)]) continue;
 								}
-								var nestedVal = mediaStyle1[subKey2];
+								var nestedVal = mediaStyle2[subKey2];
 								var subOriginalValues = styleOriginalValues.get(nestedVal);
 								var outerBase = !!mediaState$1[mediaKeyShort] ? getMediaKeyImportance(mediaKeyShort) : defaultMediaImportance;
 								var innerBase = void 0;
@@ -16338,15 +16357,15 @@ var init_getSplitStyles_native = __esmMin((() => {
 								else innerBase = defaultMediaImportance;
 								var nestedImportance = outerBase + importanceBump + innerBase + 1;
 								for (var subSubKey in nestedVal) {
-									var _styleState22;
+									var _styleState32;
 									var expandedKey = shorthands[subSubKey] || subSubKey;
 									var { usedKeys } = styleState;
 									if (usedKeys[expandedKey] && usedKeys[expandedKey] > nestedImportance) continue;
-									(_styleState22 = styleState).style || (_styleState22.style = {});
+									(_styleState32 = styleState).style || (_styleState32.style = {});
 									mergeStyle(styleState, expandedKey, nestedVal[subSubKey], nestedImportance, false, subOriginalValues === null || subOriginalValues === void 0 ? void 0 : subOriginalValues[subSubKey]);
 									if (expandedKey === "fontFamily") styleState.fontFamily = nestedVal[subSubKey];
 								}
-							} else mergeMediaStyle2(subKey2, mediaStyle1[subKey2], mediaOriginalValues === null || mediaOriginalValues === void 0 ? void 0 : mediaOriginalValues[subKey2]);
+							} else mergeMediaStyle2(subKey2, mediaStyle2[subKey2], mediaOriginalValues === null || mediaOriginalValues === void 0 ? void 0 : mediaOriginalValues[subKey2]);
 						}
 					}
 					return;

package/dist/test.cjs

@@ -876,6 +876,7 @@ function _instanceof$7(left, right) {
 }
 function setOnLayoutStrategy(state) {
 	strategy = state;
+	resumeLayoutLoop === null || resumeLayoutLoop === void 0 || resumeLayoutLoop();
 }
 function enable() {
 	if (avoidUpdates) {
@@ -926,6 +927,7 @@ function observeLayoutNode(node, disableKey) {
 		globalIntersectionObserver.observe(node);
 		IntersectionState.set(node, true);
 	}
+	resumeLayoutLoop === null || resumeLayoutLoop === void 0 || resumeLayoutLoop();
 }
 function registerLayoutNode(node, onChange, disableKey) {
 	LayoutHandlers.set(node, onChange);
@@ -1003,7 +1005,7 @@ function createMeasureLayout(node) {
 		return measureLayout$1(node, relativeTo, callback);
 	};
 }
-var LayoutHandlers, LayoutDisableKey, Nodes, IntersectionState, usePretransformDimensions, DisableLayoutContextValues, DisableLayoutContextKey, ENABLE, LayoutMeasurementController, globalIntersectionObserver, strategy, NodeRectCache, avoidUpdates, queuedUpdates, BoundingRects, rectFetchObserver, rectFetchResolve, rectFetchStartTime, lastCallbackDelay, rAF, userSkipVal, BASE_SKIP_FRAMES, MAX_SKIP_FRAMES, skipFrames, frameCount, getElementLayoutEvent, getPreTransformDimensions, getRelativeDimensions, PrevHostNode, getBoundingClientRectAsync, measureNode, measure, measureInWindow, createMeasureInWindow, measureLayout$1;
+var LayoutHandlers, LayoutDisableKey, Nodes, IntersectionState, usePretransformDimensions, DisableLayoutContextValues, DisableLayoutContextKey, ENABLE, LayoutMeasurementController, globalIntersectionObserver, strategy, resumeLayoutLoop, NodeRectCache, avoidUpdates, queuedUpdates, BoundingRects, rectFetchObserver, rectFetchResolve, rectFetchStartTime, lastCallbackDelay, rAF, userSkipVal, BASE_SKIP_FRAMES, MAX_SKIP_FRAMES, skipFrames, frameCount, frameScheduled, getElementLayoutEvent, getPreTransformDimensions, getRelativeDimensions, PrevHostNode, getBoundingClientRectAsync, measureNode, measure, measureInWindow, createMeasureInWindow, measureLayout$1;
 var init_index_native$11 = __esmMin((() => {
 	init_index_native$7();
 	init_asyncToGenerator();
@@ -1045,6 +1047,10 @@ var init_index_native$11 = __esmMin((() => {
 				}
 			}, { threshold: 0 });
 			return rectFetchObserver;
+		}, scheduleLayoutFrame2 = function() {
+			if (frameScheduled || strategy === "off" || Nodes.size === 0 || document.hidden) return;
+			frameScheduled = true;
+			rAF ? rAF(layoutOnAnimationFrame) : setTimeout(layoutOnAnimationFrame, 16);
 		};
 		BoundingRects = /* @__PURE__ */ new WeakMap();
 		rectFetchObserver = null;
@@ -1079,13 +1085,15 @@ var init_index_native$11 = __esmMin((() => {
 		MAX_SKIP_FRAMES = 20;
 		skipFrames = BASE_SKIP_FRAMES;
 		frameCount = 0;
+		frameScheduled = false;
 		function layoutOnAnimationFrame() {
 			return _layoutOnAnimationFrame.apply(this, arguments);
 		}
 		function _layoutOnAnimationFrame() {
 			_layoutOnAnimationFrame = _asyncToGenerator(function* () {
 				if (frameCount++ % skipFrames !== 0) {
-					rAF ? rAF(layoutOnAnimationFrame) : setTimeout(layoutOnAnimationFrame, 16);
+					frameScheduled = false;
+					scheduleLayoutFrame2();
 					return;
 				}
 				if (frameCount >= Number.MAX_SAFE_INTEGER) frameCount = 0;
@@ -1162,11 +1170,14 @@ var init_index_native$11 = __esmMin((() => {
 						for (var i2 = 0; i2 < visibleNodes.length; i2++) updateLayoutIfChanged(visibleNodes[i2]);
 					}
 				}
-				rAF ? rAF(layoutOnAnimationFrame) : setTimeout(layoutOnAnimationFrame, 16);
+				frameScheduled = false;
+				scheduleLayoutFrame2();
 			});
 			return _layoutOnAnimationFrame.apply(this, arguments);
 		}
-		layoutOnAnimationFrame();
+		resumeLayoutLoop = scheduleLayoutFrame2;
+		document.addEventListener("visibilitychange", scheduleLayoutFrame2);
+		scheduleLayoutFrame2();
 	}
 	getElementLayoutEvent = function(nodeRect, parentRect, node) {
 		return {
@@ -16379,6 +16390,14 @@ var init_getSplitStyles_native = __esmMin((() => {
 					}
 					var priority = mediaStylesSeen;
 					mediaStylesSeen += 1;
+					if (process.env.IS_STATIC === "is_static" && isMedia === true) {
+						var _styleState3;
+						var mediaStyle = getSubStyle(styleState, key6, val2, true);
+						(_styleState3 = styleState).style || (_styleState3.style = {});
+						var existing = styleState.style[key6];
+						styleState.style[key6] = existing ? Object.assign(existing, mediaStyle) : mediaStyle;
+						return;
+					}
 					if (shouldDoClasses) {
 						var mediaStyles = getCSSStylesAtomic(getSubStyle(styleState, key6, val2, false));
 						var _iteratorNormalCompletion12 = true, _didIteratorError12 = false, _iteratorError12 = void 0;
@@ -16411,7 +16430,7 @@ var init_getSplitStyles_native = __esmMin((() => {
 								return;
 							}
 							(_styleState4 = styleState).style || (_styleState4.style = {});
-							if (mergeMediaByImportance(styleState, mediaKeyShort, key7, val3, mediaState$1[mediaKeyShort], importanceBump, debug, originalVal2) && key7 === "fontFamily") styleState.fontFamily = mediaStyle1.fontFamily;
+							if (mergeMediaByImportance(styleState, mediaKeyShort, key7, val3, mediaState$1[mediaKeyShort], importanceBump, debug, originalVal2) && key7 === "fontFamily") styleState.fontFamily = mediaStyle2.fontFamily;
 						};
 						var isThemeMedia = isMedia === "theme";
 						var isGroupMedia = isMedia === "group";
@@ -16419,34 +16438,34 @@ var init_getSplitStyles_native = __esmMin((() => {
 						if (!isThemeMedia && !isPlatformMedia && !isGroupMedia) {
 							if (!mediaState$1[mediaKeyShort]) return;
 						}
-						var mediaStyle1 = getSubStyle(styleState, key6, val2, true);
+						var mediaStyle2 = getSubStyle(styleState, key6, val2, true);
 						var importanceBump = 0;
 						if (isThemeMedia) if (supportsDynamicColorIOS && getSetting("fastSchemeChange")) {
-							var _styleState3;
-							(_styleState3 = styleState).style || (_styleState3.style = {});
+							var _styleState12;
+							(_styleState12 = styleState).style || (_styleState12.style = {});
 							var scheme = mediaKeyShort;
 							var oppositeScheme = getOppositeScheme(mediaKeyShort);
-							var themeOriginalValues = styleOriginalValues.get(mediaStyle1);
+							var themeOriginalValues = styleOriginalValues.get(mediaStyle2);
 							var isCurrentScheme = themeName === scheme || themeName.startsWith(scheme);
-							for (var subKey1 in mediaStyle1) {
-								var _$val1 = extractValueFromDynamic(mediaStyle1[subKey1], scheme);
-								var existing = styleState.style[subKey1];
+							for (var subKey1 in mediaStyle2) {
+								var _$val1 = extractValueFromDynamic(mediaStyle2[subKey1], scheme);
+								var existing1 = styleState.style[subKey1];
 								if (!isColorStyleKey(subKey1)) {
 									dynamicThemeAccess = true;
-									if (isCurrentScheme) mediaStyle1[subKey1] = _$val1;
-									else delete mediaStyle1[subKey1];
+									if (isCurrentScheme) mediaStyle2[subKey1] = _$val1;
+									else delete mediaStyle2[subKey1];
 									continue;
 								}
-								if (existing === null || existing === void 0 ? void 0 : existing.dynamic) {
-									existing.dynamic[scheme] = _$val1;
-									mediaStyle1[subKey1] = existing;
+								if (existing1 === null || existing1 === void 0 ? void 0 : existing1.dynamic) {
+									existing1.dynamic[scheme] = _$val1;
+									mediaStyle2[subKey1] = existing1;
 								} else {
-									mediaStyle1[subKey1] = getDynamicVal({
+									mediaStyle2[subKey1] = getDynamicVal({
 										scheme,
 										val: _$val1,
-										oppositeVal: extractValueFromDynamic(existing, oppositeScheme)
+										oppositeVal: extractValueFromDynamic(existing1, oppositeScheme)
 									});
-									mergeStyle(styleState, subKey1, mediaStyle1[subKey1], priority, false, themeOriginalValues === null || themeOriginalValues === void 0 ? void 0 : themeOriginalValues[subKey1]);
+									mergeStyle(styleState, subKey1, mediaStyle2[subKey1], priority, false, themeOriginalValues === null || themeOriginalValues === void 0 ? void 0 : themeOriginalValues[subKey1]);
 								}
 							}
 						} else {
@@ -16473,7 +16492,7 @@ var init_getSplitStyles_native = __esmMin((() => {
 								var isActive = mediaState1 === null || mediaState1 === void 0 ? void 0 : mediaState1[groupMediaKey];
 								if (!mediaState1 && groupState.layout) isActive = mediaKeyMatch(groupMediaKey, groupState.layout);
 								if (!isActive) {
-									for (var pkey1 in mediaStyle1) applyDefaultStyle(pkey1, styleState);
+									for (var pkey1 in mediaStyle2) applyDefaultStyle(pkey1, styleState);
 									return;
 								}
 								importanceBump = 2;
@@ -16486,19 +16505,19 @@ var init_getSplitStyles_native = __esmMin((() => {
 								var isActive1 = componentGroupPseudoState === null || componentGroupPseudoState === void 0 ? void 0 : componentGroupPseudoState[groupPseudoKey];
 								var priority1 = pseudoPriorities[groupPseudoKey];
 								if (!isActive1) {
-									for (var pkey2 in mediaStyle1) applyDefaultStyle(pkey2, styleState);
+									for (var pkey2 in mediaStyle2) applyDefaultStyle(pkey2, styleState);
 									return;
 								}
 								importanceBump = priority1;
 							}
 						} else if (isPlatformMedia) importanceBump = getPlatformSpecificityBump(mediaKeyShort);
-						var mediaOriginalValues = styleOriginalValues.get(mediaStyle1);
-						if (isGroupMedia && mediaStyle1.transition) {
-							var _styleState12;
-							(_styleState12 = styleState).pseudoTransitions || (_styleState12.pseudoTransitions = {});
-							styleState.pseudoTransitions[`$${mediaKeyShort}`] = mediaStyle1.transition;
+						var mediaOriginalValues = styleOriginalValues.get(mediaStyle2);
+						if (isGroupMedia && mediaStyle2.transition) {
+							var _styleState22;
+							(_styleState22 = styleState).pseudoTransitions || (_styleState22.pseudoTransitions = {});
+							styleState.pseudoTransitions[`$${mediaKeyShort}`] = mediaStyle2.transition;
 						}
-						for (var subKey2 in mediaStyle1) {
+						for (var subKey2 in mediaStyle2) {
 							if (subKey2 === "space") continue;
 							if (subKey2[0] === "$") {
 								var subMediaType = getMediaKey(subKey2);
@@ -16509,7 +16528,7 @@ var init_getSplitStyles_native = __esmMin((() => {
 								} else if (subMediaType === true) {
 									if (!mediaState$1[subKey2.slice(1)]) continue;
 								}
-								var nestedVal = mediaStyle1[subKey2];
+								var nestedVal = mediaStyle2[subKey2];
 								var subOriginalValues = styleOriginalValues.get(nestedVal);
 								var outerBase = !!mediaState$1[mediaKeyShort] ? getMediaKeyImportance(mediaKeyShort) : defaultMediaImportance;
 								var innerBase = void 0;
@@ -16518,15 +16537,15 @@ var init_getSplitStyles_native = __esmMin((() => {
 								else innerBase = defaultMediaImportance;
 								var nestedImportance = outerBase + importanceBump + innerBase + 1;
 								for (var subSubKey in nestedVal) {
-									var _styleState22;
+									var _styleState32;
 									var expandedKey = shorthands[subSubKey] || subSubKey;
 									var { usedKeys } = styleState;
 									if (usedKeys[expandedKey] && usedKeys[expandedKey] > nestedImportance) continue;
-									(_styleState22 = styleState).style || (_styleState22.style = {});
+									(_styleState32 = styleState).style || (_styleState32.style = {});
 									mergeStyle(styleState, expandedKey, nestedVal[subSubKey], nestedImportance, false, subOriginalValues === null || subOriginalValues === void 0 ? void 0 : subOriginalValues[subSubKey]);
 									if (expandedKey === "fontFamily") styleState.fontFamily = nestedVal[subSubKey];
 								}
-							} else mergeMediaStyle2(subKey2, mediaStyle1[subKey2], mediaOriginalValues === null || mediaOriginalValues === void 0 ? void 0 : mediaOriginalValues[subKey2]);
+							} else mergeMediaStyle2(subKey2, mediaStyle2[subKey2], mediaOriginalValues === null || mediaOriginalValues === void 0 ? void 0 : mediaOriginalValues[subKey2]);
 						}
 					}
 					return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tamagui",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "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.7.2",
-    "@tamagui/adapt": "2.7.2",
-    "@tamagui/alert-dialog": "2.7.2",
-    "@tamagui/animate": "2.7.2",
-    "@tamagui/animate-presence": "2.7.2",
-    "@tamagui/avatar": "2.7.2",
-    "@tamagui/button": "2.7.2",
-    "@tamagui/card": "2.7.2",
-    "@tamagui/checkbox": "2.7.2",
-    "@tamagui/collapsible": "2.7.2",
-    "@tamagui/compose-refs": "2.7.2",
-    "@tamagui/constants": "2.7.2",
-    "@tamagui/context-menu": "2.7.2",
-    "@tamagui/core": "2.7.2",
-    "@tamagui/create-context": "2.7.2",
-    "@tamagui/create-menu": "2.7.2",
-    "@tamagui/dialog": "2.7.2",
-    "@tamagui/element": "2.7.2",
-    "@tamagui/elements": "2.7.2",
-    "@tamagui/fake-react-native": "2.7.2",
-    "@tamagui/focusable": "2.7.2",
-    "@tamagui/form": "2.7.2",
-    "@tamagui/get-button-sized": "2.7.2",
-    "@tamagui/get-font-sized": "2.7.2",
-    "@tamagui/get-token": "2.7.2",
-    "@tamagui/group": "2.7.2",
-    "@tamagui/helpers-tamagui": "2.7.2",
-    "@tamagui/image": "2.7.2",
-    "@tamagui/input": "2.7.2",
-    "@tamagui/label": "2.7.2",
-    "@tamagui/linear-gradient": "2.7.2",
-    "@tamagui/list-item": "2.7.2",
-    "@tamagui/menu": "2.7.2",
-    "@tamagui/polyfill-dev": "2.7.2",
-    "@tamagui/popover": "2.7.2",
-    "@tamagui/popper": "2.7.2",
-    "@tamagui/portal": "2.7.2",
-    "@tamagui/progress": "2.7.2",
-    "@tamagui/radio-group": "2.7.2",
-    "@tamagui/react-native-media-driver": "2.7.2",
-    "@tamagui/scroll-view": "2.7.2",
-    "@tamagui/select": "2.7.2",
-    "@tamagui/separator": "2.7.2",
-    "@tamagui/shapes": "2.7.2",
-    "@tamagui/sheet": "2.7.2",
-    "@tamagui/slider": "2.7.2",
-    "@tamagui/spacer": "2.7.2",
-    "@tamagui/spinner": "2.7.2",
-    "@tamagui/stacks": "2.7.2",
-    "@tamagui/switch": "2.7.2",
-    "@tamagui/tabs": "2.7.2",
-    "@tamagui/text": "2.7.2",
-    "@tamagui/theme": "2.7.2",
-    "@tamagui/toast": "2.7.2",
-    "@tamagui/toggle-group": "2.7.2",
-    "@tamagui/tooltip": "2.7.2",
-    "@tamagui/use-controllable-state": "2.7.2",
-    "@tamagui/use-debounce": "2.7.2",
-    "@tamagui/use-force-update": "2.7.2",
-    "@tamagui/use-window-dimensions": "2.7.2",
-    "@tamagui/visually-hidden": "2.7.2",
-    "@tamagui/font-size": "2.7.2",
-    "@tamagui/z-index-stack": "2.7.2"
+    "@tamagui/accordion": "2.7.3",
+    "@tamagui/adapt": "2.7.3",
+    "@tamagui/alert-dialog": "2.7.3",
+    "@tamagui/animate": "2.7.3",
+    "@tamagui/animate-presence": "2.7.3",
+    "@tamagui/avatar": "2.7.3",
+    "@tamagui/button": "2.7.3",
+    "@tamagui/card": "2.7.3",
+    "@tamagui/checkbox": "2.7.3",
+    "@tamagui/collapsible": "2.7.3",
+    "@tamagui/compose-refs": "2.7.3",
+    "@tamagui/constants": "2.7.3",
+    "@tamagui/context-menu": "2.7.3",
+    "@tamagui/core": "2.7.3",
+    "@tamagui/create-context": "2.7.3",
+    "@tamagui/create-menu": "2.7.3",
+    "@tamagui/dialog": "2.7.3",
+    "@tamagui/element": "2.7.3",
+    "@tamagui/elements": "2.7.3",
+    "@tamagui/fake-react-native": "2.7.3",
+    "@tamagui/focusable": "2.7.3",
+    "@tamagui/form": "2.7.3",
+    "@tamagui/get-button-sized": "2.7.3",
+    "@tamagui/get-font-sized": "2.7.3",
+    "@tamagui/get-token": "2.7.3",
+    "@tamagui/group": "2.7.3",
+    "@tamagui/helpers-tamagui": "2.7.3",
+    "@tamagui/image": "2.7.3",
+    "@tamagui/input": "2.7.3",
+    "@tamagui/label": "2.7.3",
+    "@tamagui/linear-gradient": "2.7.3",
+    "@tamagui/list-item": "2.7.3",
+    "@tamagui/menu": "2.7.3",
+    "@tamagui/polyfill-dev": "2.7.3",
+    "@tamagui/popover": "2.7.3",
+    "@tamagui/popper": "2.7.3",
+    "@tamagui/portal": "2.7.3",
+    "@tamagui/progress": "2.7.3",
+    "@tamagui/radio-group": "2.7.3",
+    "@tamagui/react-native-media-driver": "2.7.3",
+    "@tamagui/scroll-view": "2.7.3",
+    "@tamagui/select": "2.7.3",
+    "@tamagui/separator": "2.7.3",
+    "@tamagui/shapes": "2.7.3",
+    "@tamagui/sheet": "2.7.3",
+    "@tamagui/slider": "2.7.3",
+    "@tamagui/spacer": "2.7.3",
+    "@tamagui/spinner": "2.7.3",
+    "@tamagui/stacks": "2.7.3",
+    "@tamagui/switch": "2.7.3",
+    "@tamagui/tabs": "2.7.3",
+    "@tamagui/text": "2.7.3",
+    "@tamagui/theme": "2.7.3",
+    "@tamagui/toast": "2.7.3",
+    "@tamagui/toggle-group": "2.7.3",
+    "@tamagui/tooltip": "2.7.3",
+    "@tamagui/use-controllable-state": "2.7.3",
+    "@tamagui/use-debounce": "2.7.3",
+    "@tamagui/use-force-update": "2.7.3",
+    "@tamagui/use-window-dimensions": "2.7.3",
+    "@tamagui/visually-hidden": "2.7.3",
+    "@tamagui/font-size": "2.7.3",
+    "@tamagui/z-index-stack": "2.7.3"
   },
   "devDependencies": {
-    "@tamagui/build": "2.7.2",
+    "@tamagui/build": "2.7.3",
     "react": ">=19",
     "react-native": "0.83.2",
     "react-native-web": "^0.21.0"