@tamagui/web 3.0.0-beta.739.1 → 3.0.0-beta.745.1

package/dist/cjs/helpers/directStyle.cjs

@@ -96,11 +96,14 @@ const directStyleHandler = {
 		}
 		if (process.env.NODE_ENV === "development" && !hasBase && result & 4 && (property in import_helpers.tokenCategories.color || property in import_tokenCategories.tokenCategoryByProperty) && splitComponents(source.slice(lastPayloadStart)).length > 1) (0, import_warnOnce.warnOnce)(`${property}="${source}" has multiple values after its first conditional. Write the base value before the first conditional.`);
 		if ((!import_constants.isWeb || !state.flatShouldDoClasses) && result & 2 && !hasBase) {
-			const value = property === "opacity" ? 1 : property === "scale" || property === "scaleX" || property === "scaleY" ? 1 : property === "rotate" ? "0deg" : property === "x" || property === "y" ? 0 : null;
+			const value = implicitLifecycleBase(property);
 			if (value !== null) emitValue(state, property, value, 0, "", void 0, "", "", merge, value, contextOnly);
 		}
 	}
 };
+function implicitLifecycleBase(property) {
+	return property === "opacity" || property === "scale" || property === "scaleX" || property === "scaleY" ? 1 : property === "rotate" ? "0deg" : property === "x" || property === "y" ? 0 : null;
+}
 const legacyTransformParts = /* @__PURE__ */ new Set([
 	"matrix",
 	"perspective",
@@ -888,9 +891,48 @@ function contributeFrontendValue(state, property, value, merge, contextOnly = fa
 	}
 	return true;
 }
+function isConditionalStyleObject(state, value) {
+	if (Object.prototype.hasOwnProperty.call(value, "default")) return true;
+	for (const key in value) return key.length > 0 && !!resolveClauseChain(state, key, 0, key.length);
+	return false;
+}
 function contributeVariantClauseValue(state, property, value, conditionSource, merge, originalValue, contextOnly = false) {
+	if (value && typeof value === "object" && !Array.isArray(value) && !(0, import_createVariable.isVariable)(value) && isConditionalStyleObject(state, value)) {
+		for (const key in value) {
+			const payload = value[key];
+			if (payload == null) continue;
+			const source = key === "default" ? conditionSource : `${conditionSource}:${key}`;
+			resolveClauseChain(state, source, 0, source.length, property, payload, merge, payload, contextOnly, -1, -1, 2);
+		}
+		return;
+	}
 	resolveClauseChain(state, conditionSource, 0, conditionSource.length, property, value, merge, originalValue, contextOnly, -1, -1, 2);
 }
+function contributeStyleObject(state, property, value, merge, contextOnly) {
+	if (!isConditionalStyleObject(state, value)) return false;
+	if (import_constants.isWeb && (webShadowParts.has(property) || legacyTransformParts.has(property))) {
+		if (process.env.NODE_ENV === "development") (0, import_warnOnce.warnOnce)(`conditional "${property}" needs its composite property; dropping it`);
+		return true;
+	}
+	let hasBase = false;
+	const base = value.default;
+	if (base != null) {
+		emitValue(state, property, base, 0, "", void 0, "", "", merge, base, contextOnly);
+		hasBase = true;
+	}
+	let conditions = 0;
+	for (const key in value) {
+		if (key === "default") continue;
+		const payload = value[key];
+		if (payload == null) continue;
+		conditions |= resolveClauseChain(state, key, 0, key.length, property, payload, merge, payload, contextOnly, -1, -1, 1);
+	}
+	if ((!import_constants.isWeb || !state.flatShouldDoClasses) && conditions & 12 && !hasBase) {
+		const resting = implicitLifecycleBase(property);
+		if (resting !== null) emitValue(state, property, resting, 0, "", void 0, "", "", merge, resting, contextOnly);
+	}
+	return true;
+}
 function contributeStyleValue(state, property, value, merge, originalValue, contextOnly = false) {
 	if (value === "safe" && (0, import_resolveSafeArea.isSafeAreaKey)(property)) {
 		const expanded = (0, import_resolveSafeArea.expandSafeAreaValue)(property);
@@ -901,6 +943,7 @@ function contributeStyleValue(state, property, value, merge, originalValue, cont
 		}
 	}
 	if (typeof value === "string") return contributeStyleString(state, property, value, merge, originalValue, contextOnly);
+	if (value && typeof value === "object" && !Array.isArray(value) && !(0, import_createVariable.isVariable)(value) && contributeStyleObject(state, property, value, merge, contextOnly)) return true;
 	if (value != null) {
 		emitValue(state, property, value, 0, "", void 0, "", "", merge, originalValue ?? value, contextOnly);
 		return true;

package/dist/cjs/helpers/directStyle.native.cjs

@@ -54,6 +54,10 @@ var import_resolveSafeArea = require("./resolveSafeArea.native.js");
 var import_resolveVariableValue = require("./resolveVariableValue.native.js");
 var import_themeRef = require("./themeRef.native.js");
 var import_transformsToString = require("./transformsToString.native.js");
+function _type_of(obj) {
+	"@swc/helpers - typeof";
+	return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 var directStyleHandler = {
 	segment(state, start, end, isBase, valid, source, chainStart, chainEnd, chainValid, chainCount, _result, failure, failureIndex, property, merge, originalValue, contextOnly) {
 		if (isBase) {
@@ -98,11 +102,14 @@ var directStyleHandler = {
 		}
 		if (process.env.NODE_ENV === "development" && !hasBase && result & 4 && (property in import_helpers.tokenCategories.color || property in import_tokenCategories.tokenCategoryByProperty) && splitComponents(source.slice(lastPayloadStart)).length > 1) (0, import_warnOnce.warnOnce)(`${property}="${source}" has multiple values after its first conditional. Write the base value before the first conditional.`);
 		if ((!import_constants.isWeb || !state.flatShouldDoClasses) && result & 2 && !hasBase) {
-			var value = property === "opacity" ? 1 : property === "scale" || property === "scaleX" || property === "scaleY" ? 1 : property === "rotate" ? "0deg" : property === "x" || property === "y" ? 0 : null;
+			var value = implicitLifecycleBase(property);
 			if (value !== null) emitValue(state, property, value, 0, "", void 0, "", "", merge, value, contextOnly);
 		}
 	}
 };
+function implicitLifecycleBase(property) {
+	return property === "opacity" || property === "scale" || property === "scaleX" || property === "scaleY" ? 1 : property === "rotate" ? "0deg" : property === "x" || property === "y" ? 0 : null;
+}
 var legacyTransformParts = /* @__PURE__ */ new Set([
 	"matrix",
 	"perspective",
@@ -1070,10 +1077,49 @@ function contributeFrontendValue(state, property, value, merge) {
 	}
 	return true;
 }
+function isConditionalStyleObject(state, value) {
+	if (Object.prototype.hasOwnProperty.call(value, "default")) return true;
+	for (var key in value) return key.length > 0 && !!resolveClauseChain(state, key, 0, key.length);
+	return false;
+}
 function contributeVariantClauseValue(state, property, value, conditionSource, merge, originalValue) {
 	var contextOnly = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : false;
+	if (value && (typeof value === "undefined" ? "undefined" : _type_of(value)) === "object" && !Array.isArray(value) && !(0, import_createVariable.isVariable)(value) && isConditionalStyleObject(state, value)) {
+		for (var key in value) {
+			var payload = value[key];
+			if (payload == null) continue;
+			var source = key === "default" ? conditionSource : `${conditionSource}:${key}`;
+			resolveClauseChain(state, source, 0, source.length, property, payload, merge, payload, contextOnly, -1, -1, 2);
+		}
+		return;
+	}
 	resolveClauseChain(state, conditionSource, 0, conditionSource.length, property, value, merge, originalValue, contextOnly, -1, -1, 2);
 }
+function contributeStyleObject(state, property, value, merge, contextOnly) {
+	if (!isConditionalStyleObject(state, value)) return false;
+	if (import_constants.isWeb && (webShadowParts.has(property) || legacyTransformParts.has(property))) {
+		if (process.env.NODE_ENV === "development") (0, import_warnOnce.warnOnce)(`conditional "${property}" needs its composite property; dropping it`);
+		return true;
+	}
+	var hasBase = false;
+	var base = value.default;
+	if (base != null) {
+		emitValue(state, property, base, 0, "", void 0, "", "", merge, base, contextOnly);
+		hasBase = true;
+	}
+	var conditions = 0;
+	for (var key in value) {
+		if (key === "default") continue;
+		var payload = value[key];
+		if (payload == null) continue;
+		conditions |= resolveClauseChain(state, key, 0, key.length, property, payload, merge, payload, contextOnly, -1, -1, 1);
+	}
+	if ((!import_constants.isWeb || !state.flatShouldDoClasses) && conditions & 12 && !hasBase) {
+		var resting = implicitLifecycleBase(property);
+		if (resting !== null) emitValue(state, property, resting, 0, "", void 0, "", "", merge, resting, contextOnly);
+	}
+	return true;
+}
 function contributeStyleValue(state, property, value, merge, originalValue) {
 	var contextOnly = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : false;
 	if (value === "safe" && (0, import_resolveSafeArea.isSafeAreaKey)(property)) {
@@ -1100,6 +1146,7 @@ function contributeStyleValue(state, property, value, merge, originalValue) {
 		}
 	}
 	if (typeof value === "string") return contributeStyleString(state, property, value, merge, originalValue, contextOnly);
+	if (value && (typeof value === "undefined" ? "undefined" : _type_of(value)) === "object" && !Array.isArray(value) && !(0, import_createVariable.isVariable)(value) && contributeStyleObject(state, property, value, merge, contextOnly)) return true;
 	if (value != null) {
 		emitValue(state, property, value, 0, "", void 0, "", "", merge, originalValue !== null && originalValue !== void 0 ? originalValue : value, contextOnly);
 		return true;

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

@@ -54,6 +54,10 @@ var import_resolveSafeArea = require("./resolveSafeArea.native.js");
 var import_resolveVariableValue = require("./resolveVariableValue.native.js");
 var import_themeRef = require("./themeRef.native.js");
 var import_transformsToString = require("./transformsToString.native.js");
+function _type_of(obj) {
+	"@swc/helpers - typeof";
+	return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 var directStyleHandler = {
 	segment(state, start, end, isBase, valid, source, chainStart, chainEnd, chainValid, chainCount, _result, failure, failureIndex, property, merge, originalValue, contextOnly) {
 		if (isBase) {
@@ -98,11 +102,14 @@ var directStyleHandler = {
 		}
 		if (process.env.NODE_ENV === "development" && !hasBase && result & 4 && (property in import_helpers.tokenCategories.color || property in import_tokenCategories.tokenCategoryByProperty) && splitComponents(source.slice(lastPayloadStart)).length > 1) (0, import_warnOnce.warnOnce)(`${property}="${source}" has multiple values after its first conditional. Write the base value before the first conditional.`);
 		if ((!import_constants.isWeb || !state.flatShouldDoClasses) && result & 2 && !hasBase) {
-			var value = property === "opacity" ? 1 : property === "scale" || property === "scaleX" || property === "scaleY" ? 1 : property === "rotate" ? "0deg" : property === "x" || property === "y" ? 0 : null;
+			var value = implicitLifecycleBase(property);
 			if (value !== null) emitValue(state, property, value, 0, "", void 0, "", "", merge, value, contextOnly);
 		}
 	}
 };
+function implicitLifecycleBase(property) {
+	return property === "opacity" || property === "scale" || property === "scaleX" || property === "scaleY" ? 1 : property === "rotate" ? "0deg" : property === "x" || property === "y" ? 0 : null;
+}
 var legacyTransformParts = /* @__PURE__ */ new Set([
 	"matrix",
 	"perspective",
@@ -1070,10 +1077,49 @@ function contributeFrontendValue(state, property, value, merge) {
 	}
 	return true;
 }
+function isConditionalStyleObject(state, value) {
+	if (Object.prototype.hasOwnProperty.call(value, "default")) return true;
+	for (var key in value) return key.length > 0 && !!resolveClauseChain(state, key, 0, key.length);
+	return false;
+}
 function contributeVariantClauseValue(state, property, value, conditionSource, merge, originalValue) {
 	var contextOnly = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : false;
+	if (value && (typeof value === "undefined" ? "undefined" : _type_of(value)) === "object" && !Array.isArray(value) && !(0, import_createVariable.isVariable)(value) && isConditionalStyleObject(state, value)) {
+		for (var key in value) {
+			var payload = value[key];
+			if (payload == null) continue;
+			var source = key === "default" ? conditionSource : `${conditionSource}:${key}`;
+			resolveClauseChain(state, source, 0, source.length, property, payload, merge, payload, contextOnly, -1, -1, 2);
+		}
+		return;
+	}
 	resolveClauseChain(state, conditionSource, 0, conditionSource.length, property, value, merge, originalValue, contextOnly, -1, -1, 2);
 }
+function contributeStyleObject(state, property, value, merge, contextOnly) {
+	if (!isConditionalStyleObject(state, value)) return false;
+	if (import_constants.isWeb && (webShadowParts.has(property) || legacyTransformParts.has(property))) {
+		if (process.env.NODE_ENV === "development") (0, import_warnOnce.warnOnce)(`conditional "${property}" needs its composite property; dropping it`);
+		return true;
+	}
+	var hasBase = false;
+	var base = value.default;
+	if (base != null) {
+		emitValue(state, property, base, 0, "", void 0, "", "", merge, base, contextOnly);
+		hasBase = true;
+	}
+	var conditions = 0;
+	for (var key in value) {
+		if (key === "default") continue;
+		var payload = value[key];
+		if (payload == null) continue;
+		conditions |= resolveClauseChain(state, key, 0, key.length, property, payload, merge, payload, contextOnly, -1, -1, 1);
+	}
+	if ((!import_constants.isWeb || !state.flatShouldDoClasses) && conditions & 12 && !hasBase) {
+		var resting = implicitLifecycleBase(property);
+		if (resting !== null) emitValue(state, property, resting, 0, "", void 0, "", "", merge, resting, contextOnly);
+	}
+	return true;
+}
 function contributeStyleValue(state, property, value, merge, originalValue) {
 	var contextOnly = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : false;
 	if (value === "safe" && (0, import_resolveSafeArea.isSafeAreaKey)(property)) {
@@ -1100,6 +1146,7 @@ function contributeStyleValue(state, property, value, merge, originalValue) {
 		}
 	}
 	if (typeof value === "string") return contributeStyleString(state, property, value, merge, originalValue, contextOnly);
+	if (value && (typeof value === "undefined" ? "undefined" : _type_of(value)) === "object" && !Array.isArray(value) && !(0, import_createVariable.isVariable)(value) && contributeStyleObject(state, property, value, merge, contextOnly)) return true;
 	if (value != null) {
 		emitValue(state, property, value, 0, "", void 0, "", "", merge, originalValue !== null && originalValue !== void 0 ? originalValue : value, contextOnly);
 		return true;