@tamagui/web 3.0.0-beta.807.1 → 3.0.0-beta.831.1

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

@@ -1,35 +1,35 @@
 import { isAndroid, isClient, platformMatches, supportsDynamicColorIOS } from "@tamagui/constants";
-import { nonAnimatableStyleProps, stylePropsAll, stylePropsText, stylePropsTransform, tokenCategories, validStyles } from "@tamagui/helpers";
+import { nonAnimatableStyleProps, propToTokenCategoryCode, stylePropsAll, stylePropsText, stylePropsTransform, validStyles } from "@tamagui/helpers";
+import { addTransformValue, canonicalStateModifierNames, createTransformAccumulator, finalizeTransformAccumulator, getTransformPartKeys, isContainerSizeQueryText, isModifierName, modifierKindMedia, modifierKindPlatform, modifierKindState, modifierKindTheme, removeTransformValue, scanFlatValue, stateModifierSelectors } from "@tamagui/style-grammar/runtime";
 import { getConfig, getFont } from "../config.native.js";
-import { isVariable } from "../createVariable.native.js";
 import { isDevTools } from "../constants/isDevTools.native.js";
-import { mediaKeyMatch, mediaState } from "./mediaState.native.js";
-import { variantResolverNames } from "../types.native.js";
-import { addTransformValue, canonicalStateModifierNames, createTransformAccumulator, finalizeTransformAccumulator, getTransformPartKeys, isContainerSizeQueryText, isModifierName, modifierKindMedia, modifierKindPlatform, modifierKindState, modifierKindTheme, removeTransformValue, scanFlatValue, stateModifierSelectors } from "@tamagui/style-grammar/runtime";
-import { warnOnce, warnRefusedValue } from "./warnOnce.native.js";
+import { isVariable } from "../createVariable.native.js";
+import { addComposition, canGenerateCSS, clearFrameAtomic, completeStreamingCSS, directStyleSignature, flushDirectStyles, flushDirectStyles as flushDirectStyles2, requestBorderStyleDefault, streamAtomic } from "./directStyleCSS.native.js";
 import { expandStyle } from "./expandStyle.native.js";
 import { fixStyles } from "./expandStyles.native.js";
-import { addComposition, canGenerateCSS, clearFrameAtomic, completeStreamingCSS, directStyleSignature, flushDirectStyles, flushDirectStyles as flushDirectStyles2, requestBorderStyleDefault, streamAtomic } from "./directStyleCSS.native.js";
 import { getConfigRevisionState } from "./grammarConfig.native.js";
+import { mediaKeyMatch, mediaState } from "./mediaState.native.js";
+import { getStyleStaticConfig } from "./styleStaticConfig.native.js";
+import { getVariantDefinition } from "./variantResolvers.native.js";
+import { warnOnce, warnRefusedValue } from "./warnOnce.native.js";
 import { isColorStyleKey } from "./getDynamicVal.native.js";
-import { getDefaultProps } from "./getDefaultProps.native.js";
-import { isObj, isPlainObject } from "./isObj.native.js";
+import { getVariantExtras } from "./getVariantExtras.native.js";
+import { isObj } from "./isObj.native.js";
 import { log } from "./log.native.js";
-import { normalizeStyle } from "./normalizeStyle.native.js";
 import { normalizeColor } from "./normalizeColor.native.js";
+import { normalizeStyle } from "./normalizeStyle.native.js";
 import { normalizeValueWithProperty } from "./normalizeValueWithProperty.native.js";
 import { parseNativeStyle } from "./parseNativeStyle.native.js";
 import { parseNativeTransform } from "./parseNativeTransform.native.js";
-import { getVariantExtras } from "./getVariantExtras.native.js";
 import { isRemValue, resolveRem } from "./resolveRem.native.js";
 import { expandSafeAreaValue, isSafeAreaKey } from "./resolveSafeArea.native.js";
 import { resolveSafeAreaVariable } from "./resolveSafeAreaVariable.native.js";
 import { resolveVariableValue } from "./resolveVariableValue.native.js";
-import { THEME_REF_PREFIX } from "./themeRef.native.js";
-import { getTokenCategoryForProperty, tokenCategoryByProperty } from "./tokenCategories.native.js";
 import { HOC_CLASSNAME_MARKER, skipProps } from "./skipProps.native.js";
 import { styleOriginalValues } from "./styleOriginalValues.native.js";
 import { STYLE_TOKEN_PROVENANCE_KEY, getStyleTokenProvenance, setStyleTokenProvenance } from "./styleProvenance.native.js";
+import { THEME_REF_PREFIX } from "./themeRef.native.js";
+import { getTokenCategoryForProperty } from "./tokenCategories.native.js";
 import { transformsToString } from "./transformsToString.native.js";
 
 export * from "./tokenCategories.native.js"
@@ -40,47 +40,6 @@ function _type_of(obj) {
 }
 var TAMAGUI_CLASS_PROPS = "$$tamaguiClassProps";
 var shouldTrackStyleTokenProvenance = process.env.NODE_ENV === "development" && process.env.TAMAGUI_ENABLE_STYLE_TOKEN_PROVENANCE === "1";
-function compoundMatcherMatches(expected, actual) {
-	if (Array.isArray(expected)) {
-		for (var index = 0; index < expected.length; index++) if (expected[index] === actual) return true;
-		return false;
-	}
-	return expected === actual;
-}
-function compoundMatcherMatchesPayload(expected, source, start, end) {
-	if (Array.isArray(expected)) {
-		for (var index = 0; index < expected.length; index++) if (compoundMatcherMatchesPayload(expected[index], source, start, end)) return true;
-		return false;
-	}
-	var expectedValue = typeof expected === "string" ? expected : String(expected);
-	if (expectedValue.length !== end - start) return false;
-	for (var index1 = 0; index1 < expectedValue.length; index1++) if (expectedValue.charCodeAt(index1) !== source.charCodeAt(start + index1)) return false;
-	return true;
-}
-var preparedCompoundsKey = /* @__PURE__ */ Symbol();
-function prepareStaticConfigCompounds(staticConfig) {
-	var compoundVariants = staticConfig.compoundVariants;
-	var preparedConfig = staticConfig;
-	if (!(compoundVariants === null || compoundVariants === void 0 ? void 0 : compoundVariants.length)) {
-		preparedConfig[preparedCompoundsKey] = null;
-		return;
-	}
-	var selectorCounts = [];
-	var indexesByKey = /* @__PURE__ */ Object.create(null);
-	indexesByKey[preparedCompoundsKey] = selectorCounts;
-	for (var index = 0; index < compoundVariants.length; index++) {
-		var compoundVariant = compoundVariants[index];
-		var selectorCount = 0;
-		for (var key in compoundVariant) {
-			var _indexesByKey, _key;
-			if (key === "style") continue;
-			selectorCount++;
-			((_indexesByKey = indexesByKey)[_key = key] || (_indexesByKey[_key] = [])).push(index);
-		}
-		selectorCounts[index] = selectorCount;
-	}
-	preparedConfig[preparedCompoundsKey] = indexesByKey;
-}
 var conditionWidth = 4;
 var conditionValueOffset = 0;
 var conditionFlagsOffset = 1;
@@ -118,15 +77,6 @@ function reserveConditionCursor(cursor) {
 	conditionNumbers = new Float64Array(length);
 	conditionNumbers.set(previous1);
 }
-function conditionWrapperCopy(cursor) {
-	var wrapper = conditionNumbers[cursor + conditionWrapperOffset];
-	var count = wrapper & 7;
-	if (!count) return void 0;
-	var start = wrapper >> 3;
-	var wrappers = new Array(count);
-	for (var index = 0; index < count; index++) wrappers[index] = conditionWrappers[start + index];
-	return wrappers;
-}
 function setConditionUnresolved(cursor) {
 	var name = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
 	conditionNumbers[cursor + conditionFlagsOffset] &= ~conditionResolvedFlag;
@@ -365,170 +315,8 @@ function acquireConditionKeyCursor(state, key) {
 	}
 	return cursor;
 }
-function combineConditionKeys(state, first, second) {
-	if (!first) return second;
-	if (!second || first === second) return first;
-	var watermark = conditionCursorTop;
-	var target2 = acquireConditionKeyCursor(state, first);
-	resolveConditionText(state, target2, second);
-	commitConditionCursor(state, target2);
-	var key = conditionTexts[target2 + conditionKeyOffset] || "";
-	releaseConditionCursors(watermark);
-	return key;
-}
-function freshCompoundState() {
-	return {
-		seen: 0,
-		failed: false,
-		matchedBase: false,
-		scanned: false,
-		pending: null,
-		combinations: null
-	};
-}
-function beginCompoundEdges(indexes, states) {
-	if (!indexes) return;
-	for (var index = 0; index < indexes.length; index++) {
-		var _states, _indexes_index;
-		var state = (_states = states)[_indexes_index = indexes[index]] || (_states[_indexes_index] = freshCompoundState());
-		state.pending = null;
-		state.matchedBase = false;
-		state.scanned = false;
-	}
-}
-function feedCompoundSegment(state, source, start, end, isBase, valid, conditionKey) {
-	if (state.flatCompoundOutputDepth) return;
-	var pass = state.flatPass;
-	var indexes = pass[passCompoundIndexes];
-	var states = pass[passCompoundStates];
-	var key = pass[passCompoundKey];
-	if (!indexes || !states || !key) return;
-	var compoundVariants = state.staticConfig.compoundVariants;
-	for (var index = 0; index < indexes.length; index++) {
-		var _states, _compoundIndex;
-		var compoundIndex = indexes[index];
-		var compoundState = (_states = states)[_compoundIndex = compoundIndex] || (_states[_compoundIndex] = freshCompoundState());
-		compoundState.scanned = true;
-		if (!valid || start === end || !compoundMatcherMatchesPayload(compoundVariants[compoundIndex][key], source, start, end)) continue;
-		if (isBase) compoundState.matchedBase = true;
-		else if (!compoundState.matchedBase) {
-			var _compoundState;
-			((_compoundState = compoundState).pending || (_compoundState.pending = [])).push(conditionKey);
-		}
-	}
-}
-var compoundOnlyHandler = {
-	segment(state, start, end, isBase, valid, source, chainStart, chainEnd, chainValid) {
-		if (isBase) {
-			feedCompoundSegment(state, source, start, end, true, valid, "");
-			return;
-		}
-		var cursor = state.flatScanCursor;
-		if (!chainValid || !cursor || !(conditionNumbers[cursor + conditionFlagsOffset] & conditionResolvedFlag) || !conditionNumbers[cursor + conditionValueOffset]) {
-			feedCompoundSegment(state, source, start, end, false, false, "");
-			return;
-		}
-		feedCompoundSegment(state, source, start, end, false, valid, conditionTexts[cursor + conditionKeyOffset] || "");
-	},
-	modifier(state, start, end, valid, first, source) {
-		var cursor = state.flatScanCursor;
-		if (!cursor) cursor = state.flatScanCursor = acquireConditionCursor();
-		else if (first) resetConditionCursor(cursor, 0);
-		if (!valid) {
-			setConditionUnresolved(cursor);
-			return;
-		}
-		if (conditionNumbers[cursor + conditionFlagsOffset] & conditionResolvedFlag) resolveConditionModifier(state, cursor, source.slice(start, end));
-	},
-	chain(state, _start, _end, valid) {
-		var cursor = state.flatScanCursor;
-		if (cursor) {
-			if (!valid) setConditionUnresolved(cursor);
-			if (conditionNumbers[cursor + conditionFlagsOffset] & conditionResolvedFlag) commitConditionCursor(state, cursor);
-		}
-		return true;
-	}
-};
-function finishCompoundEdges(pass, key, value, indexes, states) {
-	if (!indexes) return;
-	var state = pass[passStyleState];
-	pass[passCompoundIndexes] = indexes;
-	pass[passCompoundKey] = key;
-	pass[passCompoundStates] = states;
-	var needsScan = false;
-	for (var index = 0; index < indexes.length; index++) {
-		var _states, _indexes_index;
-		if (!((_states = states)[_indexes_index = indexes[index]] || (_states[_indexes_index] = freshCompoundState())).scanned) {
-			needsScan = true;
-			break;
-		}
-	}
-	if (needsScan) if (typeof value === "string") {
-		var watermark = conditionCursorTop;
-		var previousCursor = state.flatScanCursor;
-		state.flatScanCursor = null;
-		try {
-			scanFlatValue(value, compoundOnlyHandler, state);
-		} finally {
-			state.flatScanCursor = previousCursor;
-			releaseConditionCursors(watermark);
-		}
-	} else if (value && (typeof value === "undefined" ? "undefined" : _type_of(value)) === "object" && !Array.isArray(value) && !isVariable(value) && Object.prototype.hasOwnProperty.call(value, "default")) for (var conditionKey in value) {
-		var payload = value[conditionKey];
-		if (conditionKey === "default") {
-			var payloadString = String(payload);
-			feedCompoundSegment(state, payloadString, 0, payloadString.length, true, true, "");
-		} else {
-			var watermark1 = conditionCursorTop;
-			var cursor = acquireConditionCursor();
-			resolveConditionText(state, cursor, conditionKey);
-			var condition = commitConditionCursor(state, cursor);
-			var payloadString1 = String(payload);
-			feedCompoundSegment(state, payloadString1, 0, payloadString1.length, false, Boolean(condition), condition ? conditionTexts[cursor + conditionKeyOffset] || "" : "");
-			releaseConditionCursors(watermark1);
-		}
-	}
-	else {
-		var variants = state.staticConfig.compoundVariants;
-		for (var index1 = 0; index1 < indexes.length; index1++) {
-			var _states1, _compoundIndex;
-			var compoundIndex = indexes[index1];
-			var compoundState1 = (_states1 = states)[_compoundIndex = compoundIndex] || (_states1[_compoundIndex] = freshCompoundState());
-			compoundState1.scanned = true;
-			if (compoundMatcherMatches(variants[compoundIndex][key], value)) compoundState1.matchedBase = true;
-		}
-	}
-	var variants1 = state.staticConfig.compoundVariants;
-	var selectorCounts = state.staticConfig[preparedCompoundsKey][preparedCompoundsKey];
-	for (var index2 = 0; index2 < indexes.length; index2++) {
-		var compoundIndex1 = indexes[index2];
-		var compoundState2 = states[compoundIndex1];
-		if (compoundState2.failed) continue;
-		var branches = compoundState2.matchedBase ? [""] : compoundState2.pending;
-		if (!branches || !branches.length) {
-			compoundState2.failed = true;
-			continue;
-		}
-		if (!compoundState2.seen) compoundState2.combinations = branches;
-		else {
-			var previous = compoundState2.combinations;
-			var next = [];
-			for (var left = 0; left < previous.length; left++) for (var right = 0; right < branches.length; right++) {
-				var conditionKey1 = combineConditionKeys(state, previous[left], branches[right]);
-				if (!next.includes(conditionKey1)) next.push(conditionKey1);
-			}
-			compoundState2.combinations = next;
-		}
-		compoundState2.seen++;
-		if (compoundState2.seen !== selectorCounts[compoundIndex1]) continue;
-		var style = variants1[compoundIndex1].style;
-		if (!isPlainObject(style)) continue;
-		var combinations = compoundState2.combinations;
-		for (var combination = 0; combination < combinations.length; combination++) for (var styleKey in style) contributeProp(pass, styleKey, style[styleKey], void 0, states, combinations[combination]);
-	}
-}
 function classifyConditionalObject(value, state, isChain, firstCursor) {
-	if (Object.prototype.hasOwnProperty.call(value, "default")) return -1;
+	if ("default" in value) return -1;
 	for (var key in value) {
 		if (!key.length) return 0;
 		if (!state) return (isChain === null || isChain === void 0 ? void 0 : isChain(key)) ? 1 : 0;
@@ -551,9 +339,6 @@ var passFrontendContainer = 27;
 var passFrontendContainerType = 28;
 var passHocMappedProperties = 29;
 var passHocMappedClasses = 30;
-var passCompoundIndexes = 31;
-var passCompoundKey = 32;
-var passCompoundStates = 33;
 var passParentCursor = 35;
 var passMapSourceKey = 36;
 var passMapFlags = 37;
@@ -565,96 +350,23 @@ var passHocFlag = 16;
 var passTextFlag = 32;
 var passInputFlag = 64;
 var passAsChildStyleFlag = 128;
-var styledDefaultsCache = /* @__PURE__ */ new WeakMap();
-function getStyledDefaults(staticConfig, shorthands) {
-	var prepared = styledDefaultsCache.get(staticConfig);
-	if (prepared === void 0) {
-		var entries = null;
-		var defaults = staticConfig.defaultProps;
-		if (defaults) for (var key in defaults) {
-			if (!(key in stylePropsAll || key in shorthands)) continue;
-			var value = defaults[key];
-			if (maybeStyleProgram(value)) (entries || (entries = [])).push(key, value);
-		}
-		prepared = entries;
-		styledDefaultsCache.set(staticConfig, prepared);
-	}
-	return prepared;
-}
-var maybeStyleProgram = function(value) {
-	return typeof value === "string" ? value.indexOf(":") !== -1 : !!value && (typeof value === "undefined" ? "undefined" : _type_of(value)) === "object" && !Array.isArray(value) && !isVariable(value);
-};
-function contributeDisplacedStyledDefaults(styledDefaults, processedProps, pass) {
-	if (!styledDefaults) return;
-	for (var offset = 0; offset < styledDefaults.length; offset += 2) {
-		var key = styledDefaults[offset];
-		var value = styledDefaults[offset + 1];
-		var propValue = processedProps[key];
-		if (propValue !== void 0 && propValue !== value) contributeProp(pass, key, value);
-	}
-}
-function injectDisplacedStyledDefault(pass, key, value) {
-	var _pass__defaultProps;
-	var defaultValue = (_pass__defaultProps = pass[4].defaultProps) === null || _pass__defaultProps === void 0 ? void 0 : _pass__defaultProps[key];
-	if (defaultValue === void 0 || value === void 0 || value === defaultValue || maybeStyleProgram(defaultValue)) return;
-	var state = pass[passStyleState];
-	state.flatWeakContribution = true;
-	try {
-		contributeProp(pass, key, defaultValue);
-	} finally {
-		state.flatWeakContribution = false;
-	}
-}
 function forEachPropInForwardOrder(pass) {
-	var _staticConfig_compoundVariants;
 	var styleState = pass[passStyleState];
-	var staticConfig = styleState.staticConfig;
 	var processedProps = styleState.props;
-	var shorthands = styleState.conf.shorthands;
-	var processedBaseStyle = staticConfig.baseStyle;
-	var styledDefaults = getStyledDefaults(staticConfig, shorthands);
-	var directState = styleState;
-	var preparedCompounds = staticConfig[preparedCompoundsKey];
-	if (preparedCompounds === void 0 && ((_staticConfig_compoundVariants = staticConfig.compoundVariants) === null || _staticConfig_compoundVariants === void 0 ? void 0 : _staticConfig_compoundVariants.length)) throw new Error("A component with compoundVariants reached style resolution before its static config was prepared.");
+	var styleStaticConfig = styleState.flatStyleStaticConfig;
+	var baseStyle = styleStaticConfig.baseStyle;
+	var baseVariantProps = styleStaticConfig.baseVariantProps;
 	var conditionWrapperBase = conditionWrapperTop;
-	if (!preparedCompounds) {
-		try {
-			if (processedBaseStyle) for (var key in processedBaseStyle) contributeProp(pass, key, processedBaseStyle[key]);
-			contributeDisplacedStyledDefaults(styledDefaults, processedProps, pass);
-			for (var key1 in processedProps) {
-				var value = processedProps[key1];
-				directState.flatPropSawCondition = false;
-				contributeProp(pass, key1, value);
-				if (directState.flatPropSawCondition) injectDisplacedStyledDefault(pass, key1, value);
-			}
-		} finally {
-			releaseConditionPayloads(conditionWrapperBase);
-		}
-		return;
-	}
-	var compoundVariants = staticConfig.compoundVariants;
-	var compoundStates = new Array(compoundVariants.length);
 	try {
-		if (processedBaseStyle) for (var key2 in processedBaseStyle) contributeProp(pass, key2, processedBaseStyle[key2]);
-		contributeDisplacedStyledDefaults(styledDefaults, processedProps, pass);
-		var selectorCounts = preparedCompounds[preparedCompoundsKey];
-		for (var compoundIndex = 0; compoundIndex < compoundVariants.length; compoundIndex++) {
-			if (selectorCounts[compoundIndex]) continue;
-			var style = compoundVariants[compoundIndex].style;
-			if (!isPlainObject(style)) continue;
-			for (var key3 in style) contributeProp(pass, key3, style[key3]);
-		}
-		for (var key4 in processedProps) {
-			var compoundIndexes = preparedCompounds[key4];
-			var value1 = processedProps[key4];
-			beginCompoundEdges(compoundIndexes, compoundStates);
-			directState.flatPropSawCondition = false;
-			contributeProp(pass, key4, value1, compoundIndexes, compoundStates);
-			if (directState.flatPropSawCondition) injectDisplacedStyledDefault(pass, key4, value1);
-			finishCompoundEdges(pass, key4, value1, compoundIndexes, compoundStates);
+		var appliesBaseStyle = baseStyle && !processedProps.asChild;
+		if (appliesBaseStyle) for (var key in baseStyle) contributeProp(pass, key, baseVariantProps && Object.hasOwn(baseVariantProps, key) && Object.hasOwn(processedProps, key) ? processedProps[key] : baseStyle[key]);
+		for (var key1 in processedProps) {
+			if (appliesBaseStyle && baseVariantProps && Object.hasOwn(baseVariantProps, key1)) continue;
+			contributeProp(pass, key1, processedProps[key1]);
 		}
-	} finally {
+	} catch (error) {
 		releaseConditionPayloads(conditionWrapperBase);
+		throw error;
 	}
 }
 function isValidStyleKey(key, validStyles, accept) {
@@ -757,13 +469,8 @@ function mapContributedProp(styleState, key, val, originalVal, condition) {
 		viewProps[key] = val;
 	}
 }
-function contributeProp(pass, keyOg, valOg, compoundIndexes, compoundStates, parentConditionKey) {
+function contributeProp(pass, keyOg, valOg, parentConditionKey) {
 	var parentWatermark = conditionCursorTop;
-	if (compoundIndexes) {
-		pass[passCompoundIndexes] = compoundIndexes;
-		pass[passCompoundKey] = keyOg;
-		pass[passCompoundStates] = compoundStates;
-	} else if (pass[passCompoundIndexes]) pass[passCompoundIndexes] = void 0;
 	if (parentConditionKey) pass[passParentCursor] = acquireConditionKeyCursor(pass[passStyleState], parentConditionKey);
 	try {
 		var [styleState, conf, props, viewProps, staticConfig, validStyles, accept, neverSkipProps, variants, inlineProps, parentVariants, styleFrontend, styledContext, styledContextKeys, flags, debug, parentStaticConfig, defaultProps, driverAnimations, driverOutputStyle, elementType] = pass;
@@ -992,10 +699,10 @@ function contributeProp(pass, keyOg, valOg, compoundIndexes, compoundStates, par
 		releaseConditionCursors(parentWatermark);
 	}
 }
-var getSplitStyles = function(props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, componentContext, groupContext, elementType, startedUnhydrated, debug, animationDriver) {
-	var _staticConfig_styleFrontend, _styleState_flatMediaKeys, _styleState_flatGroupKeys, _styleState_flatGroupMedia, _styleState_style;
+var getSplitStyles = function(props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, componentContext, groupContext, elementType, startedUnhydrated, debug, animationDriver, styleStaticConfig) {
+	var _styleState_style;
 	var conf = getConfig();
-	if ((_staticConfig_styleFrontend = staticConfig.styleFrontend) === null || _staticConfig_styleFrontend === void 0 ? void 0 : _staticConfig_styleFrontend.normalizeStaticConfig) staticConfig = staticConfig.styleFrontend.normalizeStaticConfig(staticConfig, conf);
+	styleStaticConfig || (styleStaticConfig = getStyleStaticConfig(staticConfig, conf));
 	var driver = animationDriver || (componentContext === null || componentContext === void 0 ? void 0 : componentContext.animationDriver) || conf.animations;
 	var driverAnimations = driver === null || driver === void 0 ? void 0 : driver.animations;
 	driver === null || driver === void 0 || driver.inputStyle;
@@ -1003,7 +710,8 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 	var resolvedDriver = (driver === null || driver === void 0 ? void 0 : driver.isStub) ? null : driver;
 	if (props.passThrough) return null;
 	var { shorthands } = conf;
-	var { isHOC, isText, isInput, variants, inlineProps, parentStaticConfig, acceptsClassName } = staticConfig;
+	var { isHOC, isText, isInput, inlineProps, parentStaticConfig, acceptsClassName } = staticConfig;
+	var variants = styleStaticConfig.variants;
 	var viewProps = {};
 	var mediaState$1 = styleProps.mediaState || mediaState;
 	var shouldDoClasses = !process.env.TAMAGUI_DID_OUTPUT_CSS && acceptsClassName && false;
@@ -1036,6 +744,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 		flatGroupContext: groupContext,
 		animationDriver: resolvedDriver
 	};
+	styleState.flatStyleStaticConfig = styleStaticConfig;
 	if (canGenerateCSS && shouldDoClasses && styleProps.canPlatformPseudo) styleState.flatDeferCSS = true;
 	if (process.env.NODE_ENV === "development" && (debug === "profile" || globalThis.time)) time`style-state`;
 	if (process.env.NODE_ENV === "development" && debug === "verbose" && isClient) {
@@ -1055,20 +764,20 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 	}
 	var { asChild } = props;
 	var { accept, neverSkipProps } = staticConfig;
-	var { noSkip, disableExpandShorthands, noExpand, noClass, noMergeStyle, noNormalize, isAnimated, styledContext, styledContextKeys } = styleProps;
+	var { noSkip, disableExpandShorthands, noExpand, noClass, noMergeStyle, noNormalize, isAnimated, styledContext } = styleProps;
+	var styledContextKeys = styleStaticConfig.styledContextKeys;
 	var styleFrontend = staticConfig.styleFrontend;
 	var frontendGroup;
 	var frontendContainer;
 	var frontendContainerType;
-	var parentVariants = parentStaticConfig === null || parentStaticConfig === void 0 ? void 0 : parentStaticConfig.variants;
-	var defaultProps = asChild ? getDefaultProps(staticConfig) : void 0;
+	var parentVariants = parentStaticConfig ? getStyleStaticConfig(parentStaticConfig, conf).variants : void 0;
+	var defaultProps = asChild ? styleStaticConfig.defaultProps : void 0;
 	var asChildExceptStyleLike = asChild === "except-style" || asChild === "except-style-web";
 	var containerValue;
 	var containerName;
 	var containerType;
 	var hocMappedClassProperties;
 	var hocMappedClasses;
-	var stylePassFlags = (noSkip ? passNoSkipFlag : 0) | (disableExpandShorthands ? passDisableShorthandsFlag : 0) | (noExpand ? passNoExpandFlag : 0) | (noMergeStyle ? passNoMergeFlag : 0) | (isHOC ? passHocFlag : 0) | (isText ? passTextFlag : 0) | (isInput ? passInputFlag : 0) | (asChildExceptStyleLike ? passAsChildStyleFlag : 0);
 	var pass = [
 		styleState,
 		conf,
@@ -1084,7 +793,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 		styleFrontend,
 		styledContext,
 		styledContextKeys,
-		stylePassFlags,
+		(noSkip ? passNoSkipFlag : 0) | (disableExpandShorthands ? passDisableShorthandsFlag : 0) | (noExpand ? passNoExpandFlag : 0) | (noMergeStyle ? passNoMergeFlag : 0) | (isHOC ? passHocFlag : 0) | (isText ? passTextFlag : 0) | (isInput ? passInputFlag : 0) | (asChildExceptStyleLike ? passAsChildStyleFlag : 0),
 		debug,
 		parentStaticConfig,
 		defaultProps,
@@ -1103,80 +812,32 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 		hocMappedClasses
 	];
 	styleState.flatPass = pass;
-	forEachPropInForwardOrder(pass);
-	[, , , , , , , , , , , , , , , , , , , , , className, shouldDoClasses, containerValue, containerName, containerType, frontendGroup, frontendContainer, frontendContainerType, hocMappedClassProperties, hocMappedClasses] = pass;
-	if (process.env.NODE_ENV === "development" && (debug === "profile" || globalThis.time)) time`split-styles-propsend`;
-	var conditionalStates = styleState.flatStateKeys || null;
-	var usesSafeArea = !!styleState.flatUsesSafeArea;
-	if ((_styleState_flatMediaKeys = styleState.flatMediaKeys) === null || _styleState_flatMediaKeys === void 0 ? void 0 : _styleState_flatMediaKeys.size) {
-		if (!hasMedia) hasMedia = /* @__PURE__ */ new Set();
-		if (typeof hasMedia !== "boolean") {
-			var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
-			try {
-				for (var _iterator2 = styleState.flatMediaKeys[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-					var key = _step2.value;
-					hasMedia.add(key);
-				}
-			} catch (err) {
-				_didIteratorError2 = true;
-				_iteratorError2 = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion2 && _iterator2.return != null) _iterator2.return();
-				} finally {
-					if (_didIteratorError2) throw _iteratorError2;
-				}
-			}
-		}
-	}
-	if ((_styleState_flatGroupKeys = styleState.flatGroupKeys) === null || _styleState_flatGroupKeys === void 0 ? void 0 : _styleState_flatGroupKeys.size) {
-		pseudoGroups || (pseudoGroups = /* @__PURE__ */ new Set());
-		var _iteratorNormalCompletion12 = true, _didIteratorError12 = false, _iteratorError12 = void 0;
-		try {
-			for (var _iterator12 = styleState.flatGroupKeys[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
-				var key1 = _step12.value;
-				pseudoGroups.add(key1);
-			}
-		} catch (err) {
-			_didIteratorError12 = true;
-			_iteratorError12 = err;
-		} finally {
-			try {
-				if (!_iteratorNormalCompletion12 && _iterator12.return != null) _iterator12.return();
-			} finally {
-				if (_didIteratorError12) throw _iteratorError12;
-			}
-		}
-	}
-	if ((_styleState_flatGroupMedia = styleState.flatGroupMedia) === null || _styleState_flatGroupMedia === void 0 ? void 0 : _styleState_flatGroupMedia.size) {
-		mediaGroups || (mediaGroups = /* @__PURE__ */ new Set());
-		var _iteratorNormalCompletion22 = true, _didIteratorError22 = false, _iteratorError22 = void 0;
-		try {
-			for (var _iterator22 = styleState.flatGroupMedia[Symbol.iterator](), _step22; !(_iteratorNormalCompletion22 = (_step22 = _iterator22.next()).done); _iteratorNormalCompletion22 = true) {
-				var key2 = _step22.value;
-				mediaGroups.add(key2);
-			}
-		} catch (err) {
-			_didIteratorError22 = true;
-			_iteratorError22 = err;
-		} finally {
-			try {
-				if (!_iteratorNormalCompletion22 && _iterator22.return != null) _iterator22.return();
-			} finally {
-				if (_didIteratorError22) throw _iteratorError22;
+	var conditionalStates = null;
+	var usesSafeArea = false;
+	var conditionWrapperBase = conditionWrapperTop;
+	try {
+		var _styleState_flatMediaKeys, _styleState_flatGroupKeys, _styleState_flatGroupMedia;
+		forEachPropInForwardOrder(pass);
+		[, , , , , , , , , , , , , , , , , , , , , className, shouldDoClasses, containerValue, containerName, containerType, frontendGroup, frontendContainer, frontendContainerType, hocMappedClassProperties, hocMappedClasses] = pass;
+		if (process.env.NODE_ENV === "development" && (debug === "profile" || globalThis.time)) time`split-styles-propsend`;
+		conditionalStates = styleState.flatStateKeys || null;
+		usesSafeArea = !!styleState.flatUsesSafeArea;
+		hasMedia = ((_styleState_flatMediaKeys = styleState.flatMediaKeys) === null || _styleState_flatMediaKeys === void 0 ? void 0 : _styleState_flatMediaKeys.size) ? styleState.flatMediaKeys : false;
+		pseudoGroups = ((_styleState_flatGroupKeys = styleState.flatGroupKeys) === null || _styleState_flatGroupKeys === void 0 ? void 0 : _styleState_flatGroupKeys.size) ? styleState.flatGroupKeys : void 0;
+		mediaGroups = ((_styleState_flatGroupMedia = styleState.flatGroupMedia) === null || _styleState_flatGroupMedia === void 0 ? void 0 : _styleState_flatGroupMedia.size) ? styleState.flatGroupMedia : void 0;
+		if (styleProps.canPlatformPseudo && styleState.flatHasPlatformPseudo) {
+			shouldDoClasses = false;
+			styleState.flatShouldDoClasses = false;
+			if (styleState.transformAccumulator) {
+				mergeStyle(styleState, "transform", finalizeTransformAccumulator(styleState.transformAccumulator), true);
+				styleState.transformAccumulator = void 0;
 			}
+			convertDeferredInline(styleState, mergeStyle);
 		}
+		completeStreaming(styleState, mergeStyle);
+	} finally {
+		releaseConditionPayloads(conditionWrapperBase);
 	}
-	if (styleProps.canPlatformPseudo && styleState.flatHasPlatformPseudo) {
-		shouldDoClasses = false;
-		styleState.flatShouldDoClasses = false;
-		if (styleState.transformAccumulator) {
-			mergeStyle(styleState, "transform", finalizeTransformAccumulator(styleState.transformAccumulator), 1, true);
-			styleState.transformAccumulator = void 0;
-		}
-		convertDeferredInline(styleState, mergeStyle);
-	}
-	completeStreaming(styleState, mergeStyle);
 	var effectiveTransition = (_styleState_style = styleState.style) === null || _styleState_style === void 0 ? void 0 : _styleState_style.transition;
 	if (effectiveTransition != null && styleState.style && true) delete styleState.style.transition;
 	if (styleState.style) {
@@ -1194,11 +855,11 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 			styleState.style.transform = finalizeTransformAccumulator(styleState.transformAccumulator);
 		}
 		if (parentSplitStyles) {
-			if (!shouldDoClasses) for (var key4 in parentSplitStyles.style) {
+			if (!shouldDoClasses) for (var key1 in parentSplitStyles.style) {
 				var _styleState1;
-				if (key4 in classNames || styleState.style && key4 in styleState.style) continue;
+				if (key1 in classNames || styleState.style && key1 in styleState.style) continue;
 				(_styleState1 = styleState).style || (_styleState1.style = {});
-				styleState.style[key4] = parentSplitStyles.style[key4];
+				styleState.style[key1] = parentSplitStyles.style[key1];
 			}
 		}
 	}
@@ -1227,9 +888,9 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 	if (shouldTrackStyleTokenProvenance && styleState.style && styleState.tokenProvenance) {
 		var provenance = {};
 		var hasProvenance = false;
-		for (var key5 in styleState.tokenProvenance) {
-			provenance[key5] = {
-				token: styleState.tokenProvenance[key5],
+		for (var key2 in styleState.tokenProvenance) {
+			provenance[key2] = {
+				token: styleState.tokenProvenance[key2],
 				theme: themeName
 			};
 			hasProvenance = true;
@@ -1280,7 +941,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 					rulesToInsert,
 					parentSplitStyles
 				};
-				for (var key7 in logs) log(key7, logs[key7]);
+				for (var key4 in logs) log(key4, logs[key4]);
 			} catch (e) {}
 			console.groupEnd();
 		}
@@ -1288,11 +949,11 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 	if (process.env.NODE_ENV === "development" && (debug === "profile" || globalThis.time)) time`split-styles-done`;
 	return result;
 };
-function mergeStyle(styleState, key, val, _importance) {
-	arguments.length > 4 && arguments[4] !== void 0 && arguments[4];
-	var originalVal = arguments.length > 5 ? arguments[5] : void 0;
+function mergeStyle(styleState, key, val) {
+	arguments.length > 3 && arguments[3] !== void 0 && arguments[3];
+	var originalVal = arguments.length > 4 ? arguments[4] : void 0;
 	var { viewProps, styleProps, staticConfig } = styleState;
-	var contextPropSet = getContextPropSet(staticConfig);
+	var contextPropSet = styleState.flatStyleStaticConfig.styledContextKeys;
 	if (contextPropSet === null || contextPropSet === void 0 ? void 0 : contextPropSet.has(key)) {
 		var _styleState_originalContextPropValues;
 		var _styleState;
@@ -1324,8 +985,8 @@ function recordStyleTokenProvenance(styleState, key, originalVal) {
 		var opacity = slash === -1 ? NaN : Number(tokenName.slice(slash + 1));
 		if (Number.isInteger(opacity) && opacity >= 0 && opacity <= 100) tokenName = tokenName.slice(0, slash);
 	}
-	if (tokenName !== "" && (Object.prototype.hasOwnProperty.call(styleState.theme, tokenName) || Object.prototype.hasOwnProperty.call(((_styleState_conf_themes = styleState.conf.themes) === null || _styleState_conf_themes === void 0 ? void 0 : _styleState_conf_themes[styleState.flatThemeName || ""]) || {}, tokenName) || Object.values(styleState.conf.tokensParsed).some(function(category) {
-		return Object.prototype.hasOwnProperty.call(category, tokenName);
+	if (tokenName !== "" && (tokenName in styleState.theme || tokenName in (((_styleState_conf_themes = styleState.conf.themes) === null || _styleState_conf_themes === void 0 ? void 0 : _styleState_conf_themes[styleState.flatThemeName || ""]) || {}) || Object.values(styleState.conf.tokensParsed).some(function(category) {
+		return tokenName in category;
 	}))) {
 		var _styleState;
 		((_styleState = styleState).tokenProvenance || (_styleState.tokenProvenance = {}))[key] = originalVal;
@@ -1350,7 +1011,7 @@ var resolveAcceptedStyle = function(styleState, styleIn) {
 	childState.flatSingleEntries = void 0;
 	childState.flatSlots = void 0;
 	childState.flatBorderDefaultRequests = void 0;
-	var mergeAccepted = function(_state, key2, value2, _importance, disableNormalize, originalValue) {
+	var mergeAccepted = function(_state, key2, value2, disableNormalize, originalValue) {
 		styleOut[key2] = disableNormalize || styleProps.noNormalize ? value2 : normalizeValueWithProperty(value2, key2);
 		var _styleInOriginalValues_key;
 		var trackedOriginal = (_styleInOriginalValues_key = styleInOriginalValues === null || styleInOriginalValues === void 0 ? void 0 : styleInOriginalValues[key2]) !== null && _styleInOriginalValues_key !== void 0 ? _styleInOriginalValues_key : originalValue;
@@ -1381,22 +1042,24 @@ function streamWriteCSS(state, property, value, cursor, original) {
 	if (property.charCodeAt(0) === 116 && property.startsWith("transition")) {
 		var _direct;
 		var transitions = (_direct = direct).flatTransitions || (_direct.flatTransitions = []);
-		for (var index = 0; index < transitions.length; index++) if (transitions[index].property === property && transitions[index].identity === identity) {
-			transitions[index].value = value;
-			transitions[index].condition = condition;
+		for (var index = 0; index < transitions.length; index++) if (transitions[index][0] === property && transitions[index][3] === identity) {
+			transitions[index][1] = value;
+			transitions[index][2] = condition;
 			return;
 		}
-		transitions.push({
+		transitions.push([
 			property,
 			value,
 			condition,
 			identity,
-			selector: cursor ? conditionTexts[cursor + conditionSelectorOffset] || "" : "",
-			wrappers: cursor ? conditionWrapperCopy(cursor) : void 0
-		});
+			cursor ? conditionTexts[cursor + conditionSelectorOffset] || "" : "",
+			cursor ? conditionWrappers : void 0,
+			cursor ? conditionNumbers[cursor + conditionWrapperOffset] >> 3 : 0,
+			cursor ? conditionNumbers[cursor + conditionWrapperOffset] & 7 : 0
+		]);
 		return;
 	}
-	streamAtomic(state, property, value, condition, identity, cursor ? conditionTexts[cursor + conditionSelectorOffset] || "" : "", cursor ? conditionWrappers : void 0, cursor ? conditionNumbers[cursor + conditionWrapperOffset] >> 3 : 0, cursor ? conditionNumbers[cursor + conditionWrapperOffset] & 7 : 0, direct.flatWeakContribution === true, original);
+	streamAtomic(state, property, value, condition, identity, cursor ? conditionTexts[cursor + conditionSelectorOffset] || "" : "", cursor ? conditionWrappers : void 0, cursor ? conditionNumbers[cursor + conditionWrapperOffset] >> 3 : 0, cursor ? conditionNumbers[cursor + conditionWrapperOffset] & 7 : 0, false, original);
 }
 function streamWriteInline(state, property, value, cursor, merge, original) {
 	var normalize = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : false, conditionOverride = arguments.length > 7 && arguments[7] !== void 0 ? arguments[7] : -1;
@@ -1406,12 +1069,9 @@ function streamWriteInline(state, property, value, cursor, merge, original) {
 	var importance = condition ? Math.floor(condition / 256) + 1 : 0;
 	var used = (_direct = direct).flatUsed || (_direct.flatUsed = {});
 	var previous = used[property];
-	if (previous !== void 0) {
-		if (previous > importance) return;
-		if (direct.flatWeakContribution === true) return;
-	}
+	if (previous !== void 0 && previous > importance) return;
 	used[property] = importance;
-	merge(state, property, value, 1, !normalize, original);
+	merge(state, property, value, !normalize, original);
 }
 function streamRetractInline(state, property, cursor) {
 	var _direct;
@@ -1425,19 +1085,13 @@ function streamRetractInline(state, property, cursor) {
 	if (state.style) delete state.style[property];
 }
 function convertDeferredInline(state, merge) {
-	var _direct;
 	var direct = state;
-	var used = (_direct = direct).flatUsed || (_direct.flatUsed = {});
 	var consume = function(entries) {
 		for (var index = 0; index < entries.length; index++) {
 			var entry = entries[index];
-			var condition = entry.condition;
+			var condition = entry[2];
 			if (condition && !(condition & 1)) continue;
-			var importance = condition ? Math.floor(condition / 256) + 1 : 0;
-			var previous = used[entry.property];
-			if (previous !== void 0 && previous > importance) continue;
-			used[entry.property] = importance;
-			merge(state, entry.property, entry.value, 1, true, entry.original !== void 0 ? entry.original : entry.value);
+			streamWriteInline(state, entry[0], entry[1], null, merge, entry[8] !== void 0 ? entry[8] : entry[1], false, condition);
 		}
 	};
 	var slots = direct.flatSlots;
@@ -1475,7 +1129,6 @@ function emitAtParentCondition(state, property, value, merge, originalValue, con
 }
 function emitUnderCondition(state, property, value, cursor, merge, originalValue, contextOnly, warnMode, warnSource) {
 	var condition = conditionNumbers[cursor + conditionValueOffset];
-	if (merge && property && condition) state.flatPropSawCondition = true;
 	if (!(conditionNumbers[cursor + conditionFlagsOffset] & conditionResolvedFlag)) {
 		if (warnMode && process.env.NODE_ENV === "development") warnRefusedValue(property, warnSource, `unknown modifier "${conditionTexts[cursor + conditionUnresolvedNameOffset] || ""}"`);
 		return 0;
@@ -1496,10 +1149,8 @@ function emitUnderCondition(state, property, value, cursor, merge, originalValue
 }
 var directStyleHandler = {
 	segment(state, start, end, isBase, valid, source, chainStart, chainEnd, chainValid, chainCount, _result, failure, failureIndex, property, merge, originalValue, contextOnly) {
-		var _directState_flatPass;
 		if (isBase) {
 			if (start === end) return;
-			feedCompoundSegment(state, source, start, end, true, valid || failure === "invalid-character" || failure === "stray-comment-close", "");
 			if (!valid) {
 				if (failure === "invalid-character" || failure === "stray-comment-close") return 16;
 				if (process.env.NODE_ENV === "development") warnRefusedValue(property, source, failure === "unterminated-string" ? "an unterminated string" : failure === "unterminated-comment" ? "an unterminated \"/*\" comment" : "an unterminated \"(\"");
@@ -1522,10 +1173,8 @@ var directStyleHandler = {
 			var right = Number(source.slice(start, end));
 			if (chainStart < chainEnd && Number.isFinite(left) && left > 0 && Number.isFinite(right) && right > 0) return 12;
 		}
-		var directState = state;
-		var cursor = directState.flatScanCursor;
+		var cursor = state.flatScanCursor;
 		var condition = valid ? emitUnderCondition(state, property, source.slice(start, end), cursor, merge, void 0, contextOnly, 1, source) : conditionNumbers[cursor + conditionFlagsOffset] & conditionResolvedFlag ? conditionNumbers[cursor + conditionValueOffset] : 0;
-		feedCompoundSegment(directState, source, start, end, false, valid && Boolean(condition), condition && ((_directState_flatPass = directState.flatPass) === null || _directState_flatPass === void 0 ? void 0 : _directState_flatPass[passCompoundIndexes]) ? conditionTexts[cursor + conditionKeyOffset] || "" : "");
 		if (!condition) return;
 		if (!valid) {
 			if (process.env.NODE_ENV === "development") warnRefusedValue(property, source, 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 \"(\"");
@@ -1569,7 +1218,7 @@ var directStyleHandler = {
 			emitAtParentCondition(state, property, source, merge, originalValue !== null && originalValue !== void 0 ? originalValue : source, contextOnly);
 			hasBase = true;
 		}
-		if (process.env.NODE_ENV === "development" && !hasBase && result & 4 && (property in tokenCategories.color || property in tokenCategoryByProperty) && splitComponents(source.slice(lastPayloadStart)).length > 1) warnOnce(`${property}="${source}" has multiple values after its first conditional. Write the base value before the first conditional.`);
+		if (process.env.NODE_ENV === "development" && !hasBase && result & 4 && property in propToTokenCategoryCode && splitComponents(source.slice(lastPayloadStart)).length > 1) warnOnce(`${property}="${source}" has multiple values after its first conditional. Write the base value before the first conditional.`);
 		if ((!canGenerateCSS || !state.flatShouldDoClasses) && result & 2 && !hasBase) {
 			var value = implicitLifecycleBase(property);
 			if (value !== null) emitAtParentCondition(state, property, value, merge, value, contextOnly);
@@ -1705,17 +1354,6 @@ function tokenVariable(state, property, name) {
 		var _state_conf_tokensParsed_category;
 		var own = (_state_conf_tokensParsed_category = state.conf.tokensParsed[category]) === null || _state_conf_tokensParsed_category === void 0 ? void 0 : _state_conf_tokensParsed_category[lookupName];
 		if (own) return fillTokenLookup(own, false, lookupName);
-		for (var _i = 0, _iter = [
-			"color",
-			"space",
-			"size",
-			"radius",
-			"zIndex"
-		]; _i < _iter.length; _i++) {
-			var sibling = _iter[_i];
-			var _state_conf_tokensParsed_sibling;
-			if (sibling !== category && ((_state_conf_tokensParsed_sibling = state.conf.tokensParsed[sibling]) === null || _state_conf_tokensParsed_sibling === void 0 ? void 0 : _state_conf_tokensParsed_sibling[lookupName])) return;
-		}
 	} else {
 		var first = lookupName.charCodeAt(0);
 		if (first >= 48 && first <= 57 || first === 43 || first === 45 || first === 46) return;
@@ -1772,11 +1410,14 @@ function configuredValue(state, property, raw) {
 		missKey = `${state.flatThemeName || ""}${property}${name}`;
 		if (misses.has(missKey)) return raw;
 	}
+	if (process.env.NODE_ENV === "development") {
+		var _state_conf_tokensParsed_color;
+		var category = getTokenCategoryForProperty(property);
+		if (category && category !== "color" && ((_state_conf_tokensParsed_color = state.conf.tokensParsed.color) === null || _state_conf_tokensParsed_color === void 0 ? void 0 : _state_conf_tokensParsed_color[name])) warnOnce(`"${name}" contributes to "color", not "${property}"`);
+	}
 	var lookup = tokenVariable(state, property, name);
 	if (!lookup || !isVariable(lookup.value)) {
-		var _state_conf_tokensParsed_color;
 		if (misses) misses.add(missKey);
-		if (process.env.NODE_ENV === "development" && tokenCategoryByProperty[property] && ((_state_conf_tokensParsed_color = state.conf.tokensParsed.color) === null || _state_conf_tokensParsed_color === void 0 ? void 0 : _state_conf_tokensParsed_color[name])) warnOnce(`"${name}" contributes to "color", not "${property}"; keeping it literal`);
 		return raw;
 	}
 	var resolveValues = state.styleProps.resolveValues;
@@ -1913,13 +1554,13 @@ function emitProperty(state, property, value, cursor, merge, originalValue, cont
 	}
 	if (contextOnly) {
 		if (!condition || condition & 1) {
-			var _state2;
-			((_state2 = state).overriddenContextProps || (_state2.overriddenContextProps = {}))[property] = originalValue;
+			var _state3;
+			((_state3 = state).overriddenContextProps || (_state3.overriddenContextProps = {}))[property] = originalValue;
 		}
 		return;
 	}
 	if (canGenerateCSS && state.flatShouldDoClasses && !condition && property === "transform") {
-		var _state3;
+		var _state4;
 		if (process.env.NODE_ENV === "development" && state.transformAccumulator) {
 			var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
 			try {
@@ -1938,13 +1579,13 @@ function emitProperty(state, property, value, cursor, merge, originalValue, cont
 				}
 			}
 		}
-		(_state3 = state).transformAccumulator || (_state3.transformAccumulator = createTransformAccumulator());
+		(_state4 = state).transformAccumulator || (_state4.transformAccumulator = createTransformAccumulator());
 		addTransformValue(state.transformAccumulator, property, value);
 		return;
 	}
 	var shouldPromoteAnimatedStyle = canGenerateCSS && !condition && !state.flatShouldDoClasses && !state.styleProps.noMergeStyle && state.styleProps.isAnimated && ((_state_animationDriver = state.animationDriver) === null || _state_animationDriver === void 0 ? void 0 : _state_animationDriver.inputStyle) === "css" && property in nonAnimatableStyleProps;
 	if (canGenerateCSS && (state.flatShouldDoClasses || shouldPromoteAnimatedStyle)) {
-		if (!condition && state.style && direct.flatWeakContribution !== true && !(direct.flatUsed && direct.flatUsed[property])) delete state.style[property];
+		if (!condition && state.style && !(direct.flatUsed && direct.flatUsed[property])) delete state.style[property];
 		streamWriteCSS(state, property, value, cursor, originalValue);
 		return;
 	}
@@ -2405,14 +2046,11 @@ function contributeStyleObject(state, property, value, merge, contextOnly) {
 }
 function contributeStyleObjectInner(state, property, value, merge, contextOnly) {
 	var _directState_flatPass;
-	var directState = state;
-	var parent = ((_directState_flatPass = directState.flatPass) === null || _directState_flatPass === void 0 ? void 0 : _directState_flatPass[passParentCursor]) || null;
-	var hasDefault = Object.prototype.hasOwnProperty.call(value, "default");
+	var parent = ((_directState_flatPass = state.flatPass) === null || _directState_flatPass === void 0 ? void 0 : _directState_flatPass[passParentCursor]) || null;
+	var hasDefault = "default" in value;
 	var hasBase = false;
 	var base = hasDefault ? value.default : void 0;
 	if (base != null) {
-		var baseString = String(base);
-		feedCompoundSegment(directState, baseString, 0, baseString.length, true, true, "");
 		emitAtParentCondition(state, property, base, merge, base, contextOnly);
 		hasBase = true;
 	}
@@ -2432,12 +2070,7 @@ function contributeStyleObjectInner(state, property, value, merge, contextOnly)
 				return false;
 			}
 		}
-		if (payload != null) {
-			var _directState_flatPass1;
-			conditions |= emitUnderCondition(state, property, payload, cursor, merge, payload, contextOnly, 1, payload);
-			var payloadString = String(payload);
-			feedCompoundSegment(directState, payloadString, 0, payloadString.length, false, Boolean(condition), condition && ((_directState_flatPass1 = directState.flatPass) === null || _directState_flatPass1 === void 0 ? void 0 : _directState_flatPass1[passCompoundIndexes]) ? conditionTexts[cursor + conditionKeyOffset] || "" : "");
-		}
+		if (payload != null) conditions |= emitUnderCondition(state, property, payload, cursor, merge, payload, contextOnly, 1, payload);
 		releaseConditionCursors(watermark);
 	}
 	if (!hasDefault && firstCondition) return false;
@@ -2450,13 +2083,16 @@ function contributeStyleObjectInner(state, property, value, merge, contextOnly)
 function contributeValue(state, property, value, merge, originalValue) {
 	var contextOnly = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : false, condition = arguments.length > 6 ? arguments[6] : void 0;
 	if (isConditionTransport(value)) {
-		if (value.hasBase) contributeValue(state, property, value.base, merge, value.base, contextOnly);
-		for (var offset = 0; offset < value.entries.length;) {
-			var entryValue = value.entries[offset];
+		if (value[transportHasBase]) {
+			var base = value[transportBase];
+			contributeValue(state, property, base, merge, base, contextOnly);
+		}
+		for (var offset = transportEntries; offset < value.length;) {
+			var entryValue = value[offset];
 			var watermark = conditionCursorTop;
 			try {
 				var _state_flatPass;
-				emitUnderCondition(state, property, entryValue, acquireTransportCursor(state, value.entries, offset, ((_state_flatPass = state.flatPass) === null || _state_flatPass === void 0 ? void 0 : _state_flatPass[passParentCursor]) || null), merge, entryValue, contextOnly, 2, entryValue);
+				emitUnderCondition(state, property, entryValue, acquireTransportCursor(state, value, offset, ((_state_flatPass = state.flatPass) === null || _state_flatPass === void 0 ? void 0 : _state_flatPass[passParentCursor]) || null), merge, entryValue, contextOnly, 2, entryValue);
 			} finally {
 				releaseConditionCursors(watermark);
 			}
@@ -2482,7 +2118,7 @@ function contributeValue(state, property, value, merge, originalValue) {
 				commitConditionCursor(state, effective);
 			} else effective = condition;
 			var isObjectValue = value && (typeof value === "undefined" ? "undefined" : _type_of(value)) === "object" && !Array.isArray(value) && !isVariable(value);
-			var objectHasDefault = isObjectValue && Object.prototype.hasOwnProperty.call(value, "default");
+			var objectHasDefault = isObjectValue && "default" in value;
 			var firstChild = isObjectValue && !objectHasDefault ? acquireConditionCursor(effective) : null;
 			if (isObjectValue && classifyConditionalObject(value, state, void 0, firstChild || void 0)) {
 				var useFirstChild = firstChild !== null;
@@ -2551,17 +2187,20 @@ function clearDirectStyle(state, property) {
 	if (state.style) delete state.style[atomicKey];
 	delete state.classNames[atomicKey];
 }
-var conditionTransports = /* @__PURE__ */ new WeakSet();
+var conditionTransportTag = /* @__PURE__ */ Symbol();
+var transportHasBase = 1;
+var transportBase = 2;
+var transportEntries = 3;
+var transportEntryWidth = 2;
 function isConditionTransport(value) {
-	return (typeof value === "undefined" ? "undefined" : _type_of(value)) === "object" && value !== null && conditionTransports.has(value);
+	return Array.isArray(value) && value[0] === conditionTransportTag;
 }
-var transportEntryWidth = 2;
-function appendConditionEntry(entries, cursor, value) {
-	entries.push(value, conditionTexts[cursor + conditionKeyOffset] || "");
+function appendConditionEntry(transport, cursor, value) {
+	transport.push(value, conditionTexts[cursor + conditionKeyOffset] || "");
 }
-function acquireTransportCursor(state, entries, offset, parent) {
+function acquireTransportCursor(state, transport, offset, parent) {
 	var cursor = acquireConditionCursor(parent);
-	var key = entries[offset + 1];
+	var key = transport[offset + 1];
 	if (key) resolveConditionText(state, cursor, key);
 	commitConditionCursor(state, cursor);
 	return cursor;
@@ -2570,15 +2209,14 @@ function mergeConditionTransport(state, prev, cursor, value) {
 	var transport;
 	if (isConditionTransport(prev)) transport = prev;
 	else {
-		transport = {
-			hasBase: false,
-			base: void 0,
-			entries: []
-		};
-		conditionTransports.add(transport);
+		transport = [
+			conditionTransportTag,
+			false,
+			void 0
+		];
 		if (prev != null) {
 			var isObjectValue = (typeof prev === "undefined" ? "undefined" : _type_of(prev)) === "object" && !Array.isArray(prev) && !isVariable(prev);
-			var objectHasDefault = isObjectValue && Object.prototype.hasOwnProperty.call(prev, "default");
+			var objectHasDefault = isObjectValue && "default" in prev;
 			var authoredWatermark = conditionCursorTop;
 			try {
 				var firstCursor = isObjectValue && !objectHasDefault ? acquireConditionCursor() : null;
@@ -2588,8 +2226,8 @@ function mergeConditionTransport(state, prev, cursor, value) {
 						var payload = prev[key];
 						if (payload == null) continue;
 						if (key === "default") {
-							transport.hasBase = true;
-							transport.base = payload;
+							transport[transportHasBase] = true;
+							transport[transportBase] = payload;
 							continue;
 						}
 						var watermark = conditionCursorTop;
@@ -2599,12 +2237,12 @@ function mergeConditionTransport(state, prev, cursor, value) {
 							resolveConditionText(state, keyCursor, key);
 							commitConditionCursor(state, keyCursor);
 						}
-						appendConditionEntry(transport.entries, keyCursor, payload);
+						appendConditionEntry(transport, keyCursor, payload);
 						if (keyCursor !== firstCursor) releaseConditionCursors(watermark);
 					}
 				} else {
-					transport.hasBase = true;
-					transport.base = prev;
+					transport[transportHasBase] = true;
+					transport[transportBase] = prev;
 				}
 			} finally {
 				releaseConditionCursors(authoredWatermark);
@@ -2612,30 +2250,25 @@ function mergeConditionTransport(state, prev, cursor, value) {
 		}
 	}
 	var cursorKey = conditionTexts[cursor + conditionKeyOffset] || "";
-	for (var offset = 0; offset < transport.entries.length; offset += transportEntryWidth) if (transport.entries[offset + 1] === cursorKey) {
-		transport.entries.splice(offset, transportEntryWidth);
+	for (var offset = transportEntries; offset < transport.length; offset += transportEntryWidth) if (transport[offset + 1] === cursorKey) {
+		transport.splice(offset, transportEntryWidth);
 		break;
 	}
-	appendConditionEntry(transport.entries, cursor, value);
+	appendConditionEntry(transport, cursor, value);
 	return transport;
 }
 var variantValueHandler = {
 	segment(ctx, start, end, isBase, valid, source, chainStart, chainEnd, chainValid) {
-		var _directState_flatPass;
 		var state = ctx[0];
-		var directState = state;
 		if (start === end) return;
 		if (isBase) {
-			feedCompoundSegment(directState, source, start, end, true, valid, "");
 			if (!valid) return;
 			emitResolvedVariant(ctx[1], source.slice(start, end), state, ctx[2], null);
 			return;
 		}
 		if (!valid || !chainValid) return;
-		var cursor = directState.flatScanCursor;
-		var condition = cursor && conditionNumbers[cursor + conditionFlagsOffset] & conditionResolvedFlag ? conditionNumbers[cursor + conditionValueOffset] : 0;
-		feedCompoundSegment(directState, source, start, end, false, Boolean(condition), condition && ((_directState_flatPass = directState.flatPass) === null || _directState_flatPass === void 0 ? void 0 : _directState_flatPass[passCompoundIndexes]) ? conditionTexts[cursor + conditionKeyOffset] || "" : "");
-		if (!condition) return;
+		var cursor = state.flatScanCursor;
+		if (!(cursor && conditionNumbers[cursor + conditionFlagsOffset] & conditionResolvedFlag ? conditionNumbers[cursor + conditionValueOffset] : 0)) return;
 		emitResolvedVariant(ctx[1], source.slice(start, end), state, ctx[2], cursor);
 	},
 	modifier(ctx, start, end, valid, first, source) {
@@ -2658,80 +2291,6 @@ var variantValueHandler = {
 		return true;
 	}
 };
-var contextPropSets = /* @__PURE__ */ new WeakMap();
-function getContextPropSet(staticConfig) {
-	var _staticConfig_parentStaticConfig, _staticConfig_parentStaticConfig1, _staticConfig_parentStaticConfig2, _staticConfig_parentStaticConfig_context, _staticConfig_parentStaticConfig3;
-	var cached = contextPropSets.get(staticConfig);
-	if (cached !== void 0) return cached;
-	var contextConfig = staticConfig.context || ((_staticConfig_parentStaticConfig = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig === void 0 ? void 0 : _staticConfig_parentStaticConfig.context);
-	var inheritedContextPropKeys = !staticConfig.context || staticConfig.context === ((_staticConfig_parentStaticConfig1 = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig1 === void 0 ? void 0 : _staticConfig_parentStaticConfig1.context) ? (_staticConfig_parentStaticConfig2 = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig2 === void 0 ? void 0 : _staticConfig_parentStaticConfig2.contextProps : void 0;
-	var contextPropKeys = staticConfig.contextProps || inheritedContextPropKeys;
-	var set = null;
-	if (contextConfig === null || contextConfig === void 0 ? void 0 : contextConfig.props) {
-		set || (set = /* @__PURE__ */ new Set());
-		for (var key in contextConfig.props) set.add(key);
-	}
-	if (contextPropKeys) {
-		set || (set = /* @__PURE__ */ new Set());
-		var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
-		try {
-			for (var _iterator2 = contextPropKeys[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-				var key1 = _step2.value;
-				set.add(key1);
-			}
-		} catch (err) {
-			_didIteratorError2 = true;
-			_iteratorError2 = err;
-		} finally {
-			try {
-				if (!_iteratorNormalCompletion2 && _iterator2.return != null) _iterator2.return();
-			} finally {
-				if (_didIteratorError2) throw _iteratorError2;
-			}
-		}
-	}
-	if (contextConfig === null || contextConfig === void 0 ? void 0 : contextConfig.propKeys) {
-		set || (set = /* @__PURE__ */ new Set());
-		var _iteratorNormalCompletion12 = true, _didIteratorError12 = false, _iteratorError12 = void 0;
-		try {
-			for (var _iterator12 = contextConfig.propKeys[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
-				var key2 = _step12.value;
-				set.add(key2);
-			}
-		} catch (err) {
-			_didIteratorError12 = true;
-			_iteratorError12 = err;
-		} finally {
-			try {
-				if (!_iteratorNormalCompletion12 && _iterator12.return != null) _iterator12.return();
-			} finally {
-				if (_didIteratorError12) throw _iteratorError12;
-			}
-		}
-	}
-	var parentPropKeys = (_staticConfig_parentStaticConfig3 = staticConfig.parentStaticConfig) === null || _staticConfig_parentStaticConfig3 === void 0 ? void 0 : (_staticConfig_parentStaticConfig_context = _staticConfig_parentStaticConfig3.context) === null || _staticConfig_parentStaticConfig_context === void 0 ? void 0 : _staticConfig_parentStaticConfig_context.propKeys;
-	if (parentPropKeys) {
-		set || (set = /* @__PURE__ */ new Set());
-		var _iteratorNormalCompletion22 = true, _didIteratorError22 = false, _iteratorError22 = void 0;
-		try {
-			for (var _iterator22 = parentPropKeys[Symbol.iterator](), _step22; !(_iteratorNormalCompletion22 = (_step22 = _iterator22.next()).done); _iteratorNormalCompletion22 = true) {
-				var key3 = _step22.value;
-				set.add(key3);
-			}
-		} catch (err) {
-			_didIteratorError22 = true;
-			_iteratorError22 = err;
-		} finally {
-			try {
-				if (!_iteratorNormalCompletion22 && _iterator22.return != null) _iterator22.return();
-			} finally {
-				if (_didIteratorError22) throw _iteratorError22;
-			}
-		}
-	}
-	contextPropSets.set(staticConfig, set);
-	return set;
-}
 function emitMappedValue(styleState, key, value, originalValue, nestedCondition, parentCondition, fallbackOriginal) {
 	var nested = nestedCondition;
 	var parent = parentCondition;
@@ -2752,8 +2311,8 @@ function emitMappedValue(styleState, key, value, originalValue, nestedCondition,
 }
 var contributeMappedValue = function(key, value, styleState, disabled, parentCondition, fallbackOriginal) {
 	if (disabled) return emitMappedValue(styleState, key, value, void 0, void 0, parentCondition, fallbackOriginal);
-	var { conf, styleProps, staticConfig } = styleState;
-	var { variants } = staticConfig;
+	var { conf, styleProps } = styleState;
+	var variants = styleState.flatStyleStaticConfig.variants;
 	var { disableExpandShorthands, noExpand, resolveValues } = styleProps;
 	var shorthands = conf.shorthands;
 	if (value === "unset") {
@@ -2824,15 +2383,15 @@ var contributeMappedValue = function(key, value, styleState, disabled, parentCon
 	}
 };
 function resolveVariants(key, value, styleProps, styleState, parentVariantKey) {
-	var _styleState_staticConfig_variants;
-	var variantDefinition = (_styleState_staticConfig_variants = styleState.staticConfig.variants) === null || _styleState_staticConfig_variants === void 0 ? void 0 : _styleState_staticConfig_variants[key];
+	var _styleState_flatStyleStaticConfig_variants;
+	var variantDefinition = (_styleState_flatStyleStaticConfig_variants = styleState.flatStyleStaticConfig.variants) === null || _styleState_flatStyleStaticConfig_variants === void 0 ? void 0 : _styleState_flatStyleStaticConfig_variants[key];
 	if (isConditionTransport(value)) {
-		if (value.hasBase) emitResolvedVariant(key, value.base, styleState, parentVariantKey, null);
-		for (var offset = 0; offset < value.entries.length;) {
-			var entryValue = value.entries[offset];
+		if (value[transportHasBase]) emitResolvedVariant(key, value[transportBase], styleState, parentVariantKey, null);
+		for (var offset = transportEntries; offset < value.length;) {
+			var entryValue = value[offset];
 			var watermark = conditionCursorTop;
 			try {
-				emitResolvedVariant(key, entryValue, styleState, parentVariantKey, acquireTransportCursor(styleState, value.entries, offset, null));
+				emitResolvedVariant(key, entryValue, styleState, parentVariantKey, acquireTransportCursor(styleState, value, offset, null));
 			} finally {
 				releaseConditionCursors(watermark);
 			}
@@ -2858,32 +2417,27 @@ function resolveVariants(key, value, styleProps, styleState, parentVariantKey) {
 		return;
 	}
 	var isObjectValue = value && (typeof value === "undefined" ? "undefined" : _type_of(value)) === "object" && !Array.isArray(value) && !isVariable(value);
-	var objectHasDefault = isObjectValue && Object.prototype.hasOwnProperty.call(value, "default");
+	var objectHasDefault = isObjectValue && "default" in value;
 	var objectWatermark = conditionCursorTop;
 	try {
 		var firstCursor = isObjectValue && !objectHasDefault ? acquireConditionCursor() : null;
 		if (isObjectValue && classifyConditionalObject(value, styleState, void 0, firstCursor || void 0)) {
 			var useFirstCursor = firstCursor !== null;
 			for (var objKey in value) {
-				var _directState_flatPass;
 				var payload = value[objKey];
 				if (payload == null) continue;
-				var directState1 = styleState;
-				var payloadString = String(payload);
 				if (objKey === "default") {
-					feedCompoundSegment(directState1, payloadString, 0, payloadString.length, true, true, "");
 					emitResolvedVariant(key, payload, styleState, parentVariantKey, null);
 					continue;
 				}
 				var watermark2 = conditionCursorTop;
 				var cursor1 = useFirstCursor ? firstCursor : acquireConditionCursor();
-				var condition = conditionNumbers[cursor1 + conditionValueOffset];
+				conditionNumbers[cursor1 + conditionValueOffset];
 				if (useFirstCursor) useFirstCursor = false;
 				else {
 					resolveConditionText(styleState, cursor1, objKey);
-					condition = commitConditionCursor(styleState, cursor1);
+					commitConditionCursor(styleState, cursor1);
 				}
-				if ((_directState_flatPass = directState1.flatPass) === null || _directState_flatPass === void 0 ? void 0 : _directState_flatPass[passCompoundIndexes]) feedCompoundSegment(directState1, payloadString, 0, payloadString.length, false, Boolean(condition), condition ? conditionTexts[cursor1 + conditionKeyOffset] || "" : "");
 				emitResolvedVariant(key, payload, styleState, parentVariantKey, cursor1);
 				if (cursor1 !== firstCursor) releaseConditionCursors(watermark2);
 			}
@@ -2895,31 +2449,13 @@ function resolveVariants(key, value, styleProps, styleState, parentVariantKey) {
 	emitResolvedVariant(key, value, styleState, parentVariantKey, null);
 }
 function emitResolvedVariant(key, value, styleState, parentVariantKey, conditionCursor) {
-	var { staticConfig, conf, debug } = styleState;
+	var { conf, debug } = styleState;
 	var styleProps = styleState.styleProps;
-	var { variants } = staticConfig;
+	var variants = styleState.flatStyleStaticConfig.variants;
 	if (!variants) return;
 	var variant = variants[key];
 	var variantValue = getVariantDefinition(variant, value, conf, styleState);
-	if (process.env.NODE_ENV === "development" && debug === "verbose") {
-		console.groupCollapsed(`\u2666\uFE0F\u2666\uFE0F\u2666\uFE0F resolve variant ${key}`);
-		console.info({
-			key,
-			value,
-			variantValue,
-			variants
-		});
-		console.groupEnd();
-	}
-	if (!variantValue) {
-		if (process.env.TAMAGUI_WARN_ON_MISSING_VARIANT === "1") {
-			if (typeof value !== "boolean") {
-				var name = styleState.styleProps.displayName || "[UnnamedComponent]";
-				console.warn(`No variant found: ${name} has variant "${key}", but no matching value "${value}"`);
-			}
-		}
-		return;
-	}
+	if (!variantValue) return;
 	if (typeof variantValue === "function") {
 		variantValue = variantValue(value, getVariantExtras(styleState));
 		if (process.env.NODE_ENV === "development" && debug === "verbose" && false);
@@ -2928,27 +2464,21 @@ function emitResolvedVariant(key, value, styleState, parentVariantKey, condition
 	if (process.env.NODE_ENV === "development" && debug === "verbose") console.info(`   expanding styles from `, variantValue);
 	var { noSkip } = styleProps;
 	var originals = styleOriginalValues.get(variantValue);
-	var directState = styleState;
-	directState.flatCompoundOutputDepth = (directState.flatCompoundOutputDepth || 0) + 1;
-	try {
-		for (var outputKey in variantValue) {
-			if (!noSkip && outputKey in skipProps) continue;
-			var rawOutputValue = variantValue[outputKey];
-			var outputValue = styleProps.noNormalize ? rawOutputValue : normalizeValueWithProperty(rawOutputValue, conf.shorthands[outputKey] || outputKey);
-			var _originals_outputKey;
-			var originalValue = (_originals_outputKey = originals === null || originals === void 0 ? void 0 : originals[outputKey]) !== null && _originals_outputKey !== void 0 ? _originals_outputKey : rawOutputValue;
-			var contextPropSet = getContextPropSet(staticConfig);
-			if (contextPropSet === null || contextPropSet === void 0 ? void 0 : contextPropSet.has(outputKey)) {
-				var _styleState, _styleState1;
-				(_styleState = styleState).overriddenContextProps || (_styleState.overriddenContextProps = {});
-				styleState.overriddenContextProps[outputKey] = originalValue;
-				(_styleState1 = styleState).originalContextPropValues || (_styleState1.originalContextPropValues = {});
-				styleState.originalContextPropValues[outputKey] = originalValue;
-			}
-			contributeMappedValue(outputKey, outputValue, styleState, parentVariantKey === key && outputKey === key, conditionCursor || void 0, originalValue);
-		}
-	} finally {
-		directState.flatCompoundOutputDepth--;
+	for (var outputKey in variantValue) {
+		if (!noSkip && outputKey in skipProps) continue;
+		var rawOutputValue = variantValue[outputKey];
+		var outputValue = styleProps.noNormalize ? rawOutputValue : normalizeValueWithProperty(rawOutputValue, conf.shorthands[outputKey] || outputKey);
+		var _originals_outputKey;
+		var originalValue = (_originals_outputKey = originals === null || originals === void 0 ? void 0 : originals[outputKey]) !== null && _originals_outputKey !== void 0 ? _originals_outputKey : rawOutputValue;
+		var contextPropSet = styleState.flatStyleStaticConfig.styledContextKeys;
+		if (contextPropSet === null || contextPropSet === void 0 ? void 0 : contextPropSet.has(outputKey)) {
+			var _styleState, _styleState1;
+			(_styleState = styleState).overriddenContextProps || (_styleState.overriddenContextProps = {});
+			styleState.overriddenContextProps[outputKey] = originalValue;
+			(_styleState1 = styleState).originalContextPropValues || (_styleState1.originalContextPropValues = {});
+			styleState.originalContextPropValues[outputKey] = originalValue;
+		}
+		contributeMappedValue(outputKey, outputValue, styleState, parentVariantKey === key && outputKey === key, conditionCursor || void 0, originalValue);
 	}
 }
 function getFontFamilyFromNameOrVariable(input, conf) {
@@ -2965,127 +2495,6 @@ function getFontFamilyFromNameOrVariable(input, conf) {
 	} else if (typeof input === "string" && input in conf.fontsParsed) return input;
 }
 var variableToFontNameCache = /* @__PURE__ */ new WeakMap();
-function getVariantDefinition(variant, value, conf, param) {
-	var { theme } = param;
-	if (!variant) return;
-	if (value === void 0) return;
-	if (typeof variant === "function") return variant;
-	if (Object.prototype.hasOwnProperty.call(variant, value)) return variant[value];
-	var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
-	try {
-		for (var _iterator2 = getCompiledVariantResolvers(variant)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-			var { key, parts } = _step2.value;
-			var _iteratorNormalCompletion12 = true, _didIteratorError12 = false, _iteratorError12 = void 0;
-			try {
-				for (var _iterator12 = parts[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
-					var part3 = _step12.value;
-					if (matchesVariantResolver(part3, value, conf, theme)) return variant[key];
-				}
-			} catch (err) {
-				_didIteratorError12 = true;
-				_iteratorError12 = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion12 && _iterator12.return != null) _iterator12.return();
-				} finally {
-					if (_didIteratorError12) throw _iteratorError12;
-				}
-			}
-		}
-	} catch (err) {
-		_didIteratorError2 = true;
-		_iteratorError2 = err;
-	} finally {
-		try {
-			if (!_iteratorNormalCompletion2 && _iterator2.return != null) _iterator2.return();
-		} finally {
-			if (_didIteratorError2) throw _iteratorError2;
-		}
-	}
-}
-var variantResolverNameSet = new Set(variantResolverNames);
-var variantResolverCache = /* @__PURE__ */ new WeakMap();
-var preparedStyleStaticConfigs = /* @__PURE__ */ new WeakSet();
-function prepareStyleStaticConfig(staticConfig) {
-	if (preparedStyleStaticConfigs.has(staticConfig)) return staticConfig;
-	preparedStyleStaticConfigs.add(staticConfig);
-	getContextPropSet(staticConfig);
-	prepareStaticConfigCompounds(staticConfig);
-	var variants = staticConfig.variants;
-	if (variants) for (var key in variants) {
-		var variant = variants[key];
-		if (variant && (typeof variant === "undefined" ? "undefined" : _type_of(variant)) === "object") getCompiledVariantResolvers(variant);
-	}
-	return staticConfig;
-}
-function getCompiledVariantResolvers(variant) {
-	var cached = variantResolverCache.get(variant);
-	if (cached) return cached;
-	var compiled = [];
-	for (var key in variant) {
-		var parts = parseVariantResolverKey(key);
-		if (parts) compiled.push({
-			key,
-			parts
-		});
-	}
-	variantResolverCache.set(variant, compiled);
-	return compiled;
-}
-function parseVariantResolverKey(key) {
-	if (!key) return null;
-	var parts = [];
-	var start = 0;
-	for (var index = 0; index <= key.length; index++) {
-		if (index !== key.length && key.charCodeAt(index) !== 124) continue;
-		var partStart = start;
-		var partEnd = index;
-		while (partStart < partEnd && key.charCodeAt(partStart) <= 32) partStart++;
-		while (partEnd > partStart && key.charCodeAt(partEnd - 1) <= 32) partEnd--;
-		if (partStart === partEnd) return null;
-		var part3 = key.slice(partStart, partEnd);
-		if (!variantResolverNameSet.has(part3)) return null;
-		parts.push(part3);
-		start = index + 1;
-	}
-	return parts;
-}
-function hasNumericPrefix(value, suffixLength) {
-	if (value.length <= suffixLength) return false;
-	return Number.isFinite(Number(value.slice(0, value.length - suffixLength)));
-}
-function matchesVariantResolver(resolverName, value, conf, theme) {
-	var string = typeof value === "string";
-	var number = typeof value === "number";
-	var rem = string && value.endsWith("rem") && hasNumericPrefix(value, 3);
-	switch (resolverName) {
-		case "Size":
-		case "Space":
-		case "Radius":
-		case "ZIndex": return value === true || number || string || resolverName !== "Size" && isVariable(value);
-		case "Color": return value != null && value in conf.tokensParsed.color || string;
-		case "Theme": return string && !!theme && value in theme;
-		case "FontSize":
-			var _conf_fontsParsed_body_size, _conf_fontsParsed_body;
-			return value === true || !!((_conf_fontsParsed_body = conf.fontsParsed.body) === null || _conf_fontsParsed_body === void 0 ? void 0 : (_conf_fontsParsed_body_size = _conf_fontsParsed_body.size) === null || _conf_fontsParsed_body_size === void 0 ? void 0 : _conf_fontsParsed_body_size[value]) || number || rem;
-		case "FontStyle":
-			var _conf_fontsParsed_body_style, _conf_fontsParsed_body1;
-			return !!((_conf_fontsParsed_body1 = conf.fontsParsed.body) === null || _conf_fontsParsed_body1 === void 0 ? void 0 : (_conf_fontsParsed_body_style = _conf_fontsParsed_body1.style) === null || _conf_fontsParsed_body_style === void 0 ? void 0 : _conf_fontsParsed_body_style[value]) || value === "normal" || value === "italic";
-		case "FontTransform":
-			var _conf_fontsParsed_body_transform, _conf_fontsParsed_body2;
-			return !!((_conf_fontsParsed_body2 = conf.fontsParsed.body) === null || _conf_fontsParsed_body2 === void 0 ? void 0 : (_conf_fontsParsed_body_transform = _conf_fontsParsed_body2.transform) === null || _conf_fontsParsed_body_transform === void 0 ? void 0 : _conf_fontsParsed_body_transform[value]) || value === "none" || value === "capitalize" || value === "uppercase" || value === "lowercase";
-		case "FontLineHeight":
-			var _conf_fontsParsed_body_lineHeight, _conf_fontsParsed_body3;
-			return !!((_conf_fontsParsed_body3 = conf.fontsParsed.body) === null || _conf_fontsParsed_body3 === void 0 ? void 0 : (_conf_fontsParsed_body_lineHeight = _conf_fontsParsed_body3.lineHeight) === null || _conf_fontsParsed_body_lineHeight === void 0 ? void 0 : _conf_fontsParsed_body_lineHeight[value]) || number || rem;
-		case "FontLetterSpacing":
-			var _conf_fontsParsed_body_letterSpacing, _conf_fontsParsed_body4;
-			return !!((_conf_fontsParsed_body4 = conf.fontsParsed.body) === null || _conf_fontsParsed_body4 === void 0 ? void 0 : (_conf_fontsParsed_body_letterSpacing = _conf_fontsParsed_body4.letterSpacing) === null || _conf_fontsParsed_body_letterSpacing === void 0 ? void 0 : _conf_fontsParsed_body_letterSpacing[value]) || number || rem;
-		case "number":
-		case "string":
-		case "boolean": return (typeof value === "undefined" ? "undefined" : _type_of(value)) === resolverName;
-		case "any": return true;
-	}
-}
 
-export { STYLE_TOKEN_PROVENANCE_KEY, clearDirectStyle, contributeStyleString, directStyleSignature, flushDirectStyles2 as flushDirectStyles, getContextPropSet, getDirectDynamicThemeAccess, getFontFamilyFromNameOrVariable, getSplitStyles, getStyleTokenProvenance, isValidStyleKey, prepareStyleStaticConfig, styleOriginalValues };
+export { STYLE_TOKEN_PROVENANCE_KEY, clearDirectStyle, contributeStyleString, directStyleSignature, flushDirectStyles2 as flushDirectStyles, getDirectDynamicThemeAccess, getFontFamilyFromNameOrVariable, getSplitStyles, getStyleStaticConfig, getStyleTokenProvenance, isValidStyleKey, styleOriginalValues };
 //# sourceMappingURL=getSplitStyles.native.js.map