tamagui 2.6.0 → 2.6.2

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 $ tamagui-build
-built tamagui in 2922 ms
+built tamagui in 3793 ms
 Running afterBuild script...
-afterBuild completed in 1033 ms
+afterBuild completed in 981 ms

package/dist/native.cjs

@@ -42,8 +42,8 @@ let react_native_safe_area_context = require("react-native-safe-area-context");
 if (typeof globalThis["__DEV__"] === "undefined") globalThis["__DEV__"] = false;
 //#endregion
 //#region src/setup.ts
-var _globalThis$1;
-(_globalThis$1 = globalThis)["React"] || (_globalThis$1["React"] = react$1);
+var _globalThis$2;
+(_globalThis$2 = globalThis)["React"] || (_globalThis$2["React"] = react$1);
 if (typeof requestAnimationFrame === "undefined") globalThis["requestAnimationFrame"] = typeof setImmediate === "undefined" ? setTimeout : setImmediate;
 //#endregion
 //#region \0@oxc-project+runtime@0.130.0/helpers/typeof.js
@@ -11868,11 +11868,11 @@ function getStyleCompat() {
 	var _config_settings_styleCompat;
 	return ((_config_settings_styleCompat = config === null || config === void 0 ? void 0 : config.settings.styleCompat) !== null && _config_settings_styleCompat !== void 0 ? _config_settings_styleCompat : config === null || config === void 0 ? void 0 : config.styleCompat) || "web";
 }
-function setTokens(_) {
-	tokensMerged = _;
+function setTokens(next) {
+	globalThis.__tamaguiTokensMerged = next;
 }
 function setupDev(conf2) {}
-var conf$1, getConfigFromGlobalOrLocal, getSetting, setConfig, setConfigFont, getConfig, getConfigMaybe, tokensMerged, getTokens, getTokenObject, getToken, getTokenValue, getThemes, updateConfig, getFont;
+var conf$1, getConfigFromGlobalOrLocal, getSetting, setConfig, setConfigFont, getConfig, getConfigMaybe, getTokensMerged, getTokens, getTokenObject, getToken, getTokenValue, getThemes, updateConfig, getFont;
 var init_config_native = __esmMin((() => {
 	init_index_native$7();
 	getConfigFromGlobalOrLocal = function() {
@@ -11902,6 +11902,9 @@ var init_config_native = __esmMin((() => {
 	getConfigMaybe = function() {
 		return getConfigFromGlobalOrLocal();
 	};
+	getTokensMerged = function() {
+		return globalThis.__tamaguiTokensMerged;
+	};
 	getTokens = function() {
 		var { prefixed } = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 
 		/**
@@ -11911,11 +11914,12 @@ var init_config_native = __esmMin((() => {
 		var { tokens, tokensParsed } = getConfigFromGlobalOrLocal();
 		if (prefixed === false) return tokens;
 		if (prefixed === true) return tokensParsed;
-		return tokensMerged;
+		return getTokensMerged();
 	};
 	getTokenObject = function(value, group) {
 		var _tokensMerged_group, _tokensMerged_;
 		var config = getConfigFromGlobalOrLocal();
+		var tokensMerged = getTokensMerged();
 		var _config_specificTokens_value;
 		return (_config_specificTokens_value = config.specificTokens[value]) !== null && _config_specificTokens_value !== void 0 ? _config_specificTokens_value : group ? (_tokensMerged_group = tokensMerged[group]) === null || _tokensMerged_group === void 0 ? void 0 : _tokensMerged_group[value] : (_tokensMerged_ = tokensMerged[Object.keys(tokensMerged).find(function(cat) {
 			return tokensMerged[cat][value];
@@ -11975,17 +11979,23 @@ var init_mediaObjectToString_native = __esmMin((() => {
 }));
 //#endregion
 //#region ../../core/web/dist/esm/helpers/mediaState.native.js
-var mediaState, setMediaState, mediaQueryConfig, getMedia, mediaKeys;
+var _globalThis$1, mediaState, setMediaState, getMedia, shared, mediaQueryConfig, mediaKeys, mediaKeysOrdered;
 var init_mediaState_native = __esmMin((() => {
 	mediaState = {};
 	setMediaState = function(next) {
 		mediaState = next;
 	};
-	mediaQueryConfig = {};
 	getMedia = function() {
 		return mediaState;
 	};
-	mediaKeys = /* @__PURE__ */ new Set();
+	shared = (_globalThis$1 = globalThis).__tamaguiMediaShared || (_globalThis$1.__tamaguiMediaShared = {
+		queryConfig: {},
+		keys: /* @__PURE__ */ new Set(),
+		keysOrdered: []
+	});
+	mediaQueryConfig = shared.queryConfig;
+	mediaKeys = shared.keys;
+	mediaKeysOrdered = shared.keysOrdered;
 }));
 //#endregion
 //#region ../../core/web/dist/esm/helpers/getGroupPropParts.native.js
@@ -12341,7 +12351,7 @@ function mediaKeyMatch(key, dimensions) {
 		return isMax ? givenVal < expectedVal : givenVal > expectedVal;
 	});
 }
-var mediaKeyRegex, getMediaKey, mediaKeysOrdered, getMediaKeyImportance, dispose, mediaVersion, configureMedia, setupVersion, listeners, States, touchTrackerProto, refSlot, incReducer$1, disableMediaTouch, getMediaImportanceIfMoreImportant;
+var mediaKeyRegex, getMediaKey, getMediaKeyImportance, dispose, mediaVersion, configureMedia, setupVersion, listeners, States, touchTrackerProto, refSlot, incReducer$1, disableMediaTouch, getMediaImportanceIfMoreImportant;
 var init_useMedia_native = __esmMin((() => {
 	init_index_native$7();
 	init_config_native();
@@ -12377,7 +12387,8 @@ var init_useMedia_native = __esmMin((() => {
 		}
 		Object.assign(mediaQueryConfig, media);
 		_objectSpread2({}, getMedia());
-		mediaKeysOrdered = Object.keys(media);
+		mediaKeysOrdered.length = 0;
+		mediaKeysOrdered.push(...Object.keys(media));
 		setupMediaListeners();
 	};
 	setupVersion = -1;

package/dist/test.cjs

@@ -42,8 +42,8 @@ let react_native_safe_area_context = require("react-native-safe-area-context");
 if (typeof globalThis["__DEV__"] === "undefined") globalThis["__DEV__"] = false;
 //#endregion
 //#region src/setup.ts
-var _globalThis$1;
-(_globalThis$1 = globalThis)["React"] || (_globalThis$1["React"] = react$1);
+var _globalThis$2;
+(_globalThis$2 = globalThis)["React"] || (_globalThis$2["React"] = react$1);
 if (typeof requestAnimationFrame === "undefined") globalThis["requestAnimationFrame"] = typeof setImmediate === "undefined" ? setTimeout : setImmediate;
 //#endregion
 //#region \0@oxc-project+runtime@0.130.0/helpers/typeof.js
@@ -12046,11 +12046,11 @@ function getStyleCompat() {
 	var _config_settings_styleCompat;
 	return ((_config_settings_styleCompat = config === null || config === void 0 ? void 0 : config.settings.styleCompat) !== null && _config_settings_styleCompat !== void 0 ? _config_settings_styleCompat : config === null || config === void 0 ? void 0 : config.styleCompat) || "web";
 }
-function setTokens(_) {
-	tokensMerged = _;
+function setTokens(next) {
+	globalThis.__tamaguiTokensMerged = next;
 }
 function setupDev(conf2) {}
-var conf$1, getConfigFromGlobalOrLocal, getSetting, setConfig, setConfigFont, getConfig, getConfigMaybe, tokensMerged, getTokens, getTokenObject, getToken, getTokenValue, getThemes, updateConfig, getFont;
+var conf$1, getConfigFromGlobalOrLocal, getSetting, setConfig, setConfigFont, getConfig, getConfigMaybe, getTokensMerged, getTokens, getTokenObject, getToken, getTokenValue, getThemes, updateConfig, getFont;
 var init_config_native = __esmMin((() => {
 	init_index_native$7();
 	getConfigFromGlobalOrLocal = function() {
@@ -12080,6 +12080,9 @@ var init_config_native = __esmMin((() => {
 	getConfigMaybe = function() {
 		return getConfigFromGlobalOrLocal();
 	};
+	getTokensMerged = function() {
+		return globalThis.__tamaguiTokensMerged;
+	};
 	getTokens = function() {
 		var { prefixed } = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 
 		/**
@@ -12089,11 +12092,12 @@ var init_config_native = __esmMin((() => {
 		var { tokens, tokensParsed } = getConfigFromGlobalOrLocal();
 		if (prefixed === false) return tokens;
 		if (prefixed === true) return tokensParsed;
-		return tokensMerged;
+		return getTokensMerged();
 	};
 	getTokenObject = function(value, group) {
 		var _tokensMerged_group, _tokensMerged_;
 		var config = getConfigFromGlobalOrLocal();
+		var tokensMerged = getTokensMerged();
 		var _config_specificTokens_value;
 		return (_config_specificTokens_value = config.specificTokens[value]) !== null && _config_specificTokens_value !== void 0 ? _config_specificTokens_value : group ? (_tokensMerged_group = tokensMerged[group]) === null || _tokensMerged_group === void 0 ? void 0 : _tokensMerged_group[value] : (_tokensMerged_ = tokensMerged[Object.keys(tokensMerged).find(function(cat) {
 			return tokensMerged[cat][value];
@@ -12153,17 +12157,23 @@ var init_mediaObjectToString_native = __esmMin((() => {
 }));
 //#endregion
 //#region ../../core/web/dist/esm/helpers/mediaState.native.js
-var mediaState, setMediaState, mediaQueryConfig, getMedia, mediaKeys;
+var _globalThis$1, mediaState, setMediaState, getMedia, shared, mediaQueryConfig, mediaKeys, mediaKeysOrdered;
 var init_mediaState_native = __esmMin((() => {
 	mediaState = {};
 	setMediaState = function(next) {
 		mediaState = next;
 	};
-	mediaQueryConfig = {};
 	getMedia = function() {
 		return mediaState;
 	};
-	mediaKeys = /* @__PURE__ */ new Set();
+	shared = (_globalThis$1 = globalThis).__tamaguiMediaShared || (_globalThis$1.__tamaguiMediaShared = {
+		queryConfig: {},
+		keys: /* @__PURE__ */ new Set(),
+		keysOrdered: []
+	});
+	mediaQueryConfig = shared.queryConfig;
+	mediaKeys = shared.keys;
+	mediaKeysOrdered = shared.keysOrdered;
 }));
 //#endregion
 //#region ../../core/web/dist/esm/helpers/getGroupPropParts.native.js
@@ -12519,7 +12529,7 @@ function mediaKeyMatch(key, dimensions) {
 		return isMax ? givenVal < expectedVal : givenVal > expectedVal;
 	});
 }
-var mediaKeyRegex, getMediaKey, mediaKeysOrdered, getMediaKeyImportance, dispose, mediaVersion, configureMedia, setupVersion, listeners, States, touchTrackerProto, refSlot, incReducer$1, disableMediaTouch, getMediaImportanceIfMoreImportant;
+var mediaKeyRegex, getMediaKey, getMediaKeyImportance, dispose, mediaVersion, configureMedia, setupVersion, listeners, States, touchTrackerProto, refSlot, incReducer$1, disableMediaTouch, getMediaImportanceIfMoreImportant;
 var init_useMedia_native = __esmMin((() => {
 	init_index_native$7();
 	init_config_native();
@@ -12555,7 +12565,8 @@ var init_useMedia_native = __esmMin((() => {
 		}
 		Object.assign(mediaQueryConfig, media);
 		_objectSpread2({}, getMedia());
-		mediaKeysOrdered = Object.keys(media);
+		mediaKeysOrdered.length = 0;
+		mediaKeysOrdered.push(...Object.keys(media));
 		setupMediaListeners();
 	};
 	setupVersion = -1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tamagui",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "description": "Style and UI for React (web and native) meet an optimizing compiler",
   "repository": {
@@ -77,72 +77,72 @@
     "check-circular-deps": "npx madge --circular ./src/index.ts"
   },
   "dependencies": {
-    "@tamagui/accordion": "2.6.0",
-    "@tamagui/adapt": "2.6.0",
-    "@tamagui/alert-dialog": "2.6.0",
-    "@tamagui/animate": "2.6.0",
-    "@tamagui/animate-presence": "2.6.0",
-    "@tamagui/avatar": "2.6.0",
-    "@tamagui/button": "2.6.0",
-    "@tamagui/card": "2.6.0",
-    "@tamagui/checkbox": "2.6.0",
-    "@tamagui/collapsible": "2.6.0",
-    "@tamagui/compose-refs": "2.6.0",
-    "@tamagui/constants": "2.6.0",
-    "@tamagui/context-menu": "2.6.0",
-    "@tamagui/core": "2.6.0",
-    "@tamagui/create-context": "2.6.0",
-    "@tamagui/create-menu": "2.6.0",
-    "@tamagui/dialog": "2.6.0",
-    "@tamagui/element": "2.6.0",
-    "@tamagui/elements": "2.6.0",
-    "@tamagui/fake-react-native": "2.6.0",
-    "@tamagui/focusable": "2.6.0",
-    "@tamagui/form": "2.6.0",
-    "@tamagui/get-button-sized": "2.6.0",
-    "@tamagui/get-font-sized": "2.6.0",
-    "@tamagui/get-token": "2.6.0",
-    "@tamagui/group": "2.6.0",
-    "@tamagui/helpers-tamagui": "2.6.0",
-    "@tamagui/image": "2.6.0",
-    "@tamagui/input": "2.6.0",
-    "@tamagui/label": "2.6.0",
-    "@tamagui/linear-gradient": "2.6.0",
-    "@tamagui/list-item": "2.6.0",
-    "@tamagui/menu": "2.6.0",
-    "@tamagui/polyfill-dev": "2.6.0",
-    "@tamagui/popover": "2.6.0",
-    "@tamagui/popper": "2.6.0",
-    "@tamagui/portal": "2.6.0",
-    "@tamagui/progress": "2.6.0",
-    "@tamagui/radio-group": "2.6.0",
-    "@tamagui/react-native-media-driver": "2.6.0",
-    "@tamagui/scroll-view": "2.6.0",
-    "@tamagui/select": "2.6.0",
-    "@tamagui/separator": "2.6.0",
-    "@tamagui/shapes": "2.6.0",
-    "@tamagui/sheet": "2.6.0",
-    "@tamagui/slider": "2.6.0",
-    "@tamagui/spacer": "2.6.0",
-    "@tamagui/spinner": "2.6.0",
-    "@tamagui/stacks": "2.6.0",
-    "@tamagui/switch": "2.6.0",
-    "@tamagui/tabs": "2.6.0",
-    "@tamagui/text": "2.6.0",
-    "@tamagui/theme": "2.6.0",
-    "@tamagui/toast": "2.6.0",
-    "@tamagui/toggle-group": "2.6.0",
-    "@tamagui/tooltip": "2.6.0",
-    "@tamagui/use-controllable-state": "2.6.0",
-    "@tamagui/use-debounce": "2.6.0",
-    "@tamagui/use-force-update": "2.6.0",
-    "@tamagui/use-window-dimensions": "2.6.0",
-    "@tamagui/visually-hidden": "2.6.0",
-    "@tamagui/font-size": "2.6.0",
-    "@tamagui/z-index-stack": "2.6.0"
+    "@tamagui/accordion": "2.6.2",
+    "@tamagui/adapt": "2.6.2",
+    "@tamagui/alert-dialog": "2.6.2",
+    "@tamagui/animate": "2.6.2",
+    "@tamagui/animate-presence": "2.6.2",
+    "@tamagui/avatar": "2.6.2",
+    "@tamagui/button": "2.6.2",
+    "@tamagui/card": "2.6.2",
+    "@tamagui/checkbox": "2.6.2",
+    "@tamagui/collapsible": "2.6.2",
+    "@tamagui/compose-refs": "2.6.2",
+    "@tamagui/constants": "2.6.2",
+    "@tamagui/context-menu": "2.6.2",
+    "@tamagui/core": "2.6.2",
+    "@tamagui/create-context": "2.6.2",
+    "@tamagui/create-menu": "2.6.2",
+    "@tamagui/dialog": "2.6.2",
+    "@tamagui/element": "2.6.2",
+    "@tamagui/elements": "2.6.2",
+    "@tamagui/fake-react-native": "2.6.2",
+    "@tamagui/focusable": "2.6.2",
+    "@tamagui/form": "2.6.2",
+    "@tamagui/get-button-sized": "2.6.2",
+    "@tamagui/get-font-sized": "2.6.2",
+    "@tamagui/get-token": "2.6.2",
+    "@tamagui/group": "2.6.2",
+    "@tamagui/helpers-tamagui": "2.6.2",
+    "@tamagui/image": "2.6.2",
+    "@tamagui/input": "2.6.2",
+    "@tamagui/label": "2.6.2",
+    "@tamagui/linear-gradient": "2.6.2",
+    "@tamagui/list-item": "2.6.2",
+    "@tamagui/menu": "2.6.2",
+    "@tamagui/polyfill-dev": "2.6.2",
+    "@tamagui/popover": "2.6.2",
+    "@tamagui/popper": "2.6.2",
+    "@tamagui/portal": "2.6.2",
+    "@tamagui/progress": "2.6.2",
+    "@tamagui/radio-group": "2.6.2",
+    "@tamagui/react-native-media-driver": "2.6.2",
+    "@tamagui/scroll-view": "2.6.2",
+    "@tamagui/select": "2.6.2",
+    "@tamagui/separator": "2.6.2",
+    "@tamagui/shapes": "2.6.2",
+    "@tamagui/sheet": "2.6.2",
+    "@tamagui/slider": "2.6.2",
+    "@tamagui/spacer": "2.6.2",
+    "@tamagui/spinner": "2.6.2",
+    "@tamagui/stacks": "2.6.2",
+    "@tamagui/switch": "2.6.2",
+    "@tamagui/tabs": "2.6.2",
+    "@tamagui/text": "2.6.2",
+    "@tamagui/theme": "2.6.2",
+    "@tamagui/toast": "2.6.2",
+    "@tamagui/toggle-group": "2.6.2",
+    "@tamagui/tooltip": "2.6.2",
+    "@tamagui/use-controllable-state": "2.6.2",
+    "@tamagui/use-debounce": "2.6.2",
+    "@tamagui/use-force-update": "2.6.2",
+    "@tamagui/use-window-dimensions": "2.6.2",
+    "@tamagui/visually-hidden": "2.6.2",
+    "@tamagui/font-size": "2.6.2",
+    "@tamagui/z-index-stack": "2.6.2"
   },
   "devDependencies": {
-    "@tamagui/build": "2.6.0",
+    "@tamagui/build": "2.6.2",
     "react": ">=19",
     "react-native": "0.83.2",
     "react-native-web": "^0.21.0"