@tamagui/core 3.0.13 → 3.0.14

package/dist/native.cjs

@@ -14316,7 +14316,7 @@ function resolveThemeName(parentName, name, themes2) {
 	if (!forceUpdate && found === parentName && found !== "light" && found !== "dark") return null;
 	return found;
 }
-var ThemeStateContext, allListeners, listenersByParent, HasRenderedOnce, HadTheme, PendingUpdate, states, shouldForce, forceUpdateThemes, getThemeState, themeUpdateLayers, themeProviderParents, getThemeUpdateLayer, getThemeProviderParent, getThemeProviderChainSizes, registerThemeProviderChain, cacheVersion, themeNameCache, themeNameCacheVer, themes, rootThemeState, getRootThemeState, getThemeBaseName, incReducer, useThemeState, shouldSubscribeToTheme, getSnapshotImpl, getNextState, hasThemeUpdatingProps;
+var ThemeStateContext, allListeners, listenersByParent, HasRenderedOnce, HadTheme, PendingUpdate, states, shouldForce, forceUpdateThemes, getThemeState, themeUpdateLayers, themeProviderParents, getThemeUpdateLayer, getThemeProviderParent, getThemeProviderScope, getThemeProviderChainSizes, registerThemeProviderChain, cacheVersion, themeNameCache, themeNameCacheVer, themes, rootThemeState, getRootThemeState, getThemeBaseName, incReducer, useThemeState, shouldSubscribeToTheme, getSnapshotImpl, getNextState, hasThemeUpdatingProps;
 var init_useThemeState_native = __esmMin((() => {
 	init_index_native$6();
 	init_index_native$4();
@@ -14349,7 +14349,12 @@ var init_useThemeState_native = __esmMin((() => {
 		return themeUpdateLayers.get(id);
 	};
 	getThemeProviderParent = function getThemeProviderParent2(id) {
-		return themeProviderParents.get(id);
+		var _themeProviderParents_get;
+		return (_themeProviderParents_get = themeProviderParents.get(id)) === null || _themeProviderParents_get === void 0 ? void 0 : _themeProviderParents_get.parentId;
+	};
+	getThemeProviderScope = function getThemeProviderScope2(id) {
+		var _themeProviderParents_get;
+		return (_themeProviderParents_get = themeProviderParents.get(id)) === null || _themeProviderParents_get === void 0 ? void 0 : _themeProviderParents_get.keys;
 	};
 	getThemeProviderChainSizes = function getThemeProviderChainSizes2() {
 		return {
@@ -14357,8 +14362,13 @@ var init_useThemeState_native = __esmMin((() => {
 			parents: themeProviderParents.size
 		};
 	};
-	registerThemeProviderChain = function registerThemeProviderChain2(id, parentId, props) {
-		themeProviderParents.set(id, parentId);
+	registerThemeProviderChain = function registerThemeProviderChain2(id, parentId, props, keys) {
+		var scope = themeProviderParents.get(id);
+		if (scope) scope.parentId = parentId;
+		else themeProviderParents.set(id, {
+			parentId,
+			keys
+		});
 		if (props._themeUpdate) themeUpdateLayers.set(id, props._themeUpdate);
 		else themeUpdateLayers.delete(id);
 	};
@@ -14391,7 +14401,7 @@ var init_useThemeState_native = __esmMin((() => {
 		};
 		var id = (0, react.useId)();
 		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);
+		if (cascadeOnChange) registerThemeProviderChain(id, parentId, props, keys);
 		var r = (_ref = (0, react.useRef)(null)).current || (_ref.current = {
 			id,
 			optimizeForFirstRender,
@@ -14413,7 +14423,7 @@ var init_useThemeState_native = __esmMin((() => {
 				states.set(r.id, r.lastSnap);
 				r.state = r.lastSnap;
 			}
-			if (cascadeOnChange && !themeProviderParents.has(r.id)) registerThemeProviderChain(r.id, r.parentId, r.props);
+			if (cascadeOnChange && !themeProviderParents.has(r.id)) registerThemeProviderChain(r.id, r.parentId, r.props, r.keys);
 			if (r.unsubscribe && r.subscribedTo !== r.parentId) {
 				var _r_unsubscribe;
 				(_r_unsubscribe = r.unsubscribe) === null || _r_unsubscribe === void 0 || _r_unsubscribe.call(r);
@@ -15172,7 +15182,7 @@ var init__withNativeStyle_native = __esmMin((() => {
 		var TextAncestorProvider = TextAncestor === null || TextAncestor === void 0 ? void 0 : TextAncestor.Provider;
 		var HostText = host === "text" && !("userSelect" in baseStyle) && !("verticalAlign" in baseStyle) ? baseViews === null || baseViews === void 0 ? void 0 : baseViews.NativeText : void 0;
 		var hostTextBase = HostText ? _objectSpread2(_objectSpread2({ overflow: "hidden" }, baseStyle), typeof baseStyle.fontWeight === "number" && { fontWeight: String(baseStyle.fontWeight) }) : baseStyle;
-		var entries = /* @__PURE__ */ new Map();
+		var entries = /* @__PURE__ */ new WeakMap();
 		var createEntry = function createEntry2() {
 			var entry = {
 				style: [baseStyle, null],
@@ -15191,6 +15201,7 @@ var init__withNativeStyle_native = __esmMin((() => {
 		var ScopeContext = ThemeStateContext;
 		var engineOf = getNativeStyleEngine;
 		var scopeState = getThemeState;
+		var scopeOwner = getThemeProviderScope;
 		var resolve = resolveNativeStyleMapping;
 		var linkState = createNativeStyleLinkState;
 		var linkHost = linkNativeStyleHost;
@@ -15202,8 +15213,9 @@ var init__withNativeStyle_native = __esmMin((() => {
 			var scopeId = (0, react.use)(ScopeContext);
 			var inText = TextAncestor ? (0, react.use)(TextAncestor) : false;
 			var themeState = scopeId && engineOf() ? scopeState(scopeId) : void 0;
+			var owner = scopeOwner(scopeId);
 			var resetsText = inText && host === "view";
-			if (!themeState) return resetsText ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(TextAncestorProvider, {
+			if (!themeState || !owner) return resetsText ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(TextAncestorProvider, {
 				value: false,
 				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Fallback, _objectSpread2({}, props))
 			}, key) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Fallback, _objectSpread2({}, props), key);
@@ -15216,10 +15228,10 @@ var init__withNativeStyle_native = __esmMin((() => {
 			var { name, theme } = themeState;
 			var asHostText = HostText && !inText;
 			var Rendered = asHostText ? HostText : Component;
-			var entry = entries.get(scopeId);
+			var entry = entries.get(owner);
 			if (!entry) {
 				entry = createEntry();
-				entries.set(scopeId, entry);
+				entries.set(owner, entry);
 			}
 			if (entry.stateName !== name || entry.theme !== theme) {
 				var themed = resolve(themeStyleKeys, name, theme);
@@ -15252,7 +15264,8 @@ var init__withNativeStyle_native = __esmMin((() => {
 			return render(props);
 		};
 		NativeStyleView.inline = function(element) {
-			return render(element.props, element.key);
+			var _element_key;
+			return render(element.props, (_element_key = element.key) !== null && _element_key !== void 0 ? _element_key : void 0);
 		};
 		return NativeStyleView;
 	};
@@ -15988,13 +16001,12 @@ var init_resolveSizing_native = __esmMin((() => {
 //#endregion
 //#region ../web/dist/esm/helpers/styledDynamic.native.js
 function getFontsForLanguage(fonts, language) {
-	if (fontLanguageCache.has(language)) return fontLanguageCache.get(language);
 	var next = _objectSpread2({}, fonts);
 	for (var name in language) {
+		var _fonts_;
 		var lang = language[name];
-		if (lang !== "default") next[name] = fonts[`${name}_${lang}`];
+		if (lang !== "default") next[name] = (_fonts_ = fonts[`${name}_${lang}`]) !== null && _fonts_ !== void 0 ? _fonts_ : fonts[name];
 	}
-	fontLanguageCache.set(language, next);
 	return next;
 }
 function isStyledDynamic(value) {
@@ -16032,14 +16044,13 @@ function getDynamicEnv(styleState) {
 		}
 	};
 }
-var fontLanguageCache, bareStyledDynamic;
+var bareStyledDynamic;
 var init_styledDynamic_native = __esmMin((() => {
 	init_config_native();
 	init_createVariable_native();
 	init_resolveSizing_native();
 	init_types_native();
 	init_objectSpread2();
-	fontLanguageCache = /* @__PURE__ */ new WeakMap();
 	bareStyledDynamic = { [styledDynamicSymbol]: true };
 }));
 //#endregion
@@ -17475,6 +17486,7 @@ function emitUnderCondition(state, property, value, cursor, originalValue, conte
 }
 function configuredValue(state, property, raw) {
 	var embedded = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false, nativeColors = arguments.length > 4 ? arguments[4] : void 0;
+	var _state_context;
 	var grammar = getConfigRevisionState(state.conf);
 	var name = raw;
 	var opacity;
@@ -17524,14 +17536,15 @@ function configuredValue(state, property, raw) {
 	var lookupName = name.charCodeAt(0) === 36 ? name.slice(1) : name;
 	var value;
 	var fromTheme = false;
+	var fonts = fontProperty && ((_state_context = state.context) === null || _state_context === void 0 ? void 0 : _state_context.language) ? getDynamicEnv(state).fonts : state.conf.fontsParsed;
 	if (property === "fontFamily") {
-		var _state_conf_fontsParsed_lookupName;
-		value = (_state_conf_fontsParsed_lookupName = state.conf.fontsParsed[lookupName]) === null || _state_conf_fontsParsed_lookupName === void 0 ? void 0 : _state_conf_fontsParsed_lookupName.family;
+		var _fonts_lookupName;
+		value = (_fonts_lookupName = fonts[lookupName]) === null || _fonts_lookupName === void 0 ? void 0 : _fonts_lookupName.family;
 	} else {
 		var fontKey = property === "fontSize" ? "size" : property === "fontWeight" ? "weight" : property === "lineHeight" || property === "letterSpacing" ? property : "";
 		if (fontKey) {
 			var _font_fontKey;
-			var font = state.conf.fontsParsed[state.fontFamily || state.conf.defaultFontToken] || state.conf.fontsParsed[state.conf.defaultFontToken];
+			var font = fonts[state.fontFamily || state.conf.defaultFontToken] || fonts[state.conf.defaultFontToken];
 			value = font === null || font === void 0 ? void 0 : (_font_fontKey = font[fontKey]) === null || _font_fontKey === void 0 ? void 0 : _font_fontKey[lookupName];
 		} else {
 			var _state_conf_tokensParsed_category;

package/dist/test.native.cjs

@@ -3305,7 +3305,12 @@ var getThemeUpdateLayer = function getThemeUpdateLayer2(id) {
 	return themeUpdateLayers.get(id);
 };
 var getThemeProviderParent = function getThemeProviderParent2(id) {
-	return themeProviderParents.get(id);
+	var _themeProviderParents_get;
+	return (_themeProviderParents_get = themeProviderParents.get(id)) === null || _themeProviderParents_get === void 0 ? void 0 : _themeProviderParents_get.parentId;
+};
+var getThemeProviderScope = function getThemeProviderScope2(id) {
+	var _themeProviderParents_get;
+	return (_themeProviderParents_get = themeProviderParents.get(id)) === null || _themeProviderParents_get === void 0 ? void 0 : _themeProviderParents_get.keys;
 };
 var getThemeProviderChainSizes = function getThemeProviderChainSizes2() {
 	return {
@@ -3313,8 +3318,13 @@ var getThemeProviderChainSizes = function getThemeProviderChainSizes2() {
 		parents: themeProviderParents.size
 	};
 };
-var registerThemeProviderChain = function registerThemeProviderChain2(id, parentId, props) {
-	themeProviderParents.set(id, parentId);
+var registerThemeProviderChain = function registerThemeProviderChain2(id, parentId, props, keys) {
+	var scope = themeProviderParents.get(id);
+	if (scope) scope.parentId = parentId;
+	else themeProviderParents.set(id, {
+		parentId,
+		keys
+	});
 	if (props._themeUpdate) themeUpdateLayers.set(id, props._themeUpdate);
 	else themeUpdateLayers.delete(id);
 };
@@ -3349,7 +3359,7 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 	};
 	var id = (0, react.useId)();
 	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);
+	if (cascadeOnChange) registerThemeProviderChain(id, parentId, props, keys);
 	var r = (_ref = (0, react.useRef)(null)).current || (_ref.current = {
 		id,
 		optimizeForFirstRender,
@@ -3371,7 +3381,7 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}, but no parent theme con
 			states.set(r.id, r.lastSnap);
 			r.state = r.lastSnap;
 		}
-		if (cascadeOnChange && !themeProviderParents.has(r.id)) registerThemeProviderChain(r.id, r.parentId, r.props);
+		if (cascadeOnChange && !themeProviderParents.has(r.id)) registerThemeProviderChain(r.id, r.parentId, r.props, r.keys);
 		if (r.unsubscribe && r.subscribedTo !== r.parentId) {
 			var _r_unsubscribe;
 			(_r_unsubscribe = r.unsubscribe) === null || _r_unsubscribe === void 0 || _r_unsubscribe.call(r);
@@ -4167,7 +4177,7 @@ var _withNativeStyle = function _withNativeStyle2(Component, baseStyle, themeSty
 	var TextAncestorProvider = TextAncestor === null || TextAncestor === void 0 ? void 0 : TextAncestor.Provider;
 	var HostText = host === "text" && !("userSelect" in baseStyle) && !("verticalAlign" in baseStyle) ? baseViews === null || baseViews === void 0 ? void 0 : baseViews.NativeText : void 0;
 	var hostTextBase = HostText ? _objectSpread2(_objectSpread2({ overflow: "hidden" }, baseStyle), typeof baseStyle.fontWeight === "number" && { fontWeight: String(baseStyle.fontWeight) }) : baseStyle;
-	var entries = /* @__PURE__ */ new Map();
+	var entries = /* @__PURE__ */ new WeakMap();
 	var createEntry = function createEntry2() {
 		var entry = {
 			style: [baseStyle, null],
@@ -4186,6 +4196,7 @@ var _withNativeStyle = function _withNativeStyle2(Component, baseStyle, themeSty
 	var ScopeContext = ThemeStateContext;
 	var engineOf = getNativeStyleEngine;
 	var scopeState = getThemeState;
+	var scopeOwner = getThemeProviderScope;
 	var resolve = resolveNativeStyleMapping;
 	var linkState = createNativeStyleLinkState;
 	var linkHost = linkNativeStyleHost;
@@ -4197,8 +4208,9 @@ var _withNativeStyle = function _withNativeStyle2(Component, baseStyle, themeSty
 		var scopeId = (0, react.use)(ScopeContext);
 		var inText = TextAncestor ? (0, react.use)(TextAncestor) : false;
 		var themeState = scopeId && engineOf() ? scopeState(scopeId) : void 0;
+		var owner = scopeOwner(scopeId);
 		var resetsText = inText && host === "view";
-		if (!themeState) return resetsText ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(TextAncestorProvider, {
+		if (!themeState || !owner) return resetsText ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(TextAncestorProvider, {
 			value: false,
 			children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Fallback, _objectSpread2({}, props))
 		}, key) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Fallback, _objectSpread2({}, props), key);
@@ -4211,10 +4223,10 @@ var _withNativeStyle = function _withNativeStyle2(Component, baseStyle, themeSty
 		var { name, theme } = themeState;
 		var asHostText = HostText && !inText;
 		var Rendered = asHostText ? HostText : Component;
-		var entry = entries.get(scopeId);
+		var entry = entries.get(owner);
 		if (!entry) {
 			entry = createEntry();
-			entries.set(scopeId, entry);
+			entries.set(owner, entry);
 		}
 		if (entry.stateName !== name || entry.theme !== theme) {
 			var themed = resolve(themeStyleKeys, name, theme);
@@ -4247,7 +4259,8 @@ var _withNativeStyle = function _withNativeStyle2(Component, baseStyle, themeSty
 		return render(props);
 	};
 	NativeStyleView.inline = function(element) {
-		return render(element.props, element.key);
+		var _element_key;
+		return render(element.props, (_element_key = element.key) !== null && _element_key !== void 0 ? _element_key : void 0);
 	};
 	return NativeStyleView;
 };
@@ -5213,15 +5226,13 @@ function resolveSizing(size, env) {
 }
 //#endregion
 //#region ../web/dist/esm/helpers/styledDynamic.native.js
-var fontLanguageCache = /* @__PURE__ */ new WeakMap();
 function getFontsForLanguage(fonts, language) {
-	if (fontLanguageCache.has(language)) return fontLanguageCache.get(language);
 	var next = _objectSpread2({}, fonts);
 	for (var name in language) {
+		var _fonts_;
 		var lang = language[name];
-		if (lang !== "default") next[name] = fonts[`${name}_${lang}`];
+		if (lang !== "default") next[name] = (_fonts_ = fonts[`${name}_${lang}`]) !== null && _fonts_ !== void 0 ? _fonts_ : fonts[name];
 	}
-	fontLanguageCache.set(language, next);
 	return next;
 }
 function isStyledDynamic(value) {
@@ -7364,6 +7375,7 @@ var shadowRecipeProperties = /* @__PURE__ */ new Set([
 var shadowRecipeKeywords = /* @__PURE__ */ new Set(["inset", "none"]);
 function configuredValue(state, property, raw) {
 	var embedded = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false, nativeColors = arguments.length > 4 ? arguments[4] : void 0;
+	var _state_context;
 	var grammar = getConfigRevisionState(state.conf);
 	var name = raw;
 	var opacity;
@@ -7413,14 +7425,15 @@ function configuredValue(state, property, raw) {
 	var lookupName = name.charCodeAt(0) === 36 ? name.slice(1) : name;
 	var value;
 	var fromTheme = false;
+	var fonts = fontProperty && ((_state_context = state.context) === null || _state_context === void 0 ? void 0 : _state_context.language) ? getDynamicEnv(state).fonts : state.conf.fontsParsed;
 	if (property === "fontFamily") {
-		var _state_conf_fontsParsed_lookupName;
-		value = (_state_conf_fontsParsed_lookupName = state.conf.fontsParsed[lookupName]) === null || _state_conf_fontsParsed_lookupName === void 0 ? void 0 : _state_conf_fontsParsed_lookupName.family;
+		var _fonts_lookupName;
+		value = (_fonts_lookupName = fonts[lookupName]) === null || _fonts_lookupName === void 0 ? void 0 : _fonts_lookupName.family;
 	} else {
 		var fontKey = property === "fontSize" ? "size" : property === "fontWeight" ? "weight" : property === "lineHeight" || property === "letterSpacing" ? property : "";
 		if (fontKey) {
 			var _font_fontKey;
-			var font = state.conf.fontsParsed[state.fontFamily || state.conf.defaultFontToken] || state.conf.fontsParsed[state.conf.defaultFontToken];
+			var font = fonts[state.fontFamily || state.conf.defaultFontToken] || fonts[state.conf.defaultFontToken];
 			value = font === null || font === void 0 ? void 0 : (_font_fontKey = font[fontKey]) === null || _font_fontKey === void 0 ? void 0 : _font_fontKey[lookupName];
 		} else {
 			var _state_conf_tokensParsed_category;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "3.0.13",
+  "version": "3.0.14",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "license": "MIT",
   "author": {
@@ -137,19 +137,19 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/compose-refs": "3.0.13",
-    "@tamagui/constants": "3.0.13",
-    "@tamagui/helpers": "3.0.13",
-    "@tamagui/react-native-media-driver": "3.0.13",
-    "@tamagui/react-native-use-pressable": "3.0.13",
-    "@tamagui/use-element-layout": "3.0.13",
-    "@tamagui/use-event": "3.0.13",
-    "@tamagui/web": "3.0.13"
+    "@tamagui/compose-refs": "3.0.14",
+    "@tamagui/constants": "3.0.14",
+    "@tamagui/helpers": "3.0.14",
+    "@tamagui/react-native-media-driver": "3.0.14",
+    "@tamagui/react-native-use-pressable": "3.0.14",
+    "@tamagui/use-element-layout": "3.0.14",
+    "@tamagui/use-event": "3.0.14",
+    "@tamagui/web": "3.0.14"
   },
   "devDependencies": {
-    "@tamagui/build": "3.0.13",
-    "@tamagui/native-bundle": "3.0.13",
-    "@tamagui/react-native-web-lite": "3.0.13",
+    "@tamagui/build": "3.0.14",
+    "@tamagui/native-bundle": "3.0.14",
+    "@tamagui/react-native-web-lite": "3.0.14",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": "19.2.3",
@@ -164,5 +164,5 @@
     "./dist/cjs": "./dist/esm/index.native.js",
     "./theme-update": "./dist/esm/theme-update.native.js"
   },
-  "releaseSourceCommit": "b8e55707cda1d4eb264d3a71b30b6d0ed3841919"
+  "releaseSourceCommit": "61a8bd09550319d14c141581a8e4bb286a9795a6"
 }