tamagui 2.4.3 → 2.4.5-1784066510418

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 $ tamagui-build
-built tamagui in 3495 ms
+built tamagui in 1451 ms
 Running afterBuild script...
-afterBuild completed in 618 ms
+afterBuild completed in 428 ms

package/dist/native.cjs

@@ -13275,6 +13275,10 @@ var init_useThemeState_native = __esmMin((() => {
 		(0, react$1.useEffect)(function() {
 			var r = ref.current;
 			var renderVersion = r.renderVersion;
+			if (r.lastSnap && !states.has(r.id)) {
+				states.set(r.id, r.lastSnap);
+				localStates.set(r.id, r.lastSnap);
+			}
 			if (r.unsubscribe && r.subscribedParentId !== r.parentId) cleanupThemeSubscription(r);
 			if (shouldSubscribeToTheme(r, cascadeOnChange)) {
 				if (!r.unsubscribe) {
@@ -15594,6 +15598,21 @@ var init_sortString_native = __esmMin((() => {
 		return a < b ? -1 : a > b ? 1 : 0;
 	};
 }));
+//#endregion
+//#region ../../core/web/dist/esm/helpers/styleProvenance.native.js
+function setStyleTokenProvenance(style, provenance) {
+	Object.defineProperty(style, provenanceSymbol, {
+		value: provenance,
+		enumerable: false,
+		configurable: true,
+		writable: true
+	});
+}
+var STYLE_TOKEN_PROVENANCE_KEY, provenanceSymbol;
+var init_styleProvenance_native = __esmMin((() => {
+	STYLE_TOKEN_PROVENANCE_KEY = "tamagui.styleTokenProvenance";
+	provenanceSymbol = /* @__PURE__ */ Symbol.for(STYLE_TOKEN_PROVENANCE_KEY);
+}));
 var init_transformsToString_native = __esmMin((() => {
 	init_normalizeValueWithProperty_native();
 }));
@@ -15616,6 +15635,8 @@ function isValidStyleKey(key, validStyles, accept) {
 	return key in validStyles ? true : accept && key in accept;
 }
 function shouldSkipNativeHoverProp(key, isMedia) {
+	var _getPlatformDriver;
+	if ((_getPlatformDriver = getPlatformDriver()) === null || _getPlatformDriver === void 0 ? void 0 : _getPlatformDriver.pseudo) return false;
 	if (key === "hoverStyle") return true;
 	if (isMedia === "group") return getGroupPropParts(key.slice(1)).pseudo === "hover";
 	return false;
@@ -15657,9 +15678,16 @@ function mergeStyle(styleState, key, val, importance) {
 			(_styleState2 = styleState).style || (_styleState2.style = {});
 			usedKeys[key] = importance;
 			styleState.style[key] = key === "transform" && Array.isArray(out) ? [...out] : out;
+			if (shouldTrackStyleTokenProvenance) recordStyleTokenProvenance(styleState, key, originalVal);
 		}
 	}
 }
+function recordStyleTokenProvenance(styleState, key, originalVal) {
+	if (typeof originalVal === "string" && originalVal[0] === "$") {
+		var _styleState;
+		((_styleState = styleState).tokenProvenance || (_styleState.tokenProvenance = {}))[key] = originalVal;
+	} else if (styleState.tokenProvenance && key in styleState.tokenProvenance) delete styleState.tokenProvenance[key];
+}
 function passDownProp(viewProps, key, val) {
 	if (arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false) {
 		var next = _objectSpread2(_objectSpread2({}, viewProps[key]), val);
@@ -15698,7 +15726,7 @@ function applyDefaultStyle(pkey, styleState) {
 	var defaultValues = animatableDefaults[pkey];
 	if (defaultValues != null && !(pkey in styleState.usedKeys) && (!styleState.style || !(pkey in styleState.style))) mergeStyle(styleState, pkey, defaultValues, 1);
 }
-var conf, getSplitStyles, getSubStyle, useSplitStyles, defaultColor, animatableDefaults, mergeTransform, mapTransformKeys;
+var shouldTrackStyleTokenProvenance, conf, getSplitStyles, getSubStyle, useSplitStyles, defaultColor, animatableDefaults, mergeTransform, mapTransformKeys;
 var init_getSplitStyles_native = __esmMin((() => {
 	init_index_native$7();
 	init_index_native$5();
@@ -15719,8 +15747,10 @@ var init_getSplitStyles_native = __esmMin((() => {
 	init_skipProps_native();
 	init_sortString_native();
 	init_styleOriginalValues_native();
+	init_styleProvenance_native();
 	init_transformsToString_native();
 	init_objectSpread2();
+	shouldTrackStyleTokenProvenance = false;
 	getSplitStyles = function(props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, componentContext, groupContext, elementType, startedUnhydrated, debug, animationDriver) {
 		var _loop = function(keyOg2) {
 			var keyInit = keyOg2;
@@ -15788,51 +15818,51 @@ var init_getSplitStyles_native = __esmMin((() => {
 				if (valInit && (keyInit === "fontFamily" || keyInit === shorthands["fontFamily"]) && valInit in conf.fontsParsed) styleState.fontFamily = valInit;
 			}
 			var disablePropMap = isMediaOrPseudo || !isStyleLikeKey;
-			propMapper(keyInit, valInit, styleState, disablePropMap, function(key5, val2, originalVal) {
+			propMapper(keyInit, valInit, styleState, disablePropMap, function(key6, val2, originalVal) {
 				var _parentStaticConfig_variants;
-				var isStyledContextProp = styledContext && key5 in styledContext;
+				var isStyledContextProp = styledContext && key6 in styledContext;
 				if (!isHOC && disablePropMap && !isStyledContextProp && !isMediaOrPseudo) {
-					viewProps[key5] = val2;
+					viewProps[key6] = val2;
 					return;
 				}
 				if (val2 == null) return;
-				if (key5 === "pointerEvents") {
-					viewProps[key5] = val2;
+				if (key6 === "pointerEvents") {
+					viewProps[key6] = val2;
 					return;
 				}
-				if (!isHOC && isValidStyleKey(key5, validStyles$1, accept) || isAndroid$1 && key5 === "elevation") {
-					mergeStyle(styleState, key5, val2, 1, false, originalVal);
+				if (!isHOC && isValidStyleKey(key6, validStyles$1, accept) || isAndroid$1 && key6 === "elevation") {
+					mergeStyle(styleState, key6, val2, 1, false, originalVal);
 					return;
 				}
-				isPseudo = key5 in validPseudoKeys;
-				isMedia = isPseudo ? false : getMediaKey(key5);
+				isPseudo = key6 in validPseudoKeys;
+				isMedia = isPseudo ? false : getMediaKey(key6);
 				isMediaOrPseudo = Boolean(isMedia || isPseudo);
-				isVariant = variants && key5 in variants;
-				if (isMedia === "group") key5 = normalizeGroupKey(key5, groupContext);
-				if (shouldSkipNativeHoverProp(key5, isMedia)) return;
-				if ((inlineProps === null || inlineProps === void 0 ? void 0 : inlineProps.has(key5)) || process.env.IS_STATIC === "is_static" && (inlineWhenUnflattened === null || inlineWhenUnflattened === void 0 ? void 0 : inlineWhenUnflattened.has(key5))) {
+				isVariant = variants && key6 in variants;
+				if (isMedia === "group") key6 = normalizeGroupKey(key6, groupContext);
+				if (shouldSkipNativeHoverProp(key6, isMedia)) return;
+				if ((inlineProps === null || inlineProps === void 0 ? void 0 : inlineProps.has(key6)) || process.env.IS_STATIC === "is_static" && (inlineWhenUnflattened === null || inlineWhenUnflattened === void 0 ? void 0 : inlineWhenUnflattened.has(key6))) {
 					var _props_key;
-					viewProps[key5] = (_props_key = props[key5]) !== null && _props_key !== void 0 ? _props_key : val2;
+					viewProps[key6] = (_props_key = props[key6]) !== null && _props_key !== void 0 ? _props_key : val2;
 				}
 				if (styleProps.noExpand && isPseudo || isHOC && (isMediaOrPseudo || (parentStaticConfig === null || parentStaticConfig === void 0 ? void 0 : (_parentStaticConfig_variants = parentStaticConfig.variants) === null || _parentStaticConfig_variants === void 0 ? void 0 : _parentStaticConfig_variants[keyInit]))) {
-					passDownProp(viewProps, key5, val2, isMediaOrPseudo);
+					passDownProp(viewProps, key6, val2, isMediaOrPseudo);
 					return;
 				}
 				if (isPseudo) {
 					if (!val2) return;
-					var pseudoStyleObject = getSubStyle(styleState, key5, val2, styleProps.noClass && !(process.env.IS_STATIC === "is_static"));
+					var pseudoStyleObject = getSubStyle(styleState, key6, val2, styleProps.noClass && !(process.env.IS_STATIC === "is_static"));
 					if (!shouldDoClasses || process.env.IS_STATIC === "is_static") {
 						var _pseudos, _key;
 						pseudos || (pseudos = {});
-						(_pseudos = pseudos)[_key = key5] || (_pseudos[_key] = {});
+						(_pseudos = pseudos)[_key = key6] || (_pseudos[_key] = {});
 						if (process.env.IS_STATIC === "is_static") {
-							Object.assign(pseudos[key5], pseudoStyleObject);
+							Object.assign(pseudos[key6], pseudoStyleObject);
 							return;
 						}
 					}
-					var descriptor = pseudoDescriptors[key5];
-					var isEnter = key5 === "enterStyle";
-					var isExit = key5 === "exitStyle";
+					var descriptor = pseudoDescriptors[key6];
+					var isEnter = key6 === "enterStyle";
+					var isExit = key6 === "exitStyle";
 					if (!descriptor) return;
 					if (shouldDoClasses && !isExit) {
 						var pseudoStyles = getStyleAtomic(pseudoStyleObject, descriptor);
@@ -15867,34 +15897,34 @@ var init_getSplitStyles_native = __esmMin((() => {
 								if (process.env.IS_STATIC === "is_static") {
 									var _pseudos1, _key1;
 									pseudos || (pseudos = {});
-									(_pseudos1 = pseudos)[_key1 = key5] || (_pseudos1[_key1] = {});
-									pseudos[key5][pkey] = _$val;
+									(_pseudos1 = pseudos)[_key1 = key6] || (_pseudos1[_key1] = {});
+									pseudos[key6][pkey] = _$val;
 								}
 								mergeStyle(styleState, pkey, _$val, importance, false, pseudoOriginalValues === null || pseudoOriginalValues === void 0 ? void 0 : pseudoOriginalValues[pkey]);
 							}
 						}
 						if (!isDisabled) for (var _$key in val2) {
-							var k = shorthands[_$key] || _$key;
-							styleState.usedKeys[k] = Math.max(importance, styleState.usedKeys[k] || 0);
+							var k2 = shorthands[_$key] || _$key;
+							styleState.usedKeys[k2] = Math.max(importance, styleState.usedKeys[k2] || 0);
 						}
 					}
 					return;
 				}
 				if (isMedia) {
 					if (!val2) return;
-					var mediaKeyShort = key5.slice(isMedia == "theme" ? 7 : 1);
+					var mediaKeyShort = key6.slice(isMedia == "theme" ? 7 : 1);
 					hasMedia || (hasMedia = true);
 					if (val2["space"] || !shouldDoClasses || styleProps.willBeAnimated) {
 						if (!hasMedia || typeof hasMedia === "boolean") hasMedia = /* @__PURE__ */ new Set();
 						hasMedia.add(mediaKeyShort);
 					}
 					if (isMedia === "platform") {
-						if (!isActivePlatform(key5)) return;
+						if (!isActivePlatform(key6)) return;
 					}
 					var priority = mediaStylesSeen;
 					mediaStylesSeen += 1;
 					if (shouldDoClasses) {
-						var mediaStyles = getCSSStylesAtomic(getSubStyle(styleState, key5, val2, false));
+						var mediaStyles = getCSSStylesAtomic(getSubStyle(styleState, key6, val2, false));
 						var _iteratorNormalCompletion12 = true, _didIteratorError12 = false, _iteratorError12 = void 0;
 						try {
 							for (var _iterator12 = mediaStyles[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
@@ -15918,14 +15948,14 @@ var init_getSplitStyles_native = __esmMin((() => {
 							}
 						}
 					} else {
-						let mergeMediaStyle2 = function(key6, val3, originalVal2) {
+						let mergeMediaStyle2 = function(key7, val3, originalVal2) {
 							var _styleState4;
-							if (!isValidStyleKey(key6, validStyles$1, accept)) {
-								viewProps[key6] = val3;
+							if (!isValidStyleKey(key7, validStyles$1, accept)) {
+								viewProps[key7] = val3;
 								return;
 							}
 							(_styleState4 = styleState).style || (_styleState4.style = {});
-							if (mergeMediaByImportance(styleState, mediaKeyShort, key6, val3, mediaState$1[mediaKeyShort], importanceBump, debug, originalVal2) && key6 === "fontFamily") styleState.fontFamily = mediaStyle1.fontFamily;
+							if (mergeMediaByImportance(styleState, mediaKeyShort, key7, val3, mediaState$1[mediaKeyShort], importanceBump, debug, originalVal2) && key7 === "fontFamily") styleState.fontFamily = mediaStyle1.fontFamily;
 						};
 						var isThemeMedia = isMedia === "theme";
 						var isGroupMedia = isMedia === "group";
@@ -15933,7 +15963,7 @@ var init_getSplitStyles_native = __esmMin((() => {
 						if (!isThemeMedia && !isPlatformMedia && !isGroupMedia) {
 							if (!mediaState$1[mediaKeyShort]) return;
 						}
-						var mediaStyle1 = getSubStyle(styleState, key5, val2, true);
+						var mediaStyle1 = getSubStyle(styleState, key6, val2, true);
 						var importanceBump = 0;
 						if (isThemeMedia) if (supportsDynamicColorIOS && getSetting("fastSchemeChange")) {
 							var _styleState3;
@@ -16047,7 +16077,7 @@ var init_getSplitStyles_native = __esmMin((() => {
 				}
 				if (!isVariant) {
 					if (isStyledContextProp) return;
-					viewProps[key5] = val2;
+					viewProps[key6] = val2;
 				}
 			});
 		};
@@ -16087,9 +16117,9 @@ var init_getSplitStyles_native = __esmMin((() => {
 		};
 		if (process.env.IS_STATIC === "is_static") {
 			var { fallbackProps } = styleProps;
-			if (fallbackProps) styleState.props = new Proxy(props, { get(_, key5, val2) {
-				if (!Reflect.has(props, key5)) return Reflect.get(fallbackProps, key5);
-				return Reflect.get(props, key5);
+			if (fallbackProps) styleState.props = new Proxy(props, { get(_, key6, val2) {
+				if (!Reflect.has(props, key6)) return Reflect.get(fallbackProps, key6);
+				return Reflect.get(props, key6);
 			} });
 		}
 		var { asChild } = props;
@@ -16128,7 +16158,12 @@ var init_getSplitStyles_native = __esmMin((() => {
 				else {
 					var _styleState2;
 					(_styleState2 = styleState).style || (_styleState2.style = {});
-					Object.assign(styleState.style, normalizeStyle(style));
+					var normalized = normalizeStyle(style);
+					Object.assign(styleState.style, normalized);
+					if (shouldTrackStyleTokenProvenance) {
+						var styleOriginals = styleOriginalValues.get(normalized);
+						for (var k in normalized) recordStyleTokenProvenance(styleState, k, styleOriginals === null || styleOriginals === void 0 ? void 0 : styleOriginals[k]);
+					}
 				}
 			}
 		}
@@ -16152,6 +16187,18 @@ var init_getSplitStyles_native = __esmMin((() => {
 				}
 			}
 		}
+		if (shouldTrackStyleTokenProvenance && styleState.style && styleState.tokenProvenance) {
+			var provenance = {};
+			var hasProvenance = false;
+			for (var key4 in styleState.tokenProvenance) {
+				provenance[key4] = {
+					token: styleState.tokenProvenance[key4],
+					theme: themeName
+				};
+				hasProvenance = true;
+			}
+			if (hasProvenance) setStyleTokenProvenance(styleState.style, provenance);
+		}
 		var result = {
 			hasMedia,
 			fontFamily: styleState.fontFamily,

package/dist/test.cjs

@@ -13453,6 +13453,10 @@ var init_useThemeState_native = __esmMin((() => {
 		(0, react$1.useEffect)(function() {
 			var r = ref.current;
 			var renderVersion = r.renderVersion;
+			if (r.lastSnap && !states.has(r.id)) {
+				states.set(r.id, r.lastSnap);
+				localStates.set(r.id, r.lastSnap);
+			}
 			if (r.unsubscribe && r.subscribedParentId !== r.parentId) cleanupThemeSubscription(r);
 			if (shouldSubscribeToTheme(r, cascadeOnChange)) {
 				if (!r.unsubscribe) {
@@ -15773,6 +15777,21 @@ var init_sortString_native = __esmMin((() => {
 		return a < b ? -1 : a > b ? 1 : 0;
 	};
 }));
+//#endregion
+//#region ../../core/web/dist/esm/helpers/styleProvenance.native.js
+function setStyleTokenProvenance(style, provenance) {
+	Object.defineProperty(style, provenanceSymbol, {
+		value: provenance,
+		enumerable: false,
+		configurable: true,
+		writable: true
+	});
+}
+var STYLE_TOKEN_PROVENANCE_KEY, provenanceSymbol;
+var init_styleProvenance_native = __esmMin((() => {
+	STYLE_TOKEN_PROVENANCE_KEY = "tamagui.styleTokenProvenance";
+	provenanceSymbol = /* @__PURE__ */ Symbol.for(STYLE_TOKEN_PROVENANCE_KEY);
+}));
 var init_transformsToString_native = __esmMin((() => {
 	init_normalizeValueWithProperty_native();
 }));
@@ -15795,6 +15814,8 @@ function isValidStyleKey(key, validStyles, accept) {
 	return key in validStyles ? true : accept && key in accept;
 }
 function shouldSkipNativeHoverProp(key, isMedia) {
+	var _getPlatformDriver;
+	if ((_getPlatformDriver = getPlatformDriver()) === null || _getPlatformDriver === void 0 ? void 0 : _getPlatformDriver.pseudo) return false;
 	if (key === "hoverStyle") return true;
 	if (isMedia === "group") return getGroupPropParts(key.slice(1)).pseudo === "hover";
 	return false;
@@ -15836,9 +15857,16 @@ function mergeStyle(styleState, key, val, importance) {
 			(_styleState2 = styleState).style || (_styleState2.style = {});
 			usedKeys[key] = importance;
 			styleState.style[key] = key === "transform" && Array.isArray(out) ? [...out] : out;
+			if (shouldTrackStyleTokenProvenance) recordStyleTokenProvenance(styleState, key, originalVal);
 		}
 	}
 }
+function recordStyleTokenProvenance(styleState, key, originalVal) {
+	if (typeof originalVal === "string" && originalVal[0] === "$") {
+		var _styleState;
+		((_styleState = styleState).tokenProvenance || (_styleState.tokenProvenance = {}))[key] = originalVal;
+	} else if (styleState.tokenProvenance && key in styleState.tokenProvenance) delete styleState.tokenProvenance[key];
+}
 function passDownProp(viewProps, key, val) {
 	if (arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false) {
 		var next = _objectSpread2(_objectSpread2({}, viewProps[key]), val);
@@ -15877,7 +15905,7 @@ function applyDefaultStyle(pkey, styleState) {
 	var defaultValues = animatableDefaults[pkey];
 	if (defaultValues != null && !(pkey in styleState.usedKeys) && (!styleState.style || !(pkey in styleState.style))) mergeStyle(styleState, pkey, defaultValues, 1);
 }
-var conf, getSplitStyles, getSubStyle, useSplitStyles, defaultColor, animatableDefaults, mergeTransform, mapTransformKeys;
+var shouldTrackStyleTokenProvenance, conf, getSplitStyles, getSubStyle, useSplitStyles, defaultColor, animatableDefaults, mergeTransform, mapTransformKeys;
 var init_getSplitStyles_native = __esmMin((() => {
 	init_index_native$7();
 	init_index_native$5();
@@ -15898,8 +15926,10 @@ var init_getSplitStyles_native = __esmMin((() => {
 	init_skipProps_native();
 	init_sortString_native();
 	init_styleOriginalValues_native();
+	init_styleProvenance_native();
 	init_transformsToString_native();
 	init_objectSpread2();
+	shouldTrackStyleTokenProvenance = false;
 	getSplitStyles = function(props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, componentContext, groupContext, elementType, startedUnhydrated, debug, animationDriver) {
 		var _loop = function(keyOg2) {
 			var keyInit = keyOg2;
@@ -15968,51 +15998,51 @@ var init_getSplitStyles_native = __esmMin((() => {
 				if (valInit && (keyInit === "fontFamily" || keyInit === shorthands["fontFamily"]) && valInit in conf.fontsParsed) styleState.fontFamily = valInit;
 			}
 			var disablePropMap = isMediaOrPseudo || !isStyleLikeKey;
-			propMapper(keyInit, valInit, styleState, disablePropMap, function(key5, val2, originalVal) {
+			propMapper(keyInit, valInit, styleState, disablePropMap, function(key6, val2, originalVal) {
 				var _parentStaticConfig_variants;
-				var isStyledContextProp = styledContext && key5 in styledContext;
+				var isStyledContextProp = styledContext && key6 in styledContext;
 				if (!isHOC && disablePropMap && !isStyledContextProp && !isMediaOrPseudo) {
-					viewProps[key5] = val2;
+					viewProps[key6] = val2;
 					return;
 				}
 				if (val2 == null) return;
-				if (key5 === "pointerEvents") {
-					viewProps[key5] = val2;
+				if (key6 === "pointerEvents") {
+					viewProps[key6] = val2;
 					return;
 				}
-				if (!isHOC && isValidStyleKey(key5, validStyles$1, accept) || isAndroid$1 && key5 === "elevation") {
-					mergeStyle(styleState, key5, val2, 1, false, originalVal);
+				if (!isHOC && isValidStyleKey(key6, validStyles$1, accept) || isAndroid$1 && key6 === "elevation") {
+					mergeStyle(styleState, key6, val2, 1, false, originalVal);
 					return;
 				}
-				isPseudo = key5 in validPseudoKeys;
-				isMedia = isPseudo ? false : getMediaKey(key5);
+				isPseudo = key6 in validPseudoKeys;
+				isMedia = isPseudo ? false : getMediaKey(key6);
 				isMediaOrPseudo = Boolean(isMedia || isPseudo);
-				isVariant = variants && key5 in variants;
-				if (isMedia === "group") key5 = normalizeGroupKey(key5, groupContext);
-				if (shouldSkipNativeHoverProp(key5, isMedia)) return;
-				if ((inlineProps === null || inlineProps === void 0 ? void 0 : inlineProps.has(key5)) || process.env.IS_STATIC === "is_static" && (inlineWhenUnflattened === null || inlineWhenUnflattened === void 0 ? void 0 : inlineWhenUnflattened.has(key5))) {
+				isVariant = variants && key6 in variants;
+				if (isMedia === "group") key6 = normalizeGroupKey(key6, groupContext);
+				if (shouldSkipNativeHoverProp(key6, isMedia)) return;
+				if ((inlineProps === null || inlineProps === void 0 ? void 0 : inlineProps.has(key6)) || process.env.IS_STATIC === "is_static" && (inlineWhenUnflattened === null || inlineWhenUnflattened === void 0 ? void 0 : inlineWhenUnflattened.has(key6))) {
 					var _props_key;
-					viewProps[key5] = (_props_key = props[key5]) !== null && _props_key !== void 0 ? _props_key : val2;
+					viewProps[key6] = (_props_key = props[key6]) !== null && _props_key !== void 0 ? _props_key : val2;
 				}
 				if (styleProps.noExpand && isPseudo || isHOC && (isMediaOrPseudo || (parentStaticConfig === null || parentStaticConfig === void 0 ? void 0 : (_parentStaticConfig_variants = parentStaticConfig.variants) === null || _parentStaticConfig_variants === void 0 ? void 0 : _parentStaticConfig_variants[keyInit]))) {
-					passDownProp(viewProps, key5, val2, isMediaOrPseudo);
+					passDownProp(viewProps, key6, val2, isMediaOrPseudo);
 					return;
 				}
 				if (isPseudo) {
 					if (!val2) return;
-					var pseudoStyleObject = getSubStyle(styleState, key5, val2, styleProps.noClass && !(process.env.IS_STATIC === "is_static"));
+					var pseudoStyleObject = getSubStyle(styleState, key6, val2, styleProps.noClass && !(process.env.IS_STATIC === "is_static"));
 					if (!shouldDoClasses || process.env.IS_STATIC === "is_static") {
 						var _pseudos, _key;
 						pseudos || (pseudos = {});
-						(_pseudos = pseudos)[_key = key5] || (_pseudos[_key] = {});
+						(_pseudos = pseudos)[_key = key6] || (_pseudos[_key] = {});
 						if (process.env.IS_STATIC === "is_static") {
-							Object.assign(pseudos[key5], pseudoStyleObject);
+							Object.assign(pseudos[key6], pseudoStyleObject);
 							return;
 						}
 					}
-					var descriptor = pseudoDescriptors[key5];
-					var isEnter = key5 === "enterStyle";
-					var isExit = key5 === "exitStyle";
+					var descriptor = pseudoDescriptors[key6];
+					var isEnter = key6 === "enterStyle";
+					var isExit = key6 === "exitStyle";
 					if (!descriptor) return;
 					if (shouldDoClasses && !isExit) {
 						var pseudoStyles = getStyleAtomic(pseudoStyleObject, descriptor);
@@ -16047,34 +16077,34 @@ var init_getSplitStyles_native = __esmMin((() => {
 								if (process.env.IS_STATIC === "is_static") {
 									var _pseudos1, _key1;
 									pseudos || (pseudos = {});
-									(_pseudos1 = pseudos)[_key1 = key5] || (_pseudos1[_key1] = {});
-									pseudos[key5][pkey] = _$val;
+									(_pseudos1 = pseudos)[_key1 = key6] || (_pseudos1[_key1] = {});
+									pseudos[key6][pkey] = _$val;
 								}
 								mergeStyle(styleState, pkey, _$val, importance, false, pseudoOriginalValues === null || pseudoOriginalValues === void 0 ? void 0 : pseudoOriginalValues[pkey]);
 							}
 						}
 						if (!isDisabled) for (var _$key in val2) {
-							var k = shorthands[_$key] || _$key;
-							styleState.usedKeys[k] = Math.max(importance, styleState.usedKeys[k] || 0);
+							var k2 = shorthands[_$key] || _$key;
+							styleState.usedKeys[k2] = Math.max(importance, styleState.usedKeys[k2] || 0);
 						}
 					}
 					return;
 				}
 				if (isMedia) {
 					if (!val2) return;
-					var mediaKeyShort = key5.slice(isMedia == "theme" ? 7 : 1);
+					var mediaKeyShort = key6.slice(isMedia == "theme" ? 7 : 1);
 					hasMedia || (hasMedia = true);
 					if (val2["space"] || !shouldDoClasses || styleProps.willBeAnimated) {
 						if (!hasMedia || typeof hasMedia === "boolean") hasMedia = /* @__PURE__ */ new Set();
 						hasMedia.add(mediaKeyShort);
 					}
 					if (isMedia === "platform") {
-						if (!isActivePlatform(key5)) return;
+						if (!isActivePlatform(key6)) return;
 					}
 					var priority = mediaStylesSeen;
 					mediaStylesSeen += 1;
 					if (shouldDoClasses) {
-						var mediaStyles = getCSSStylesAtomic(getSubStyle(styleState, key5, val2, false));
+						var mediaStyles = getCSSStylesAtomic(getSubStyle(styleState, key6, val2, false));
 						var _iteratorNormalCompletion12 = true, _didIteratorError12 = false, _iteratorError12 = void 0;
 						try {
 							for (var _iterator12 = mediaStyles[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
@@ -16098,14 +16128,14 @@ var init_getSplitStyles_native = __esmMin((() => {
 							}
 						}
 					} else {
-						let mergeMediaStyle2 = function(key6, val3, originalVal2) {
+						let mergeMediaStyle2 = function(key7, val3, originalVal2) {
 							var _styleState4;
-							if (!isValidStyleKey(key6, validStyles$1, accept)) {
-								viewProps[key6] = val3;
+							if (!isValidStyleKey(key7, validStyles$1, accept)) {
+								viewProps[key7] = val3;
 								return;
 							}
 							(_styleState4 = styleState).style || (_styleState4.style = {});
-							if (mergeMediaByImportance(styleState, mediaKeyShort, key6, val3, mediaState$1[mediaKeyShort], importanceBump, debug, originalVal2) && key6 === "fontFamily") styleState.fontFamily = mediaStyle1.fontFamily;
+							if (mergeMediaByImportance(styleState, mediaKeyShort, key7, val3, mediaState$1[mediaKeyShort], importanceBump, debug, originalVal2) && key7 === "fontFamily") styleState.fontFamily = mediaStyle1.fontFamily;
 						};
 						var isThemeMedia = isMedia === "theme";
 						var isGroupMedia = isMedia === "group";
@@ -16113,7 +16143,7 @@ var init_getSplitStyles_native = __esmMin((() => {
 						if (!isThemeMedia && !isPlatformMedia && !isGroupMedia) {
 							if (!mediaState$1[mediaKeyShort]) return;
 						}
-						var mediaStyle1 = getSubStyle(styleState, key5, val2, true);
+						var mediaStyle1 = getSubStyle(styleState, key6, val2, true);
 						var importanceBump = 0;
 						if (isThemeMedia) if (supportsDynamicColorIOS && getSetting("fastSchemeChange")) {
 							var _styleState3;
@@ -16227,7 +16257,7 @@ var init_getSplitStyles_native = __esmMin((() => {
 				}
 				if (!isVariant) {
 					if (isStyledContextProp) return;
-					viewProps[key5] = val2;
+					viewProps[key6] = val2;
 				}
 			});
 		};
@@ -16267,9 +16297,9 @@ var init_getSplitStyles_native = __esmMin((() => {
 		};
 		if (process.env.IS_STATIC === "is_static") {
 			var { fallbackProps } = styleProps;
-			if (fallbackProps) styleState.props = new Proxy(props, { get(_, key5, val2) {
-				if (!Reflect.has(props, key5)) return Reflect.get(fallbackProps, key5);
-				return Reflect.get(props, key5);
+			if (fallbackProps) styleState.props = new Proxy(props, { get(_, key6, val2) {
+				if (!Reflect.has(props, key6)) return Reflect.get(fallbackProps, key6);
+				return Reflect.get(props, key6);
 			} });
 		}
 		var { asChild } = props;
@@ -16308,7 +16338,12 @@ var init_getSplitStyles_native = __esmMin((() => {
 				else {
 					var _styleState2;
 					(_styleState2 = styleState).style || (_styleState2.style = {});
-					Object.assign(styleState.style, normalizeStyle(style));
+					var normalized = normalizeStyle(style);
+					Object.assign(styleState.style, normalized);
+					if (shouldTrackStyleTokenProvenance) {
+						var styleOriginals = styleOriginalValues.get(normalized);
+						for (var k in normalized) recordStyleTokenProvenance(styleState, k, styleOriginals === null || styleOriginals === void 0 ? void 0 : styleOriginals[k]);
+					}
 				}
 			}
 		}
@@ -16332,6 +16367,18 @@ var init_getSplitStyles_native = __esmMin((() => {
 				}
 			}
 		}
+		if (shouldTrackStyleTokenProvenance && styleState.style && styleState.tokenProvenance) {
+			var provenance = {};
+			var hasProvenance = false;
+			for (var key4 in styleState.tokenProvenance) {
+				provenance[key4] = {
+					token: styleState.tokenProvenance[key4],
+					theme: themeName
+				};
+				hasProvenance = true;
+			}
+			if (hasProvenance) setStyleTokenProvenance(styleState.style, provenance);
+		}
 		var result = {
 			hasMedia,
 			fontFamily: styleState.fontFamily,

package/package.json

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