tamagui 1.139.0 → 1.139.2

package/dist/native.cjs

@@ -1247,19 +1247,26 @@ var stackDefaultStyles = {};
   position: process.env.TAMAGUI_POSITION_STATIC === "1" ? "static" : "relative"
 });
 var MISSING_THEME_MESSAGE = "Missing theme.";
-var conf$1, getSetting = function(key) {
-  var _conf_settings_key;
-  return (_conf_settings_key = conf$1.settings[key]) !== null && _conf_settings_key !== void 0 ? _conf_settings_key : (
+var conf$1, getConfigFromGlobalOrLocal = function() {
+  return conf$1 || (globalThis.__tamaguiConfig ? globalThis.__tamaguiConfig : null);
+}, getSetting = function(key) {
+  var config = getConfigFromGlobalOrLocal();
+  var _config_settings_key;
+  return (_config_settings_key = config.settings[key]) !== null && _config_settings_key !== void 0 ? _config_settings_key : (
     // @ts-expect-error
-    conf$1[key]
+    config[key]
   );
 }, setConfig = function(next) {
-  conf$1 = next;
+  conf$1 = next, globalThis.__tamaguiConfig = next;
 }, setConfigFont = function(name, font, fontParsed) {
-  conf$1.fonts[name] = font, conf$1.fontsParsed[`$${name}`] = fontParsed;
+  var config = getConfigFromGlobalOrLocal();
+  config.fonts[name] = font, config.fontsParsed[`$${name}`] = fontParsed;
 }, getConfig = function() {
-  if (!conf$1) throw new Error("Err0");
-  return conf$1;
+  var config = getConfigFromGlobalOrLocal();
+  if (!config) throw new Error("Err0");
+  return config;
+}, getConfigMaybe = function() {
+  return getConfigFromGlobalOrLocal();
 }, tokensMerged;
 function setTokens(_) {
   tokensMerged = _;
@@ -1272,15 +1279,15 @@ var getTokens = function() {
     * Force either with $ or without $ prefix
     */
     {}
-  );
+  ), config = getConfigFromGlobalOrLocal();
   var {
     tokens,
     tokensParsed
-  } = conf$1;
+  } = config;
   return prefixed === false ? tokens : prefixed === true ? tokensParsed : tokensMerged;
 }, getTokenObject = function(value, group) {
-  var _tokensMerged_group, _tokensMerged_, _conf_specificTokens_value;
-  return (_conf_specificTokens_value = conf$1.specificTokens[value]) !== null && _conf_specificTokens_value !== void 0 ? _conf_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) {
+  var _tokensMerged_group, _tokensMerged_, config = getConfigFromGlobalOrLocal(), _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];
   }) || ""]) === null || _tokensMerged_ === void 0 ? void 0 : _tokensMerged_[value];
 }, getToken = function(value, group) {
@@ -1289,11 +1296,13 @@ var getTokens = function() {
 }, getTokenValue = function(value, group) {
   if (!(value === "unset" || value === "auto")) return getToken(value, group, false);
 }, getThemes = function() {
-  return conf$1.themes;
+  return getConfigFromGlobalOrLocal().themes;
 }, configListeners = /* @__PURE__ */ new Set(), onConfiguredOnce = function(cb) {
-  conf$1 ? cb(conf$1) : configListeners.add(cb);
+  var config = getConfigFromGlobalOrLocal();
+  config ? cb(config) : configListeners.add(cb);
 }, updateConfig = function(key, value) {
-  Object.assign(conf$1[key], value);
+  var config = getConfigFromGlobalOrLocal();
+  Object.assign(config[key], value);
 }, getFont = function(name) {
   var _Object_entries_find, conf2 = getConfig(), _conf_fontsParsed_name;
   return (_conf_fontsParsed_name = conf2.fontsParsed[name]) !== null && _conf_fontsParsed_name !== void 0 ? _conf_fontsParsed_name : (_Object_entries_find = Object.entries(conf2.fontsParsed).find(function(param) {
@@ -4841,7 +4850,8 @@ function parseFont(definition) {
   return parsed;
 }
 function createTamagui$2(configIn) {
-  var _configIn_settings;
+  var _configIn_settings, existingConfig = getConfigMaybe();
+  existingConfig && (configIn = __spreadValues(__spreadValues({}, existingConfig), configIn));
   var tokensParsed = {}, tokens = createVariables(configIn.tokens || {});
   if (configIn.tokens) {
     var tokensMerged2 = {};

package/dist/test.cjs

@@ -1479,27 +1479,26 @@ var stackDefaultStyles = {};
   position: process.env.TAMAGUI_POSITION_STATIC === "1" ? "static" : "relative"
 });
 var MISSING_THEME_MESSAGE = "Missing theme.";
-var hasLogged = false;
-function loadDuplicatedConfig() {
-  return globalThis.__tamaguiConfig ? (hasLogged = true, hasLogged || console.warn(`Warning: You have duplicate Tamagui dependencies which can cause major, confusing issues.
-    In dev/test, we're working around this by loading a previously loaded config.
-    In production, this will error.`), globalThis.__tamaguiConfig) : null;
-}
-var conf$1, getSetting = function(key) {
-  var _conf_settings_key;
-  return (_conf_settings_key = conf$1.settings[key]) !== null && _conf_settings_key !== void 0 ? _conf_settings_key : (
+var conf$1, getConfigFromGlobalOrLocal = function() {
+  return conf$1 || (globalThis.__tamaguiConfig ? globalThis.__tamaguiConfig : null);
+}, getSetting = function(key) {
+  var config = getConfigFromGlobalOrLocal();
+  var _config_settings_key;
+  return (_config_settings_key = config.settings[key]) !== null && _config_settings_key !== void 0 ? _config_settings_key : (
     // @ts-expect-error
-    conf$1[key]
+    config[key]
   );
 }, setConfig = function(next) {
-  conf$1 = next;
+  conf$1 = next, globalThis.__tamaguiConfig = next;
 }, setConfigFont = function(name, font, fontParsed) {
-  conf$1.fonts[name] = font, conf$1.fontsParsed[`$${name}`] = fontParsed;
+  var config = getConfigFromGlobalOrLocal();
+  config.fonts[name] = font, config.fontsParsed[`$${name}`] = fontParsed;
 }, getConfig = function() {
-  var dup = loadDuplicatedConfig();
-  if (dup) return dup;
-  if (!conf$1) throw new Error("Missing tamagui config, you either have a duplicate config, or haven't set it up. Be sure createTamagui is called before rendering. Also, make sure all of your tamagui dependencies are on the same version (`tamagui`, `@tamagui/package-name`, etc.) not just in your package.json, but in your lockfile.");
-  return conf$1;
+  var config = getConfigFromGlobalOrLocal();
+  if (!config) throw new Error("Missing tamagui config, you either have a duplicate config, or haven't set it up. Be sure createTamagui is called before rendering. Also, make sure all of your tamagui dependencies are on the same version (`tamagui`, `@tamagui/package-name`, etc.) not just in your package.json, but in your lockfile.");
+  return config;
+}, getConfigMaybe = function() {
+  return getConfigFromGlobalOrLocal();
 }, tokensMerged;
 function setTokens(_) {
   tokensMerged = _;
@@ -1512,15 +1511,15 @@ var getTokens = function() {
     * Force either with $ or without $ prefix
     */
     {}
-  );
+  ), config = getConfigFromGlobalOrLocal();
   var {
     tokens,
     tokensParsed
-  } = conf$1;
+  } = config;
   return prefixed === false ? tokens : prefixed === true ? tokensParsed : tokensMerged;
 }, getTokenObject = function(value, group) {
-  var _tokensMerged_group, _tokensMerged_, _conf_specificTokens_value;
-  return (_conf_specificTokens_value = conf$1.specificTokens[value]) !== null && _conf_specificTokens_value !== void 0 ? _conf_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) {
+  var _tokensMerged_group, _tokensMerged_, config = getConfigFromGlobalOrLocal(), _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];
   }) || ""]) === null || _tokensMerged_ === void 0 ? void 0 : _tokensMerged_[value];
 }, getToken = function(value, group) {
@@ -1529,11 +1528,13 @@ var getTokens = function() {
 }, getTokenValue = function(value, group) {
   if (!(value === "unset" || value === "auto")) return getToken(value, group, false);
 }, getThemes = function() {
-  return conf$1.themes;
+  return getConfigFromGlobalOrLocal().themes;
 }, configListeners = /* @__PURE__ */ new Set(), onConfiguredOnce = function(cb) {
-  conf$1 ? cb(conf$1) : configListeners.add(cb);
+  var config = getConfigFromGlobalOrLocal();
+  config ? cb(config) : configListeners.add(cb);
 }, updateConfig = function(key, value) {
-  Object.assign(conf$1[key], value);
+  var config = getConfigFromGlobalOrLocal();
+  Object.assign(config[key], value);
 }, getFont = function(name) {
   var _Object_entries_find, conf2 = getConfig(), _conf_fontsParsed_name;
   return (_conf_fontsParsed_name = conf2.fontsParsed[name]) !== null && _conf_fontsParsed_name !== void 0 ? _conf_fontsParsed_name : (_Object_entries_find = Object.entries(conf2.fontsParsed).find(function(param) {
@@ -5087,8 +5088,8 @@ function parseFont(definition) {
   return parsed;
 }
 function createTamagui$2(configIn) {
-  var _configIn_settings, dup = loadDuplicatedConfig();
-  if (dup) return dup;
+  var _configIn_settings, existingConfig = getConfigMaybe();
+  existingConfig && (configIn = __spreadValues(__spreadValues({}, existingConfig), configIn));
   var tokensParsed = {}, tokens = createVariables(configIn.tokens || {});
   if (configIn.tokens) {
     var tokensMerged2 = {};
@@ -5186,7 +5187,7 @@ function createTamagui$2(configIn) {
     specificTokens,
     defaultFontToken
   });
-  if (setConfig(config), configureMedia(config), globalThis.__tamaguiConfig = config, configListeners.size && (configListeners.forEach(function(cb) {
+  if (setConfig(config), configureMedia(config), configListeners.size && (configListeners.forEach(function(cb) {
     return cb(config);
   }), configListeners.clear()), false) ;
   return config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tamagui",
-  "version": "1.139.0",
+  "version": "1.139.2",
   "type": "module",
   "description": "Style and UI for React (web and native) meet an optimizing compiler",
   "removeSideEffects": true,
@@ -81,62 +81,62 @@
     }
   },
   "dependencies": {
-    "@tamagui/accordion": "1.139.0",
-    "@tamagui/adapt": "1.139.0",
-    "@tamagui/alert-dialog": "1.139.0",
-    "@tamagui/animate-presence": "1.139.0",
-    "@tamagui/avatar": "1.139.0",
-    "@tamagui/button": "1.139.0",
-    "@tamagui/card": "1.139.0",
-    "@tamagui/checkbox": "1.139.0",
-    "@tamagui/compose-refs": "1.139.0",
-    "@tamagui/constants": "1.139.0",
-    "@tamagui/core": "1.139.0",
-    "@tamagui/create-context": "1.139.0",
-    "@tamagui/dialog": "1.139.0",
-    "@tamagui/elements": "1.139.0",
-    "@tamagui/fake-react-native": "1.139.0",
-    "@tamagui/focusable": "1.139.0",
-    "@tamagui/font-size": "1.139.0",
-    "@tamagui/form": "1.139.0",
-    "@tamagui/get-button-sized": "1.139.0",
-    "@tamagui/get-font-sized": "1.139.0",
-    "@tamagui/get-token": "1.139.0",
-    "@tamagui/group": "1.139.0",
-    "@tamagui/helpers-tamagui": "1.139.0",
-    "@tamagui/image": "1.139.0",
-    "@tamagui/label": "1.139.0",
-    "@tamagui/linear-gradient": "1.139.0",
-    "@tamagui/list-item": "1.139.0",
-    "@tamagui/polyfill-dev": "1.139.0",
-    "@tamagui/popover": "1.139.0",
-    "@tamagui/popper": "1.139.0",
-    "@tamagui/portal": "1.139.0",
-    "@tamagui/progress": "1.139.0",
-    "@tamagui/radio-group": "1.139.0",
-    "@tamagui/react-native-media-driver": "1.139.0",
-    "@tamagui/scroll-view": "1.139.0",
-    "@tamagui/select": "1.139.0",
-    "@tamagui/separator": "1.139.0",
-    "@tamagui/shapes": "1.139.0",
-    "@tamagui/sheet": "1.139.0",
-    "@tamagui/slider": "1.139.0",
-    "@tamagui/stacks": "1.139.0",
-    "@tamagui/switch": "1.139.0",
-    "@tamagui/tabs": "1.139.0",
-    "@tamagui/text": "1.139.0",
-    "@tamagui/theme": "1.139.0",
-    "@tamagui/toggle-group": "1.139.0",
-    "@tamagui/tooltip": "1.139.0",
-    "@tamagui/use-controllable-state": "1.139.0",
-    "@tamagui/use-debounce": "1.139.0",
-    "@tamagui/use-force-update": "1.139.0",
-    "@tamagui/use-window-dimensions": "1.139.0",
-    "@tamagui/visually-hidden": "1.139.0",
-    "@tamagui/z-index-stack": "1.139.0"
+    "@tamagui/accordion": "1.139.2",
+    "@tamagui/adapt": "1.139.2",
+    "@tamagui/alert-dialog": "1.139.2",
+    "@tamagui/animate-presence": "1.139.2",
+    "@tamagui/avatar": "1.139.2",
+    "@tamagui/button": "1.139.2",
+    "@tamagui/card": "1.139.2",
+    "@tamagui/checkbox": "1.139.2",
+    "@tamagui/compose-refs": "1.139.2",
+    "@tamagui/constants": "1.139.2",
+    "@tamagui/core": "1.139.2",
+    "@tamagui/create-context": "1.139.2",
+    "@tamagui/dialog": "1.139.2",
+    "@tamagui/elements": "1.139.2",
+    "@tamagui/fake-react-native": "1.139.2",
+    "@tamagui/focusable": "1.139.2",
+    "@tamagui/font-size": "1.139.2",
+    "@tamagui/form": "1.139.2",
+    "@tamagui/get-button-sized": "1.139.2",
+    "@tamagui/get-font-sized": "1.139.2",
+    "@tamagui/get-token": "1.139.2",
+    "@tamagui/group": "1.139.2",
+    "@tamagui/helpers-tamagui": "1.139.2",
+    "@tamagui/image": "1.139.2",
+    "@tamagui/label": "1.139.2",
+    "@tamagui/linear-gradient": "1.139.2",
+    "@tamagui/list-item": "1.139.2",
+    "@tamagui/polyfill-dev": "1.139.2",
+    "@tamagui/popover": "1.139.2",
+    "@tamagui/popper": "1.139.2",
+    "@tamagui/portal": "1.139.2",
+    "@tamagui/progress": "1.139.2",
+    "@tamagui/radio-group": "1.139.2",
+    "@tamagui/react-native-media-driver": "1.139.2",
+    "@tamagui/scroll-view": "1.139.2",
+    "@tamagui/select": "1.139.2",
+    "@tamagui/separator": "1.139.2",
+    "@tamagui/shapes": "1.139.2",
+    "@tamagui/sheet": "1.139.2",
+    "@tamagui/slider": "1.139.2",
+    "@tamagui/stacks": "1.139.2",
+    "@tamagui/switch": "1.139.2",
+    "@tamagui/tabs": "1.139.2",
+    "@tamagui/text": "1.139.2",
+    "@tamagui/theme": "1.139.2",
+    "@tamagui/toggle-group": "1.139.2",
+    "@tamagui/tooltip": "1.139.2",
+    "@tamagui/use-controllable-state": "1.139.2",
+    "@tamagui/use-debounce": "1.139.2",
+    "@tamagui/use-force-update": "1.139.2",
+    "@tamagui/use-window-dimensions": "1.139.2",
+    "@tamagui/visually-hidden": "1.139.2",
+    "@tamagui/z-index-stack": "1.139.2"
   },
   "devDependencies": {
-    "@tamagui/build": "1.139.0",
+    "@tamagui/build": "1.139.2",
     "react": "*",
     "react-native": "0.81.5",
     "react-native-web": "^0.21.0"