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

package/dist/cjs/helpers/getSplitStyles.cjs

@@ -26,98 +26,55 @@ __export(getSplitStyles_exports, {
 	contributeStyleString: () => contributeStyleString,
 	directStyleSignature: () => import_directStyleCSS2.directStyleSignature,
 	flushDirectStyles: () => import_directStyleCSS2.flushDirectStyles,
-	getContextPropSet: () => getContextPropSet,
 	getDirectDynamicThemeAccess: () => getDirectDynamicThemeAccess,
 	getFontFamilyFromNameOrVariable: () => getFontFamilyFromNameOrVariable,
 	getSplitStyles: () => getSplitStyles,
+	getStyleStaticConfig: () => import_styleStaticConfig.getStyleStaticConfig,
 	getStyleTokenProvenance: () => import_styleProvenance2.getStyleTokenProvenance,
 	isValidStyleKey: () => isValidStyleKey,
-	prepareStyleStaticConfig: () => prepareStyleStaticConfig,
 	styleOriginalValues: () => import_styleOriginalValues.styleOriginalValues
 });
 module.exports = __toCommonJS(getSplitStyles_exports);
 var import_constants = require("@tamagui/constants");
 var import_helpers = require("@tamagui/helpers");
+var import_runtime = require("@tamagui/style-grammar/runtime");
 var import_config = require("../config.cjs");
-var import_createVariable = require("../createVariable.cjs");
 var import_isDevTools = require("../constants/isDevTools.cjs");
-var import_mediaState = require("./mediaState.cjs");
-var import_types = require("../types.cjs");
-var import_runtime = require("@tamagui/style-grammar/runtime");
-var import_mediaState2 = require("./mediaState.cjs");
-var import_warnOnce = require("./warnOnce.cjs");
+var import_createVariable = require("../createVariable.cjs");
+var import_directStyleCSS = require("./directStyleCSS.cjs");
 var import_expandStyle = require("./expandStyle.cjs");
 var import_expandStyles = require("./expandStyles.cjs");
+var import_grammarConfig = require("./grammarConfig.cjs");
+var import_mediaState = require("./mediaState.cjs");
+var import_styleStaticConfig = require("./styleStaticConfig.cjs");
 var import_styleToCSS = require("./styleToCSS.cjs");
-var import_directStyleCSS = require("./directStyleCSS.cjs");
+var import_variantResolvers = require("./variantResolvers.cjs");
+var import_warnOnce = require("./warnOnce.cjs");
 var import_directStyleCSS2 = require("./directStyleCSS.cjs");
-var import_grammarConfig = require("./grammarConfig.cjs");
 require("./getDynamicVal.cjs");
-var import_getDefaultProps = require("./getDefaultProps.cjs");
+var import_getVariantExtras = require("./getVariantExtras.cjs");
 require("./insertStyleRule.cjs");
 var import_isObj = require("./isObj.cjs");
-var import_isObj2 = require("./isObj.cjs");
 var import_log = require("./log.cjs");
-var import_normalizeStyle = require("./normalizeStyle.cjs");
 var import_normalizeColor = require("./normalizeColor.cjs");
+var import_normalizeStyle = require("./normalizeStyle.cjs");
 var import_normalizeValueWithProperty = require("./normalizeValueWithProperty.cjs");
 require("./parseNativeStyle.native.cjs");
 require("./parseNativeTransform.native.cjs");
-var import_getVariantExtras = require("./getVariantExtras.cjs");
 var import_resolveRem = require("./resolveRem.cjs");
 var import_resolveSafeArea = require("./resolveSafeArea.cjs");
 var import_resolveSafeAreaVariable = require("./resolveSafeAreaVariable.cjs");
 var import_resolveVariableValue = require("./resolveVariableValue.cjs");
-var import_themeRef = require("./themeRef.cjs");
-var import_tokenCategories = require("./tokenCategories.cjs");
 var import_skipProps = require("./skipProps.cjs");
 var import_styleOriginalValues = require("./styleOriginalValues.cjs");
 var import_styleProvenance = require("./styleProvenance.cjs");
+var import_themeRef = require("./themeRef.cjs");
+var import_tokenCategories = require("./tokenCategories.cjs");
 var import_transformsToString = require("./transformsToString.cjs");
 var import_styleProvenance2 = require("./styleProvenance.cjs");
 __reExport(getSplitStyles_exports, require("./tokenCategories.cjs"), module.exports);
 const TAMAGUI_CLASS_PROPS = "$$tamaguiClassProps";
 const shouldTrackStyleTokenProvenance = process.env.NODE_ENV === "development" && process.env.TAMAGUI_ENABLE_STYLE_TOKEN_PROVENANCE === "1";
-function compoundMatcherMatches(expected, actual) {
-	if (Array.isArray(expected)) {
-		for (let 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 (let index = 0; index < expected.length; index++) if (compoundMatcherMatchesPayload(expected[index], source, start, end)) return true;
-		return false;
-	}
-	const expectedValue = typeof expected === "string" ? expected : String(expected);
-	if (expectedValue.length !== end - start) return false;
-	for (let index = 0; index < expectedValue.length; index++) if (expectedValue.charCodeAt(index) !== source.charCodeAt(start + index)) return false;
-	return true;
-}
-const preparedCompoundsKey = /* @__PURE__ */ Symbol();
-function prepareStaticConfigCompounds(staticConfig) {
-	const compoundVariants = staticConfig.compoundVariants;
-	const preparedConfig = staticConfig;
-	if (!compoundVariants?.length) {
-		preparedConfig[preparedCompoundsKey] = null;
-		return;
-	}
-	const selectorCounts = [];
-	const indexesByKey = /* @__PURE__ */ Object.create(null);
-	indexesByKey[preparedCompoundsKey] = selectorCounts;
-	for (let index = 0; index < compoundVariants.length; index++) {
-		const compoundVariant = compoundVariants[index];
-		let selectorCount = 0;
-		for (const key in compoundVariant) {
-			if (key === "style") continue;
-			selectorCount++;
-			(indexesByKey[key] ||= []).push(index);
-		}
-		selectorCounts[index] = selectorCount;
-	}
-	preparedConfig[preparedCompoundsKey] = indexesByKey;
-}
 const conditionWidth = 4;
 const conditionValueOffset = 0;
 const conditionFlagsOffset = 1;
@@ -155,15 +112,6 @@ function reserveConditionCursor(cursor) {
 	conditionNumbers = new Float64Array(length);
 	conditionNumbers.set(previous);
 }
-function conditionWrapperCopy(cursor) {
-	const wrapper = conditionNumbers[cursor + conditionWrapperOffset];
-	const count = wrapper & 7;
-	if (!count) return void 0;
-	const start = wrapper >> 3;
-	const wrappers = new Array(count);
-	for (let index = 0; index < count; index++) wrappers[index] = conditionWrappers[start + index];
-	return wrappers;
-}
 function setConditionUnresolved(cursor, name = "") {
 	conditionNumbers[cursor + conditionFlagsOffset] &= ~conditionResolvedFlag;
 	if (name) {
@@ -295,7 +243,7 @@ function accumulateConditionAtom(state, cursor, kind, rank, name) {
 		const context = state.flatGroupContext?.[groupKey];
 		if (process.env.NODE_ENV === "development" && containerName && !component && !context && state.flatGroupContext?.[containerName]) (0, import_warnOnce.warnOnce)(`group-container:${containerName}`, `@${containerSize}/${containerName}: targets group="${containerName}", but groups no longer establish query containers. Add container="${containerName}" to that group.`);
 		const match = component?.media?.[containerSize];
-		if (!(match === void 0 ? context?.state.layout && (0, import_mediaState2.mediaKeyMatch)(containerSize, context.state.layout) : match)) conditionNumbers[cursor + conditionFlagsOffset] &= ~conditionActiveFlag;
+		if (!(match === void 0 ? context?.state.layout && (0, import_mediaState.mediaKeyMatch)(containerSize, context.state.layout) : match)) conditionNumbers[cursor + conditionFlagsOffset] &= ~conditionActiveFlag;
 		(state.flatGroupKeys ||= /* @__PURE__ */ new Set()).add(groupKey);
 		(state.flatGroupMedia ||= /* @__PURE__ */ new Set()).add(containerSize);
 	} else {
@@ -387,161 +335,8 @@ function acquireConditionKeyCursor(state, key) {
 	}
 	return cursor;
 }
-function combineConditionKeys(state, first, second) {
-	if (!first) return second;
-	if (!second || first === second) return first;
-	const watermark = conditionCursorTop;
-	const target = acquireConditionKeyCursor(state, first);
-	resolveConditionText(state, target, second);
-	commitConditionCursor(state, target);
-	const key = conditionTexts[target + 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 (let index = 0; index < indexes.length; index++) {
-		const state = 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;
-	const pass = state.flatPass;
-	const indexes = pass[passCompoundIndexes];
-	const states = pass[passCompoundStates];
-	const key = pass[passCompoundKey];
-	if (!indexes || !states || !key) return;
-	const compoundVariants = state.staticConfig.compoundVariants;
-	for (let index = 0; index < indexes.length; index++) {
-		const compoundIndex = indexes[index];
-		const compoundState = 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) (compoundState.pending ||= []).push(conditionKey);
-	}
-}
-const compoundOnlyHandler = {
-	segment(state, start, end, isBase, valid, source, chainStart, chainEnd, chainValid) {
-		if (isBase) {
-			feedCompoundSegment(state, source, start, end, true, valid, "");
-			return;
-		}
-		const 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) {
-		let 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) {
-		const 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;
-	const state = pass[passStyleState];
-	pass[passCompoundIndexes] = indexes;
-	pass[passCompoundKey] = key;
-	pass[passCompoundStates] = states;
-	let needsScan = false;
-	for (let index = 0; index < indexes.length; index++) if (!(states[indexes[index]] ||= freshCompoundState()).scanned) {
-		needsScan = true;
-		break;
-	}
-	if (needsScan) if (typeof value === "string") {
-		const watermark = conditionCursorTop;
-		const previousCursor = state.flatScanCursor;
-		state.flatScanCursor = null;
-		try {
-			(0, import_runtime.scanFlatValue)(value, compoundOnlyHandler, state);
-		} finally {
-			state.flatScanCursor = previousCursor;
-			releaseConditionCursors(watermark);
-		}
-	} else if (value && typeof value === "object" && !Array.isArray(value) && !(0, import_createVariable.isVariable)(value) && Object.prototype.hasOwnProperty.call(value, "default")) for (const conditionKey in value) {
-		const payload = value[conditionKey];
-		if (conditionKey === "default") {
-			const payloadString = String(payload);
-			feedCompoundSegment(state, payloadString, 0, payloadString.length, true, true, "");
-		} else {
-			const watermark = conditionCursorTop;
-			const cursor = acquireConditionCursor();
-			resolveConditionText(state, cursor, conditionKey);
-			const condition = commitConditionCursor(state, cursor);
-			const payloadString = String(payload);
-			feedCompoundSegment(state, payloadString, 0, payloadString.length, false, Boolean(condition), condition ? conditionTexts[cursor + conditionKeyOffset] || "" : "");
-			releaseConditionCursors(watermark);
-		}
-	}
-	else {
-		const variants2 = state.staticConfig.compoundVariants;
-		for (let index = 0; index < indexes.length; index++) {
-			const compoundIndex = indexes[index];
-			const compoundState = states[compoundIndex] ||= freshCompoundState();
-			compoundState.scanned = true;
-			if (compoundMatcherMatches(variants2[compoundIndex][key], value)) compoundState.matchedBase = true;
-		}
-	}
-	const variants = state.staticConfig.compoundVariants;
-	const selectorCounts = state.staticConfig[preparedCompoundsKey][preparedCompoundsKey];
-	for (let index = 0; index < indexes.length; index++) {
-		const compoundIndex = indexes[index];
-		const compoundState = states[compoundIndex];
-		if (compoundState.failed) continue;
-		const branches = compoundState.matchedBase ? [""] : compoundState.pending;
-		if (!branches || !branches.length) {
-			compoundState.failed = true;
-			continue;
-		}
-		if (!compoundState.seen) compoundState.combinations = branches;
-		else {
-			const previous = compoundState.combinations;
-			const next = [];
-			for (let left = 0; left < previous.length; left++) for (let right = 0; right < branches.length; right++) {
-				const conditionKey = combineConditionKeys(state, previous[left], branches[right]);
-				if (!next.includes(conditionKey)) next.push(conditionKey);
-			}
-			compoundState.combinations = next;
-		}
-		compoundState.seen++;
-		if (compoundState.seen !== selectorCounts[compoundIndex]) continue;
-		const style = variants[compoundIndex].style;
-		if (!(0, import_isObj.isPlainObject)(style)) continue;
-		const combinations = compoundState.combinations;
-		for (let combination = 0; combination < combinations.length; combination++) for (const 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 (const key in value) {
 		if (!key.length) return 0;
 		if (!state) return isChain?.(key) ? 1 : 0;
@@ -567,9 +362,6 @@ const passFrontendContainer = 27;
 const passFrontendContainerType = 28;
 const passHocMappedProperties = 29;
 const passHocMappedClasses = 30;
-const passCompoundIndexes = 31;
-const passCompoundKey = 32;
-const passCompoundStates = 33;
 const passParentCursor = 35;
 const passMapSourceKey = 36;
 const passMapFlags = 37;
@@ -581,92 +373,23 @@ const passHocFlag = 16;
 const passTextFlag = 32;
 const passInputFlag = 64;
 const passAsChildStyleFlag = 128;
-const styledDefaultsCache = /* @__PURE__ */ new WeakMap();
-function getStyledDefaults(staticConfig, shorthands) {
-	let prepared = styledDefaultsCache.get(staticConfig);
-	if (prepared === void 0) {
-		let entries = null;
-		const defaults = staticConfig.defaultProps;
-		if (defaults) for (const key in defaults) {
-			if (!(key in import_helpers.stylePropsAll || key in shorthands)) continue;
-			const value = defaults[key];
-			if (maybeStyleProgram(value)) (entries ||= []).push(key, value);
-		}
-		prepared = entries;
-		styledDefaultsCache.set(staticConfig, prepared);
-	}
-	return prepared;
-}
-const maybeStyleProgram = (value) => typeof value === "string" ? value.indexOf(":") !== -1 : !!value && typeof value === "object" && !Array.isArray(value) && !(0, import_createVariable.isVariable)(value);
-function contributeDisplacedStyledDefaults(styledDefaults, processedProps, pass) {
-	if (!styledDefaults) return;
-	for (let offset = 0; offset < styledDefaults.length; offset += 2) {
-		const key = styledDefaults[offset];
-		const value = styledDefaults[offset + 1];
-		const propValue = processedProps[key];
-		if (propValue !== void 0 && propValue !== value) contributeProp(pass, key, value);
-	}
-}
-function injectDisplacedStyledDefault(pass, key, value) {
-	const defaultValue = pass[4].defaultProps?.[key];
-	if (defaultValue === void 0 || value === void 0 || value === defaultValue || maybeStyleProgram(defaultValue)) return;
-	const state = pass[passStyleState];
-	state.flatWeakContribution = true;
-	try {
-		contributeProp(pass, key, defaultValue);
-	} finally {
-		state.flatWeakContribution = false;
-	}
-}
 function forEachPropInForwardOrder(pass) {
 	const styleState = pass[passStyleState];
-	const staticConfig = styleState.staticConfig;
 	const processedProps = styleState.props;
-	const shorthands = styleState.conf.shorthands;
-	const processedBaseStyle = staticConfig.baseStyle;
-	const styledDefaults = getStyledDefaults(staticConfig, shorthands);
-	const directState = styleState;
-	const preparedCompounds = staticConfig[preparedCompoundsKey];
-	if (preparedCompounds === void 0 && staticConfig.compoundVariants?.length) throw new Error("A component with compoundVariants reached style resolution before its static config was prepared.");
+	const styleStaticConfig = styleState.flatStyleStaticConfig;
+	const baseStyle = styleStaticConfig.baseStyle;
+	const baseVariantProps = styleStaticConfig.baseVariantProps;
 	const conditionWrapperBase = conditionWrapperTop;
-	if (!preparedCompounds) {
-		try {
-			if (processedBaseStyle) for (const key in processedBaseStyle) contributeProp(pass, key, processedBaseStyle[key]);
-			contributeDisplacedStyledDefaults(styledDefaults, processedProps, pass);
-			for (const key in processedProps) {
-				const value = processedProps[key];
-				directState.flatPropSawCondition = false;
-				contributeProp(pass, key, value);
-				if (directState.flatPropSawCondition) injectDisplacedStyledDefault(pass, key, value);
-			}
-		} finally {
-			releaseConditionPayloads(conditionWrapperBase);
-		}
-		return;
-	}
-	const compoundVariants = staticConfig.compoundVariants;
-	const compoundStates = new Array(compoundVariants.length);
 	try {
-		if (processedBaseStyle) for (const key in processedBaseStyle) contributeProp(pass, key, processedBaseStyle[key]);
-		contributeDisplacedStyledDefaults(styledDefaults, processedProps, pass);
-		const selectorCounts = preparedCompounds[preparedCompoundsKey];
-		for (let compoundIndex = 0; compoundIndex < compoundVariants.length; compoundIndex++) {
-			if (selectorCounts[compoundIndex]) continue;
-			const style = compoundVariants[compoundIndex].style;
-			if (!(0, import_isObj.isPlainObject)(style)) continue;
-			for (const key in style) contributeProp(pass, key, style[key]);
-		}
+		const appliesBaseStyle = baseStyle && !processedProps.asChild;
+		if (appliesBaseStyle) for (const key in baseStyle) contributeProp(pass, key, baseVariantProps && Object.hasOwn(baseVariantProps, key) && Object.hasOwn(processedProps, key) ? processedProps[key] : baseStyle[key]);
 		for (const key in processedProps) {
-			const compoundIndexes = preparedCompounds[key];
-			const value = processedProps[key];
-			beginCompoundEdges(compoundIndexes, compoundStates);
-			directState.flatPropSawCondition = false;
-			contributeProp(pass, key, value, compoundIndexes, compoundStates);
-			if (directState.flatPropSawCondition) injectDisplacedStyledDefault(pass, key, value);
-			finishCompoundEdges(pass, key, value, compoundIndexes, compoundStates);
+			if (appliesBaseStyle && baseVariantProps && Object.hasOwn(baseVariantProps, key)) continue;
+			contributeProp(pass, key, processedProps[key]);
 		}
-	} finally {
+	} catch (error) {
 		releaseConditionPayloads(conditionWrapperBase);
+		throw error;
 	}
 }
 function isValidStyleKey(key, validStyles, accept) {
@@ -754,13 +477,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) {
 	const 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 {
 		const [styleState, conf, props, viewProps, staticConfig, validStyles, accept, neverSkipProps, variants, inlineProps, parentVariants, styleFrontend, styledContext, styledContextKeys, flags, debug, parentStaticConfig, defaultProps, driverAnimations, driverOutputStyle, elementType] = pass;
@@ -894,8 +612,8 @@ function contributeProp(pass, keyOg, valOg, compoundIndexes, compoundStates, par
 				for (const key in normalized) {
 					if (normalized[key] == null) continue;
 					if (pass[passHocMappedProperties]?.delete(key)) clearDirectStyle(styleState, key);
-					if (key === "containerName" && typeof normalized[key] === "string" && normalized[key].indexOf(":") === -1) pass[passContainerName] = normalized[key];
-					if (key === "containerType" && typeof normalized[key] === "string" && normalized[key].indexOf(":") === -1) pass[passContainerType] = normalized[key];
+					if (key === "containerName") pass[passContainerName] = normalized[key];
+					else if (key === "containerType") pass[passContainerType] = normalized[key];
 					contributeValue(styleState, key, normalized[key], mergeStyle, styleOriginals?.[key]);
 				}
 			}
@@ -933,6 +651,11 @@ function contributeProp(pass, keyOg, valOg, compoundIndexes, compoundStates, par
 				return;
 			}
 		}
+		if (isValidStyleKeyInit && valInit == null && keyOg in props) {
+			clearDirectStyle(styleState, keyInit);
+			if (styledContextKeys?.has(keyInit)) (styleState.overriddenContextProps ||= {})[keyInit] = valInit;
+			return;
+		}
 		let isVariant = !isValidStyleKeyInit && variants && keyInit in variants;
 		const isStyleLikeKey = isValidStyleKeyInit || isVariant;
 		const isStyleProp = isValidStyleKeyInit || isVariant && !noExpand;
@@ -992,9 +715,9 @@ function contributeProp(pass, keyOg, valOg, compoundIndexes, compoundStates, par
 		releaseConditionCursors(parentWatermark);
 	}
 }
-const getSplitStyles = (props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, componentContext, groupContext, elementType, startedUnhydrated, debug, animationDriver) => {
+const getSplitStyles = (props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, componentContext, groupContext, elementType, startedUnhydrated, debug, animationDriver, styleStaticConfig) => {
 	const conf = (0, import_config.getConfig)();
-	if (staticConfig.styleFrontend?.normalizeStaticConfig) staticConfig = staticConfig.styleFrontend.normalizeStaticConfig(staticConfig, conf);
+	styleStaticConfig ||= (0, import_styleStaticConfig.getStyleStaticConfig)(staticConfig, conf);
 	const driver = animationDriver || componentContext?.animationDriver || conf.animations;
 	const driverAnimations = driver?.animations;
 	const driverInputStyle = driver?.inputStyle;
@@ -1002,7 +725,8 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
 	const resolvedDriver = driver?.isStub ? null : driver;
 	if (props.passThrough) return null;
 	const { shorthands } = conf;
-	const { isHOC, isText, isInput, variants, inlineProps, parentStaticConfig, acceptsClassName } = staticConfig;
+	const { isHOC, isText, isInput, inlineProps, parentStaticConfig, acceptsClassName } = staticConfig;
+	const variants = styleStaticConfig.variants;
 	const viewProps = {};
 	const mediaState = styleProps.mediaState || import_mediaState.mediaState;
 	let shouldDoClasses = !process.env.TAMAGUI_DID_OUTPUT_CSS && acceptsClassName && !styleProps.noClass;
@@ -1011,7 +735,7 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
 	let hasMedia = false;
 	let pseudoGroups;
 	let mediaGroups;
-	const staticPassthroughClassName = staticConfig.passthroughClassName || "";
+	const staticPassthroughClassName = styleStaticConfig.passthroughClassName || "";
 	let className = staticPassthroughClassName;
 	if (staticPassthroughClassName) shouldDoClasses = false;
 	const validStyles = staticConfig.validStyles || (staticConfig.isText || staticConfig.isInput ? import_helpers.stylePropsText : import_helpers.validStyles);
@@ -1035,6 +759,7 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
 		flatGroupContext: groupContext,
 		animationDriver: resolvedDriver
 	};
+	styleState.flatStyleStaticConfig = styleStaticConfig;
 	if (import_directStyleCSS.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" && import_constants.isClient) {
@@ -1054,27 +779,23 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
 	}
 	const { asChild } = props;
 	const { accept, neverSkipProps } = staticConfig;
-	const { noSkip, disableExpandShorthands, noExpand, noClass, noMergeStyle, noNormalize, isAnimated, styledContext, styledContextKeys } = styleProps;
+	const { noSkip, disableExpandShorthands, noExpand, noClass, noMergeStyle, noNormalize, isAnimated, styledContext } = styleProps;
+	const styledContextKeys = styleStaticConfig.styledContextKeys;
 	const styleFrontend = staticConfig.styleFrontend;
 	let frontendGroup;
 	let frontendContainer;
 	let frontendContainerType;
 	const processedProps = props;
-	const parentVariants = parentStaticConfig?.variants;
-	const defaultProps = asChild ? (0, import_getDefaultProps.getDefaultProps)(staticConfig) : void 0;
+	const parentVariants = parentStaticConfig ? (0, import_styleStaticConfig.getStyleStaticConfig)(parentStaticConfig, conf).variants : void 0;
+	const defaultProps = asChild ? styleStaticConfig.defaultProps : void 0;
 	const asChildExceptStyleLike = asChild === "except-style" || asChild === "except-style-web";
 	let containerValue;
 	let containerName;
 	let containerType;
-	{
-		const authoredContainerName = processedProps.containerName;
-		const authoredContainerType = processedProps.containerType;
-		containerName = typeof authoredContainerName === "string" && authoredContainerName.indexOf(":") === -1 ? authoredContainerName : void 0;
-		containerType = typeof authoredContainerType === "string" && authoredContainerType.indexOf(":") === -1 ? authoredContainerType : void 0;
-	}
+	containerName = processedProps.containerName;
+	containerType = processedProps.containerType;
 	let hocMappedClassProperties;
 	let hocMappedClasses;
-	const 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);
 	const pass = [
 		styleState,
 		conf,
@@ -1090,7 +811,7 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
 		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,
@@ -1109,38 +830,36 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
 		hocMappedClasses
 	];
 	styleState.flatPass = pass;
-	forEachPropInForwardOrder(pass);
-	[, , , , , , , , , , , , , , , , , , , , , className, shouldDoClasses, containerValue, containerName, containerType, frontendGroup, frontendContainer, frontendContainerType, hocMappedClassProperties, hocMappedClasses] = pass;
-	if (containerValue) {
-		containerName ??= typeof containerValue === "string" ? containerValue : void 0;
-		containerType ??= "inline-size";
-		contributeValue(styleState, containerName ? "container" : "containerType", containerName ? `${containerName} / ${containerType}` : containerType, mergeStyle);
-	}
-	if (process.env.NODE_ENV === "development" && (debug === "profile" || globalThis.time)) time`split-styles-propsend`;
-	const conditionalStates = styleState.flatStateKeys || null;
-	const usesSafeArea = !!styleState.flatUsesSafeArea;
-	if (styleState.flatMediaKeys?.size) {
-		if (!hasMedia) hasMedia = /* @__PURE__ */ new Set();
-		if (typeof hasMedia !== "boolean") for (const key of styleState.flatMediaKeys) hasMedia.add(key);
-	}
-	if (styleState.flatGroupKeys?.size) {
-		pseudoGroups ||= /* @__PURE__ */ new Set();
-		for (const key of styleState.flatGroupKeys) pseudoGroups.add(key);
-	}
-	if (styleState.flatGroupMedia?.size) {
-		mediaGroups ||= /* @__PURE__ */ new Set();
-		for (const key of styleState.flatGroupMedia) mediaGroups.add(key);
-	}
-	if (styleProps.canPlatformPseudo && styleState.flatHasPlatformPseudo) {
-		shouldDoClasses = false;
-		styleState.flatShouldDoClasses = false;
-		if (styleState.transformAccumulator) {
-			mergeStyle(styleState, "transform", (0, import_runtime.finalizeTransformAccumulator)(styleState.transformAccumulator), 1, true);
-			styleState.transformAccumulator = void 0;
-		}
-		convertDeferredInline(styleState, mergeStyle);
-	}
-	completeStreaming(styleState, mergeStyle);
+	let conditionalStates = null;
+	let usesSafeArea = false;
+	const conditionWrapperBase = conditionWrapperTop;
+	try {
+		forEachPropInForwardOrder(pass);
+		[, , , , , , , , , , , , , , , , , , , , , className, shouldDoClasses, containerValue, containerName, containerType, frontendGroup, frontendContainer, frontendContainerType, hocMappedClassProperties, hocMappedClasses] = pass;
+		if (containerValue) {
+			containerName ??= typeof containerValue === "string" ? containerValue : void 0;
+			containerType ??= "inline-size";
+			contributeValue(styleState, containerName ? "container" : "containerType", containerName ? `${containerName} / ${containerType}` : containerType, mergeStyle);
+		}
+		if (process.env.NODE_ENV === "development" && (debug === "profile" || globalThis.time)) time`split-styles-propsend`;
+		conditionalStates = styleState.flatStateKeys || null;
+		usesSafeArea = !!styleState.flatUsesSafeArea;
+		hasMedia = styleState.flatMediaKeys?.size ? styleState.flatMediaKeys : false;
+		pseudoGroups = styleState.flatGroupKeys?.size ? styleState.flatGroupKeys : void 0;
+		mediaGroups = styleState.flatGroupMedia?.size ? styleState.flatGroupMedia : void 0;
+		if (styleProps.canPlatformPseudo && styleState.flatHasPlatformPseudo) {
+			shouldDoClasses = false;
+			styleState.flatShouldDoClasses = false;
+			if (styleState.transformAccumulator) {
+				mergeStyle(styleState, "transform", (0, import_runtime.finalizeTransformAccumulator)(styleState.transformAccumulator), true);
+				styleState.transformAccumulator = void 0;
+			}
+			convertDeferredInline(styleState, mergeStyle);
+		}
+		completeStreaming(styleState, mergeStyle);
+	} finally {
+		releaseConditionPayloads(conditionWrapperBase);
+	}
 	const effectiveTransition = styleState.style?.transition;
 	if (effectiveTransition != null && styleState.style && driverOutputStyle !== "css") delete styleState.style.transition;
 	if (!(noNormalize === false)) {
@@ -1263,9 +982,9 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
 	if (process.env.NODE_ENV === "development" && (debug === "profile" || globalThis.time)) time`split-styles-done`;
 	return result;
 };
-function mergeStyle(styleState, key, val, _importance, disableNormalize = false, originalVal) {
+function mergeStyle(styleState, key, val, disableNormalize = false, originalVal) {
 	const { viewProps, styleProps, staticConfig } = styleState;
-	if (getContextPropSet(staticConfig)?.has(key)) {
+	if (styleState.flatStyleStaticConfig.styledContextKeys?.has(key)) {
 		styleState.overriddenContextProps ||= {};
 		const originalFromState = styleState.originalContextPropValues?.[key];
 		styleState.overriddenContextProps[key] = originalVal ?? originalFromState ?? val;
@@ -1290,7 +1009,7 @@ function recordStyleTokenProvenance(styleState, key, originalVal) {
 		const 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.flatThemeName || ""] || {}, tokenName) || Object.values(styleState.conf.tokensParsed).some((category) => Object.prototype.hasOwnProperty.call(category, tokenName)))) (styleState.tokenProvenance ||= {})[key] = originalVal;
+	if (tokenName !== "" && (tokenName in styleState.theme || tokenName in (styleState.conf.themes?.[styleState.flatThemeName || ""] || {}) || Object.values(styleState.conf.tokensParsed).some((category) => tokenName in category))) (styleState.tokenProvenance ||= {})[key] = originalVal;
 	else if (styleState.tokenProvenance && key in styleState.tokenProvenance) delete styleState.tokenProvenance[key];
 }
 const resolveAcceptedStyle = (styleState, styleIn) => {
@@ -1312,7 +1031,7 @@ const resolveAcceptedStyle = (styleState, styleIn) => {
 	childState.flatSingleEntries = void 0;
 	childState.flatSlots = void 0;
 	childState.flatBorderDefaultRequests = void 0;
-	const mergeAccepted = (_state, key, value, _importance, disableNormalize, originalValue) => {
+	const mergeAccepted = (_state, key, value, disableNormalize, originalValue) => {
 		styleOut[key] = disableNormalize || styleProps.noNormalize ? value : (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(value, key);
 		const trackedOriginal = styleInOriginalValues?.[key] ?? originalValue;
 		if (trackedOriginal !== void 0) (originalValues ||= {})[key] = trackedOriginal;
@@ -1340,22 +1059,24 @@ function streamWriteCSS(state, property, value, cursor, original, conditionOverr
 	const identity = cursor ? conditionTexts[cursor + conditionKeyOffset] || "" : "";
 	if (property.charCodeAt(0) === 116 && property.startsWith("transition")) {
 		const transitions = direct.flatTransitions ||= [];
-		for (let index = 0; index < transitions.length; index++) if (transitions[index].property === property && transitions[index].identity === identity) {
-			transitions[index].value = value;
-			transitions[index].condition = condition;
+		for (let 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;
 	}
-	(0, import_directStyleCSS.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);
+	(0, import_directStyleCSS.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, normalize = false, conditionOverride = -1) {
 	const direct = state;
@@ -1363,12 +1084,9 @@ function streamWriteInline(state, property, value, cursor, merge, original, norm
 	const importance = condition ? Math.floor(condition / 256) + 1 : 0;
 	const used = direct.flatUsed ||= {};
 	const 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) {
 	const direct = state;
@@ -1382,17 +1100,12 @@ function streamRetractInline(state, property, cursor) {
 }
 function convertDeferredInline(state, merge) {
 	const direct = state;
-	const used = direct.flatUsed ||= {};
 	const consume = (entries) => {
 		for (let index = 0; index < entries.length; index++) {
 			const entry = entries[index];
-			const condition = entry.condition;
+			const condition = entry[2];
 			if (condition && !(condition & 1)) continue;
-			const importance = condition ? Math.floor(condition / 256) + 1 : 0;
-			const 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);
 		}
 	};
 	const slots = direct.flatSlots;
@@ -1428,7 +1141,6 @@ function emitAtParentCondition(state, property, value, merge, originalValue, con
 }
 function emitUnderCondition(state, property, value, cursor, merge, originalValue, contextOnly, warnMode, warnSource) {
 	const condition = conditionNumbers[cursor + conditionValueOffset];
-	if (merge && property && condition) state.flatPropSawCondition = true;
 	if (!(conditionNumbers[cursor + conditionFlagsOffset] & conditionResolvedFlag)) {
 		if (warnMode && process.env.NODE_ENV === "development") (0, import_warnOnce.warnRefusedValue)(property, warnSource, `unknown modifier "${conditionTexts[cursor + conditionUnresolvedNameOffset] || ""}"`);
 		return 0;
@@ -1451,7 +1163,6 @@ const directStyleHandler = {
 	segment(state, start, end, isBase, valid, source, chainStart, chainEnd, chainValid, chainCount, _result, failure, failureIndex, property, merge, originalValue, contextOnly) {
 		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") (0, import_warnOnce.warnRefusedValue)(property, source, failure === "unterminated-string" ? "an unterminated string" : failure === "unterminated-comment" ? "an unterminated \"/*\" comment" : "an unterminated \"(\"");
@@ -1474,10 +1185,8 @@ const directStyleHandler = {
 			const right = Number(source.slice(start, end));
 			if (chainStart < chainEnd && Number.isFinite(left) && left > 0 && Number.isFinite(right) && right > 0) return 12;
 		}
-		const directState = state;
-		const cursor = directState.flatScanCursor;
+		const cursor = state.flatScanCursor;
 		const 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?.[passCompoundIndexes] ? conditionTexts[cursor + conditionKeyOffset] || "" : "");
 		if (!condition) return;
 		if (!valid) {
 			if (process.env.NODE_ENV === "development") (0, import_warnOnce.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 \"(\"");
@@ -1516,7 +1225,7 @@ const directStyleHandler = {
 			emitAtParentCondition(state, property, source, merge, originalValue ?? source, contextOnly);
 			hasBase = true;
 		}
-		if (process.env.NODE_ENV === "development" && !hasBase && result & 4 && (property in import_helpers.tokenCategories.color || property in import_tokenCategories.tokenCategoryByProperty) && splitComponents(source.slice(lastPayloadStart)).length > 1) (0, import_warnOnce.warnOnce)(`${property}="${source}" has multiple values after its first conditional. Write the base value before the first conditional.`);
+		if (process.env.NODE_ENV === "development" && !hasBase && result & 4 && property in import_helpers.propToTokenCategoryCode && splitComponents(source.slice(lastPayloadStart)).length > 1) (0, import_warnOnce.warnOnce)(`${property}="${source}" has multiple values after its first conditional. Write the base value before the first conditional.`);
 		if ((!import_directStyleCSS.canGenerateCSS || !state.flatShouldDoClasses) && result & 2 && !hasBase) {
 			const value = implicitLifecycleBase(property);
 			if (value !== null) emitAtParentCondition(state, property, value, merge, value, contextOnly);
@@ -1647,13 +1356,6 @@ function tokenVariable(state, property, name) {
 	if (category) {
 		const own = state.conf.tokensParsed[category]?.[lookupName];
 		if (own) return fillTokenLookup(own, false, lookupName);
-		for (const sibling of [
-			"color",
-			"space",
-			"size",
-			"radius",
-			"zIndex"
-		]) if (sibling !== category && state.conf.tokensParsed[sibling]?.[lookupName]) return;
 	} else {
 		const first = lookupName.charCodeAt(0);
 		if (first >= 48 && first <= 57 || first === 43 || first === 45 || first === 46) return;
@@ -1710,10 +1412,13 @@ function configuredValue(state, property, raw) {
 		missKey = `${state.flatThemeName || ""}${property}${name}`;
 		if (misses.has(missKey)) return raw;
 	}
+	if (process.env.NODE_ENV === "development") {
+		const category = (0, import_tokenCategories.getTokenCategoryForProperty)(property);
+		if (category && category !== "color" && state.conf.tokensParsed.color?.[name]) (0, import_warnOnce.warnOnce)(`"${name}" contributes to "color", not "${property}"`);
+	}
 	const lookup = tokenVariable(state, property, name);
 	if (!lookup || !(0, import_createVariable.isVariable)(lookup.value)) {
 		if (misses) misses.add(missKey);
-		if (process.env.NODE_ENV === "development" && import_tokenCategories.tokenCategoryByProperty[property] && state.conf.tokensParsed.color?.[name]) (0, import_warnOnce.warnOnce)(`"${name}" contributes to "color", not "${property}"; keeping it literal`);
 		return raw;
 	}
 	const resolveValues = !state.flatShouldDoClasses && state.styleProps.resolveValues === "auto" ? "value" : state.styleProps.resolveValues;
@@ -1833,6 +1538,11 @@ function getDirectDynamicThemeAccess(state) {
 function emitProperty(state, property, value, cursor, merge, originalValue, contextOnly) {
 	const direct = state;
 	const condition = cursor ? conditionNumbers[cursor + conditionValueOffset] : 0;
+	if (value === false && !condition) {
+		clearDirectStyle(state, property);
+		if (direct.flatStyleStaticConfig?.styledContextKeys?.has(property)) (state.overriddenContextProps ||= {})[property] = false;
+		return;
+	}
 	if (condition & 4) (state.flatEnterKeys ||= /* @__PURE__ */ new Set()).add(property);
 	if (condition & 8) (state.flatExitKeys ||= /* @__PURE__ */ new Set()).add(property);
 	cursor && conditionTexts[cursor + conditionThemeOffset];
@@ -1848,7 +1558,7 @@ function emitProperty(state, property, value, cursor, merge, originalValue, cont
 	}
 	const shouldPromoteAnimatedStyle = import_directStyleCSS.canGenerateCSS && !condition && !state.flatShouldDoClasses && !state.styleProps.noMergeStyle && state.styleProps.isAnimated && state.animationDriver?.inputStyle === "css" && property in import_helpers.nonAnimatableStyleProps;
 	if (import_directStyleCSS.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;
 	}
@@ -2157,14 +1867,11 @@ function contributeStyleObject(state, property, value, merge, contextOnly) {
 	}
 }
 function contributeStyleObjectInner(state, property, value, merge, contextOnly) {
-	const directState = state;
-	const parent = directState.flatPass?.[passParentCursor] || null;
-	const hasDefault = Object.prototype.hasOwnProperty.call(value, "default");
+	const parent = state.flatPass?.[passParentCursor] || null;
+	const hasDefault = "default" in value;
 	let hasBase = false;
 	const base = hasDefault ? value.default : void 0;
 	if (base != null) {
-		const baseString = String(base);
-		feedCompoundSegment(directState, baseString, 0, baseString.length, true, true, "");
 		emitAtParentCondition(state, property, base, merge, base, contextOnly);
 		hasBase = true;
 	}
@@ -2184,11 +1891,7 @@ function contributeStyleObjectInner(state, property, value, merge, contextOnly)
 				return false;
 			}
 		}
-		if (payload != null) {
-			conditions |= emitUnderCondition(state, property, payload, cursor, merge, payload, contextOnly, 1, payload);
-			const payloadString = String(payload);
-			feedCompoundSegment(directState, payloadString, 0, payloadString.length, false, Boolean(condition), condition && directState.flatPass?.[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;
@@ -2200,12 +1903,15 @@ function contributeStyleObjectInner(state, property, value, merge, contextOnly)
 }
 function contributeValue(state, property, value, merge, originalValue, contextOnly = false, condition) {
 	if (isConditionTransport(value)) {
-		if (value.hasBase) contributeValue(state, property, value.base, merge, value.base, contextOnly);
-		for (let offset = 0; offset < value.entries.length;) {
-			const entryValue = value.entries[offset];
+		if (value[transportHasBase]) {
+			const base = value[transportBase];
+			contributeValue(state, property, base, merge, base, contextOnly);
+		}
+		for (let offset = transportEntries; offset < value.length;) {
+			const entryValue = value[offset];
 			const watermark = conditionCursorTop;
 			try {
-				emitUnderCondition(state, property, entryValue, acquireTransportCursor(state, value.entries, offset, state.flatPass?.[passParentCursor] || null), merge, entryValue, contextOnly, 2, entryValue);
+				emitUnderCondition(state, property, entryValue, acquireTransportCursor(state, value, offset, state.flatPass?.[passParentCursor] || null), merge, entryValue, contextOnly, 2, entryValue);
 			} finally {
 				releaseConditionCursors(watermark);
 			}
@@ -2230,7 +1936,7 @@ function contributeValue(state, property, value, merge, originalValue, contextOn
 				commitConditionCursor(state, effective);
 			} else effective = condition;
 			const isObjectValue = value && typeof value === "object" && !Array.isArray(value) && !(0, import_createVariable.isVariable)(value);
-			const objectHasDefault = isObjectValue && Object.prototype.hasOwnProperty.call(value, "default");
+			const objectHasDefault = isObjectValue && "default" in value;
 			const firstChild = isObjectValue && !objectHasDefault ? acquireConditionCursor(effective) : null;
 			if (isObjectValue && classifyConditionalObject(value, state, void 0, firstChild || void 0)) {
 				let useFirstChild = firstChild !== null;
@@ -2288,17 +1994,20 @@ function clearDirectStyle(state, property) {
 	if (state.style) delete state.style[atomicKey];
 	delete state.classNames[atomicKey];
 }
-const conditionTransports = /* @__PURE__ */ new WeakSet();
+const conditionTransportTag = /* @__PURE__ */ Symbol();
+const transportHasBase = 1;
+const transportBase = 2;
+const transportEntries = 3;
+const transportEntryWidth = 2;
 function isConditionTransport(value) {
-	return typeof value === "object" && value !== null && conditionTransports.has(value);
+	return Array.isArray(value) && value[0] === conditionTransportTag;
 }
-const 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) {
 	const cursor = acquireConditionCursor(parent);
-	const key = entries[offset + 1];
+	const key = transport[offset + 1];
 	if (key) resolveConditionText(state, cursor, key);
 	commitConditionCursor(state, cursor);
 	return cursor;
@@ -2307,15 +2016,14 @@ function mergeConditionTransport(state, prev, cursor, value) {
 	let 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) {
 			const isObjectValue = typeof prev === "object" && !Array.isArray(prev) && !(0, import_createVariable.isVariable)(prev);
-			const objectHasDefault = isObjectValue && Object.prototype.hasOwnProperty.call(prev, "default");
+			const objectHasDefault = isObjectValue && "default" in prev;
 			const authoredWatermark = conditionCursorTop;
 			try {
 				const firstCursor = isObjectValue && !objectHasDefault ? acquireConditionCursor() : null;
@@ -2325,8 +2033,8 @@ function mergeConditionTransport(state, prev, cursor, value) {
 						const payload = prev[key];
 						if (payload == null) continue;
 						if (key === "default") {
-							transport.hasBase = true;
-							transport.base = payload;
+							transport[transportHasBase] = true;
+							transport[transportBase] = payload;
 							continue;
 						}
 						const watermark = conditionCursorTop;
@@ -2336,12 +2044,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);
@@ -2349,29 +2057,25 @@ function mergeConditionTransport(state, prev, cursor, value) {
 		}
 	}
 	const cursorKey = conditionTexts[cursor + conditionKeyOffset] || "";
-	for (let offset = 0; offset < transport.entries.length; offset += transportEntryWidth) if (transport.entries[offset + 1] === cursorKey) {
-		transport.entries.splice(offset, transportEntryWidth);
+	for (let 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;
 }
 const variantValueHandler = {
 	segment(ctx, start, end, isBase, valid, source, chainStart, chainEnd, chainValid) {
 		const state = ctx[0];
-		const 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;
-		const cursor = directState.flatScanCursor;
-		const condition = cursor && conditionNumbers[cursor + conditionFlagsOffset] & conditionResolvedFlag ? conditionNumbers[cursor + conditionValueOffset] : 0;
-		feedCompoundSegment(directState, source, start, end, false, Boolean(condition), condition && directState.flatPass?.[passCompoundIndexes] ? conditionTexts[cursor + conditionKeyOffset] || "" : "");
-		if (!condition) return;
+		const 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) {
@@ -2394,34 +2098,6 @@ const variantValueHandler = {
 		return true;
 	}
 };
-const contextPropSets = /* @__PURE__ */ new WeakMap();
-function getContextPropSet(staticConfig) {
-	const cached = contextPropSets.get(staticConfig);
-	if (cached !== void 0) return cached;
-	const contextConfig = staticConfig.context || staticConfig.parentStaticConfig?.context;
-	const inheritedContextPropKeys = !staticConfig.context || staticConfig.context === staticConfig.parentStaticConfig?.context ? staticConfig.parentStaticConfig?.contextProps : void 0;
-	const contextPropKeys = staticConfig.contextProps || inheritedContextPropKeys;
-	let set = null;
-	if (contextConfig?.props) {
-		set ||= /* @__PURE__ */ new Set();
-		for (const key in contextConfig.props) set.add(key);
-	}
-	if (contextPropKeys) {
-		set ||= /* @__PURE__ */ new Set();
-		for (const key of contextPropKeys) set.add(key);
-	}
-	if (contextConfig?.propKeys) {
-		set ||= /* @__PURE__ */ new Set();
-		for (const key of contextConfig.propKeys) set.add(key);
-	}
-	const parentPropKeys = staticConfig.parentStaticConfig?.context?.propKeys;
-	if (parentPropKeys) {
-		set ||= /* @__PURE__ */ new Set();
-		for (const key of parentPropKeys) set.add(key);
-	}
-	contextPropSets.set(staticConfig, set);
-	return set;
-}
 function emitMappedValue(styleState, key, value, originalValue, nestedCondition, parentCondition, fallbackOriginal) {
 	const nested = nestedCondition;
 	const parent = parentCondition;
@@ -2442,8 +2118,8 @@ function emitMappedValue(styleState, key, value, originalValue, nestedCondition,
 }
 const contributeMappedValue = (key, value, styleState, disabled, parentCondition, fallbackOriginal) => {
 	if (disabled) return emitMappedValue(styleState, key, value, void 0, void 0, parentCondition, fallbackOriginal);
-	const { conf, styleProps, staticConfig } = styleState;
-	const { variants } = staticConfig;
+	const { conf, styleProps } = styleState;
+	const variants = styleState.flatStyleStaticConfig.variants;
 	const { disableExpandShorthands, noExpand, resolveValues } = styleProps;
 	const shorthands = conf.shorthands;
 	if (!noExpand) {
@@ -2486,14 +2162,14 @@ const contributeMappedValue = (key, value, styleState, disabled, parentCondition
 	}
 };
 function resolveVariants(key, value, styleProps, styleState, parentVariantKey) {
-	const variantDefinition = styleState.staticConfig.variants?.[key];
+	const variantDefinition = styleState.flatStyleStaticConfig.variants?.[key];
 	if (isConditionTransport(value)) {
-		if (value.hasBase) emitResolvedVariant(key, value.base, styleState, parentVariantKey, null);
-		for (let offset = 0; offset < value.entries.length;) {
-			const entryValue = value.entries[offset];
+		if (value[transportHasBase]) emitResolvedVariant(key, value[transportBase], styleState, parentVariantKey, null);
+		for (let offset = transportEntries; offset < value.length;) {
+			const entryValue = value[offset];
 			const 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);
 			}
@@ -2519,7 +2195,7 @@ function resolveVariants(key, value, styleProps, styleState, parentVariantKey) {
 		return;
 	}
 	const isObjectValue = value && typeof value === "object" && !Array.isArray(value) && !(0, import_createVariable.isVariable)(value);
-	const objectHasDefault = isObjectValue && Object.prototype.hasOwnProperty.call(value, "default");
+	const objectHasDefault = isObjectValue && "default" in value;
 	const objectWatermark = conditionCursorTop;
 	try {
 		const firstCursor = isObjectValue && !objectHasDefault ? acquireConditionCursor() : null;
@@ -2528,22 +2204,18 @@ function resolveVariants(key, value, styleProps, styleState, parentVariantKey) {
 			for (const objKey in value) {
 				const payload = value[objKey];
 				if (payload == null) continue;
-				const directState = styleState;
-				const payloadString = String(payload);
 				if (objKey === "default") {
-					feedCompoundSegment(directState, payloadString, 0, payloadString.length, true, true, "");
 					emitResolvedVariant(key, payload, styleState, parentVariantKey, null);
 					continue;
 				}
 				const watermark = conditionCursorTop;
 				const cursor = useFirstCursor ? firstCursor : acquireConditionCursor();
-				let condition = conditionNumbers[cursor + conditionValueOffset];
+				conditionNumbers[cursor + conditionValueOffset];
 				if (useFirstCursor) useFirstCursor = false;
 				else {
 					resolveConditionText(styleState, cursor, objKey);
-					condition = commitConditionCursor(styleState, cursor);
+					commitConditionCursor(styleState, cursor);
 				}
-				if (directState.flatPass?.[passCompoundIndexes]) feedCompoundSegment(directState, payloadString, 0, payloadString.length, false, Boolean(condition), condition ? conditionTexts[cursor + conditionKeyOffset] || "" : "");
 				emitResolvedVariant(key, payload, styleState, parentVariantKey, cursor);
 				if (cursor !== firstCursor) releaseConditionCursors(watermark);
 			}
@@ -2555,31 +2227,13 @@ function resolveVariants(key, value, styleProps, styleState, parentVariantKey) {
 	emitResolvedVariant(key, value, styleState, parentVariantKey, null);
 }
 function emitResolvedVariant(key, value, styleState, parentVariantKey, conditionCursor) {
-	const { staticConfig, conf, debug } = styleState;
+	const { conf, debug } = styleState;
 	const styleProps = styleState.styleProps;
-	const { variants } = staticConfig;
+	const variants = styleState.flatStyleStaticConfig.variants;
 	if (!variants) return;
 	const variant = variants[key];
-	let 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") {
-				const name = styleState.styleProps.displayName || "[UnnamedComponent]";
-				console.warn(`No variant found: ${name} has variant "${key}", but no matching value "${value}"`);
-			}
-		}
-		return;
-	}
+	let variantValue = (0, import_variantResolvers.getVariantDefinition)(variant, value, conf, styleState);
+	if (!variantValue) return;
 	if (typeof variantValue === "function") {
 		const fn = variantValue;
 		const extras = (0, import_getVariantExtras.getVariantExtras)(styleState);
@@ -2594,28 +2248,22 @@ function emitResolvedVariant(key, value, styleState, parentVariantKey, condition
 			console.groupEnd();
 		}
 	}
-	if (!(0, import_isObj2.isObj)(variantValue)) return;
+	if (!(0, import_isObj.isObj)(variantValue)) return;
 	if (process.env.NODE_ENV === "development" && debug === "verbose") console.info(`   expanding styles from `, variantValue);
 	const { noSkip } = styleProps;
 	const originals = import_styleOriginalValues.styleOriginalValues.get(variantValue);
-	const directState = styleState;
-	directState.flatCompoundOutputDepth = (directState.flatCompoundOutputDepth || 0) + 1;
-	try {
-		for (const outputKey in variantValue) {
-			if (!noSkip && outputKey in import_skipProps.skipProps) continue;
-			const rawOutputValue = variantValue[outputKey];
-			const outputValue = styleProps.noNormalize ? rawOutputValue : (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(rawOutputValue, conf.shorthands[outputKey] || outputKey);
-			const originalValue = originals?.[outputKey] ?? rawOutputValue;
-			if (getContextPropSet(staticConfig)?.has(outputKey)) {
-				styleState.overriddenContextProps ||= {};
-				styleState.overriddenContextProps[outputKey] = originalValue;
-				styleState.originalContextPropValues ||= {};
-				styleState.originalContextPropValues[outputKey] = originalValue;
-			}
-			contributeMappedValue(outputKey, outputValue, styleState, parentVariantKey === key && outputKey === key, conditionCursor || void 0, originalValue);
+	for (const outputKey in variantValue) {
+		if (!noSkip && outputKey in import_skipProps.skipProps) continue;
+		const rawOutputValue = variantValue[outputKey];
+		const outputValue = styleProps.noNormalize ? rawOutputValue : (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(rawOutputValue, conf.shorthands[outputKey] || outputKey);
+		const originalValue = originals?.[outputKey] ?? rawOutputValue;
+		if (styleState.flatStyleStaticConfig.styledContextKeys?.has(outputKey)) {
+			styleState.overriddenContextProps ||= {};
+			styleState.overriddenContextProps[outputKey] = originalValue;
+			styleState.originalContextPropValues ||= {};
+			styleState.originalContextPropValues[outputKey] = originalValue;
 		}
-	} finally {
-		directState.flatCompoundOutputDepth--;
+		contributeMappedValue(outputKey, outputValue, styleState, parentVariantKey === key && outputKey === key, conditionCursor || void 0, originalValue);
 	}
 }
 function getFontFamilyFromNameOrVariable(input, conf) {
@@ -2632,83 +2280,3 @@ function getFontFamilyFromNameOrVariable(input, conf) {
 	} else if (typeof input === "string" && input in conf.fontsParsed) return input;
 }
 const variableToFontNameCache = /* @__PURE__ */ new WeakMap();
-function getVariantDefinition(variant, value, conf, { theme }) {
-	if (!variant) return;
-	if (value === void 0) return;
-	if (typeof variant === "function") return variant;
-	if (Object.prototype.hasOwnProperty.call(variant, value)) return variant[value];
-	for (const { key, parts } of getCompiledVariantResolvers(variant)) for (const part of parts) if (matchesVariantResolver(part, value, conf, theme)) return variant[key];
-}
-const variantResolverNameSet = new Set(import_types.variantResolverNames);
-const variantResolverCache = /* @__PURE__ */ new WeakMap();
-const preparedStyleStaticConfigs = /* @__PURE__ */ new WeakSet();
-function prepareStyleStaticConfig(staticConfig) {
-	if (preparedStyleStaticConfigs.has(staticConfig)) return staticConfig;
-	preparedStyleStaticConfigs.add(staticConfig);
-	getContextPropSet(staticConfig);
-	prepareStaticConfigCompounds(staticConfig);
-	const variants = staticConfig.variants;
-	if (variants) for (const key in variants) {
-		const variant = variants[key];
-		if (variant && typeof variant === "object") getCompiledVariantResolvers(variant);
-	}
-	return staticConfig;
-}
-function getCompiledVariantResolvers(variant) {
-	let cached = variantResolverCache.get(variant);
-	if (cached) return cached;
-	const compiled = [];
-	for (const key in variant) {
-		const parts = parseVariantResolverKey(key);
-		if (parts) compiled.push({
-			key,
-			parts
-		});
-	}
-	variantResolverCache.set(variant, compiled);
-	return compiled;
-}
-function parseVariantResolverKey(key) {
-	if (!key) return null;
-	const parts = [];
-	let start = 0;
-	for (let index = 0; index <= key.length; index++) {
-		if (index !== key.length && key.charCodeAt(index) !== 124) continue;
-		let partStart = start;
-		let partEnd = index;
-		while (partStart < partEnd && key.charCodeAt(partStart) <= 32) partStart++;
-		while (partEnd > partStart && key.charCodeAt(partEnd - 1) <= 32) partEnd--;
-		if (partStart === partEnd) return null;
-		const part = key.slice(partStart, partEnd);
-		if (!variantResolverNameSet.has(part)) return null;
-		parts.push(part);
-		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) {
-	const string = typeof value === "string";
-	const number = typeof value === "number";
-	const 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" && (0, import_createVariable.isVariable)(value);
-		case "Color": return value != null && value in conf.tokensParsed.color || string;
-		case "Theme": return string && !!theme && value in theme;
-		case "FontSize": return value === true || !!conf.fontsParsed.body?.size?.[value] || number || rem;
-		case "FontStyle": return !!conf.fontsParsed.body?.style?.[value] || value === "normal" || value === "italic";
-		case "FontTransform": return !!conf.fontsParsed.body?.transform?.[value] || value === "none" || value === "capitalize" || value === "uppercase" || value === "lowercase";
-		case "FontLineHeight": return !!conf.fontsParsed.body?.lineHeight?.[value] || number || rem;
-		case "FontLetterSpacing": return !!conf.fontsParsed.body?.letterSpacing?.[value] || number || rem;
-		case "number":
-		case "string":
-		case "boolean": return typeof value === resolverName;
-		case "any": return true;
-	}
-}