@tamagui/web 3.0.0-beta.1216.1 → 3.0.0-beta.1309.1

package/dist/esm/helpers/getSplitStyles.native.js

@@ -378,6 +378,7 @@ function contributeProp(pass, keyOg, valOg) {
 			if (hocSlots) {
 				var _direct1;
 				var slots = (_direct1 = direct).flatSlots || (_direct1.flatSlots = /* @__PURE__ */ new Map());
+				var markerLayer = pass[passSourceLayer];
 				var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
 				try {
 					for (var _iterator = hocSlots[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
@@ -386,6 +387,7 @@ function contributeProp(pass, keyOg, valOg) {
 						try {
 							for (var _iterator1 = entries[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
 								var entry = _step1.value;
+								pass[passSourceLayer] = Math.max(entry[7] >> 5, sourceLayerResolver);
 								if (!ownsSourceLayer(styleState, entry[0], !!entry[2])) continue;
 								if (!isHOC && styleState.styleProps.isAnimated && (slot === "transition" || entry[8]) && !(entry[0] in nonAnimatableStyleProps)) {
 									var _styleState_animationDriver;
@@ -415,6 +417,7 @@ function contributeProp(pass, keyOg, valOg) {
 						if (_didIteratorError) throw _iteratorError;
 					}
 				}
+				pass[passSourceLayer] = markerLayer;
 			}
 		}
 		return;
@@ -486,9 +489,6 @@ function contributeProp(pass, keyOg, valOg) {
 		}
 	}
 	if (!isValidStyleKeyInit) {
-		if (!isAndroid) {
-			if (keyInit === "elevationAndroid") return;
-		}
 		if (keyInit === "userSelect") {
 			keyInit = "selectable";
 			valInit = valInit !== "none";
@@ -641,6 +641,12 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 		animationDriver: resolvedDriver
 	};
 	styleState.flatStyleStaticConfig = styleStaticConfig;
+	var prev = styleProps.prevStyle;
+	if (prev) {
+		styleState.flatPrevStyle = prev;
+		styleState.flatStyleChanged = false;
+		styleState.flatStyleKeyCount = 0;
+	}
 	if (process.env.NODE_ENV === "development" && (debug === "profile" || globalThis.time)) time`style-state`;
 	if (process.env.NODE_ENV === "development" && debug === "verbose" && isClient) {
 		if (isDevTools) {
@@ -859,6 +865,9 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 		}
 		if (hasProvenance) setStyleTokenProvenance(styleState.style, provenance);
 	}
+	var direct = styleState;
+	var prevStyle = direct.flatPrevStyle;
+	if (prevStyle && styleState.style && !direct.flatStyleChanged && Object.keys(prevStyle).length === Object.keys(styleState.style).length) styleState.style = prevStyle;
 	var result = {
 		hasMedia,
 		fontFamily: styleState.fontFamily,
@@ -1000,6 +1009,11 @@ function mergeStyle(styleState, key, val) {
 		if (staticConfig.isInput && key in nativeTextInputColorProps) viewProps[nativeTextInputColorProps[key]] = out;
 		else {
 			var _styleState4;
+			var direct = styleState;
+			if (direct.flatPrevStyle) {
+				direct.flatStyleKeyCount = (direct.flatStyleKeyCount || 0) + 1;
+				if (!direct.flatStyleChanged && direct.flatPrevStyle[key] !== out) direct.flatStyleChanged = true;
+			}
 			(_styleState4 = styleState).style || (_styleState4.style = {});
 			styleState.style[key] = out;
 			if (shouldTrackStyleTokenProvenance) recordStyleTokenProvenance(styleState, key, originalVal);
@@ -1863,10 +1877,11 @@ function walkConditionalValue(state, property, value, parent, sink) {
 		}
 	}
 	if (warnMode && process.env.NODE_ENV === "development" && typeof value === "string" && !hasBase && conditions && getConfigRevisionState(state.conf).tokenCategory(property) && getConfigRevisionState(state.conf).propertyKind(property) !== 8 && property !== "boxShadow" && property !== "textShadow" && property !== "fontFamily" && property !== "gap" && splitComponents(lastPayload).length > 1) warnOnce(`${property}="${value}" has multiple values after its first conditional. Write the base value before the first conditional.`);
-	if (warnMode === 1 && (!canGenerateCSS || !state.flatShouldDoClasses) && conditions & 12 && !hasBase) {
-		var _state_flatPropertyLayers;
+	if (warnMode === 1 && conditions & 12 && !hasBase) {
 		var resting = property === "opacity" || property.startsWith("scale") ? 1 : property === "rotate" ? "0deg" : property === "x" || property === "y" ? 0 : null;
-		if (resting !== null && !((_state_flatPropertyLayers = state.flatPropertyLayers) === null || _state_flatPropertyLayers === void 0 ? void 0 : _state_flatPropertyLayers.has(property))) emitConditionalValue(state, property, resting, parentCondition, resting, sink, warnMode, contextOnly);
+		var layers = state.flatPropertyLayers;
+		var owned = !canGenerateCSS || !state.flatShouldDoClasses ? layers === null || layers === void 0 ? void 0 : layers.has(property) : property === "scale" ? (layers === null || layers === void 0 ? void 0 : layers.has("--t-scale-x")) || (layers === null || layers === void 0 ? void 0 : layers.has("--t-scale-y")) : layers === null || layers === void 0 ? void 0 : layers.has(property === "x" ? "--t-x" : property === "y" ? "--t-y" : property === "scaleX" ? "--t-scale-x" : property === "scaleY" ? "--t-scale-y" : property);
+		if (resting !== null && !owned) emitConditionalValue(state, property, resting, parentCondition, resting, sink, warnMode, contextOnly);
 	}
 	return true;
 }