@tamagui/web 1.52.5 → 1.52.7

package/dist/esm/createTamagui.js

@@ -1,5 +1,5 @@
 import { isWeb } from "@tamagui/constants";
-import { configListeners, setConfig } from "./config";
+import { configListeners, setConfig, setTokens } from "./config";
 import { createVariables } from "./createVariables";
 import { getThemeCSSRules } from "./helpers/getThemeCSSRules";
 import {
@@ -30,12 +30,22 @@ function createTamagui(configIn) {
       throw new Error("Must define fonts");
     }
   }
-  const tokensParsed = Object.fromEntries(
-    Object.entries(configIn.tokens).map(([k, v]) => {
-      const val = Object.fromEntries(Object.entries(v).map(([k2, v2]) => [`$${k2}`, v2]));
-      return [k, val];
-    })
-  );
+  const tokens = createVariables(configIn.tokens);
+  const tokensParsed = {};
+  const tokensMerged = {};
+  for (const cat in tokens) {
+    tokensParsed[cat] = {};
+    tokensMerged[cat] = {};
+    const tokenCat = tokens[cat];
+    for (const key in tokenCat) {
+      const val = tokenCat[key];
+      const prefixedKey = `$${key}`;
+      tokensParsed[cat][prefixedKey] = val;
+      tokensMerged[cat][prefixedKey] = val;
+      tokensMerged[cat][key] = val;
+    }
+  }
+  setTokens(tokensMerged);
   const noThemes = Object.keys(configIn.themes).length === 0;
   const foundThemes = scanAllSheets(noThemes, tokensParsed);
   listenForSheetChanges();
@@ -61,33 +71,35 @@ function createTamagui(configIn) {
   const themeConfig = (() => {
     const cssRuleSets = [];
     if (process.env.TAMAGUI_DOES_SSR_CSS !== "true") {
-      if (isWeb) {
-        let declarationsToRuleSet2 = function(decs, selector = "") {
-          return `:root${selector} {${sep}${[...decs].join(`;${sep}`)}${sep}}`;
-        };
-        var declarationsToRuleSet = declarationsToRuleSet2;
-        const declarations = [];
-        const fontDeclarations = {};
-        for (const key in configIn.tokens) {
-          for (const skey in configIn.tokens[key]) {
-            const variable = configIn.tokens[key][skey];
-            specificTokens[`$${key}.${skey}`] = variable;
-            if (process.env.NODE_ENV === "development") {
-              if (typeof variable === "undefined") {
-                throw new Error(
-                  `No value for tokens.${key}.${skey}:
+      const declarations = [];
+      const fontDeclarations = {};
+      for (const key in tokens) {
+        for (const skey in tokens[key]) {
+          const variable = tokens[key][skey];
+          specificTokens[`$${key}.${skey}`] = variable;
+          if (process.env.NODE_ENV === "development") {
+            if (typeof variable === "undefined") {
+              throw new Error(
+                `No value for tokens.${key}.${skey}:
 ${JSON.stringify(
-                    variable,
-                    null,
-                    2
-                  )}`
-                );
-              }
+                  variable,
+                  null,
+                  2
+                )}`
+              );
             }
+          }
+          if (isWeb) {
             registerCSSVariable(variable);
             declarations.push(variableToCSS(variable, key === "zIndex"));
           }
         }
+      }
+      if (isWeb) {
+        let declarationsToRuleSet2 = function(decs, selector = "") {
+          return `:root${selector} {${sep}${[...decs].join(`;${sep}`)}${sep}}`;
+        };
+        var declarationsToRuleSet = declarationsToRuleSet2;
         for (const key in fontsParsed) {
           const fontParsed = fontsParsed[key];
           const [name, language] = key.includes("_") ? key.split("_") : [key];
@@ -173,8 +185,7 @@ ${runtimeStyles}`;
     animations: {},
     media: {},
     ...configIn,
-    // already processed by createTokens()
-    tokens: configIn.tokens,
+    tokens,
     // vite made this into a function if it wasn't set
     shorthands,
     inverseShorthands: shorthands ? Object.fromEntries(Object.entries(shorthands).map(([k, v]) => [v, k])) : {},

package/dist/esm/createTamagui.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/createTamagui.ts"],
-  "mappings": "AAAA,SAAS,aAAa;AAEtB,SAAS,iBAAiB,iBAAiB;AAE3C,SAAS,uBAAuB;AAChC,SAAS,wBAAwB;AACjC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,4BAA4B;AACrC,SAAS,qBAAqB,qBAAqB;AACnD,SAAS,2BAA2B;AACpC,SAAS,sBAAsB;AAC/B,SAAS,WAAW,6BAA6B;AACjD,SAAS,eAAe;AAaxB,MAAM,iBAAiB,oBAAI,QAAsB;AAE1C,SAAS,cACd,UAC0B;AAjC5B;AAkCE,MAAI,eAAe,IAAI,QAAQ,GAAG;AAChC,WAAO;AAAA,EACT;AAEA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,CAAC,SAAS,QAAQ;AACpB,YAAM,IAAI,MAAM,oBAAoB;AAAA,IACtC;AACA,QAAI,CAAC,SAAS,QAAQ;AACpB,YAAM,IAAI,MAAM,oBAAoB;AAAA,IACtC;AACA,QAAI,CAAC,SAAS,OAAO;AACnB,YAAM,IAAI,MAAM,mBAAmB;AAAA,IACrC;AAAA,EACF;AAGA,QAAM,eAAoB,OAAO;AAAA,IAC/B,OAAO,QAAQ,SAAS,MAAM,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM;AAC9C,YAAM,MAAM,OAAO,YAAY,OAAO,QAAQ,CAAC,EAAE,IAAI,CAAC,CAACA,IAAGC,EAAC,MAAM,CAAC,IAAID,EAAC,IAAIC,EAAC,CAAC,CAAC;AAC9E,aAAO,CAAC,GAAG,GAAG;AAAA,IAChB,CAAC;AAAA,EACH;AAEA,QAAM,WAAW,OAAO,KAAK,SAAS,MAAM,EAAE,WAAW;AACzD,QAAM,cAAc,cAAc,UAAU,YAAY;AACxD,wBAAsB;AAEtB,QAAM,aAAa,OAAO;AAAA,IACxB,OAAO,QAAQ,SAAS,KAAM,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM;AAC9C,aAAO,CAAC,GAAG,gBAAgB,GAAG,KAAK,IAAI,CAAC;AAAA,IAC1C,CAAC;AAAA,EACH;AAEA,MAAI,iBAAqC;AAEzC,QAAM,eAAe,MAAM;AACzB,UAAM,MAAM,CAAC;AACb,eAAW,cAAc,YAAY;AACnC,YAAM,OAAO,WAAW,UAAU;AAClC,YAAM,aAAa,UAAU,IAAI;AACjC,UAAI,IAAI,UAAU,EAAE,IAAI;AACxB,UAAI,CAAC,kBAAkB,WAAW,MAAM;AACtC,yBAAiB,IAAI,IAAI,OAAO,KAAK,WAAW,IAAI,CAAC;AAAA,MACvD;AAAA,IACF;AACA,WAAO;AAAA,EACT,GAAG;AAEH,QAAM,iBAAiB,CAAC;AAExB,QAAM,eAAe,MAAM;AACzB,UAAM,cAAwB,CAAC;AAE/B,QAAI,QAAQ,IAAI,yBAAyB,QAAQ;AAC/C,UAAI,OAAO;AA6CT,YAASC,yBAAT,SAA+B,MAAgB,WAAW,IAAI;AAC5D,iBAAO,QAAQ,QAAQ,KAAK,GAAG,GAAG,CAAC,GAAG,IAAI,EAAE,KAAK,IAAI,GAAG,EAAE,CAAC,GAAG,GAAG;AAAA,QACnE;AAFS,oCAAAA;AA5CT,cAAM,eAAyB,CAAC;AAChC,cAAM,mBAGF,CAAC;AAEL,mBAAW,OAAO,SAAS,QAAQ;AACjC,qBAAW,QAAQ,SAAS,OAAO,GAAG,GAAG;AACvC,kBAAM,WAAW,SAAS,OAAO,GAAG,EAAE,IAAI;AAG1C,2BAAe,IAAI,GAAG,IAAI,IAAI,EAAE,IAAI;AAEpC,gBAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,kBAAI,OAAO,aAAa,aAAa;AACnC,sBAAM,IAAI;AAAA,kBACR,uBAAuB,GAAG,IAAI,IAAI;AAAA,EAAM,KAAK;AAAA,oBAC3C;AAAA,oBACA;AAAA,oBACA;AAAA,kBACF,CAAC;AAAA,gBACH;AAAA,cACF;AAAA,YACF;AAEA,gCAAoB,QAAQ;AAC5B,yBAAa,KAAK,cAAc,UAAU,QAAQ,QAAQ,CAAC;AAAA,UAC7D;AAAA,QACF;AAEA,mBAAW,OAAO,aAAa;AAC7B,gBAAM,aAAa,YAAY,GAAG;AAClC,gBAAM,CAAC,MAAM,QAAQ,IAAI,IAAI,SAAS,GAAG,IAAI,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG;AAClE,gBAAM,WAAW,sBAAsB,UAAU;AACjD,2BAAiB,GAAG,IAAI;AAAA,YACtB,MAAM,KAAK,MAAM,CAAC;AAAA,YAClB,cAAc;AAAA,YACd;AAAA,UACF;AAAA,QACF;AAEA,cAAM,MACJ,QAAQ,IAAI,aAAa,gBAAgB,SAAS,qBAAqB,MAAM;AAO/E,oBAAY,KAAKA,uBAAsB,YAAY,CAAC;AAGpD,YAAI,kBAAkB;AACpB,qBAAW,OAAO,kBAAkB;AAClC,kBAAM,EAAE,MAAM,cAAAC,eAAc,WAAW,UAAU,IAAI,iBAAiB,GAAG;AACzE,kBAAM,eAAe,SAAS,IAAI;AAClC,kBAAM,eAAe,iBAAiB,IAAI,IAAI,QAAQ,IAAI,YAAY;AACtE,kBAAM,YACJ,aAAa,YAAY,IAAI,YAAY,KAAK,YAAY,KAAK;AACjE,kBAAM,kBAAkBD,uBAAsBC,eAAc,SAAS;AACrE,wBAAY,KAAK,eAAe;AAAA,UAClC;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAEA,UAAM,WAAW,EAAE,GAAG,SAAS,OAAO;AACtC,UAAM,gBAAgB,eAAe,iBAAiB,QAAQ;AAC9D,UAAM,SAAS,qBAAqB,aAAa;AAEjD,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA,oBAAoB;AAElB,YAAI,gBAA0B,CAAC;AAE/B,YAAI,OAAO;AACT,qBAAW,EAAE,OAAO,MAAM,KAAK,eAAe;AAC5C,kBAAM,YAAY,iBAAiB;AAAA,cACjC,QAAQ;AAAA,cACR,WAAW,MAAM,CAAC;AAAA,cAClB;AAAA,cACA;AAAA,YACF,CAAC;AACD,4BAAgB,CAAC,GAAG,eAAe,GAAG,SAAS;AAAA,UACjD;AAAA,QACF;AAEA,eAAO;AAAA,MACT;AAAA,IACF;AAAA,EACF,GAAG;AAEH,QAAM,aAAa,SAAS,cAAc,CAAC;AAE3C,MAAI,4BAA4B;AAEhC,QAAM,SAAiB,CAAC,EAAE,YAAY,MAAM,eAAe,QAAQ,IAAI,CAAC,MAAM;AAC5E,QAAI,iBAAiB,6BAA6B,GAAG;AAEnD,YAAM,QAAQ,YAAY;AAC1B,kCAA4B,MAAM;AAClC,aAAO,MAAM,MAAM,yBAAyB,EAAE,KAAK,SAAS;AAAA,IAC9D;AAGA,gCAA4B;AAE5B,UAAM,gBAAgB,YAAY,EAAE,KAAK,SAAS;AAElD,QAAI,YAAY,iBAAiB;AAC/B,aAAO;AAAA,IACT;AAEA,UAAM,eAAe;AAAA;AAAA;AAAA,EAGvB,YAAY,YAAY,KAAK,SAAS,CAAC;AAErC,WAAO,GAAG,YAAY;AAAA,EACxB,UAAU,KAAK,YAAY,kBAAkB,EAAE,KAAK,SAAS,CAAC;AAAA,EAC9D,aAAa;AAAA,EACb;AAEA,QAAM,YAAoB,CAAC,SAAS,OAAO,EAAE,GAAG,MAAM,eAAe,KAAK,CAAC;AAE3E,QAAM,kBACJ,SAAS;AAAA,GAER,UAAU,SAAS,QAAQ,SAAS;AAAA,EAErC,OAAO,KAAK,SAAS,KAAK,EAAE,CAAC;AAE/B,MAAI,QAAQ,IAAI,aAAa,cAAc;AACzC,SAAI,mDAAkB,QAAO,KAAK;AAChC,YAAM,IAAI,MAAM,wCAAwC,SAAS,WAAW,GAAG;AAAA,IACjF;AAAA,EACF;AAGA,QAAM,cAAc,IAAI,eAAe;AAEvC,QAAM,SAAgC;AAAA,IACpC,UAAU,CAAC;AAAA,IACX,qBAAqB;AAAA,IACrB,eAAe,CAAC;AAAA,IAChB,YAAY,CAAC;AAAA,IACb,OAAO,CAAC;AAAA,IACR,GAAG;AAAA;AAAA,IAEH,QAAQ,SAAS;AAAA;AAAA,IAEjB;AAAA,IACA,mBAAmB,aACf,OAAO,YAAY,OAAO,QAAQ,UAAU,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IACrE,CAAC;AAAA,IACL,QAAQ,YAAY;AAAA,IACpB;AAAA,IACA;AAAA,IACA;AAAA,IACA,QAAQ;AAAA,IACR;AAAA,IACA;AAAA,IACA;AAAA,IACA,gBAAgB,kBAAkB,oBAAI,IAAI;AAAA,IAC1C;AAAA;AAAA;AAAA,EAGF;AAEA,iBAAe,MAAM;AACrB,YAAU,MAAM;AAEhB,MAAI,gBAAgB,MAAM;AACxB,oBAAgB,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC;AAC1C,oBAAgB,MAAM;AAAA,EACxB;AAEA,iBAAe,IAAI,QAAQ,IAAI;AAE/B,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,SAAI,aAAQ,IAAI,UAAZ,mBAAmB,WAAW,YAAY;AAE5C,cAAQ,IAAI,mBAAmB,MAAM;AAAA,IACvC;AACA,QAAI,CAAC,WAAW,SAAS,GAAG;AAC1B,iBAAW,SAAS,IAAI;AAAA,IAC1B;AAAA,EACF;AAEA,SAAO;AACT;AAGA,SAAS,iBAAiB,QAAyC;AACjE,QAAM,gBAA+B,CAAC;AACtC,QAAM,WAAW,oBAAI,IAA0B;AAG/C,aAAW,aAAa,QAAQ;AAE9B,UAAM,4BAA4B,UAAU,WAAW,MAAM,IACzD,SACA,UAAU,WAAW,OAAO,IAC5B,UACA;AAEJ,UAAM,WAAW,OAAO,SAAS;AAIjC,UAAM,MAAM,4BAA4B,KAAK,UAAU,QAAQ;AAG/D,QAAI,SAAS,IAAI,GAAG,GAAG;AACrB,YAAM,IAAI,SAAS,IAAI,GAAG;AAC1B,QAAE,MAAM,KAAK,SAAS;AACtB;AAAA,IACF;AAIA,UAAM,QAAQ,EAAE,GAAG,SAAS;AAE5B,eAAWC,QAAO,OAAO;AAEvB,0BAAoB,OAAOA,IAAG;AAAA,IAChC;AAGA,UAAM,UAAwB;AAAA,MAC5B,OAAO,CAAC,SAAS;AAAA,MACjB;AAAA,IACF;AACA,kBAAc,KAAK,OAAO;AAC1B,aAAS,IAAI,KAAK,OAAO;AAAA,EAC3B;AAEA,SAAO;AACT;",
-  "names": ["k", "v", "declarationsToRuleSet", "declarations", "key"]
+  "mappings": "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",
+  "names": ["declarationsToRuleSet", "declarations", "key"]
 }

package/dist/esm/createVariables.js

@@ -1,13 +1,17 @@
 import { simpleHash } from "@tamagui/helpers";
 import { createVariable, isVariable } from "./createVariable";
+const cache = /* @__PURE__ */ new WeakMap();
 const createVariables = (tokens, parentPath = "", isFont = false) => {
+  if (cache.has(tokens))
+    return tokens;
   const res = {};
   let i = 0;
   for (let keyIn in tokens) {
     i++;
     const val = tokens[keyIn];
-    const keyWithPrefix = keyIn[0] === "$" ? keyIn : `$${keyIn}`;
-    const key = keyWithPrefix.slice(1);
+    const isPrefixed = keyIn[0] === "$";
+    const keyWithPrefix = isPrefixed ? keyIn : `$${keyIn}`;
+    const key = isPrefixed ? keyWithPrefix.slice(1) : keyIn;
     if (isVariable(val)) {
       res[key] = val;
       continue;
@@ -16,11 +20,13 @@ const createVariables = (tokens, parentPath = "", isFont = false) => {
     let name = isFont ? niceKey.slice(0, 2) : i;
     name = parentPath ? `${parentPath}-${name}` : niceKey;
     if (val && typeof val === "object") {
-      res[key] = createVariables(tokens[key], name);
+      res[key] = createVariables(tokens[key], name, isFont);
       continue;
     }
-    res[key] = isVariable(val) ? val : createVariable({ val, name, key: keyWithPrefix });
+    const finalValue = isVariable(val) ? val : createVariable({ val, name, key: keyWithPrefix });
+    res[key] = finalValue;
   }
+  cache.set(res, true);
   return res;
 };
 export {

package/dist/esm/createVariables.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/createVariables.ts"],
-  "mappings": "AAAA,SAAS,kBAAkB;AAE3B,SAAmB,gBAAgB,kBAAkB;AAc9C,MAAM,kBAAkB,CAC7B,QACA,aAAa,IACb,SAAS,UACiB;AAC1B,QAAM,MAAW,CAAC;AAClB,MAAI,IAAI;AACR,WAAS,SAAS,QAAQ;AACxB;AACA,UAAM,MAAM,OAAO,KAAK;AACxB,UAAM,gBAAgB,MAAM,CAAC,MAAM,MAAM,QAAQ,IAAI,KAAK;AAC1D,UAAM,MAAM,cAAc,MAAM,CAAC;AACjC,QAAI,WAAW,GAAG,GAAG;AACnB,UAAI,GAAG,IAAI;AACX;AAAA,IACF;AACA,UAAM,UAAU,WAAW,GAAG;AAC9B,QAAI,OAAO,SAAS,QAAQ,MAAM,GAAG,CAAC,IAAI;AAC1C,WAAO,aAAa,GAAG,UAAU,IAAI,IAAI,KAAK;AAC9C,QAAI,OAAO,OAAO,QAAQ,UAAU;AAElC,UAAI,GAAG,IAAI,gBAAgB,OAAO,GAAG,GAAU,IAAI;AACnD;AAAA,IACF;AACA,QAAI,GAAG,IAAI,WAAW,GAAG,IAAI,MAAM,eAAe,EAAE,KAAK,MAAM,KAAK,cAAc,CAAC;AAAA,EACrF;AAEA,SAAO;AACT;",
+  "mappings": "AAAA,SAAS,kBAAkB;AAE3B,SAAmB,gBAAgB,kBAAkB;AAcrD,MAAM,QAAQ,oBAAI,QAAQ;AAInB,MAAM,kBAAkB,CAC7B,QACA,aAAa,IACb,SAAS,UACiB;AAC1B,MAAI,MAAM,IAAI,MAAM;AAAG,WAAO;AAE9B,QAAM,MAAW,CAAC;AAClB,MAAI,IAAI;AACR,WAAS,SAAS,QAAQ;AACxB;AACA,UAAM,MAAM,OAAO,KAAK;AACxB,UAAM,aAAa,MAAM,CAAC,MAAM;AAChC,UAAM,gBAAgB,aAAa,QAAQ,IAAI,KAAK;AACpD,UAAM,MAAM,aAAa,cAAc,MAAM,CAAC,IAAI;AAClD,QAAI,WAAW,GAAG,GAAG;AACnB,UAAI,GAAG,IAAI;AACX;AAAA,IACF;AACA,UAAM,UAAU,WAAW,GAAG;AAC9B,QAAI,OAAO,SAAS,QAAQ,MAAM,GAAG,CAAC,IAAI;AAC1C,WAAO,aAAa,GAAG,UAAU,IAAI,IAAI,KAAK;AAC9C,QAAI,OAAO,OAAO,QAAQ,UAAU;AAElC,UAAI,GAAG,IAAI,gBAAgB,OAAO,GAAG,GAAU,MAAM,MAAM;AAC3D;AAAA,IACF;AACA,UAAM,aAAa,WAAW,GAAG,IAC7B,MACA,eAAe,EAAE,KAAK,MAAM,KAAK,cAAc,CAAC;AACpD,QAAI,GAAG,IAAI;AAAA,EACb;AAEA,QAAM,IAAI,KAAK,IAAI;AACnB,SAAO;AACT;",
   "names": []
 }

package/dist/esm/helpers/getStylesAtomic.native.js

@@ -2,9 +2,11 @@ const empty = () => {
   console.warn("no-op native");
 };
 const getStylesAtomic = empty;
+const generateAtomicStyles = empty;
 const getAtomicStyle = empty;
 const styleToCSS = empty;
 export {
+  generateAtomicStyles,
   getAtomicStyle,
   getStylesAtomic,
   styleToCSS

package/dist/esm/helpers/getStylesAtomic.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/getStylesAtomic.native.ts"],
-  "mappings": "AAAA,MAAM,QAAQ,MAAM;AAClB,UAAQ,KAAK,cAAc;AAC7B;AAEO,MAAM,kBAAkB;AACxB,MAAM,iBAAiB;AACvB,MAAM,aAAa;",
+  "mappings": "AAAA,MAAM,QAAQ,MAAM;AAClB,UAAQ,KAAK,cAAc;AAC7B;AAEO,MAAM,kBAAkB;AACxB,MAAM,uBAAuB;AAC7B,MAAM,iBAAiB;AACvB,MAAM,aAAa;",
   "names": []
 }

package/dist/esm/helpers/insertStyleRule.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/insertStyleRule.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["sheet"]
 }

package/dist/esm/helpers/propMapper.js

@@ -27,7 +27,7 @@ const propMapper = (key, value, styleStateIn, subPropsIn) => {
       )}`
     );
   }
-  if (variants && key in variants && value != null) {
+  if (variants && key in variants) {
     styleState.curProps[key] = value;
     const variantValue = resolveVariants(key, value, styleProps, styleState, "");
     if (variantValue) {

package/dist/esm/helpers/propMapper.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/propMapper.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["key", "val"]
 }

package/dist/esm/helpers/proxyThemeToParents.js

@@ -1,4 +1,4 @@
-import { getToken } from "../config";
+import { getTokenObject } from "../config";
 import { GetThemeUnwrapped } from "../hooks/getThemeUnwrapped";
 const themesRaw = {};
 function proxyThemesToParents(dedupedThemes) {
@@ -27,8 +27,11 @@ function proxyThemeToParents(themeName, theme) {
     get(target, key) {
       if (key === GetThemeUnwrapped)
         return theme;
-      if (Reflect.has(target, key))
+      if (key == null || // dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
+      // if someone is crazy enough to use "undefined" as a theme key then this not working is on them
+      key == "undefined" || Reflect.has(target, key)) {
         return Reflect.get(target, key);
+      }
       for (let i = numParents - 1; i >= 0; i--) {
         const parent = themesRaw[parents[i]];
         if (!parent)
@@ -37,7 +40,7 @@ function proxyThemeToParents(themeName, theme) {
           return Reflect.get(parent, key);
         }
       }
-      return getToken(key) ?? Reflect.get(target, key);
+      return getTokenObject(key) ?? Reflect.get(target, key);
     }
   });
 }

package/dist/esm/helpers/proxyThemeToParents.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/proxyThemeToParents.ts"],
-  "mappings": "AAAA,SAAS,gBAAgB;AACzB,SAAS,yBAAyB;AAG3B,MAAM,YAAyC,CAAC;AAIhD,SAAS,qBACd,eAC6B;AAE7B,aAAW,EAAE,OAAO,MAAM,KAAK,eAAe;AAC5C,eAAW,QAAQ,OAAO;AACxB,gBAAU,IAAI,IAAI;AAAA,IACpB;AAAA,EACF;AAEA,QAAM,SAAsC,CAAC;AAM7C,aAAW,EAAE,OAAO,MAAM,KAAK,eAAe;AAC5C,eAAW,aAAa,OAAO;AAC7B,YAAM,eAAe,oBAAoB,WAAW,KAAK;AACzD,aAAO,SAAS,IAAI;AAAA,IACtB;AAAA,EACF;AAEA,SAAO;AACT;AAEO,SAAS,oBAAoB,WAAmB,OAAoB;AACzE,QAAM,MAAgB,CAAC;AAIvB,QAAM,UAAU,UACb,MAAM,GAAG,EACT,MAAM,GAAG,EAAE,EACX,IAAI,CAAC,SAAS;AACb,QAAI,KAAK,IAAI;AACb,WAAO,IAAI,KAAK,GAAG;AAAA,EACrB,CAAC;AAEH,QAAM,aAAa,QAAQ;AAG3B,SAAO,IAAI,MAAM,OAAO;AAAA,IACtB,IAAI,QAAQ,KAAK;AACf,UAAI,QAAQ;AAAmB,eAAO;AACtC,UAAI,QAAQ,IAAI,QAAQ,GAAG;AAAG,eAAO,QAAQ,IAAI,QAAQ,GAAG;AAE5D,eAAS,IAAI,aAAa,GAAG,KAAK,GAAG,KAAK;AACxC,cAAM,SAAS,UAAU,QAAQ,CAAC,CAAC;AACnC,YAAI,CAAC;AAAQ;AACb,YAAI,QAAQ,IAAI,QAAQ,GAAG,GAAG;AAC5B,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,QAChC;AAAA,MACF;AACA,aAAO,SAAS,GAAU,KAAK,QAAQ,IAAI,QAAQ,GAAG;AAAA,IACxD;AAAA,EACF,CAAC;AACH;",
+  "mappings": "AAAA,SAAmB,sBAAiC;AACpD,SAAS,yBAAyB;AAG3B,MAAM,YAAyC,CAAC;AAIhD,SAAS,qBACd,eAC6B;AAE7B,aAAW,EAAE,OAAO,MAAM,KAAK,eAAe;AAC5C,eAAW,QAAQ,OAAO;AACxB,gBAAU,IAAI,IAAI;AAAA,IACpB;AAAA,EACF;AAEA,QAAM,SAAsC,CAAC;AAM7C,aAAW,EAAE,OAAO,MAAM,KAAK,eAAe;AAC5C,eAAW,aAAa,OAAO;AAC7B,YAAM,eAAe,oBAAoB,WAAW,KAAK;AACzD,aAAO,SAAS,IAAI;AAAA,IACtB;AAAA,EACF;AAEA,SAAO;AACT;AAEO,SAAS,oBAAoB,WAAmB,OAAoB;AACzE,QAAM,MAAgB,CAAC;AAIvB,QAAM,UAAU,UACb,MAAM,GAAG,EACT,MAAM,GAAG,EAAE,EACX,IAAI,CAAC,SAAS;AACb,QAAI,KAAK,IAAI;AACb,WAAO,IAAI,KAAK,GAAG;AAAA,EACrB,CAAC;AAEH,QAAM,aAAa,QAAQ;AAG3B,SAAO,IAAI,MAAM,OAAO;AAAA,IACtB,IAAI,QAAQ,KAAK;AACf,UAAI,QAAQ;AAAmB,eAAO;AACtC,UACE,OAAO;AAAA;AAAA,MAGP,OAAO,eACP,QAAQ,IAAI,QAAQ,GAAG,GACvB;AACA,eAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,MAChC;AAEA,eAAS,IAAI,aAAa,GAAG,KAAK,GAAG,KAAK;AACxC,cAAM,SAAS,UAAU,QAAQ,CAAC,CAAC;AACnC,YAAI,CAAC;AAAQ;AACb,YAAI,QAAQ,IAAI,QAAQ,GAAG,GAAG;AAC5B,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,QAChC;AAAA,MACF;AACA,aAAO,eAAe,GAAU,KAAK,QAAQ,IAAI,QAAQ,GAAG;AAAA,IAC9D;AAAA,EACF,CAAC;AACH;",
   "names": []
 }

package/dist/esm/hooks/useTheme.js

@@ -85,7 +85,11 @@ function getThemeProxied({
       if (key === GetThemeUnwrapped) {
         return theme;
       }
-      if (typeof key === "string" && keys) {
+      if (
+        // dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
+        // if someone is crazy enough to use "undefined" as a theme key then this not working is on them
+        key !== "undefined" && typeof key === "string" && keys
+      ) {
         const keyString = key[0] === "$" ? key.slice(1) : key;
         const val = theme[keyString];
         if (val && typeof val === "object") {

package/dist/esm/hooks/useTheme.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useTheme.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["_", "themeManager", "state", "isNewTheme", "mounted"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.52.5",
+  "version": "1.52.7",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,20 +27,20 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "1.52.5",
-    "@tamagui/constants": "1.52.5",
-    "@tamagui/helpers": "1.52.5",
-    "@tamagui/normalize-css-color": "1.52.5",
-    "@tamagui/timer": "1.52.5",
-    "@tamagui/use-did-finish-ssr": "1.52.5",
-    "@tamagui/use-event": "1.52.5",
-    "@tamagui/use-force-update": "1.52.5"
+    "@tamagui/compose-refs": "1.52.7",
+    "@tamagui/constants": "1.52.7",
+    "@tamagui/helpers": "1.52.7",
+    "@tamagui/normalize-css-color": "1.52.7",
+    "@tamagui/timer": "1.52.7",
+    "@tamagui/use-did-finish-ssr": "1.52.7",
+    "@tamagui/use-event": "1.52.7",
+    "@tamagui/use-force-update": "1.52.7"
   },
   "peerDependencies": {
     "react": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.52.5",
+    "@tamagui/build": "1.52.7",
     "@testing-library/react": "^13.4.0",
     "csstype": "^3.0.10",
     "react": "^18.2.0",

package/src/config.ts

@@ -34,7 +34,10 @@ export const getConfig = () => {
   return conf
 }
 
-let cached: TokensMerged
+let tokensMerged: TokensMerged
+export function setTokens(_: TokensMerged) {
+  tokensMerged = _
+}
 
 export const getTokens = ({
   prefixed,
@@ -48,21 +51,24 @@ export const getTokens = ({
     if (!conf) throw new Error(`Haven't called createTamagui yet`)
   }
   const { tokens, tokensParsed } = conf!
-  if (prefixed === false) return tokens
-  if (prefixed === true) return tokensParsed
-  if (cached) return cached
-  cached = Object.fromEntries(
-    Object.entries(tokens).map(([k, v]) => [k, { ...v, ...tokensParsed[k] }])
-  ) as any
-  return cached
+  if (prefixed === false) return tokens as any
+  if (prefixed === true) return tokensParsed as any
+  return tokensMerged
+}
+
+export const getTokenObject = (value: Token, group?: keyof Tokens) => {
+  return (
+    conf!.specificTokens[value] ??
+    (group
+      ? tokensMerged[group]?.[value]
+      : tokensMerged[
+          Object.keys(tokensMerged).find((cat) => tokensMerged[cat][value]) || ''
+        ]?.[value])
+  )
 }
 
 export const getToken = (value: Token, group?: keyof Tokens, useVariable = isWeb) => {
-  const tokens = getTokens()
-  const token =
-    value in conf!.specificTokens
-      ? conf!.specificTokens[value]
-      : (tokens[group as any]?.[value] as any)
+  const token = getTokenObject(value, group)
   return useVariable ? token?.variable : token?.val
 }
 

package/src/constants/constants.ts

@@ -1,5 +1,3 @@
-import { isWeb } from '@tamagui/constants'
-
 export const THEME_NAME_SEPARATOR = '_'
 export const THEME_CLASSNAME_PREFIX = 't_'
 

package/src/createTamagui.ts

@@ -1,7 +1,7 @@
 import { isWeb } from '@tamagui/constants'
 
-import { configListeners, setConfig } from './config'
-import { Variable } from './createVariable'
+import { configListeners, setConfig, setTokens } from './config'
+import { Variable, createVariable, isVariable } from './createVariable'
 import { createVariables } from './createVariables'
 import { getThemeCSSRules } from './helpers/getThemeCSSRules'
 import {
@@ -24,6 +24,8 @@ import {
   TamaguiInternalConfig,
   ThemeParsed,
   ThemesLikeObject,
+  TokensMerged,
+  TokensParsed,
 } from './types'
 
 // config is re-run by the @tamagui/static, dont double validate
@@ -48,13 +50,25 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
     }
   }
 
-  // faster $lookups
-  const tokensParsed: any = Object.fromEntries(
-    Object.entries(configIn.tokens).map(([k, v]) => {
-      const val = Object.fromEntries(Object.entries(v).map(([k, v]) => [`$${k}`, v]))
-      return [k, val]
-    })
-  )
+  // ensure variables
+  const tokens = createVariables(configIn.tokens)
+
+  // faster lookups
+  const tokensParsed: TokensParsed = {} as any
+  const tokensMerged: TokensMerged = {} as any
+  for (const cat in tokens) {
+    tokensParsed[cat] = {}
+    tokensMerged[cat] = {}
+    const tokenCat = tokens[cat]
+    for (const key in tokenCat) {
+      const val = tokenCat[key]
+      const prefixedKey = `$${key}`
+      tokensParsed[cat][prefixedKey] = val as any
+      tokensMerged[cat][prefixedKey] = val as any
+      tokensMerged[cat][key] = val as any
+    }
+  }
+  setTokens(tokensMerged)
 
   const noThemes = Object.keys(configIn.themes).length === 0
   const foundThemes = scanAllSheets(noThemes, tokensParsed)
@@ -87,37 +101,39 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
     const cssRuleSets: string[] = []
 
     if (process.env.TAMAGUI_DOES_SSR_CSS !== 'true') {
-      if (isWeb) {
-        const declarations: string[] = []
-        const fontDeclarations: Record<
-          string,
-          { name: string; declarations: string[]; language?: string }
-        > = {}
-
-        for (const key in configIn.tokens) {
-          for (const skey in configIn.tokens[key]) {
-            const variable = configIn.tokens[key][skey] as Variable
-
-            // set specific tokens (like $size.sm)
-            specificTokens[`$${key}.${skey}`] = variable
-
-            if (process.env.NODE_ENV === 'development') {
-              if (typeof variable === 'undefined') {
-                throw new Error(
-                  `No value for tokens.${key}.${skey}:\n${JSON.stringify(
-                    variable,
-                    null,
-                    2
-                  )}`
-                )
-              }
+      const declarations: string[] = []
+      const fontDeclarations: Record<
+        string,
+        { name: string; declarations: string[]; language?: string }
+      > = {}
+
+      for (const key in tokens) {
+        for (const skey in tokens[key]) {
+          const variable = tokens[key][skey] as any as Variable
+
+          // set specific tokens (like $size.sm)
+          specificTokens[`$${key}.${skey}`] = variable
+
+          if (process.env.NODE_ENV === 'development') {
+            if (typeof variable === 'undefined') {
+              throw new Error(
+                `No value for tokens.${key}.${skey}:\n${JSON.stringify(
+                  variable,
+                  null,
+                  2
+                )}`
+              )
             }
+          }
 
+          if (isWeb) {
             registerCSSVariable(variable)
             declarations.push(variableToCSS(variable, key === 'zIndex'))
           }
         }
+      }
 
+      if (isWeb) {
         for (const key in fontsParsed) {
           const fontParsed = fontsParsed[key]
           const [name, language] = key.includes('_') ? key.split('_') : [key]
@@ -238,8 +254,7 @@ ${runtimeStyles}`
     animations: {} as any,
     media: {},
     ...configIn,
-    // already processed by createTokens()
-    tokens: configIn.tokens as any,
+    tokens: tokens as any,
     // vite made this into a function if it wasn't set
     shorthands,
     inverseShorthands: shorthands
@@ -248,7 +263,7 @@ ${runtimeStyles}`
     themes: themeConfig.themes as any,
     fontsParsed,
     themeConfig,
-    tokensParsed,
+    tokensParsed: tokensParsed as any,
     parsed: true,
     getNewCSS,
     getCSS,