@tamagui/core 3.0.0-beta.1093.1 → 3.0.0-beta.1097.1

package/dist/native.cjs

@@ -10847,6 +10847,80 @@ var nonAnimatableWebTextProps = toStylePropsObject("whiteSpace wordWrap textOver
 var webOnlyStylePropsView = toStylePropsObject(nonAnimatableWebViewProps, "transition transitionProperty transitionDuration transitionTimingFunction transitionDelay transitionBehavior backdropFilter WebkitBackdropFilter borderTop borderRight borderBottom borderLeft backgroundPosition backgroundSize borderImage caretColor clipPath mask maskBorder maskBorderOutset maskBorderSlice maskBorderSource maskBorderWidth maskImage maskPosition maskSize objectPosition textEmphasis userSelect overflowWrap wordWrap resize");
 var webOnlyStylePropsText = toStylePropsObject(nonAnimatableWebTextProps, "textDecorationDistance WebkitLineClamp");
 //#endregion
+//#region ../style-grammar/dist/esm/tooling/config.native.js
+var containerSizeQueryTextPattern = /width|height|inline-size|block-size/;
+function isContainerSizeQueryText(query) {
+	return containerSizeQueryTextPattern.test(query);
+}
+var grammarPlatformNames = /* @__PURE__ */ new Set([
+	"web",
+	"native",
+	"android",
+	"ios",
+	"tv",
+	"androidtv",
+	"tvos"
+]);
+function grammarPlatformRank(modifier) {
+	return modifier === "native" || modifier === "web" ? 1 : modifier === "androidtv" || modifier === "tvos" ? 3 : 2;
+}
+//#endregion
+//#region ../style-grammar/dist/esm/runtime/stateModifiers.native.js
+var coreStateModifierNames = Object.freeze([
+	"hover",
+	"press",
+	"focus",
+	"focus-visible",
+	"focus-within",
+	"disabled",
+	"enter",
+	"exit"
+]);
+var canonicalStateModifierNames = Object.freeze([
+	"hover",
+	"focus-within",
+	"focus",
+	"focus-visible",
+	"press",
+	"disabled",
+	"enter",
+	"exit"
+]);
+var stateModifierSelectors = Object.freeze([
+	":hover",
+	":focus-within",
+	":focus",
+	":focus-visible",
+	":active",
+	"[aria-disabled]",
+	".t_unmounted",
+	".t_exiting"
+]);
+var modifierAliases = Object.freeze(Object.assign(/* @__PURE__ */ Object.create(null), {
+	active: "press",
+	pressed: "press",
+	starting: "enter",
+	ending: "exit"
+}));
+function isModifierName(text, start, end) {
+	if (start >= end) return false;
+	for (var index = start; index < end; index++) {
+		var code = text.charCodeAt(index);
+		if (!(code >= 97 && code <= 122) && !(code >= 65 && code <= 90) && !(code >= 48 && code <= 57) && code !== 45 && code !== 95) return false;
+	}
+	return true;
+}
+function canonicalClauseModifier(name) {
+	var direct = modifierAliases[name];
+	if (direct) return direct;
+	if (!name.startsWith("group-")) return name;
+	var slash = name.indexOf("/");
+	if (slash !== -1 && !isModifierName(name, slash + 1, name.length)) return name;
+	var state = modifierAliases[name.slice(6, slash === -1 ? name.length : slash)];
+	if (!state || state === "enter" || state === "exit") return name;
+	return slash === -1 ? `group-${state}` : `group-${state}${name.slice(slash)}`;
+}
+//#endregion
 //#region ../style-grammar/dist/esm/runtime/scanFlatValue.native.js
 var parsedValues = /* @__PURE__ */ new Map();
 var parsedValuesLimit = 4096;
@@ -10861,12 +10935,12 @@ function parseFlatValue(source) {
 function parseFlatValueProduction(source) {
 	var length = source.length;
 	var segments = [];
-	var sawChain = false, chainStart = -1, chainEnd = -1, segmentStart = 0, wordStart = -1, lastColon = -1, quote = 0, comment = false, depth = 0, valid = true;
+	var sawChain = false, chainStart = -1, chainEnd = -1, segmentStart = 0, wordStart = -1, lastColon = -1, quote = 0, comment = false, depth = 0, valid = true, clauseChainValid = true, currentChainValid = true, chainNonPlatformModifiers = null;
 	var close = function(end) {
 		var start = segmentStart;
 		while (start < end && source.charCodeAt(start) <= 32) start++;
 		while (end > start && source.charCodeAt(end - 1) <= 32) end--;
-		segments.push(start, end, chainStart, chainEnd, (!sawChain ? 1 : 0) | 6);
+		segments.push(start, end, chainStart, chainEnd, (!sawChain ? 1 : 0) | (clauseChainValid ? 6 : 0));
 	};
 	var flush = function() {
 		if (wordStart !== -1 && lastColon !== -1) {
@@ -10874,8 +10948,11 @@ function parseFlatValueProduction(source) {
 			chainEnd = lastColon;
 			sawChain = true;
 			segmentStart = lastColon + 1;
+			clauseChainValid = currentChainValid;
 		}
 		wordStart = lastColon = -1;
+		currentChainValid = true;
+		chainNonPlatformModifiers = null;
 	};
 	for (var index = 0; index < length; index++) {
 		var code = source.charCodeAt(index);
@@ -10924,7 +11001,20 @@ function parseFlatValueProduction(source) {
 		if (wordStart === -1) wordStart = index;
 		if (code === 59 || code === 123 || code === 125) valid = false;
 		else if (code === 58) {
-			if (lastColon === -1) close(wordStart);
+			if (lastColon === -1) {
+				close(wordStart);
+				clauseChainValid = true;
+				currentChainValid = true;
+				chainNonPlatformModifiers = /* @__PURE__ */ new Set();
+			}
+			var modStart = lastColon === -1 ? wordStart : lastColon + 1;
+			if (modStart < index && currentChainValid) {
+				var canonical = canonicalClauseModifier(source.slice(modStart, index));
+				if (!grammarPlatformNames.has(canonical)) {
+					chainNonPlatformModifiers === null || chainNonPlatformModifiers === void 0 || chainNonPlatformModifiers.add(canonical);
+					if (chainNonPlatformModifiers && chainNonPlatformModifiers.size > 5) currentChainValid = false;
+				}
+			}
 			lastColon = index;
 		}
 	}
@@ -10939,83 +11029,9 @@ function parseFlatValueProduction(source) {
 	];
 }
 //#endregion
-//#region ../style-grammar/dist/esm/runtime/stateModifiers.native.js
-var coreStateModifierNames = Object.freeze([
-	"hover",
-	"press",
-	"focus",
-	"focus-visible",
-	"focus-within",
-	"disabled",
-	"enter",
-	"exit"
-]);
-var canonicalStateModifierNames = Object.freeze([
-	"hover",
-	"focus-within",
-	"focus",
-	"focus-visible",
-	"press",
-	"disabled",
-	"enter",
-	"exit"
-]);
-var stateModifierSelectors = Object.freeze([
-	":hover",
-	":focus-within",
-	":focus",
-	":focus-visible",
-	":active",
-	"[aria-disabled]",
-	".t_unmounted",
-	".t_exiting"
-]);
-var modifierAliases = Object.freeze(Object.assign(/* @__PURE__ */ Object.create(null), {
-	active: "press",
-	pressed: "press",
-	starting: "enter",
-	ending: "exit"
-}));
-//#endregion
 //#region ../style-grammar/dist/esm/runtime/clauseIdentity.native.js
 var stateModifierNames = Object.freeze([...coreStateModifierNames, ...Object.keys(modifierAliases)]);
 new Set(stateModifierNames);
-function isModifierName(text, start, end) {
-	if (start >= end) return false;
-	for (var index = start; index < end; index++) {
-		var code = text.charCodeAt(index);
-		if (!(code >= 97 && code <= 122) && !(code >= 65 && code <= 90) && !(code >= 48 && code <= 57) && code !== 45 && code !== 95) return false;
-	}
-	return true;
-}
-function canonicalClauseModifier(name) {
-	var direct = modifierAliases[name];
-	if (direct) return direct;
-	if (!name.startsWith("group-")) return name;
-	var slash = name.indexOf("/");
-	if (slash !== -1 && !isModifierName(name, slash + 1, name.length)) return name;
-	var state = modifierAliases[name.slice(6, slash === -1 ? name.length : slash)];
-	if (!state || state === "enter" || state === "exit") return name;
-	return slash === -1 ? `group-${state}` : `group-${state}${name.slice(slash)}`;
-}
-//#endregion
-//#region ../style-grammar/dist/esm/tooling/config.native.js
-var containerSizeQueryTextPattern = /width|height|inline-size|block-size/;
-function isContainerSizeQueryText(query) {
-	return containerSizeQueryTextPattern.test(query);
-}
-var grammarPlatformNames = /* @__PURE__ */ new Set([
-	"web",
-	"native",
-	"android",
-	"ios",
-	"tv",
-	"androidtv",
-	"tvos"
-]);
-function grammarPlatformRank(modifier) {
-	return modifier === "native" || modifier === "web" ? 1 : modifier === "androidtv" || modifier === "tvos" ? 3 : 2;
-}
 //#endregion
 //#region ../style-grammar/dist/esm/runtime/modifierVocabulary.native.js
 var configRevisionSymbol = /* @__PURE__ */ Symbol.for("tamagui.configRevision");
@@ -11999,14 +12015,12 @@ var getConfigFromGlobalOrLocal = function() {
 	return null;
 };
 var getSetting = function(key) {
-	var config = getConfigFromGlobalOrLocal();
-	var _config_settings_key;
-	return (_config_settings_key = config.settings[key]) !== null && _config_settings_key !== void 0 ? _config_settings_key : config[key];
+	return getConfigFromGlobalOrLocal().settings[key];
 };
 function getStyleCompat() {
+	var _config_settings;
 	var config = getConfigFromGlobalOrLocal();
-	var _config_settings_styleCompat;
-	return ((_config_settings_styleCompat = config === null || config === void 0 ? void 0 : config.settings.styleCompat) !== null && _config_settings_styleCompat !== void 0 ? _config_settings_styleCompat : config === null || config === void 0 ? void 0 : config.styleCompat) || "web";
+	return (config === null || config === void 0 ? void 0 : (_config_settings = config.settings) === null || _config_settings === void 0 ? void 0 : _config_settings.styleCompat) || "web";
 }
 var setConfig = function(next) {
 	var previous = conf;
@@ -13996,7 +14010,13 @@ var borderDefaults = {
 	borderBottomWidth: nativeStyle || "borderBottomStyle",
 	borderTopWidth: nativeStyle || "borderTopStyle",
 	borderLeftWidth: nativeStyle || "borderLeftStyle",
-	borderRightWidth: nativeStyle || "borderRightStyle"
+	borderRightWidth: nativeStyle || "borderRightStyle",
+	borderBlockWidth: nativeStyle || "borderBlockStyle",
+	borderBlockStartWidth: nativeStyle || "borderBlockStartStyle",
+	borderBlockEndWidth: nativeStyle || "borderBlockEndStyle",
+	borderInlineWidth: nativeStyle || "borderInlineStyle",
+	borderInlineStartWidth: nativeStyle || "borderInlineStartStyle",
+	borderInlineEndWidth: nativeStyle || "borderInlineEndStyle"
 };
 //#endregion
 //#region ../web/dist/esm/helpers/styleStaticConfig.native.js
@@ -14369,7 +14389,7 @@ function isDynamicUnitValue(value) {
 	var _UNIT_RE_exec;
 	if (typeof value !== "string") return false;
 	var trimmed = value.trim();
-	if (trimmed.startsWith("clamp(") || trimmed.startsWith("CLAMP(")) return true;
+	if (trimmed.startsWith("clamp(") || trimmed.startsWith("CLAMP(") || trimmed.startsWith("calc(") || trimmed.startsWith("CALC(")) return true;
 	return !!((_UNIT_RE_exec = UNIT_RE.exec(trimmed.replace(/\s+/g, ""))) === null || _UNIT_RE_exec === void 0 ? void 0 : _UNIT_RE_exec[2]);
 }
 function getUnitContext(key, styleState) {
@@ -14423,6 +14443,60 @@ function resolveSingleUnit(val, ctx) {
 		default: return num;
 	}
 }
+function evaluateCalc(expr, ctx) {
+	var s = expr.trim();
+	if (s.toLowerCase().startsWith("calc(") && s.endsWith(")")) s = s.slice(5, -1).trim();
+	var tokens = s.match(/[()*/+-]|[^\s()*/+-]+/g) || [];
+	var pos = 0;
+	var peek = function() {
+		return tokens[pos];
+	};
+	var consume = function() {
+		return tokens[pos++];
+	};
+	function parseExpression() {
+		var left = parseTerm();
+		while (peek() === "+" || peek() === "-") {
+			var op = consume();
+			var right = parseTerm();
+			if (op === "+") left += right;
+			else left -= right;
+		}
+		return left;
+	}
+	function parseTerm() {
+		var left = parseFactor();
+		while (peek() === "*" || peek() === "/") {
+			var op = consume();
+			var right = parseFactor();
+			if (op === "*") left *= right;
+			else left = right !== 0 ? left / right : 0;
+		}
+		return left;
+	}
+	function parseFactor() {
+		if (peek() === "+") {
+			consume();
+			return parseFactor();
+		}
+		if (peek() === "-") {
+			consume();
+			return -parseFactor();
+		}
+		return parsePrimary();
+	}
+	function parsePrimary() {
+		if (peek() === "(") {
+			consume();
+			var val = parseExpression();
+			if (peek() === ")") consume();
+			return val;
+		}
+		var token = consume();
+		return token ? resolveSingleUnit(token, ctx) : 0;
+	}
+	return parseExpression();
+}
 function resolveClamp(val, ctx) {
 	var start = val.indexOf("(");
 	var end = val.lastIndexOf(")");
@@ -14431,28 +14505,7 @@ function resolveClamp(val, ctx) {
 	if (args.length < 3) return 0;
 	var min = resolveSingleUnit(args[0], ctx);
 	var max = resolveSingleUnit(args[2], ctx);
-	var prefStr = args[1].trim();
-	if (prefStr.toLowerCase().startsWith("calc(") && prefStr.endsWith(")")) prefStr = prefStr.slice(5, -1).trim();
-	var pref = 0;
-	var terms = prefStr.match(/([+-]?\s*[^+-]+)/g);
-	if (terms && terms.length > 0) {
-		var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-		try {
-			for (var _iterator = terms[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-				var term = _step.value;
-				pref += resolveSingleUnit(term, ctx);
-			}
-		} catch (err) {
-			_didIteratorError = true;
-			_iteratorError = err;
-		} finally {
-			try {
-				if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
-			} finally {
-				if (_didIteratorError) throw _iteratorError;
-			}
-		}
-	} else pref = resolveSingleUnit(prefStr, ctx);
+	var pref = evaluateCalc(args[1], ctx);
 	return Math.min(Math.max(pref, Math.min(min, max)), Math.max(min, max));
 }
 function splitClampArgs(inner) {
@@ -14477,6 +14530,7 @@ function resolveNativeUnits(key, value, styleState) {
 	if (!isDynamicUnitValue(trimmed)) return value;
 	var ctx = getUnitContext(key, styleState);
 	if (trimmed.startsWith("clamp(") || trimmed.startsWith("CLAMP(")) return resolveClamp(trimmed, ctx);
+	if (trimmed.startsWith("calc(") || trimmed.startsWith("CALC(")) return evaluateCalc(trimmed, ctx);
 	return resolveSingleUnit(trimmed, ctx);
 }
 //#endregion
@@ -16664,10 +16718,7 @@ var Theme = createRefComponent(function Theme2(props, ref) {
 	var finalChildren = props["disable-child-theme"] ? react.Children.map(props.children, function(child) {
 		return passThrough || !/* @__PURE__ */ (0, react.isValidElement)(child) ? child : /* @__PURE__ */ (0, react.cloneElement)(child, { ["data-disable-theme"]: true });
 	}) : props.children;
-	if (ref) try {
-		react.default.Children.only(finalChildren);
-		finalChildren = /* @__PURE__ */ (0, react.cloneElement)(finalChildren, { ref });
-	} catch (e) {}
+	if (ref && /* @__PURE__ */ (0, react.isValidElement)(finalChildren)) finalChildren = /* @__PURE__ */ (0, react.cloneElement)(finalChildren, { ref });
 	var stateRef = (0, react.useRef)({ hasEverThemed: false });
 	return getThemedChildren(themeState, finalChildren, props, isRoot, stateRef, passThrough);
 });
@@ -16738,8 +16789,7 @@ var avoidReRenderKeys = /* @__PURE__ */ new Set([
 	"group",
 	"focus",
 	"focusWithin",
-	"media",
-	"group"
+	"media"
 ]);
 var groupPseudoKeys = [
 	"disabled",

package/dist/test.native.cjs

@@ -887,6 +887,80 @@ var index_native_exports = /* @__PURE__ */ __exportAll({
 	withStaticProperties: () => withStaticProperties
 });
 //#endregion
+//#region ../style-grammar/dist/esm/tooling/config.native.js
+var containerSizeQueryTextPattern = /width|height|inline-size|block-size/;
+function isContainerSizeQueryText(query) {
+	return containerSizeQueryTextPattern.test(query);
+}
+var grammarPlatformNames = /* @__PURE__ */ new Set([
+	"web",
+	"native",
+	"android",
+	"ios",
+	"tv",
+	"androidtv",
+	"tvos"
+]);
+function grammarPlatformRank(modifier) {
+	return modifier === "native" || modifier === "web" ? 1 : modifier === "androidtv" || modifier === "tvos" ? 3 : 2;
+}
+//#endregion
+//#region ../style-grammar/dist/esm/runtime/stateModifiers.native.js
+var coreStateModifierNames = Object.freeze([
+	"hover",
+	"press",
+	"focus",
+	"focus-visible",
+	"focus-within",
+	"disabled",
+	"enter",
+	"exit"
+]);
+var canonicalStateModifierNames = Object.freeze([
+	"hover",
+	"focus-within",
+	"focus",
+	"focus-visible",
+	"press",
+	"disabled",
+	"enter",
+	"exit"
+]);
+var stateModifierSelectors = Object.freeze([
+	":hover",
+	":focus-within",
+	":focus",
+	":focus-visible",
+	":active",
+	"[aria-disabled]",
+	".t_unmounted",
+	".t_exiting"
+]);
+var modifierAliases = Object.freeze(Object.assign(/* @__PURE__ */ Object.create(null), {
+	active: "press",
+	pressed: "press",
+	starting: "enter",
+	ending: "exit"
+}));
+function isModifierName(text, start, end) {
+	if (start >= end) return false;
+	for (var index = start; index < end; index++) {
+		var code = text.charCodeAt(index);
+		if (!(code >= 97 && code <= 122) && !(code >= 65 && code <= 90) && !(code >= 48 && code <= 57) && code !== 45 && code !== 95) return false;
+	}
+	return true;
+}
+function canonicalClauseModifier(name) {
+	var direct = modifierAliases[name];
+	if (direct) return direct;
+	if (!name.startsWith("group-")) return name;
+	var slash = name.indexOf("/");
+	if (slash !== -1 && !isModifierName(name, slash + 1, name.length)) return name;
+	var state = modifierAliases[name.slice(6, slash === -1 ? name.length : slash)];
+	if (!state || state === "enter" || state === "exit") return name;
+	return slash === -1 ? `group-${state}` : `group-${state}${name.slice(slash)}`;
+}
+//#endregion
 //#region ../style-grammar/dist/esm/runtime/scanFlatValue.native.js
 function opensUrlToken(source, index) {
 	if (index < 3 || (source.charCodeAt(index - 3) | 32) !== 117 || (source.charCodeAt(index - 2) | 32) !== 114 || (source.charCodeAt(index - 1) | 32) !== 108) return false;
@@ -909,12 +983,12 @@ function parseFlatValue(source) {
 function parseFlatValueProduction(source) {
 	var length = source.length;
 	var segments = [];
-	var sawChain = false, chainStart = -1, chainEnd = -1, segmentStart = 0, wordStart = -1, lastColon = -1, quote = 0, comment = false, depth = 0, valid = true;
+	var sawChain = false, chainStart = -1, chainEnd = -1, segmentStart = 0, wordStart = -1, lastColon = -1, quote = 0, comment = false, depth = 0, valid = true, clauseChainValid = true, currentChainValid = true, chainNonPlatformModifiers = null;
 	var close = function(end) {
 		var start = segmentStart;
 		while (start < end && source.charCodeAt(start) <= 32) start++;
 		while (end > start && source.charCodeAt(end - 1) <= 32) end--;
-		segments.push(start, end, chainStart, chainEnd, (!sawChain ? 1 : 0) | 6);
+		segments.push(start, end, chainStart, chainEnd, (!sawChain ? 1 : 0) | (clauseChainValid ? 6 : 0));
 	};
 	var flush = function() {
 		if (wordStart !== -1 && lastColon !== -1) {
@@ -922,8 +996,11 @@ function parseFlatValueProduction(source) {
 			chainEnd = lastColon;
 			sawChain = true;
 			segmentStart = lastColon + 1;
+			clauseChainValid = currentChainValid;
 		}
 		wordStart = lastColon = -1;
+		currentChainValid = true;
+		chainNonPlatformModifiers = null;
 	};
 	for (var index = 0; index < length; index++) {
 		var code = source.charCodeAt(index);
@@ -972,7 +1049,20 @@ function parseFlatValueProduction(source) {
 		if (wordStart === -1) wordStart = index;
 		if (code === 59 || code === 123 || code === 125) valid = false;
 		else if (code === 58) {
-			if (lastColon === -1) close(wordStart);
+			if (lastColon === -1) {
+				close(wordStart);
+				clauseChainValid = true;
+				currentChainValid = true;
+				chainNonPlatformModifiers = /* @__PURE__ */ new Set();
+			}
+			var modStart = lastColon === -1 ? wordStart : lastColon + 1;
+			if (modStart < index && currentChainValid) {
+				var canonical = canonicalClauseModifier(source.slice(modStart, index));
+				if (!grammarPlatformNames.has(canonical)) {
+					chainNonPlatformModifiers === null || chainNonPlatformModifiers === void 0 || chainNonPlatformModifiers.add(canonical);
+					if (chainNonPlatformModifiers && chainNonPlatformModifiers.size > 5) currentChainValid = false;
+				}
+			}
 			lastColon = index;
 		}
 	}
@@ -989,7 +1079,7 @@ function parseFlatValueProduction(source) {
 function parseFlatValueChecked(source) {
 	var length = source.length;
 	var segments = [];
-	var failure = null, failureIndex = -1, sawChain = false, chainStart = -1, chainEnd = -1, chainValid = true, segmentValid = true, segmentStart = 0, comment = false, commentStart = -1, quote = 0, quoteStart = -1, url = false, depth = 0, parenStart = -1, wordStart = -1, lastColon = -1, wordErrorMin = length, wordErrorMax = -1;
+	var failure = null, failureIndex = -1, sawChain = false, chainStart = -1, chainEnd = -1, chainValid = true, segmentValid = true, segmentStart = 0, comment = false, commentStart = -1, quote = 0, quoteStart = -1, url = false, depth = 0, parenStart = -1, wordStart = -1, lastColon = -1, wordErrorMin = length, wordErrorMax = -1, chainNonPlatformModifiers = null;
 	var report = function(code2, index2) {
 		if (failureIndex === -1) failureIndex = index2;
 		failure !== null && failure !== void 0 || (failure = code2);
@@ -1013,6 +1103,7 @@ function parseFlatValueChecked(source) {
 		} else if (wordErrorMax !== -1) segmentValid = false;
 		wordStart = lastColon = wordErrorMax = -1;
 		wordErrorMin = length;
+		chainNonPlatformModifiers = null;
 	};
 	for (var index = 0; index < length; index++) {
 		var code = source.charCodeAt(index);
@@ -1070,7 +1161,18 @@ function parseFlatValueChecked(source) {
 		if (wordStart === -1) wordStart = index;
 		if (code === 59 || code === 123 || code === 125) report("invalid-character", index);
 		else if (code === 58) {
-			if (lastColon === -1) close(wordStart);
+			if (lastColon === -1) {
+				close(wordStart);
+				chainNonPlatformModifiers = /* @__PURE__ */ new Set();
+			}
+			var modStart = lastColon === -1 ? wordStart : lastColon + 1;
+			if (modStart < index) {
+				var canonical = canonicalClauseModifier(source.slice(modStart, index));
+				if (!grammarPlatformNames.has(canonical)) {
+					chainNonPlatformModifiers === null || chainNonPlatformModifiers === void 0 || chainNonPlatformModifiers.add(canonical);
+					if (chainNonPlatformModifiers && chainNonPlatformModifiers.size > 5) report("over-deep-clause", modStart);
+				}
+			}
 			lastColon = index;
 		}
 	}
@@ -1086,83 +1188,12 @@ function parseFlatValueChecked(source) {
 	];
 }
 //#endregion
-//#region ../style-grammar/dist/esm/runtime/stateModifiers.native.js
-var coreStateModifierNames = Object.freeze([
-	"hover",
-	"press",
-	"focus",
-	"focus-visible",
-	"focus-within",
-	"disabled",
-	"enter",
-	"exit"
-]);
-var canonicalStateModifierNames = Object.freeze([
-	"hover",
-	"focus-within",
-	"focus",
-	"focus-visible",
-	"press",
-	"disabled",
-	"enter",
-	"exit"
-]);
-var stateModifierSelectors = Object.freeze([
-	":hover",
-	":focus-within",
-	":focus",
-	":focus-visible",
-	":active",
-	"[aria-disabled]",
-	".t_unmounted",
-	".t_exiting"
-]);
-var modifierAliases = Object.freeze(Object.assign(/* @__PURE__ */ Object.create(null), {
-	active: "press",
-	pressed: "press",
-	starting: "enter",
-	ending: "exit"
-}));
-//#endregion
 //#region ../style-grammar/dist/esm/runtime/clauseIdentity.native.js
 var stateModifierNames = Object.freeze([...coreStateModifierNames, ...Object.keys(modifierAliases)]);
 new Set(stateModifierNames);
-function isModifierName(text, start, end) {
-	if (start >= end) return false;
-	for (var index = start; index < end; index++) {
-		var code = text.charCodeAt(index);
-		if (!(code >= 97 && code <= 122) && !(code >= 65 && code <= 90) && !(code >= 48 && code <= 57) && code !== 45 && code !== 95) return false;
-	}
-	return true;
-}
-function canonicalClauseModifier(name) {
-	var direct = modifierAliases[name];
-	if (direct) return direct;
-	if (!name.startsWith("group-")) return name;
-	var slash = name.indexOf("/");
-	if (slash !== -1 && !isModifierName(name, slash + 1, name.length)) return name;
-	var state = modifierAliases[name.slice(6, slash === -1 ? name.length : slash)];
-	if (!state || state === "enter" || state === "exit") return name;
-	return slash === -1 ? `group-${state}` : `group-${state}${name.slice(slash)}`;
-}
 //#endregion
-//#region ../style-grammar/dist/esm/tooling/config.native.js
-var containerSizeQueryTextPattern = /width|height|inline-size|block-size/;
-function isContainerSizeQueryText(query) {
-	return containerSizeQueryTextPattern.test(query);
-}
-var grammarPlatformNames = /* @__PURE__ */ new Set([
-	"web",
-	"native",
-	"android",
-	"ios",
-	"tv",
-	"androidtv",
-	"tvos"
-]);
-function grammarPlatformRank(modifier) {
-	return modifier === "native" || modifier === "web" ? 1 : modifier === "androidtv" || modifier === "tvos" ? 3 : 2;
-}
+//#region ../style-grammar/dist/esm/runtime/namedCssColors.native.js
+var namedCssColors = new Set("aliceblue antiquewhite aqua aquamarine azure beige bisque black blanchedalmond blue blueviolet brown burlywood cadetblue chartreuse chocolate coral cornflowerblue cornsilk crimson cyan darkblue darkcyan darkgoldenrod darkgray darkgreen darkgrey darkkhaki darkmagenta darkolivegreen darkorange darkorchid darkred darksalmon darkseagreen darkslateblue darkslategray darkslategrey darkturquoise darkviolet deeppink deepskyblue dimgray dimgrey dodgerblue firebrick floralwhite forestgreen fuchsia gainsboro ghostwhite gold goldenrod gray green greenyellow grey honeydew hotpink indianred indigo ivory khaki lavender lavenderblush lawngreen lemonchiffon lightblue lightcoral lightcyan lightgoldenrodyellow lightgray lightgreen lightgrey lightpink lightsalmon lightseagreen lightskyblue lightslategray lightslategrey lightsteelblue lightyellow lime limegreen linen magenta maroon mediumaquamarine mediumblue mediumorchid mediumpurple mediumseagreen mediumslateblue mediumspringgreen mediumturquoise mediumvioletred midnightblue mintcream mistyrose moccasin navajowhite navy oldlace olive olivedrab orange orangered orchid palegoldenrod palegreen paleturquoise palevioletred papayawhip peachpuff peru pink plum powderblue purple rebeccapurple red rosybrown royalblue saddlebrown salmon sandybrown seagreen seashell sienna silver skyblue slateblue slategray slategrey snow springgreen steelblue tan teal thistle tomato turquoise violet wheat white whitesmoke yellow yellowgreen".split(" "));
 //#endregion
 //#region ../style-grammar/dist/esm/runtime/modifierVocabulary.native.js
 var configRevisionSymbol = /* @__PURE__ */ Symbol.for("tamagui.configRevision");
@@ -2192,13 +2223,12 @@ var getSetting = function(key) {
 	if (globalThis.process.env.NODE_ENV === "development") {
 		if (!config) throw new Error(haventCalledErrorMessage);
 	}
-	var _config_settings_key;
-	return (_config_settings_key = config.settings[key]) !== null && _config_settings_key !== void 0 ? _config_settings_key : config[key];
+	return config.settings[key];
 };
 function getStyleCompat() {
+	var _config_settings;
 	var config = getConfigFromGlobalOrLocal();
-	var _config_settings_styleCompat;
-	return ((_config_settings_styleCompat = config === null || config === void 0 ? void 0 : config.settings.styleCompat) !== null && _config_settings_styleCompat !== void 0 ? _config_settings_styleCompat : config === null || config === void 0 ? void 0 : config.styleCompat) || "web";
+	return (config === null || config === void 0 ? void 0 : (_config_settings = config.settings) === null || _config_settings === void 0 ? void 0 : _config_settings.styleCompat) || "web";
 }
 var setConfig = function(next) {
 	setConfigCalledByThisInstance = true;
@@ -4520,7 +4550,13 @@ var borderDefaults = {
 	borderBottomWidth: nativeStyle || "borderBottomStyle",
 	borderTopWidth: nativeStyle || "borderTopStyle",
 	borderLeftWidth: nativeStyle || "borderLeftStyle",
-	borderRightWidth: nativeStyle || "borderRightStyle"
+	borderRightWidth: nativeStyle || "borderRightStyle",
+	borderBlockWidth: nativeStyle || "borderBlockStyle",
+	borderBlockStartWidth: nativeStyle || "borderBlockStartStyle",
+	borderBlockEndWidth: nativeStyle || "borderBlockEndStyle",
+	borderInlineWidth: nativeStyle || "borderInlineStyle",
+	borderInlineStartWidth: nativeStyle || "borderInlineStartStyle",
+	borderInlineEndWidth: nativeStyle || "borderInlineEndStyle"
 };
 //#endregion
 //#region ../web/dist/esm/helpers/styleStaticConfig.native.js
@@ -5040,7 +5076,7 @@ function isDynamicUnitValue(value) {
 	var _UNIT_RE_exec;
 	if (typeof value !== "string") return false;
 	var trimmed = value.trim();
-	if (trimmed.startsWith("clamp(") || trimmed.startsWith("CLAMP(")) return true;
+	if (trimmed.startsWith("clamp(") || trimmed.startsWith("CLAMP(") || trimmed.startsWith("calc(") || trimmed.startsWith("CALC(")) return true;
 	return !!((_UNIT_RE_exec = UNIT_RE.exec(trimmed.replace(/\s+/g, ""))) === null || _UNIT_RE_exec === void 0 ? void 0 : _UNIT_RE_exec[2]);
 }
 function getUnitContext(key, styleState) {
@@ -5094,6 +5130,60 @@ function resolveSingleUnit(val, ctx) {
 		default: return num;
 	}
 }
+function evaluateCalc(expr, ctx) {
+	var s = expr.trim();
+	if (s.toLowerCase().startsWith("calc(") && s.endsWith(")")) s = s.slice(5, -1).trim();
+	var tokens = s.match(/[()*/+-]|[^\s()*/+-]+/g) || [];
+	var pos = 0;
+	var peek = function() {
+		return tokens[pos];
+	};
+	var consume = function() {
+		return tokens[pos++];
+	};
+	function parseExpression() {
+		var left = parseTerm();
+		while (peek() === "+" || peek() === "-") {
+			var op = consume();
+			var right = parseTerm();
+			if (op === "+") left += right;
+			else left -= right;
+		}
+		return left;
+	}
+	function parseTerm() {
+		var left = parseFactor();
+		while (peek() === "*" || peek() === "/") {
+			var op = consume();
+			var right = parseFactor();
+			if (op === "*") left *= right;
+			else left = right !== 0 ? left / right : 0;
+		}
+		return left;
+	}
+	function parseFactor() {
+		if (peek() === "+") {
+			consume();
+			return parseFactor();
+		}
+		if (peek() === "-") {
+			consume();
+			return -parseFactor();
+		}
+		return parsePrimary();
+	}
+	function parsePrimary() {
+		if (peek() === "(") {
+			consume();
+			var val = parseExpression();
+			if (peek() === ")") consume();
+			return val;
+		}
+		var token = consume();
+		return token ? resolveSingleUnit(token, ctx) : 0;
+	}
+	return parseExpression();
+}
 function resolveClamp(val, ctx) {
 	var start = val.indexOf("(");
 	var end = val.lastIndexOf(")");
@@ -5102,28 +5192,7 @@ function resolveClamp(val, ctx) {
 	if (args.length < 3) return 0;
 	var min = resolveSingleUnit(args[0], ctx);
 	var max = resolveSingleUnit(args[2], ctx);
-	var prefStr = args[1].trim();
-	if (prefStr.toLowerCase().startsWith("calc(") && prefStr.endsWith(")")) prefStr = prefStr.slice(5, -1).trim();
-	var pref = 0;
-	var terms = prefStr.match(/([+-]?\s*[^+-]+)/g);
-	if (terms && terms.length > 0) {
-		var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-		try {
-			for (var _iterator = terms[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-				var term = _step.value;
-				pref += resolveSingleUnit(term, ctx);
-			}
-		} catch (err) {
-			_didIteratorError = true;
-			_iteratorError = err;
-		} finally {
-			try {
-				if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
-			} finally {
-				if (_didIteratorError) throw _iteratorError;
-			}
-		}
-	} else pref = resolveSingleUnit(prefStr, ctx);
+	var pref = evaluateCalc(args[1], ctx);
 	return Math.min(Math.max(pref, Math.min(min, max)), Math.max(min, max));
 }
 function splitClampArgs(inner) {
@@ -5148,6 +5217,7 @@ function resolveNativeUnits(key, value, styleState) {
 	if (!isDynamicUnitValue(trimmed)) return value;
 	var ctx = getUnitContext(key, styleState);
 	if (trimmed.startsWith("clamp(") || trimmed.startsWith("CLAMP(")) return resolveClamp(trimmed, ctx);
+	if (trimmed.startsWith("calc(") || trimmed.startsWith("CALC(")) return evaluateCalc(trimmed, ctx);
 	return resolveSingleUnit(trimmed, ctx);
 }
 //#endregion
@@ -5698,6 +5768,19 @@ function contributeProp(pass, keyOg, valOg) {
 	if (!isNativeInputColor && keyInit in skipProps && shouldSkipDirectProps && !(neverSkipProps === null || neverSkipProps === void 0 ? void 0 : neverSkipProps[keyInit])) if (keyInit === "transition" && typeof valInit === "string") return;
 	else return;
 	var isValidStyleKeyInit = isValidStyleKey(keyInit, validStyles);
+	if (globalThis.process.env.NODE_ENV === "development") {
+		if (!isValidStyleKeyInit && (!variants || !(keyInit in variants))) {
+			var replacement;
+			if (keyInit === "animation") replacement = "transition=";
+			else if (keyInit === "hoverStyle") replacement = "hover: clause";
+			else if (keyInit === "pressStyle") replacement = "press: clause";
+			else if (keyInit === "focusStyle") replacement = "focus: clause";
+			else if (keyInit === "enterStyle") replacement = "enter: clause";
+			else if (keyInit === "exitStyle") replacement = "exit: clause";
+			else if (keyInit.charCodeAt(0) === 36 && keyInit.length > 1) replacement = `${keyInit.slice(1)}: clause`;
+			if (replacement) warnOnce(`v2-prop:${keyInit}`, `prop "${keyInit}" was removed in v3; use ${replacement}`);
+		}
+	}
 	if (!isValidStyleKeyInit) {
 		if (!isAndroid) {
 			if (keyInit === "elevationAndroid") return;
@@ -6423,7 +6506,7 @@ function emitUnderCondition(state, property, value, cursor, originalValue, conte
 	return condition;
 }
 var formatScanFailure = function(failure, source, failureIndex) {
-	return failure === "invalid-character" ? `"${source[failureIndex]}" would end the declaration or rule` : failure === "unterminated-string" ? "an unterminated string" : failure === "unterminated-comment" ? "an unterminated \"/*\" comment" : failure === "stray-comment-close" ? "a stray \"*/\"" : "an unterminated \"(\"";
+	return failure === "invalid-character" ? `"${source[failureIndex]}" would end the declaration or rule` : failure === "unterminated-string" ? "an unterminated string" : failure === "unterminated-comment" ? "an unterminated \"/*\" comment" : failure === "stray-comment-close" ? "a stray \"*/\"" : failure === "over-deep-clause" ? `a clause with more than 5 non-platform conditions` : "an unterminated \"(\"";
 };
 var warnScanFailure = function(property, source, failure, failureIndex) {
 	if (globalThis.process.env.NODE_ENV === "development") warnRefusedValue(property, source, formatScanFailure(failure, source, failureIndex));
@@ -6449,6 +6532,15 @@ var valueCaches = /* @__PURE__ */ new WeakMap();
 var valueCacheEntries = 0;
 var valueCacheRoot = {};
 var parsedSlices = /* @__PURE__ */ new WeakMap();
+var cssWideColorKeywords = /* @__PURE__ */ new Set([
+	"inherit",
+	"initial",
+	"unset",
+	"revert",
+	"revert-layer",
+	"currentcolor",
+	"transparent"
+]);
 function configuredValue(state, property, raw) {
 	var embedded = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false;
 	var grammar = getConfigRevisionState(state.conf);
@@ -6534,8 +6626,89 @@ function configuredValue(state, property, raw) {
 	}
 	if (globalThis.process.env.NODE_ENV === "development") {
 		var _state_conf_tokensParsed_color1;
-		var category1 = grammar.tokenCategory(property);
+		var category1 = grammar.tokenCategory(property) || grammar.tokenCategory(state.conf.shorthands[property] || property);
 		if (category1 && category1 !== "color" && ((_state_conf_tokensParsed_color1 = state.conf.tokensParsed.color) === null || _state_conf_tokensParsed_color1 === void 0 ? void 0 : _state_conf_tokensParsed_color1[name])) warnOnce(`"${name}" contributes to "color", not "${property}"`);
+		if (!value && !fontProperty) {
+			if (name.charCodeAt(0) === 36 || raw.charCodeAt(0) === 36) {
+				var suggested = name.charCodeAt(0) === 36 ? name.slice(1) : raw.slice(1);
+				warnOnce(`v2-token:${property}=${raw}`, `${property}="${raw}": v3 tokens have no "$" prefix, did you mean "${suggested}"?`);
+			} else if ((category1 === "size" || category1 === "space" || category1 === "radius" || category1 === "zIndex") && /^-?\d+(?:\.\d+)?$/.test(name)) {
+				var nearest;
+				var minDistance = Infinity;
+				var rawNum = Number(name);
+				var tokens = category1 ? state.conf.tokensParsed[category1] : void 0;
+				if (tokens && Number.isFinite(rawNum)) for (var key in tokens) {
+					var keyNum = Number(key);
+					if (Number.isFinite(keyNum)) {
+						var dist = Math.abs(keyNum - rawNum);
+						if (dist < minDistance) {
+							minDistance = dist;
+							nearest = key;
+						}
+					} else {
+						var _tokens_key;
+						var val = (_tokens_key = tokens[key]) === null || _tokens_key === void 0 ? void 0 : _tokens_key.val;
+						var valNum = typeof val === "number" ? val : Number(val);
+						if (Number.isFinite(valNum)) {
+							var dist1 = Math.abs(valNum - rawNum);
+							if (dist1 < minDistance) {
+								minDistance = dist1;
+								nearest = key;
+							}
+						}
+					}
+				}
+				warnOnce(`numeric-token:${property}=${raw}`, `${property}="${raw}" was passed to CSS as-is with px units${nearest ? `; nearest token is "${nearest}"` : ""}`);
+			} else if (category1 === "color" && /^[a-zA-Z0-9-]+$/.test(name) && /[a-zA-Z]/.test(name)) {
+				var lower = name.toLowerCase();
+				if (!namedCssColors.has(lower) && !cssWideColorKeywords.has(lower)) {
+					var themeKeys = [];
+					if (state.theme && typeof state.theme === "object") for (var k in state.theme) themeKeys.push(k);
+					if (state.conf.themes) {
+						var active = state.conf.themes[state.flatThemeName || ""];
+						if (active) for (var k1 in active) themeKeys.push(k1);
+						else for (var t in state.conf.themes) for (var k2 in state.conf.themes[t]) themeKeys.push(k2);
+					}
+					var bestMatch;
+					var minDistance1 = 3;
+					var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+					try {
+						for (var _iterator = themeKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+							var key1 = _step.value;
+							if (Math.abs(key1.length - name.length) > 2) continue;
+							var m = name.length;
+							var n = key1.length;
+							var d = [];
+							for (var i = 0; i <= m; i++) d[i] = i;
+							for (var j = 1; j <= n; j++) {
+								var prev = d[0];
+								d[0] = j;
+								for (var i1 = 1; i1 <= m; i1++) {
+									var temp = d[i1];
+									d[i1] = name[i1 - 1] === key1[j - 1] ? prev : Math.min(prev, d[i1], d[i1 - 1]) + 1;
+									prev = temp;
+								}
+							}
+							var dist2 = d[m];
+							if (dist2 <= 2 && dist2 < minDistance1) {
+								minDistance1 = dist2;
+								bestMatch = key1;
+							}
+						}
+					} catch (err) {
+						_didIteratorError = true;
+						_iteratorError = err;
+					} finally {
+						try {
+							if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+						} finally {
+							if (_didIteratorError) throw _iteratorError;
+						}
+					}
+					warnOnce(`unknown-color:${property}=${raw}`, bestMatch ? `unknown color "${name}", did you mean "${bestMatch}"?` : `unknown color "${name}"`);
+				}
+			}
+		}
 	}
 	var out = raw;
 	if (isVariable(value)) {
@@ -6798,6 +6971,11 @@ function walkConditionalValue(state, property, value, parent, sink) {
 	if (typeof value === "string") {
 		var parsed = getConfigRevisionState(state.conf).parseFlatValue(value);
 		var [segments, failure, failureIndex] = parsed;
+		if (globalThis.process.env.NODE_ENV === "development") {
+			if (getSetting("styleValueSyntax") === "object") {
+				if (segments.length > 5 || segments.length >= 5 && segments[2] !== -1 || value.includes(":")) warnOnce(`syntax:string:${property}=${value}`, `string syntax is disabled by config (styleValueSyntax: 'object'); received "${property}=${value}"`);
+			}
+		}
 		var slices = parsedSlices.get(parsed);
 		if (slices === void 0) parsedSlices.set(parsed, slices = []);
 		var chainCount = segments.length / 5 - 1;
@@ -6851,6 +7029,9 @@ function walkConditionalValue(state, property, value, parent, sink) {
 		if (globalThis.process.env.NODE_ENV !== "production") lastPayload = value.slice(lastPayloadStart);
 	} else {
 		if (!value || typeof value !== "object" || Array.isArray(value) || isVariable(value) || !classifyConditionalObject(value, state)) return false;
+		if (globalThis.process.env.NODE_ENV === "development") {
+			if (getSetting("styleValueSyntax") === "string") warnOnce(`syntax:object:${property}=${JSON.stringify(value)}`, `object-form conditional syntax is disabled by config (styleValueSyntax: 'string'); received "${property}"`);
+		}
 		if (value.default != null) {
 			emitConditionalValue(state, property, value.default, parentCondition, value.default, sink, warnMode, contextOnly);
 			hasBase = true;
@@ -7462,10 +7643,7 @@ var Theme = createRefComponent(function Theme2(props, ref) {
 	var finalChildren = props["disable-child-theme"] ? react.Children.map(props.children, function(child) {
 		return passThrough || !/* @__PURE__ */ (0, react.isValidElement)(child) ? child : /* @__PURE__ */ (0, react.cloneElement)(child, { ["data-disable-theme"]: true });
 	}) : props.children;
-	if (ref) try {
-		react.default.Children.only(finalChildren);
-		finalChildren = /* @__PURE__ */ (0, react.cloneElement)(finalChildren, { ref });
-	} catch (e) {}
+	if (ref && /* @__PURE__ */ (0, react.isValidElement)(finalChildren)) finalChildren = /* @__PURE__ */ (0, react.cloneElement)(finalChildren, { ref });
 	var stateRef = (0, react.useRef)({ hasEverThemed: false });
 	return getThemedChildren(themeState, finalChildren, props, isRoot, stateRef, passThrough);
 });
@@ -7568,8 +7746,7 @@ var avoidReRenderKeys = /* @__PURE__ */ new Set([
 	"group",
 	"focus",
 	"focusWithin",
-	"media",
-	"group"
+	"media"
 ]);
 var groupPseudoKeys = [
 	"disabled",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "3.0.0-beta.1093.1",
+  "version": "3.0.0-beta.1097.1",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "license": "MIT",
   "author": {
@@ -137,20 +137,20 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/compose-refs": "3.0.0-beta.1093.1",
-    "@tamagui/constants": "3.0.0-beta.1093.1",
-    "@tamagui/helpers": "3.0.0-beta.1093.1",
-    "@tamagui/react-native-media-driver": "3.0.0-beta.1093.1",
-    "@tamagui/react-native-use-pressable": "3.0.0-beta.1093.1",
-    "@tamagui/size": "3.0.0-beta.1093.1",
-    "@tamagui/use-element-layout": "3.0.0-beta.1093.1",
-    "@tamagui/use-event": "3.0.0-beta.1093.1",
-    "@tamagui/web": "3.0.0-beta.1093.1"
+    "@tamagui/compose-refs": "3.0.0-beta.1097.1",
+    "@tamagui/constants": "3.0.0-beta.1097.1",
+    "@tamagui/helpers": "3.0.0-beta.1097.1",
+    "@tamagui/react-native-media-driver": "3.0.0-beta.1097.1",
+    "@tamagui/react-native-use-pressable": "3.0.0-beta.1097.1",
+    "@tamagui/size": "3.0.0-beta.1097.1",
+    "@tamagui/use-element-layout": "3.0.0-beta.1097.1",
+    "@tamagui/use-event": "3.0.0-beta.1097.1",
+    "@tamagui/web": "3.0.0-beta.1097.1"
   },
   "devDependencies": {
-    "@tamagui/build": "3.0.0-beta.1093.1",
-    "@tamagui/native-bundle": "3.0.0-beta.1093.1",
-    "@tamagui/react-native-web-lite": "3.0.0-beta.1093.1",
+    "@tamagui/build": "3.0.0-beta.1097.1",
+    "@tamagui/native-bundle": "3.0.0-beta.1097.1",
+    "@tamagui/react-native-web-lite": "3.0.0-beta.1097.1",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": "19.2.3",