tamagui 3.0.12 → 3.0.14

package/dist/native.cjs

@@ -15019,8 +15019,13 @@ var init_useThemeState_native = __esmMin((() => {
 	};
 	themeUpdateLayers = /* @__PURE__ */ new Map();
 	themeProviderParents = /* @__PURE__ */ new Map();
-	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);
 	};
@@ -15053,7 +15058,7 @@ var init_useThemeState_native = __esmMin((() => {
 		};
 		var id = (0, react$1.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$1.useRef)(null)).current || (_ref.current = {
 			id,
 			optimizeForFirstRender,
@@ -15075,7 +15080,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);
@@ -16519,13 +16524,12 @@ var init_resolveSizing_native = __esmMin((() => {
 //#endregion
 //#region ../../core/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) {
@@ -16563,14 +16567,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
@@ -17992,6 +17995,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;
@@ -18041,14 +18045,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;
@@ -36109,18 +36114,15 @@ function useSheetScrollViewGestures(param) {
 				vy
 			});
 		},
-		onStartShouldSetResponder: function onStartShouldSetResponder2() {
+		onTouchStart: function onTouchStart2(e) {
 			var s = state.current;
+			s.lastPageY = e.nativeEvent.pageY;
 			scrollBridge.scrollStartY = -1;
 			s.isDraggingScrollArea = true;
 			s.scrollEngaged = scrollBridge.y > 0;
 			s.prevScrollY = scrollBridge.y;
 			s.handoffOccurred = false;
 			s.handoffDragOffset = 0;
-			return false;
-		},
-		onTouchStart: function onTouchStart2(e) {
-			state.current.lastPageY = e.nativeEvent.pageY;
 		},
 		onMoveShouldSetResponder: function onMoveShouldSetResponder2(e) {
 			if (!scrollEnabled) return false;

package/dist/test.cjs

@@ -15222,8 +15222,13 @@ var init_useThemeState_native = __esmMin((() => {
 	};
 	themeUpdateLayers = /* @__PURE__ */ new Map();
 	themeProviderParents = /* @__PURE__ */ new Map();
-	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);
 	};
@@ -15256,7 +15261,7 @@ var init_useThemeState_native = __esmMin((() => {
 		};
 		var id = (0, react$1.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$1.useRef)(null)).current || (_ref.current = {
 			id,
 			optimizeForFirstRender,
@@ -15278,7 +15283,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);
@@ -16722,13 +16727,12 @@ var init_resolveSizing_native = __esmMin((() => {
 //#endregion
 //#region ../../core/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) {
@@ -16766,14 +16770,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
@@ -18202,6 +18205,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;
@@ -18251,14 +18255,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;
@@ -36225,18 +36230,15 @@ function useSheetScrollViewGestures(param) {
 				vy
 			});
 		},
-		onStartShouldSetResponder: function onStartShouldSetResponder2() {
+		onTouchStart: function onTouchStart2(e) {
 			var s = state.current;
+			s.lastPageY = e.nativeEvent.pageY;
 			scrollBridge.scrollStartY = -1;
 			s.isDraggingScrollArea = true;
 			s.scrollEngaged = scrollBridge.y > 0;
 			s.prevScrollY = scrollBridge.y;
 			s.handoffOccurred = false;
 			s.handoffDragOffset = 0;
-			return false;
-		},
-		onTouchStart: function onTouchStart2(e) {
-			state.current.lastPageY = e.nativeEvent.pageY;
 		},
 		onMoveShouldSetResponder: function onMoveShouldSetResponder2(e) {
 			if (!scrollEnabled) return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tamagui",
-  "version": "3.0.12",
+  "version": "3.0.14",
   "license": "MIT",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "description": "Style and UI for React (web and native) meet an optimizing compiler",
@@ -315,73 +315,73 @@
     "check-circular-deps": "npx madge --circular ./src/index.ts"
   },
   "dependencies": {
-    "@tamagui/accordion": "3.0.12",
-    "@tamagui/adapt": "3.0.12",
-    "@tamagui/alert-dialog": "3.0.12",
-    "@tamagui/animate": "3.0.12",
-    "@tamagui/animate-presence": "3.0.12",
-    "@tamagui/avatar": "3.0.12",
-    "@tamagui/button": "3.0.12",
-    "@tamagui/card": "3.0.12",
-    "@tamagui/checkbox": "3.0.12",
-    "@tamagui/collapsible": "3.0.12",
-    "@tamagui/compose-refs": "3.0.12",
-    "@tamagui/constants": "3.0.12",
-    "@tamagui/context-menu": "3.0.12",
-    "@tamagui/core": "3.0.12",
-    "@tamagui/create-context": "3.0.12",
-    "@tamagui/create-menu": "3.0.12",
-    "@tamagui/dialog": "3.0.12",
-    "@tamagui/element": "3.0.12",
-    "@tamagui/fake-react-native": "3.0.12",
-    "@tamagui/field": "3.0.12",
-    "@tamagui/focusable": "3.0.12",
-    "@tamagui/font-size": "3.0.12",
-    "@tamagui/form": "3.0.12",
-    "@tamagui/get-font-sized": "3.0.12",
-    "@tamagui/get-token": "3.0.12",
-    "@tamagui/group": "3.0.12",
-    "@tamagui/helpers-tamagui": "3.0.12",
-    "@tamagui/image": "3.0.12",
-    "@tamagui/input": "3.0.12",
-    "@tamagui/label": "3.0.12",
-    "@tamagui/linear-gradient": "3.0.12",
-    "@tamagui/list-item": "3.0.12",
-    "@tamagui/menu": "3.0.12",
-    "@tamagui/polyfill-dev": "3.0.12",
-    "@tamagui/popover": "3.0.12",
-    "@tamagui/popper": "3.0.12",
-    "@tamagui/portal": "3.0.12",
-    "@tamagui/progress": "3.0.12",
-    "@tamagui/radio-group": "3.0.12",
-    "@tamagui/react-native-media-driver": "3.0.12",
-    "@tamagui/react-native-types": "3.0.12",
-    "@tamagui/scroll-view": "3.0.12",
-    "@tamagui/select": "3.0.12",
-    "@tamagui/separator": "3.0.12",
-    "@tamagui/shapes": "3.0.12",
-    "@tamagui/sheet": "3.0.12",
-    "@tamagui/slider": "3.0.12",
-    "@tamagui/spacer": "3.0.12",
-    "@tamagui/spinner": "3.0.12",
-    "@tamagui/stacks": "3.0.12",
-    "@tamagui/switch": "3.0.12",
-    "@tamagui/tabs": "3.0.12",
-    "@tamagui/text": "3.0.12",
-    "@tamagui/theme": "3.0.12",
-    "@tamagui/toast": "3.0.12",
-    "@tamagui/toggle-group": "3.0.12",
-    "@tamagui/tooltip": "3.0.12",
-    "@tamagui/ui": "3.0.12",
-    "@tamagui/use-controllable-state": "3.0.12",
-    "@tamagui/use-debounce": "3.0.12",
-    "@tamagui/use-force-update": "3.0.12",
-    "@tamagui/use-window-dimensions": "3.0.12",
-    "@tamagui/visually-hidden": "3.0.12",
-    "@tamagui/z-index-stack": "3.0.12"
+    "@tamagui/accordion": "3.0.14",
+    "@tamagui/adapt": "3.0.14",
+    "@tamagui/alert-dialog": "3.0.14",
+    "@tamagui/animate": "3.0.14",
+    "@tamagui/animate-presence": "3.0.14",
+    "@tamagui/avatar": "3.0.14",
+    "@tamagui/button": "3.0.14",
+    "@tamagui/card": "3.0.14",
+    "@tamagui/checkbox": "3.0.14",
+    "@tamagui/collapsible": "3.0.14",
+    "@tamagui/compose-refs": "3.0.14",
+    "@tamagui/constants": "3.0.14",
+    "@tamagui/context-menu": "3.0.14",
+    "@tamagui/core": "3.0.14",
+    "@tamagui/create-context": "3.0.14",
+    "@tamagui/create-menu": "3.0.14",
+    "@tamagui/dialog": "3.0.14",
+    "@tamagui/element": "3.0.14",
+    "@tamagui/fake-react-native": "3.0.14",
+    "@tamagui/field": "3.0.14",
+    "@tamagui/focusable": "3.0.14",
+    "@tamagui/font-size": "3.0.14",
+    "@tamagui/form": "3.0.14",
+    "@tamagui/get-font-sized": "3.0.14",
+    "@tamagui/get-token": "3.0.14",
+    "@tamagui/group": "3.0.14",
+    "@tamagui/helpers-tamagui": "3.0.14",
+    "@tamagui/image": "3.0.14",
+    "@tamagui/input": "3.0.14",
+    "@tamagui/label": "3.0.14",
+    "@tamagui/linear-gradient": "3.0.14",
+    "@tamagui/list-item": "3.0.14",
+    "@tamagui/menu": "3.0.14",
+    "@tamagui/polyfill-dev": "3.0.14",
+    "@tamagui/popover": "3.0.14",
+    "@tamagui/popper": "3.0.14",
+    "@tamagui/portal": "3.0.14",
+    "@tamagui/progress": "3.0.14",
+    "@tamagui/radio-group": "3.0.14",
+    "@tamagui/react-native-media-driver": "3.0.14",
+    "@tamagui/react-native-types": "3.0.14",
+    "@tamagui/scroll-view": "3.0.14",
+    "@tamagui/select": "3.0.14",
+    "@tamagui/separator": "3.0.14",
+    "@tamagui/shapes": "3.0.14",
+    "@tamagui/sheet": "3.0.14",
+    "@tamagui/slider": "3.0.14",
+    "@tamagui/spacer": "3.0.14",
+    "@tamagui/spinner": "3.0.14",
+    "@tamagui/stacks": "3.0.14",
+    "@tamagui/switch": "3.0.14",
+    "@tamagui/tabs": "3.0.14",
+    "@tamagui/text": "3.0.14",
+    "@tamagui/theme": "3.0.14",
+    "@tamagui/toast": "3.0.14",
+    "@tamagui/toggle-group": "3.0.14",
+    "@tamagui/tooltip": "3.0.14",
+    "@tamagui/ui": "3.0.14",
+    "@tamagui/use-controllable-state": "3.0.14",
+    "@tamagui/use-debounce": "3.0.14",
+    "@tamagui/use-force-update": "3.0.14",
+    "@tamagui/use-window-dimensions": "3.0.14",
+    "@tamagui/visually-hidden": "3.0.14",
+    "@tamagui/z-index-stack": "3.0.14"
   },
   "devDependencies": {
-    "@tamagui/build": "3.0.12",
+    "@tamagui/build": "3.0.14",
     "react": "19.2.3",
     "react-native": "0.87.1",
     "react-native-web": "~0.21.0"
@@ -400,5 +400,5 @@
   ],
   "module:jsx": "dist/jsx",
   "removeSideEffects": true,
-  "releaseSourceCommit": "820e351095bd167c0ca898f680a242a2fda8df6f"
+  "releaseSourceCommit": "61a8bd09550319d14c141581a8e4bb286a9795a6"
 }