@tamagui/web 3.0.0-beta.1546.1 → 3.0.0-beta.1551.1

package/dist/cjs/helpers/getSplitStyles.cjs

@@ -392,7 +392,7 @@ function contributeProp(pass, keyOg, valOg, originalOg = valOg, disabled = false
 						const property = entry[0] === "--t-x" ? "x" : entry[0] === "--t-y" ? "y" : entry[0] === "--t-scale-x" ? "scaleX" : entry[0] === "--t-scale-y" ? "scaleY" : entry[0];
 						const value = styleState.animationDriver?.inputStyle === "value" ? entry[6] : entry[1];
 						entry[3] ? contributeValue(styleState, property, value, entry[6], false, entry[3]) : emitValue(styleState, property, value, null, entry[6], false);
-					} else writeCapturedStyleRecord(slots, slot, entry, pass[passSourceLayer]);
+					} else writeStyleSlot(slots, slot, [...entry], pass[passSourceLayer]);
 				}
 				pass[passSourceLayer] = markerLayer;
 			}
@@ -977,7 +977,7 @@ function applyStylePieceClasses(styleState, piece, sourceLayer) {
 		for (const slot in compiled.slots) for (const entry of compiled.slots[slot]) {
 			const property = entry[0];
 			if (!ownsSourceLayer(styleState, property, !!entry[2])) continue;
-			writeCapturedStyleRecord(slots, slot, entry, sourceLayer);
+			writeStyleSlot(slots, slot, [...entry], sourceLayer);
 		}
 		if (compiled.programStates) {
 			const target = styleState.flatStateKeys ||= /* @__PURE__ */ new Set();
@@ -1023,7 +1023,7 @@ function applyStylePieceClasses(styleState, piece, sourceLayer) {
 	}
 	return applied;
 }
-function writeCapturedStyleRecord(slots, slot, source, sourceLayer) {
+function writeStyleSlot(slots, slot, source, sourceLayer) {
 	let list = slots.get(slot);
 	if (!list) slots.set(slot, list = []);
 	const flags = source[7] & 31;
@@ -1048,9 +1048,8 @@ function writeCapturedStyleRecord(slots, slot, source, sourceLayer) {
 			break;
 		}
 	}
-	const next = [...source];
-	next[7] = flags | sourceLayer << 5;
-	list.push(next);
+	source[7] = flags | sourceLayer << 5;
+	list.push(source);
 }
 function mergeStyle(styleState, key, val, disableNormalize = false, originalVal) {
 	const { viewProps, styleProps, staticConfig } = styleState;
@@ -1172,23 +1171,7 @@ function writeStyleRecord(state, property, value, cursor, original, flags, condi
 			if (entry[0] === property && !entry[2] && entryFlags >> 5 === sourceLayerStyle && (entryFlags & (recordInline | recordCSS)) !== (flags & (recordInline | recordCSS))) other.splice(index--, 1);
 		}
 	}
-	for (let index = 0; index < list.length; index++) {
-		const entry = list[index];
-		const entryFlags = entry[7];
-		if ((entryFlags & (recordInline | recordCSS)) !== (flags & (recordInline | recordCSS))) continue;
-		if (entry[0] !== property) continue;
-		if (flags & recordDefault) {
-			if (!(entryFlags & recordDefault) && (!entry[2] || entry[3] === identity)) return;
-		} else if (entryFlags & recordDefault && (!condition || entry[3] === identity)) {
-			list.splice(index--, 1);
-			continue;
-		}
-		if (entry[3] === identity) {
-			list.splice(index, 1);
-			break;
-		}
-	}
-	list.push([
+	writeStyleSlot(slots, slot, [
 		property,
 		value,
 		condition,
@@ -1196,8 +1179,10 @@ function writeStyleRecord(state, property, value, cursor, original, flags, condi
 		cursor ? cursor[conditionSelector] : "",
 		cursor ? cursor[conditionWrappers] : void 0,
 		original,
-		flags | sourceLayer << 5
-	]);
+		flags,
+		void 0,
+		!sourceLayer && direct.flatPass?.[passVariantOutput]
+	], sourceLayer);
 }
 function streamWriteInline(state, property, value, cursor, original, normalize = property === "lineHeight", conditionOverride = -1, force = false) {
 	writeStyleRecord(state, property, value, cursor, original, (normalize ? recordNormalize : 0) | (force ? recordInline : 0), conditionOverride);
@@ -1469,13 +1454,15 @@ function ownsSourceLayer(state, property, conditional = false) {
 	const layer = direct.flatPass?.[passSourceLayer] || 0;
 	const layers = direct.flatPropertyLayers ||= /* @__PURE__ */ new Map();
 	const previous = layers.get(property);
-	if (previous !== void 0) {
-		if (previous > layer) return false;
-		if (previous < layer) {
-			if (conditional) return true;
-			clearDirectStyle(state, property);
+	if (!layer && !conditional && !direct.flatPass?.[passVariantOutput]) {
+		const entries = direct.flatSlots?.get(styleSlot(property));
+		if (entries) {
+			for (let index = entries.length; index--;) if (entries[index][0] === property && entries[index][9]) entries.splice(index, 1);
 		}
-	} else if (conditional) return true;
+	}
+	if (previous > layer) return false;
+	if (conditional && previous !== layer) return true;
+	if (previous < layer) clearDirectStyle(state, property);
 	layers.set(property, layer);
 	return true;
 }

package/dist/cjs/helpers/getSplitStyles.native.cjs

@@ -432,7 +432,7 @@ function contributeProp(pass, keyOg, valOg) {
 									var property2 = entry[0] === "--t-x" ? "x" : entry[0] === "--t-y" ? "y" : entry[0] === "--t-scale-x" ? "scaleX" : entry[0] === "--t-scale-y" ? "scaleY" : entry[0];
 									var value = ((_styleState_animationDriver = styleState.animationDriver) === null || _styleState_animationDriver === void 0 ? void 0 : _styleState_animationDriver.inputStyle) === "value" ? entry[6] : entry[1];
 									entry[3] ? contributeValue(styleState, property2, value, entry[6], false, entry[3]) : emitValue(styleState, property2, value, null, entry[6], false);
-								} else writeCapturedStyleRecord(slots, slot, entry, pass[passSourceLayer]);
+								} else writeStyleSlot(slots, slot, [...entry], pass[passSourceLayer]);
 							}
 						} catch (err) {
 							_didIteratorError1 = true;
@@ -1015,7 +1015,7 @@ function resolveStylePiece(styleState, piece) {
 	themeCache.set(theme, resolved);
 	return resolved;
 }
-function writeCapturedStyleRecord(slots, slot, source, sourceLayer) {
+function writeStyleSlot(slots, slot, source, sourceLayer) {
 	var list = slots.get(slot);
 	if (!list) slots.set(slot, list = []);
 	var flags = source[7] & 31;
@@ -1040,9 +1040,8 @@ function writeCapturedStyleRecord(slots, slot, source, sourceLayer) {
 			break;
 		}
 	}
-	var next = [...source];
-	next[7] = flags | sourceLayer << 5;
-	list.push(next);
+	source[7] = flags | sourceLayer << 5;
+	list.push(source);
 }
 function mergeStyle(styleState, key, val) {
 	arguments.length > 3 && arguments[3] !== void 0 && arguments[3];
@@ -1143,7 +1142,7 @@ var recordDefault = 8;
 var recordCSS = 16;
 function writeStyleRecord(state, property, value, cursor, original, flags) {
 	var conditionOverride = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : -1;
-	var _direct_flatPass;
+	var _direct_flatPass, _direct_flatPass1;
 	var _direct;
 	var condition = conditionOverride !== -1 ? conditionOverride : cursor ? cursor[conditionValue] : 0;
 	var identity = cursor ? cursor[conditionKey] : "";
@@ -1168,23 +1167,7 @@ function writeStyleRecord(state, property, value, cursor, original, flags) {
 			if (entry[0] === property && !entry[2] && entryFlags >> 5 === sourceLayerStyle && (entryFlags & (recordInline | recordCSS)) !== (flags & (recordInline | recordCSS))) other.splice(index--, 1);
 		}
 	}
-	for (var index1 = 0; index1 < list.length; index1++) {
-		var entry1 = list[index1];
-		var entryFlags1 = entry1[7];
-		if ((entryFlags1 & (recordInline | recordCSS)) !== (flags & (recordInline | recordCSS))) continue;
-		if (entry1[0] !== property) continue;
-		if (flags & recordDefault) {
-			if (!(entryFlags1 & recordDefault) && (!entry1[2] || entry1[3] === identity)) return;
-		} else if (entryFlags1 & recordDefault && (!condition || entry1[3] === identity)) {
-			list.splice(index1--, 1);
-			continue;
-		}
-		if (entry1[3] === identity) {
-			list.splice(index1, 1);
-			break;
-		}
-	}
-	list.push([
+	writeStyleSlot(slots, slot, [
 		property,
 		value,
 		condition,
@@ -1192,8 +1175,10 @@ function writeStyleRecord(state, property, value, cursor, original, flags) {
 		cursor ? cursor[conditionSelector] : "",
 		cursor ? cursor[conditionWrappers] : void 0,
 		original,
-		flags | sourceLayer << 5
-	]);
+		flags,
+		void 0,
+		!sourceLayer && ((_direct_flatPass1 = direct.flatPass) === null || _direct_flatPass1 === void 0 ? void 0 : _direct_flatPass1[passVariantOutput])
+	], sourceLayer);
 }
 function streamWriteInline(state, property, value, cursor, original) {
 	var normalize = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : property === "lineHeight", conditionOverride = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : -1, force = arguments.length > 7 && arguments[7] !== void 0 ? arguments[7] : false;
@@ -1557,19 +1542,22 @@ function configuredValue(state, property, raw) {
 }
 function ownsSourceLayer(state, property) {
 	var conditional = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
-	var _direct_flatPass;
+	var _direct_flatPass, _direct_flatPass1;
 	var _direct;
 	var direct = state;
 	var layer = ((_direct_flatPass = direct.flatPass) === null || _direct_flatPass === void 0 ? void 0 : _direct_flatPass[passSourceLayer]) || 0;
 	var layers = (_direct = direct).flatPropertyLayers || (_direct.flatPropertyLayers = /* @__PURE__ */ new Map());
 	var previous = layers.get(property);
-	if (previous !== void 0) {
-		if (previous > layer) return false;
-		if (previous < layer) {
-			if (conditional) return true;
-			clearDirectStyle(state, property);
+	if (!layer && !conditional && !((_direct_flatPass1 = direct.flatPass) === null || _direct_flatPass1 === void 0 ? void 0 : _direct_flatPass1[passVariantOutput])) {
+		var _direct_flatSlots;
+		var entries = (_direct_flatSlots = direct.flatSlots) === null || _direct_flatSlots === void 0 ? void 0 : _direct_flatSlots.get(property);
+		if (entries) {
+			for (var index = entries.length; index--;) if (entries[index][0] === property && entries[index][9]) entries.splice(index, 1);
 		}
-	} else if (conditional) return true;
+	}
+	if (previous > layer) return false;
+	if (conditional && previous !== layer) return true;
+	if (previous < layer) clearDirectStyle(state, property);
 	layers.set(property, layer);
 	return true;
 }

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

@@ -432,7 +432,7 @@ function contributeProp(pass, keyOg, valOg) {
 									var property2 = entry[0] === "--t-x" ? "x" : entry[0] === "--t-y" ? "y" : entry[0] === "--t-scale-x" ? "scaleX" : entry[0] === "--t-scale-y" ? "scaleY" : entry[0];
 									var value = ((_styleState_animationDriver = styleState.animationDriver) === null || _styleState_animationDriver === void 0 ? void 0 : _styleState_animationDriver.inputStyle) === "value" ? entry[6] : entry[1];
 									entry[3] ? contributeValue(styleState, property2, value, entry[6], false, entry[3]) : emitValue(styleState, property2, value, null, entry[6], false);
-								} else writeCapturedStyleRecord(slots, slot, entry, pass[passSourceLayer]);
+								} else writeStyleSlot(slots, slot, [...entry], pass[passSourceLayer]);
 							}
 						} catch (err) {
 							_didIteratorError1 = true;
@@ -1015,7 +1015,7 @@ function resolveStylePiece(styleState, piece) {
 	themeCache.set(theme, resolved);
 	return resolved;
 }
-function writeCapturedStyleRecord(slots, slot, source, sourceLayer) {
+function writeStyleSlot(slots, slot, source, sourceLayer) {
 	var list = slots.get(slot);
 	if (!list) slots.set(slot, list = []);
 	var flags = source[7] & 31;
@@ -1040,9 +1040,8 @@ function writeCapturedStyleRecord(slots, slot, source, sourceLayer) {
 			break;
 		}
 	}
-	var next = [...source];
-	next[7] = flags | sourceLayer << 5;
-	list.push(next);
+	source[7] = flags | sourceLayer << 5;
+	list.push(source);
 }
 function mergeStyle(styleState, key, val) {
 	arguments.length > 3 && arguments[3] !== void 0 && arguments[3];
@@ -1143,7 +1142,7 @@ var recordDefault = 8;
 var recordCSS = 16;
 function writeStyleRecord(state, property, value, cursor, original, flags) {
 	var conditionOverride = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : -1;
-	var _direct_flatPass;
+	var _direct_flatPass, _direct_flatPass1;
 	var _direct;
 	var condition = conditionOverride !== -1 ? conditionOverride : cursor ? cursor[conditionValue] : 0;
 	var identity = cursor ? cursor[conditionKey] : "";
@@ -1168,23 +1167,7 @@ function writeStyleRecord(state, property, value, cursor, original, flags) {
 			if (entry[0] === property && !entry[2] && entryFlags >> 5 === sourceLayerStyle && (entryFlags & (recordInline | recordCSS)) !== (flags & (recordInline | recordCSS))) other.splice(index--, 1);
 		}
 	}
-	for (var index1 = 0; index1 < list.length; index1++) {
-		var entry1 = list[index1];
-		var entryFlags1 = entry1[7];
-		if ((entryFlags1 & (recordInline | recordCSS)) !== (flags & (recordInline | recordCSS))) continue;
-		if (entry1[0] !== property) continue;
-		if (flags & recordDefault) {
-			if (!(entryFlags1 & recordDefault) && (!entry1[2] || entry1[3] === identity)) return;
-		} else if (entryFlags1 & recordDefault && (!condition || entry1[3] === identity)) {
-			list.splice(index1--, 1);
-			continue;
-		}
-		if (entry1[3] === identity) {
-			list.splice(index1, 1);
-			break;
-		}
-	}
-	list.push([
+	writeStyleSlot(slots, slot, [
 		property,
 		value,
 		condition,
@@ -1192,8 +1175,10 @@ function writeStyleRecord(state, property, value, cursor, original, flags) {
 		cursor ? cursor[conditionSelector] : "",
 		cursor ? cursor[conditionWrappers] : void 0,
 		original,
-		flags | sourceLayer << 5
-	]);
+		flags,
+		void 0,
+		!sourceLayer && ((_direct_flatPass1 = direct.flatPass) === null || _direct_flatPass1 === void 0 ? void 0 : _direct_flatPass1[passVariantOutput])
+	], sourceLayer);
 }
 function streamWriteInline(state, property, value, cursor, original) {
 	var normalize = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : property === "lineHeight", conditionOverride = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : -1, force = arguments.length > 7 && arguments[7] !== void 0 ? arguments[7] : false;
@@ -1557,19 +1542,22 @@ function configuredValue(state, property, raw) {
 }
 function ownsSourceLayer(state, property) {
 	var conditional = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
-	var _direct_flatPass;
+	var _direct_flatPass, _direct_flatPass1;
 	var _direct;
 	var direct = state;
 	var layer = ((_direct_flatPass = direct.flatPass) === null || _direct_flatPass === void 0 ? void 0 : _direct_flatPass[passSourceLayer]) || 0;
 	var layers = (_direct = direct).flatPropertyLayers || (_direct.flatPropertyLayers = /* @__PURE__ */ new Map());
 	var previous = layers.get(property);
-	if (previous !== void 0) {
-		if (previous > layer) return false;
-		if (previous < layer) {
-			if (conditional) return true;
-			clearDirectStyle(state, property);
+	if (!layer && !conditional && !((_direct_flatPass1 = direct.flatPass) === null || _direct_flatPass1 === void 0 ? void 0 : _direct_flatPass1[passVariantOutput])) {
+		var _direct_flatSlots;
+		var entries = (_direct_flatSlots = direct.flatSlots) === null || _direct_flatSlots === void 0 ? void 0 : _direct_flatSlots.get(property);
+		if (entries) {
+			for (var index = entries.length; index--;) if (entries[index][0] === property && entries[index][9]) entries.splice(index, 1);
 		}
-	} else if (conditional) return true;
+	}
+	if (previous > layer) return false;
+	if (conditional && previous !== layer) return true;
+	if (previous < layer) clearDirectStyle(state, property);
 	layers.set(property, layer);
 	return true;
 }