@tamagui/core 2.4.5 → 2.5.0

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 $ tamagui-build
-built @tamagui/core in 691 ms
+built @tamagui/core in 1368 ms
 Running afterBuild script...
-afterBuild completed in 226 ms
+afterBuild completed in 217 ms

package/dist/native.cjs

@@ -15324,6 +15324,25 @@ var init_sortString_native = __esmMin((() => {
 	};
 }));
 //#endregion
+//#region ../web/dist/esm/helpers/styleProvenance.native.js
+function setStyleTokenProvenance(style, provenance) {
+	Object.defineProperty(style, provenanceSymbol, {
+		value: provenance,
+		enumerable: false,
+		configurable: true,
+		writable: true
+	});
+}
+function getStyleTokenProvenance(style) {
+	if (!style) return void 0;
+	return style[provenanceSymbol];
+}
+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);
+}));
+//#endregion
 //#region ../web/dist/esm/helpers/transformsToString.native.js
 function transformsToString(transforms) {
 	return transforms.map(function(transform) {
@@ -15398,9 +15417,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);
@@ -15439,7 +15465,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, PROP_SPLIT, getSplitStyles, getSubStyle, useSplitStyles, defaultColor, animatableDefaults, mergeTransform, mapTransformKeys;
+var shouldTrackStyleTokenProvenance, conf, PROP_SPLIT, getSplitStyles, getSubStyle, useSplitStyles, defaultColor, animatableDefaults, mergeTransform, mapTransformKeys;
 var init_getSplitStyles_native = __esmMin((() => {
 	init_index_native$7();
 	init_index_native$5();
@@ -15460,8 +15486,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;
 	PROP_SPLIT = "-";
 	getSplitStyles = function(props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, componentContext, groupContext, elementType, startedUnhydrated, debug, animationDriver) {
 		var _loop = function(keyOg2) {
@@ -15492,9 +15520,13 @@ var init_getSplitStyles_native = __esmMin((() => {
 				}
 			}
 			if (keyInit in skipProps && !noSkip && !isHOC) {
-				var _driver_animations;
 				if (keyInit === "group");
-				if (keyInit === "transition" && typeof valInit === "string" && !(driver === null || driver === void 0 ? void 0 : (_driver_animations = driver.animations) === null || _driver_animations === void 0 ? void 0 : _driver_animations[valInit])) {} else return "continue";
+				if (keyInit === "transition" && typeof valInit === "string") {
+					var _driver_animations;
+					var animationConfig = driver === null || driver === void 0 ? void 0 : (_driver_animations = driver.animations) === null || _driver_animations === void 0 ? void 0 : _driver_animations[valInit];
+					if (animationConfig && (driver === null || driver === void 0 ? void 0 : driver.outputStyle) === "css" && process.env.IS_STATIC === "is_static") valInit = `all ${animationConfig}`;
+					else if (animationConfig) return "continue";
+				} else return "continue";
 			}
 			var isValidStyleKeyInit = isValidStyleKey(keyInit, validStyles$1, accept);
 			if (!isValidStyleKeyInit) {
@@ -15530,51 +15562,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 && key5 === "elevation") {
-					mergeStyle(styleState, key5, val2, 1, false, originalVal);
+				if (!isHOC && isValidStyleKey(key6, validStyles$1, accept) || isAndroid && 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);
@@ -15609,34 +15641,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) {
@@ -15660,14 +15692,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";
@@ -15675,7 +15707,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;
@@ -15789,7 +15821,7 @@ var init_getSplitStyles_native = __esmMin((() => {
 				}
 				if (!isVariant) {
 					if (isStyledContextProp) return;
-					viewProps[key5] = val2;
+					viewProps[key6] = val2;
 				}
 			});
 		};
@@ -15829,9 +15861,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;
@@ -15870,7 +15902,12 @@ var init_getSplitStyles_native = __esmMin((() => {
 				else {
 					var _styleState2;
 					(_styleState2 = styleState).style || (_styleState2.style = {});
-					Object.assign(styleState.style, normalizeStyle$1(style));
+					var normalized = normalizeStyle$1(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]);
+					}
 				}
 			}
 		}
@@ -15894,6 +15931,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,
@@ -16866,7 +16915,7 @@ function createComponent(staticConfig) {
 		setMediaShouldUpdate(componentContext, didGetVariableValue() || hasRuntimeMediaKeys || noClass && (splitStyles === null || splitStyles === void 0 ? void 0 : splitStyles.hasMedia) === true, hasRuntimeMediaKeys ? splitStyles.hasMedia : null);
 		var { viewProps: viewPropsIn, pseudos, style: splitStylesStyle, classNames, pseudoGroups, mediaGroups } = splitStyles || {};
 		var propsWithAnimation = props;
-		var _ref5 = viewPropsIn || {}, { asChild, children, themeShallow, spaceDirection: _spaceDirection, onPress, onLongPress, onPressIn, onPressOut, onHoverIn, onHoverOut, onMouseUp, onMouseDown, onMouseEnter, onMouseLeave, onFocus, onBlur, separator, passThrough, forceStyle: _forceStyle, onClick, theme: _themeProp } = _ref5, nonTamaguiProps = _objectWithoutProperties(_ref5, _excluded2$1);
+		var _ref5 = viewPropsIn || {}, { asChild, children, themeShallow, spaceDirection: _spaceDirection, onPress, onLongPress, onPressIn, onPressOut, onHoverIn, onHoverOut, onMouseUp, onMouseDown, onMouseEnter, onMouseLeave, onFocus, onBlur, onDidAnimate, separator, passThrough, forceStyle: _forceStyle, onClick, theme: _themeProp } = _ref5, nonTamaguiProps = _objectWithoutProperties(_ref5, _excluded2$1);
 		var viewProps = nonTamaguiProps;
 		if (props.forceStyle) viewProps.forceStyle = props.forceStyle;
 		if (isHOC) {
@@ -16896,7 +16945,8 @@ function createComponent(staticConfig) {
 				themeName,
 				pseudos: pseudos || null,
 				staticConfig,
-				stateRef
+				stateRef,
+				onDidAnimate
 			});
 			if (animations) {
 				if (animations.ref) animatedRef = animations.ref;
@@ -17227,6 +17277,7 @@ var init_createComponent_native = __esmMin((() => {
 		"onMouseLeave",
 		"onFocus",
 		"onBlur",
+		"onDidAnimate",
 		"separator",
 		"passThrough",
 		"forceStyle",
@@ -19093,6 +19144,7 @@ exports.LayoutMeasurementController = LayoutMeasurementController;
 exports.MEDIA_SEP = MEDIA_SEP;
 exports.MISSING_THEME_MESSAGE = MISSING_THEME_MESSAGE;
 exports.PROP_SPLIT = PROP_SPLIT;
+exports.STYLE_TOKEN_PROVENANCE_KEY = STYLE_TOKEN_PROVENANCE_KEY;
 exports.Slot = Slot;
 exports.Slottable = Slottable;
 exports.StyleObjectIdentifier = StyleObjectIdentifier;
@@ -19152,6 +19204,7 @@ exports.getSplitStyles = getSplitStyles;
 exports.getStyleAtomic = getStyleAtomic;
 exports.getStyleCompat = getStyleCompat;
 exports.getStyleTags = getStyleTags;
+exports.getStyleTokenProvenance = getStyleTokenProvenance;
 exports.getSubStyle = getSubStyle;
 exports.getThemeCSSRules = getThemeCSSRules;
 exports.getThemedChildren = getThemedChildren;

package/dist/test.native.cjs

@@ -3873,6 +3873,22 @@ var sortString = function(a, b) {
 	return a < b ? -1 : a > b ? 1 : 0;
 };
 //#endregion
+//#region ../web/dist/esm/helpers/styleProvenance.native.js
+var STYLE_TOKEN_PROVENANCE_KEY = "tamagui.styleTokenProvenance";
+var provenanceSymbol = /* @__PURE__ */ Symbol.for(STYLE_TOKEN_PROVENANCE_KEY);
+function setStyleTokenProvenance(style, provenance) {
+	Object.defineProperty(style, provenanceSymbol, {
+		value: provenance,
+		enumerable: false,
+		configurable: true,
+		writable: true
+	});
+}
+function getStyleTokenProvenance(style) {
+	if (!style) return void 0;
+	return style[provenanceSymbol];
+}
+//#endregion
 //#region ../web/dist/esm/helpers/transformsToString.native.js
 function transformsToString(transforms) {
 	return transforms.map(function(transform) {
@@ -3888,6 +3904,7 @@ function _type_of$3(obj) {
 	"@swc/helpers - typeof";
 	return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
+var shouldTrackStyleTokenProvenance = false;
 var conf;
 var PROP_SPLIT = "-";
 function normalizeGroupKey(key, groupContext) {
@@ -3939,9 +3956,13 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 			}
 		}
 		if (keyInit in skipProps && !noSkip && !isHOC) {
-			var _driver_animations;
 			if (keyInit === "group");
-			if (keyInit === "transition" && typeof valInit === "string" && !(driver === null || driver === void 0 ? void 0 : (_driver_animations = driver.animations) === null || _driver_animations === void 0 ? void 0 : _driver_animations[valInit])) {} else return "continue";
+			if (keyInit === "transition" && typeof valInit === "string") {
+				var _driver_animations;
+				var animationConfig = driver === null || driver === void 0 ? void 0 : (_driver_animations = driver.animations) === null || _driver_animations === void 0 ? void 0 : _driver_animations[valInit];
+				if (animationConfig && (driver === null || driver === void 0 ? void 0 : driver.outputStyle) === "css" && process.env.IS_STATIC === "is_static") valInit = `all ${animationConfig}`;
+				else if (animationConfig) return "continue";
+			} else return "continue";
 		}
 		var isValidStyleKeyInit = isValidStyleKey(keyInit, validStyles$1, accept);
 		if (!isValidStyleKeyInit) {
@@ -3977,51 +3998,51 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 			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 && key5 === "elevation") {
-				mergeStyle(styleState, key5, val2, 1, false, originalVal);
+			if (!isHOC && isValidStyleKey(key6, validStyles$1, accept) || isAndroid && 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);
@@ -4056,34 +4077,34 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 							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) {
@@ -4107,14 +4128,14 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 						}
 					}
 				} 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";
@@ -4122,7 +4143,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 					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;
@@ -4236,7 +4257,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 			}
 			if (!isVariant) {
 				if (isStyledContextProp) return;
-				viewProps[key5] = val2;
+				viewProps[key6] = val2;
 			}
 		});
 	};
@@ -4276,9 +4297,9 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 	};
 	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;
@@ -4317,7 +4338,12 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 			else {
 				var _styleState2;
 				(_styleState2 = styleState).style || (_styleState2.style = {});
-				Object.assign(styleState.style, normalizeStyle$1(style));
+				var normalized = normalizeStyle$1(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]);
+				}
 			}
 		}
 	}
@@ -4341,6 +4367,18 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 			}
 		}
 	}
+	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,
@@ -4401,9 +4439,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];
+}
 var getSubStyle = function(styleState, subKey, styleIn, avoidMergeTransform) {
 	var { staticConfig, conf: conf2, styleProps } = styleState;
 	var styleOut = {};
@@ -5095,6 +5140,7 @@ var _excluded$2 = [
 	"onMouseLeave",
 	"onFocus",
 	"onBlur",
+	"onDidAnimate",
 	"separator",
 	"passThrough",
 	"forceStyle",
@@ -5384,7 +5430,7 @@ function createComponent(staticConfig) {
 		setMediaShouldUpdate(componentContext, didGetVariableValue() || hasRuntimeMediaKeys || noClass && (splitStyles === null || splitStyles === void 0 ? void 0 : splitStyles.hasMedia) === true, hasRuntimeMediaKeys ? splitStyles.hasMedia : null);
 		var { viewProps: viewPropsIn, pseudos, style: splitStylesStyle, classNames, pseudoGroups, mediaGroups } = splitStyles || {};
 		var propsWithAnimation = props;
-		var _ref5 = viewPropsIn || {}, { asChild, children, themeShallow, spaceDirection: _spaceDirection, onPress, onLongPress, onPressIn, onPressOut, onHoverIn, onHoverOut, onMouseUp, onMouseDown, onMouseEnter, onMouseLeave, onFocus, onBlur, separator, passThrough, forceStyle: _forceStyle, onClick, theme: _themeProp } = _ref5, nonTamaguiProps = _objectWithoutProperties(_ref5, _excluded2$1);
+		var _ref5 = viewPropsIn || {}, { asChild, children, themeShallow, spaceDirection: _spaceDirection, onPress, onLongPress, onPressIn, onPressOut, onHoverIn, onHoverOut, onMouseUp, onMouseDown, onMouseEnter, onMouseLeave, onFocus, onBlur, onDidAnimate, separator, passThrough, forceStyle: _forceStyle, onClick, theme: _themeProp } = _ref5, nonTamaguiProps = _objectWithoutProperties(_ref5, _excluded2$1);
 		var viewProps = nonTamaguiProps;
 		if (props.forceStyle) viewProps.forceStyle = props.forceStyle;
 		if (isHOC) {
@@ -5414,7 +5460,8 @@ function createComponent(staticConfig) {
 				themeName,
 				pseudos: pseudos || null,
 				staticConfig,
-				stateRef
+				stateRef,
+				onDidAnimate
 			});
 			if (animations) {
 				if (animations.ref) animatedRef = animations.ref;
@@ -7437,6 +7484,7 @@ exports.LayoutMeasurementController = LayoutMeasurementController;
 exports.MEDIA_SEP = MEDIA_SEP;
 exports.MISSING_THEME_MESSAGE = MISSING_THEME_MESSAGE;
 exports.PROP_SPLIT = PROP_SPLIT;
+exports.STYLE_TOKEN_PROVENANCE_KEY = STYLE_TOKEN_PROVENANCE_KEY;
 exports.Slot = Slot;
 exports.Slottable = Slottable;
 exports.StyleObjectIdentifier = StyleObjectIdentifier;
@@ -7496,6 +7544,7 @@ exports.getSplitStyles = getSplitStyles;
 exports.getStyleAtomic = getStyleAtomic;
 exports.getStyleCompat = getStyleCompat;
 exports.getStyleTags = getStyleTags;
+exports.getStyleTokenProvenance = getStyleTokenProvenance;
 exports.getSubStyle = getSubStyle;
 exports.getThemeCSSRules = getThemeCSSRules;
 exports.getThemedChildren = getThemedChildren;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "2.4.5",
+  "version": "2.5.0",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "license": "MIT",
   "author": {
@@ -9,7 +9,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/tamagui/tamagui.git",
-    "directory": "packages/core"
+    "directory": "code/core/core"
   },
   "source": "src/index.tsx",
   "type": "module",
@@ -79,17 +79,17 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/helpers": "2.4.5",
-    "@tamagui/react-native-media-driver": "2.4.5",
-    "@tamagui/react-native-use-pressable": "2.4.5",
-    "@tamagui/use-element-layout": "2.4.5",
-    "@tamagui/use-event": "2.4.5",
-    "@tamagui/web": "2.4.5"
+    "@tamagui/helpers": "2.5.0",
+    "@tamagui/react-native-media-driver": "2.5.0",
+    "@tamagui/react-native-use-pressable": "2.5.0",
+    "@tamagui/use-element-layout": "2.5.0",
+    "@tamagui/use-event": "2.5.0",
+    "@tamagui/web": "2.5.0"
   },
   "devDependencies": {
-    "@tamagui/build": "2.4.5",
-    "@tamagui/native-bundle": "2.4.5",
-    "@tamagui/react-native-web-lite": "2.4.5",
+    "@tamagui/build": "2.5.0",
+    "@tamagui/native-bundle": "2.5.0",
+    "@tamagui/react-native-web-lite": "2.5.0",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": ">=19",