@tamagui/core 3.0.0-beta.1598.1 → 3.0.0-beta.1648.1

package/dist/native.cjs

@@ -12660,6 +12660,27 @@ function extractValueFromDynamic(val, scheme) {
 //#region ../web/dist/esm/helpers/themeUpdateState.native.js
 var themeUpdateStateKey = "_tmgInlineLayer";
 //#endregion
+//#region ../web/dist/esm/helpers/themes.native.js
+var schemeKey = /* @__PURE__ */ Symbol.for("tamagui.theme.scheme");
+function getAuthoredThemeScheme(theme) {
+	var scheme = theme[schemeKey];
+	return scheme === "light" || scheme === "dark" ? scheme : void 0;
+}
+function copyAuthoredThemeScheme(target, source) {
+	var scheme = getAuthoredThemeScheme(source);
+	if (scheme) Object.defineProperty(target, schemeKey, { value: scheme });
+	return target;
+}
+function ensureThemeVariable(theme, key) {
+	var val = theme[key];
+	var variable = isVariable(val);
+	if (!variable || val.name !== key) theme[key] = createVariable({
+		key: variable ? val.name : key,
+		name: key,
+		val: variable ? val.val : val
+	});
+}
+//#endregion
 //#region ../web/dist/esm/hooks/useThemeState.native.js
 var ThemeStateContext = (0, react.createContext)("");
 var allListeners = /* @__PURE__ */ new Map();
@@ -12716,6 +12737,7 @@ var incReducer = function(c) {
 var useThemeState = function(props) {
 	"use no memo";
 	var isRoot = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false, keys = arguments.length > 2 ? arguments[2] : void 0, schemeKeys = arguments.length > 3 ? arguments[3] : void 0, cascadeOnChange = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : false, optimizeForFirstRender = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : false;
+	var _props__themeUpdate;
 	var _ref;
 	var { disable } = props;
 	var parentId = (0, react.useContext)(ThemeStateContext);
@@ -12726,16 +12748,10 @@ var useThemeState = function(props) {
 		theme: getConfig().themes.light
 	};
 	var id = (0, react.useId)();
-	var propsKey = getPropsKey(props);
+	var propsKey = `${props.name || ""}${props.forceClassName || ""}${((_props__themeUpdate = props._themeUpdate) === null || _props__themeUpdate === void 0 ? void 0 : _props__themeUpdate.key) || ""}`;
 	if (cascadeOnChange) registerThemeProviderChain(id, parentId, props);
 	var r = (_ref = (0, react.useRef)(null)).current || (_ref.current = {
 		id,
-		parentId,
-		props,
-		propsKey,
-		isRoot,
-		keys,
-		schemeKeys,
 		optimizeForFirstRender,
 		renderVersion: 0
 	});
@@ -12756,7 +12772,10 @@ var useThemeState = function(props) {
 			r.state = r.lastSnap;
 		}
 		if (cascadeOnChange && !themeProviderParents.has(r.id)) registerThemeProviderChain(r.id, r.parentId, r.props);
-		if (r.unsubscribe && r.subscribedTo !== r.parentId) cleanupThemeSubscription(r);
+		if (r.unsubscribe && r.subscribedTo !== r.parentId) {
+			var _r_unsubscribe;
+			(_r_unsubscribe = r.unsubscribe) === null || _r_unsubscribe === void 0 || _r_unsubscribe.call(r);
+		}
 		if (shouldSubscribeToTheme(r, cascadeOnChange)) {
 			if (!r.unsubscribe) {
 				var _listenersByParent, _pid;
@@ -12789,7 +12808,10 @@ var useThemeState = function(props) {
 					r.subscribedTo = void 0;
 				};
 			}
-		} else if (r.unsubscribe) cleanupThemeSubscription(r);
+		} else if (r.unsubscribe) {
+			var _r_unsubscribe1;
+			(_r_unsubscribe1 = r.unsubscribe) === null || _r_unsubscribe1 === void 0 || _r_unsubscribe1.call(r);
+		}
 		return function() {
 			if (r.renderVersion === renderVersion) cleanupThemeState(r);
 		};
@@ -12813,12 +12835,8 @@ var shouldSubscribeToTheme = function(r, cascadeOnChange) {
 	var _r_keys_current, _r_props_needsUpdate, _r_props;
 	return Boolean(r.optimizeForFirstRender || r.isRoot || cascadeOnChange || hasThemeUpdatingProps(r.props) || ((_r_keys_current = r.keys.current) === null || _r_keys_current === void 0 ? void 0 : _r_keys_current.size) || ((_r_props_needsUpdate = (_r_props = r.props).needsUpdate) === null || _r_props_needsUpdate === void 0 ? void 0 : _r_props_needsUpdate.call(_r_props)));
 };
-function cleanupThemeSubscription(r) {
-	var _r_unsubscribe;
-	(_r_unsubscribe = r.unsubscribe) === null || _r_unsubscribe === void 0 || _r_unsubscribe.call(r);
-}
 function cleanupThemeState(r) {
-	if (r.unsubscribe) cleanupThemeSubscription(r);
+	if (r.unsubscribe) r.unsubscribe();
 	else {
 		r.state = void 0;
 		states.delete(r.id);
@@ -12829,15 +12847,15 @@ function cleanupThemeState(r) {
 }
 var getSnapshotImpl = function(r) {
 	var _keys_current, _schemeKeys_current, _keys_current1, _props_needsUpdate;
-	var { id, parentId, props, propsKey, isRoot, keys, schemeKeys, optimizeForFirstRender } = r;
+	var { id, parentId, props, propsKey, isRoot, keys, optimizeForFirstRender } = r;
+	var schemeKeys = r.schemeKeys;
 	var local = r.state;
 	var parentState = states.get(parentId);
 	if (local && !PendingUpdate.has(id)) {
 		if (parentState && local._parentName === parentState.name && local._parentSchemeAuthored === parentState.schemeAuthored && local._propsKey === propsKey) return local;
 	}
 	var isSchemeOnlyChange = !optimizeForFirstRender && supportsDynamicColorIOS && getSetting("fastSchemeChange") && local && parentState && local.scheme !== parentState.scheme && getThemeBaseName(local.name) === getThemeBaseName(parentState.name);
-	var allKeysSchemeOptimized = !optimizeForFirstRender && Boolean(((_keys_current = keys.current) === null || _keys_current === void 0 ? void 0 : _keys_current.size) && (schemeKeys === null || schemeKeys === void 0 ? void 0 : (_schemeKeys_current = schemeKeys.current) === null || _schemeKeys_current === void 0 ? void 0 : _schemeKeys_current.size) === keys.current.size);
-	var canSkipForSchemeChange = Boolean(isSchemeOnlyChange && allKeysSchemeOptimized);
+	var canSkipForSchemeChange = Boolean(isSchemeOnlyChange && ((_keys_current = keys.current) === null || _keys_current === void 0 ? void 0 : _keys_current.size) && (schemeKeys === null || schemeKeys === void 0 ? void 0 : (_schemeKeys_current = schemeKeys.current) === null || _schemeKeys_current === void 0 ? void 0 : _schemeKeys_current.size) === keys.current.size);
 	var needsUpdate = props.passThrough ? false : optimizeForFirstRender ? true : isRoot || props.forceClassName || props.name === "light" || props.name === "dark" || props.name === null ? true : !HasRenderedOnce.get(keys) ? true : canSkipForSchemeChange ? false : (keys === null || keys === void 0 ? void 0 : (_keys_current1 = keys.current) === null || _keys_current1 === void 0 ? void 0 : _keys_current1.size) ? true : (_props_needsUpdate = props.needsUpdate) === null || _props_needsUpdate === void 0 ? void 0 : _props_needsUpdate.call(props);
 	var [rerender, nextRaw] = getNextState(local, props, propsKey, isRoot, id, parentId, needsUpdate, PendingUpdate.get(id));
 	var next = nextRaw;
@@ -12890,7 +12908,7 @@ var getNextState = function(lastState, props, propsKey) {
 		if (shouldRerender) return [true, _objectSpread2({}, parentState || lastState || next)];
 		return [false, next];
 	}
-	var scheme = getThemeScheme(resolvedName);
+	var scheme = getAuthoredThemeScheme(themes[resolvedName]) || getThemeScheme(resolvedName);
 	var _parentState_inverses;
 	var parentInverses = (_parentState_inverses = parentState === null || parentState === void 0 ? void 0 : parentState.inverses) !== null && _parentState_inverses !== void 0 ? _parentState_inverses : 0;
 	var isInverse = Boolean(parentState && scheme !== parentState.scheme);
@@ -12977,10 +12995,6 @@ function resolveThemeName(parentName, name, themes2) {
 	if (!forceUpdate && found === parentName && found !== "light" && found !== "dark") return null;
 	return found;
 }
-var getPropsKey = function(param) {
-	var { name, forceClassName, _themeUpdate } = param;
-	return `${name || ""}${forceClassName || ""}${(_themeUpdate === null || _themeUpdate === void 0 ? void 0 : _themeUpdate.key) || ""}`;
-};
 var hasThemeUpdatingProps = function(props) {
 	return "name" in props || "forceClassName" in props || "_themeUpdate" in props;
 };
@@ -15063,7 +15077,6 @@ function contributeProp(pass, keyOg, valOg) {
 	var shouldCheckSkipProps = !noSkip;
 	var asChildExceptStyleLike = Boolean(flags & passAsChildStyleFlag);
 	var isTextOrInput = isText || isInput;
-	var hocParentVariants = isHOC ? parentVariants : void 0;
 	var keyInit = keyOg;
 	var valInit = valOg;
 	if (keyInit === "children") {
@@ -15264,9 +15277,8 @@ function contributeProp(pass, keyOg, valOg) {
 	var isVariant = !isValidStyleKeyInit && variants && keyInit in variants;
 	var isStyleProp = isValidStyleKeyInit || isVariant && !noExpand;
 	if (isStyleProp && asChildExceptStyleLike) return;
-	var shouldPassProp = !isStyleProp && isHOC || hocParentVariants && keyInit in hocParentVariants || (inlineProps === null || inlineProps === void 0 ? void 0 : inlineProps.has(keyInit));
-	var parentVariant = parentVariants === null || parentVariants === void 0 ? void 0 : parentVariants[keyInit];
-	var isHOCShouldPassThrough = Boolean(isHOC && (parentVariant || keyInit in skipProps));
+	var shouldPassProp = !isStyleProp && isHOC || parentVariants && keyInit in parentVariants || (inlineProps === null || inlineProps === void 0 ? void 0 : inlineProps.has(keyInit));
+	var isHOCShouldPassThrough = isHOC && keyInit in skipProps;
 	if (shouldPassProp || isHOCShouldPassThrough) {
 		if (keyInit in viewProps) delete viewProps[keyInit];
 		viewProps[keyInit] = valInit;
@@ -15322,7 +15334,7 @@ function contributeProp(pass, keyOg, valOg) {
 	viewProps[keyInit] = valInit;
 }
 var getSplitStyles = function(props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, componentContext, groupContext, elementType, startedUnhydrated, debug, animationDriver, styleStaticConfig) {
-	var _styleState_flatMediaKeys, _styleState_flatGroupKeys, _styleState_flatGroupMedia, _styleState_flatGroupKeys1, _styleState_flatGroupMedia1, _styleState_style;
+	var _staticConfig_Component_staticConfig, _staticConfig_Component, _styleState_flatMediaKeys, _styleState_flatGroupKeys, _styleState_flatGroupMedia, _styleState_flatGroupKeys1, _styleState_flatGroupMedia1, _styleState_style;
 	var conf = getConfig();
 	styleStaticConfig || (styleStaticConfig = getStyleStaticConfig(staticConfig, conf));
 	var driver = animationDriver || (componentContext === null || componentContext === void 0 ? void 0 : componentContext.animationDriver) || conf.animations;
@@ -15381,7 +15393,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 	var frontendContainer;
 	var frontendContainerType;
 	var processedProps = props;
-	var parentVariants = parentStaticConfig ? getStyleStaticConfig(parentStaticConfig, conf).variants : void 0;
+	var parentVariants = isHOC ? (_staticConfig_Component = staticConfig.Component) === null || _staticConfig_Component === void 0 ? void 0 : (_staticConfig_Component_staticConfig = _staticConfig_Component.staticConfig) === null || _staticConfig_Component_staticConfig === void 0 ? void 0 : _staticConfig_Component_staticConfig.variants : void 0;
 	var defaultProps = asChild ? styleStaticConfig.defaultProps : void 0;
 	var asChildExceptStyleLike = asChild === "except-style" || asChild === "except-style-web";
 	var containerValue;
@@ -15403,7 +15415,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 		styledContextKeys,
 		(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,
+		void 0,
 		defaultProps,
 		driverAnimations,
 		driverOutputStyle,
@@ -16300,7 +16312,7 @@ function emitValue(state, property, raw, cursor, originalValue, contextOnly) {
 	}
 	if (typeof raw === "string" && property === "background") {
 		var parts = splitComponents(raw);
-		if (parts.length === 1 && !startsValueFunction(parts[0])) {
+		if (parts.length === 1 && (!startsValueFunction(parts[0]) || classifyBorderComponents(parts[0]).color)) {
 			emitResolved(state, "backgroundColor", parts[0], cursor, originalValue, contextOnly);
 			return;
 		}
@@ -18495,23 +18507,7 @@ function proxyThemeToParents(themeName, theme) {
 		}
 	}
 	Object.assign(out, theme);
-	return out;
-}
-//#endregion
-//#region ../web/dist/esm/helpers/themes.native.js
-function ensureThemeVariable(theme, key) {
-	var val = theme[key];
-	var value = isVariable(val) ? val.val : val;
-	if (!isVariable(val)) theme[key] = createVariable({
-		key,
-		name: key,
-		val: value
-	});
-	else if (val.name !== key) theme[key] = createVariable({
-		key: val.name,
-		name: key,
-		val: value
-	});
+	return copyAuthoredThemeScheme(out, theme);
 }
 //#endregion
 //#region ../web/dist/esm/helpers/variableValue.native.js
@@ -18768,7 +18764,7 @@ function createTamagui$2(configIn) {
 	var themeConfig = (function() {
 		var cssRuleSets = buildCSSRuleSets(createTokenCSS(tokens, shouldTokenCategoryHaveUnits), createFontCSS(fontsParsed, registerFontVariables), defaultFontToken);
 		var themesIn = configIn.themes;
-		var dedupedThemes = foundThemes !== null && foundThemes !== void 0 ? foundThemes : getThemesDeduped(themesIn, tokens.color, configIn.variables, { tokensParsed });
+		var dedupedThemes = foundThemes !== null && foundThemes !== void 0 ? foundThemes : getThemesDeduped(themesIn, tokensParsed, configIn.variables);
 		return {
 			themes: proxyThemesToParents(dedupedThemes, Object.keys(themesIn)),
 			cssRuleSets,
@@ -18828,7 +18824,7 @@ function createTamagui$2(configIn) {
 	initializeTamaguiConfig(config);
 	return config;
 }
-function getThemesDeduped(themes, colorTokens, variables, variablesCtx) {
+function getThemesDeduped(themes, tokensParsed, variables) {
 	var dedupedThemes = [];
 	var existing = /* @__PURE__ */ new Map();
 	var sortedThemeNames = Object.keys(themes).sort(function(a, b) {
@@ -18840,14 +18836,17 @@ function getThemesDeduped(themes, colorTokens, variables, variablesCtx) {
 		for (var _iterator = sortedThemeNames[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
 			var themeName = _step.value;
 			var rawTheme = themes[themeName];
-			var key = JSON.stringify(rawTheme);
-			if (existing.has(key)) {
-				existing.get(key).names.push(themeName);
+			var scheme = getAuthoredThemeScheme(rawTheme);
+			var key = JSON.stringify(rawTheme) + scheme;
+			var e = existing.get(key);
+			if (e) {
+				e.names.push(themeName);
 				continue;
 			}
-			var theme = _objectSpread2(_objectSpread2({}, colorTokens), rawTheme);
+			var theme = _objectSpread2(_objectSpread2({}, tokensParsed.color), rawTheme);
 			for (var key1 in theme) ensureThemeVariable(theme, key1);
-			if (variables && variablesCtx && !themeName.includes("_")) mergeConfigVariablesIntoTheme(theme, themeName, variables, variablesCtx.tokensParsed);
+			copyAuthoredThemeScheme(theme, rawTheme);
+			if (variables && !themeName.includes("_")) mergeConfigVariablesIntoTheme(theme, themeName, variables, tokensParsed);
 			var deduped = {
 				names: [themeName],
 				theme

package/dist/test.native.cjs

@@ -2907,6 +2907,27 @@ function extractValueFromDynamic(val, scheme) {
 //#region ../web/dist/esm/helpers/themeUpdateState.native.js
 var themeUpdateStateKey = "_tmgInlineLayer";
 //#endregion
+//#region ../web/dist/esm/helpers/themes.native.js
+var schemeKey = /* @__PURE__ */ Symbol.for("tamagui.theme.scheme");
+function getAuthoredThemeScheme(theme) {
+	var scheme = theme[schemeKey];
+	return scheme === "light" || scheme === "dark" ? scheme : void 0;
+}
+function copyAuthoredThemeScheme(target, source) {
+	var scheme = getAuthoredThemeScheme(source);
+	if (scheme) Object.defineProperty(target, schemeKey, { value: scheme });
+	return target;
+}
+function ensureThemeVariable(theme, key) {
+	var val = theme[key];
+	var variable = isVariable(val);
+	if (!variable || val.name !== key) theme[key] = createVariable({
+		key: variable ? val.name : key,
+		name: key,
+		val: variable ? val.val : val
+	});
+}
+//#endregion
 //#region ../web/dist/esm/hooks/useThemeState.native.js
 var ThemeStateContext = (0, react.createContext)("");
 var allListeners = /* @__PURE__ */ new Map();
@@ -2963,6 +2984,7 @@ var incReducer = function(c) {
 var useThemeState = function(props) {
 	"use no memo";
 	var isRoot = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false, keys = arguments.length > 2 ? arguments[2] : void 0, schemeKeys = arguments.length > 3 ? arguments[3] : void 0, cascadeOnChange = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : false, optimizeForFirstRender = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : false;
+	var _props__themeUpdate;
 	var _ref;
 	var { disable } = props;
 	var parentId = (0, react.useContext)(ThemeStateContext);
@@ -2975,16 +2997,10 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 		theme: getConfig().themes.light
 	};
 	var id = (0, react.useId)();
-	var propsKey = getPropsKey(props);
+	var propsKey = `${props.name || ""}${props.forceClassName || ""}${((_props__themeUpdate = props._themeUpdate) === null || _props__themeUpdate === void 0 ? void 0 : _props__themeUpdate.key) || ""}`;
 	if (cascadeOnChange) registerThemeProviderChain(id, parentId, props);
 	var r = (_ref = (0, react.useRef)(null)).current || (_ref.current = {
 		id,
-		parentId,
-		props,
-		propsKey,
-		isRoot,
-		keys,
-		schemeKeys,
 		optimizeForFirstRender,
 		renderVersion: 0
 	});
@@ -3005,7 +3021,10 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 			r.state = r.lastSnap;
 		}
 		if (cascadeOnChange && !themeProviderParents.has(r.id)) registerThemeProviderChain(r.id, r.parentId, r.props);
-		if (r.unsubscribe && r.subscribedTo !== r.parentId) cleanupThemeSubscription(r);
+		if (r.unsubscribe && r.subscribedTo !== r.parentId) {
+			var _r_unsubscribe;
+			(_r_unsubscribe = r.unsubscribe) === null || _r_unsubscribe === void 0 || _r_unsubscribe.call(r);
+		}
 		if (shouldSubscribeToTheme(r, cascadeOnChange)) {
 			if (!r.unsubscribe) {
 				var _listenersByParent, _pid;
@@ -3038,7 +3057,10 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 					r.subscribedTo = void 0;
 				};
 			}
-		} else if (r.unsubscribe) cleanupThemeSubscription(r);
+		} else if (r.unsubscribe) {
+			var _r_unsubscribe1;
+			(_r_unsubscribe1 = r.unsubscribe) === null || _r_unsubscribe1 === void 0 || _r_unsubscribe1.call(r);
+		}
 		return function() {
 			if (r.renderVersion === renderVersion) cleanupThemeState(r);
 		};
@@ -3062,12 +3084,8 @@ var shouldSubscribeToTheme = function(r, cascadeOnChange) {
 	var _r_keys_current, _r_props_needsUpdate, _r_props;
 	return Boolean(r.optimizeForFirstRender || r.isRoot || cascadeOnChange || hasThemeUpdatingProps(r.props) || ((_r_keys_current = r.keys.current) === null || _r_keys_current === void 0 ? void 0 : _r_keys_current.size) || ((_r_props_needsUpdate = (_r_props = r.props).needsUpdate) === null || _r_props_needsUpdate === void 0 ? void 0 : _r_props_needsUpdate.call(_r_props)));
 };
-function cleanupThemeSubscription(r) {
-	var _r_unsubscribe;
-	(_r_unsubscribe = r.unsubscribe) === null || _r_unsubscribe === void 0 || _r_unsubscribe.call(r);
-}
 function cleanupThemeState(r) {
-	if (r.unsubscribe) cleanupThemeSubscription(r);
+	if (r.unsubscribe) r.unsubscribe();
 	else {
 		r.state = void 0;
 		states.delete(r.id);
@@ -3078,15 +3096,15 @@ function cleanupThemeState(r) {
 }
 var getSnapshotImpl = function(r) {
 	var _keys_current, _schemeKeys_current, _keys_current1, _props_needsUpdate;
-	var { id, parentId, props, propsKey, isRoot, keys, schemeKeys, optimizeForFirstRender } = r;
+	var { id, parentId, props, propsKey, isRoot, keys, optimizeForFirstRender } = r;
+	var schemeKeys = r.schemeKeys;
 	var local = r.state;
 	var parentState = states.get(parentId);
 	if (local && !PendingUpdate.has(id)) {
 		if (parentState && local._parentName === parentState.name && local._parentSchemeAuthored === parentState.schemeAuthored && local._propsKey === propsKey) return local;
 	}
 	var isSchemeOnlyChange = !optimizeForFirstRender && supportsDynamicColorIOS && getSetting("fastSchemeChange") && local && parentState && local.scheme !== parentState.scheme && getThemeBaseName(local.name) === getThemeBaseName(parentState.name);
-	var allKeysSchemeOptimized = !optimizeForFirstRender && Boolean(((_keys_current = keys.current) === null || _keys_current === void 0 ? void 0 : _keys_current.size) && (schemeKeys === null || schemeKeys === void 0 ? void 0 : (_schemeKeys_current = schemeKeys.current) === null || _schemeKeys_current === void 0 ? void 0 : _schemeKeys_current.size) === keys.current.size);
-	var canSkipForSchemeChange = Boolean(isSchemeOnlyChange && allKeysSchemeOptimized);
+	var canSkipForSchemeChange = Boolean(isSchemeOnlyChange && ((_keys_current = keys.current) === null || _keys_current === void 0 ? void 0 : _keys_current.size) && (schemeKeys === null || schemeKeys === void 0 ? void 0 : (_schemeKeys_current = schemeKeys.current) === null || _schemeKeys_current === void 0 ? void 0 : _schemeKeys_current.size) === keys.current.size);
 	var needsUpdate = props.passThrough ? false : optimizeForFirstRender ? true : isRoot || props.forceClassName || props.name === "light" || props.name === "dark" || props.name === null ? true : !HasRenderedOnce.get(keys) ? true : canSkipForSchemeChange ? false : (keys === null || keys === void 0 ? void 0 : (_keys_current1 = keys.current) === null || _keys_current1 === void 0 ? void 0 : _keys_current1.size) ? true : (_props_needsUpdate = props.needsUpdate) === null || _props_needsUpdate === void 0 ? void 0 : _props_needsUpdate.call(props);
 	var [rerender, nextRaw] = getNextState(local, props, propsKey, isRoot, id, parentId, needsUpdate, PendingUpdate.get(id));
 	var next = nextRaw;
@@ -3139,7 +3157,7 @@ var getNextState = function(lastState, props, propsKey) {
 		if (shouldRerender) return [true, _objectSpread2({}, parentState || lastState || next)];
 		return [false, next];
 	}
-	var scheme = getThemeScheme(resolvedName);
+	var scheme = getAuthoredThemeScheme(themes[resolvedName]) || getThemeScheme(resolvedName);
 	var _parentState_inverses;
 	var parentInverses = (_parentState_inverses = parentState === null || parentState === void 0 ? void 0 : parentState.inverses) !== null && _parentState_inverses !== void 0 ? _parentState_inverses : 0;
 	var isInverse = Boolean(parentState && scheme !== parentState.scheme);
@@ -3226,10 +3244,6 @@ function resolveThemeName(parentName, name, themes2) {
 	if (!forceUpdate && found === parentName && found !== "light" && found !== "dark") return null;
 	return found;
 }
-var getPropsKey = function(param) {
-	var { name, forceClassName, _themeUpdate } = param;
-	return `${name || ""}${forceClassName || ""}${(_themeUpdate === null || _themeUpdate === void 0 ? void 0 : _themeUpdate.key) || ""}`;
-};
 var hasThemeUpdatingProps = function(props) {
 	return "name" in props || "forceClassName" in props || "_themeUpdate" in props;
 };
@@ -5767,7 +5781,6 @@ function contributeProp(pass, keyOg, valOg) {
 	var shouldCheckSkipProps = !noSkip;
 	var asChildExceptStyleLike = Boolean(flags & passAsChildStyleFlag);
 	var isTextOrInput = isText || isInput;
-	var hocParentVariants = isHOC ? parentVariants : void 0;
 	var keyInit = keyOg;
 	var valInit = valOg;
 	if (keyInit === "children") {
@@ -5989,9 +6002,8 @@ function contributeProp(pass, keyOg, valOg) {
 	var isVariant = !isValidStyleKeyInit && variants && keyInit in variants;
 	var isStyleProp = isValidStyleKeyInit || isVariant && !noExpand;
 	if (isStyleProp && asChildExceptStyleLike) return;
-	var shouldPassProp = !isStyleProp && isHOC || hocParentVariants && keyInit in hocParentVariants || (inlineProps === null || inlineProps === void 0 ? void 0 : inlineProps.has(keyInit));
-	var parentVariant = parentVariants === null || parentVariants === void 0 ? void 0 : parentVariants[keyInit];
-	var isHOCShouldPassThrough = Boolean(isHOC && (parentVariant || keyInit in skipProps));
+	var shouldPassProp = !isStyleProp && isHOC || parentVariants && keyInit in parentVariants || (inlineProps === null || inlineProps === void 0 ? void 0 : inlineProps.has(keyInit));
+	var isHOCShouldPassThrough = isHOC && keyInit in skipProps;
 	var shouldPassThrough = shouldPassProp || isHOCShouldPassThrough;
 	if (globalThis.process.env.NODE_ENV === "development" && debug === "verbose") {
 		console.groupCollapsed(`  \u{1F511} ${keyOg}${keyInit !== keyOg ? ` (shorthand for ${keyInit})` : ""} ${shouldPassThrough ? "(pass)" : ""}`);
@@ -6079,7 +6091,7 @@ function contributeProp(pass, keyOg, valOg) {
 	}
 }
 var getSplitStyles = function(props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, componentContext, groupContext, elementType, startedUnhydrated, debug, animationDriver, styleStaticConfig) {
-	var _styleState_flatMediaKeys, _styleState_flatGroupKeys, _styleState_flatGroupMedia, _styleState_flatGroupKeys1, _styleState_flatGroupMedia1, _styleState_style;
+	var _staticConfig_Component_staticConfig, _staticConfig_Component, _styleState_flatMediaKeys, _styleState_flatGroupKeys, _styleState_flatGroupMedia, _styleState_flatGroupKeys1, _styleState_flatGroupMedia1, _styleState_style;
 	var conf = getConfig();
 	styleStaticConfig || (styleStaticConfig = getStyleStaticConfig(staticConfig, conf));
 	var driver = animationDriver || (componentContext === null || componentContext === void 0 ? void 0 : componentContext.animationDriver) || conf.animations;
@@ -6155,7 +6167,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 	var frontendContainer;
 	var frontendContainerType;
 	var processedProps = props;
-	var parentVariants = parentStaticConfig ? getStyleStaticConfig(parentStaticConfig, conf).variants : void 0;
+	var parentVariants = isHOC ? (_staticConfig_Component = staticConfig.Component) === null || _staticConfig_Component === void 0 ? void 0 : (_staticConfig_Component_staticConfig = _staticConfig_Component.staticConfig) === null || _staticConfig_Component_staticConfig === void 0 ? void 0 : _staticConfig_Component_staticConfig.variants : void 0;
 	var defaultProps = asChild ? styleStaticConfig.defaultProps : void 0;
 	var asChildExceptStyleLike = asChild === "except-style" || asChild === "except-style-web";
 	var containerValue;
@@ -6177,7 +6189,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
 		styledContextKeys,
 		(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,
+		globalThis.process.env.NODE_ENV === "development" ? parentStaticConfig : void 0,
 		defaultProps,
 		driverAnimations,
 		driverOutputStyle,
@@ -7193,7 +7205,7 @@ function emitValue(state, property, raw, cursor, originalValue, contextOnly) {
 	}
 	if (typeof raw === "string" && property === "background") {
 		var parts = splitComponents(raw);
-		if (parts.length === 1 && !startsValueFunction(parts[0])) {
+		if (parts.length === 1 && (!startsValueFunction(parts[0]) || classifyBorderComponents(parts[0]).color)) {
 			emitResolved(state, "backgroundColor", parts[0], cursor, originalValue, contextOnly);
 			return;
 		}
@@ -9622,23 +9634,7 @@ function proxyThemeToParents(themeName, theme) {
 		}
 	}
 	Object.assign(out, theme);
-	return out;
-}
-//#endregion
-//#region ../web/dist/esm/helpers/themes.native.js
-function ensureThemeVariable(theme, key) {
-	var val = theme[key];
-	var value = isVariable(val) ? val.val : val;
-	if (!isVariable(val)) theme[key] = createVariable({
-		key,
-		name: key,
-		val: value
-	});
-	else if (val.name !== key) theme[key] = createVariable({
-		key: val.name,
-		name: key,
-		val: value
-	});
+	return copyAuthoredThemeScheme(out, theme);
 }
 //#endregion
 //#region ../web/dist/esm/helpers/variableValue.native.js
@@ -9994,7 +9990,7 @@ function createTamagui$2(configIn) {
 	var themeConfig = (function() {
 		var cssRuleSets = buildCSSRuleSets(createTokenCSS(tokens, shouldTokenCategoryHaveUnits), createFontCSS(fontsParsed, registerFontVariables), defaultFontToken);
 		var themesIn = configIn.themes;
-		var dedupedThemes = foundThemes !== null && foundThemes !== void 0 ? foundThemes : getThemesDeduped(themesIn, tokens.color, configIn.variables, { tokensParsed });
+		var dedupedThemes = foundThemes !== null && foundThemes !== void 0 ? foundThemes : getThemesDeduped(themesIn, tokensParsed, configIn.variables);
 		return {
 			themes: proxyThemesToParents(dedupedThemes, Object.keys(themesIn)),
 			cssRuleSets,
@@ -10057,7 +10053,7 @@ function createTamagui$2(configIn) {
 	if (!globalThis["Tamagui"]) globalThis["Tamagui"] = Tamagui;
 	return config;
 }
-function getThemesDeduped(themes, colorTokens, variables, variablesCtx) {
+function getThemesDeduped(themes, tokensParsed, variables) {
 	var dedupedThemes = [];
 	var existing = /* @__PURE__ */ new Map();
 	var sortedThemeNames = Object.keys(themes).sort(function(a, b) {
@@ -10069,14 +10065,17 @@ function getThemesDeduped(themes, colorTokens, variables, variablesCtx) {
 		for (var _iterator = sortedThemeNames[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
 			var themeName = _step.value;
 			var rawTheme = themes[themeName];
-			var key = JSON.stringify(rawTheme);
-			if (existing.has(key)) {
-				existing.get(key).names.push(themeName);
+			var scheme = getAuthoredThemeScheme(rawTheme);
+			var key = JSON.stringify(rawTheme) + scheme;
+			var e = existing.get(key);
+			if (e) {
+				e.names.push(themeName);
 				continue;
 			}
-			var theme = _objectSpread2(_objectSpread2({}, colorTokens), rawTheme);
+			var theme = _objectSpread2(_objectSpread2({}, tokensParsed.color), rawTheme);
 			for (var key1 in theme) ensureThemeVariable(theme, key1);
-			if (variables && variablesCtx && !themeName.includes("_")) mergeConfigVariablesIntoTheme(theme, themeName, variables, variablesCtx.tokensParsed);
+			copyAuthoredThemeScheme(theme, rawTheme);
+			if (variables && !themeName.includes("_")) mergeConfigVariablesIntoTheme(theme, themeName, variables, tokensParsed);
 			var deduped = {
 				names: [themeName],
 				theme

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "3.0.0-beta.1598.1",
+  "version": "3.0.0-beta.1648.1",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "license": "MIT",
   "author": {
@@ -137,19 +137,19 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/compose-refs": "3.0.0-beta.1598.1",
-    "@tamagui/constants": "3.0.0-beta.1598.1",
-    "@tamagui/helpers": "3.0.0-beta.1598.1",
-    "@tamagui/react-native-media-driver": "3.0.0-beta.1598.1",
-    "@tamagui/react-native-use-pressable": "3.0.0-beta.1598.1",
-    "@tamagui/use-element-layout": "3.0.0-beta.1598.1",
-    "@tamagui/use-event": "3.0.0-beta.1598.1",
-    "@tamagui/web": "3.0.0-beta.1598.1"
+    "@tamagui/compose-refs": "3.0.0-beta.1648.1",
+    "@tamagui/constants": "3.0.0-beta.1648.1",
+    "@tamagui/helpers": "3.0.0-beta.1648.1",
+    "@tamagui/react-native-media-driver": "3.0.0-beta.1648.1",
+    "@tamagui/react-native-use-pressable": "3.0.0-beta.1648.1",
+    "@tamagui/use-element-layout": "3.0.0-beta.1648.1",
+    "@tamagui/use-event": "3.0.0-beta.1648.1",
+    "@tamagui/web": "3.0.0-beta.1648.1"
   },
   "devDependencies": {
-    "@tamagui/build": "3.0.0-beta.1598.1",
-    "@tamagui/native-bundle": "3.0.0-beta.1598.1",
-    "@tamagui/react-native-web-lite": "3.0.0-beta.1598.1",
+    "@tamagui/build": "3.0.0-beta.1648.1",
+    "@tamagui/native-bundle": "3.0.0-beta.1648.1",
+    "@tamagui/react-native-web-lite": "3.0.0-beta.1648.1",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": "19.2.3",
@@ -160,5 +160,5 @@
   "peerDependencies": {
     "react": ">=19"
   },
-  "releaseSourceCommit": "cb51d68712077103855934d1cd4055921caa9b35"
+  "releaseSourceCommit": "302078aa9222bfff888df41f1679e1179a20b18a"
 }