@tamagui/web 1.108.4 → 1.109.0

package/dist/cjs/createVariables.js

@@ -29,9 +29,8 @@ const cache = /* @__PURE__ */ new WeakMap(), createVariables = (tokens, parentPa
       res[key] = val;
       continue;
     }
-    const niceKey = (0, import_helpers.simpleHash)(key);
-    let name = isFont ? niceKey.slice(0, 2) : i;
-    if (name = parentPath ? `${parentPath}-${name}` : niceKey, val && typeof val == "object") {
+    const niceKey = (0, import_helpers.simpleHash)(key, 1e3), name = parentPath && parentPath !== "color" ? `${parentPath}-${niceKey}` : niceKey;
+    if (val && typeof val == "object") {
       res[key] = createVariables(
         tokens[key],
         name,

package/dist/cjs/createVariables.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/createVariables.ts"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAA2B,6BAG3B,wBAA2C;AAc3C,MAAM,QAAQ,oBAAI,QAAQ,GAIb,kBAAkB,CAC7B,QACA,aAAa,IACb,SAAS,OACiB;AAC1B,MAAI,MAAM,IAAI,MAAM,EAAG,QAAO;AAE9B,QAAM,MAAW,CAAC;AAClB,MAAI,IAAI;AACR,WAAS,SAAS,QAAQ;AACxB;AACA,UAAM,MAAM,OAAO,KAAK,GAClB,aAAa,MAAM,CAAC,MAAM,KAC1B,gBAAgB,aAAa,QAAQ,IAAI,KAAK,IAC9C,MAAM,aAAa,cAAc,MAAM,CAAC,IAAI;AAClD,YAAI,kCAAW,GAAG,GAAG;AACnB,UAAI,GAAG,IAAI;AACX;AAAA,IACF;AACA,UAAM,cAAU,2BAAW,GAAG;AAC9B,QAAI,OAAO,SAAS,QAAQ,MAAM,GAAG,CAAC,IAAI;AAE1C,QADA,OAAO,aAAa,GAAG,UAAU,IAAI,IAAI,KAAK,SAC1C,OAAO,OAAO,OAAQ,UAAU;AAElC,UAAI,GAAG,IAAI;AAAA,QACT,OAAO,GAAG;AAAA,QACV;AAAA,QACA;AAAA;AAAA,MACF;AACA;AAAA,IACF;AACA,UAAM,iBAAa,kCAAW,GAAG,IAC7B,UACA,sCAAe,EAAE,KAAK,MAAM,KAAK,cAAc,CAAC;AACpD,QAAI,GAAG,IAAI;AAAA,EACb;AAEA,eAAM,IAAI,KAAK,EAAI,GACZ;AACT;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAA2B,6BAG3B,wBAA2C;AAc3C,MAAM,QAAQ,oBAAI,QAAQ,GAIb,kBAAkB,CAC7B,QACA,aAAa,IACb,SAAS,OACiB;AAC1B,MAAI,MAAM,IAAI,MAAM,EAAG,QAAO;AAE9B,QAAM,MAAW,CAAC;AAClB,MAAI,IAAI;AACR,WAAS,SAAS,QAAQ;AACxB;AACA,UAAM,MAAM,OAAO,KAAK,GAClB,aAAa,MAAM,CAAC,MAAM,KAC1B,gBAAgB,aAAa,QAAQ,IAAI,KAAK,IAC9C,MAAM,aAAa,cAAc,MAAM,CAAC,IAAI;AAElD,YAAI,kCAAW,GAAG,GAAG;AACnB,UAAI,GAAG,IAAI;AACX;AAAA,IACF;AACA,UAAM,cAAU,2BAAW,KAAK,GAAI,GAC9B,OACJ,cAAc,eAAe,UAAU,GAAG,UAAU,IAAI,OAAO,KAAK;AAEtE,QAAI,OAAO,OAAO,OAAQ,UAAU;AAElC,UAAI,GAAG,IAAI;AAAA,QACT,OAAO,GAAG;AAAA,QACV;AAAA,QACA;AAAA;AAAA,MACF;AACA;AAAA,IACF;AACA,UAAM,iBAAa,kCAAW,GAAG,IAC7B,UACA,sCAAe,EAAE,KAAK,MAAM,KAAK,cAAc,CAAC;AACpD,QAAI,GAAG,IAAI;AAAA,EACb;AAEA,eAAM,IAAI,KAAK,EAAI,GACZ;AACT;",
   "names": []
 }

package/dist/cjs/createVariables.native.js

@@ -34,8 +34,8 @@ var cache = /* @__PURE__ */ new WeakMap(), createVariables = function(tokens) {
       res[key] = val;
       continue;
     }
-    var niceKey = (0, import_helpers.simpleHash)(key), name = isFont ? niceKey.slice(0, 2) : i;
-    if (name = parentPath ? "".concat(parentPath, "-").concat(name) : niceKey, val && (typeof val > "u" ? "undefined" : _type_of(val)) === "object") {
+    var niceKey = (0, import_helpers.simpleHash)(key, 1e3), name = parentPath && parentPath !== "color" ? "".concat(parentPath, "-").concat(niceKey) : niceKey;
+    if (val && (typeof val > "u" ? "undefined" : _type_of(val)) === "object") {
       res[key] = createVariables(tokens[key], name, !1);
       continue;
     }

package/dist/cjs/createVariables.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/code/core/web/src/createVariables.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA,qBAA2B,6BAG3B,wBAA2C;;;;;AAc3C,IAAMA,QAAQ,oBAAIC,QAAAA,GAILC,kBAAkB,SAC7BC,QAAAA;MACAC,aAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAa,IACbC,SAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAS;AAET,MAAIL,MAAMM,IAAIH,MAAAA,EAAS,QAAOA;AAE9B,MAAMI,MAAW,CAAC,GACdC,IAAI;AACR,WAASC,SAASN,QAAQ;AACxBK;AACA,QAAME,MAAMP,OAAOM,KAAAA,GACbE,aAAaF,MAAM,CAAA,MAAO,KAC1BG,gBAAgBD,aAAaF,QAAS,IAAS,OAANA,KAAAA,GACzCI,MAAMF,aAAaC,cAAcE,MAAM,CAAA,IAAKL;AAClD,YAAIM,kCAAWL,GAAAA,GAAM;AACnBH,UAAIM,GAAAA,IAAOH;AACX;IACF;AACA,QAAMM,cAAUC,2BAAWJ,GAAAA,GACvBK,OAAOb,SAASW,QAAQF,MAAM,GAAG,CAAA,IAAKN;AAE1C,QADAU,OAAOd,aAAc,GAAgBc,OAAdd,YAAW,GAAA,EAAQ,OAALc,IAAAA,IAASF,SAC1CN,QAAO,OAAOA,MAAAA,MAAAA,cAAP,SAAOA,GAAAA,OAAQ,UAAU;AAElCH,UAAIM,GAAAA,IAAOX,gBACTC,OAAOU,GAAAA,GACPK,MACA,EAAA;AAEF;IACF;AACA,QAAMC,iBAAaJ,kCAAWL,GAAAA,IAC1BA,UACAU,sCAAe;MAAEV;MAAKQ;MAAML,KAAKD;IAAc,CAAA;AACnDL,QAAIM,GAAAA,IAAOM;EACb;AAEAnB,eAAMqB,IAAId,KAAK,EAAA,GACRA;AACT;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA,qBAA2B,6BAG3B,wBAA2C;;;;;AAc3C,IAAMA,QAAQ,oBAAIC,QAAAA,GAILC,kBAAkB,SAC7BC,QAAAA;MACAC,aAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAa,IACbC,SAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAS;AAET,MAAIL,MAAMM,IAAIH,MAAAA,EAAS,QAAOA;AAE9B,MAAMI,MAAW,CAAC,GACdC,IAAI;AACR,WAASC,SAASN,QAAQ;AACxBK;AACA,QAAME,MAAMP,OAAOM,KAAAA,GACbE,aAAaF,MAAM,CAAA,MAAO,KAC1BG,gBAAgBD,aAAaF,QAAS,IAAS,OAANA,KAAAA,GACzCI,MAAMF,aAAaC,cAAcE,MAAM,CAAA,IAAKL;AAElD,YAAIM,kCAAWL,GAAAA,GAAM;AACnBH,UAAIM,GAAAA,IAAOH;AACX;IACF;AACA,QAAMM,cAAUC,2BAAWJ,KAAK,GAAA,GAC1BK,OACJd,cAAcA,eAAe,UAAW,GAAgBY,OAAdZ,YAAW,GAAA,EAAW,OAARY,OAAAA,IAAYA;AAEtE,QAAIN,QAAO,OAAOA,MAAAA,MAAAA,cAAP,SAAOA,GAAAA,OAAQ,UAAU;AAElCH,UAAIM,GAAAA,IAAOX,gBACTC,OAAOU,GAAAA,GACPK,MACA,EAAA;AAEF;IACF;AACA,QAAMC,iBAAaJ,kCAAWL,GAAAA,IAC1BA,UACAU,sCAAe;MAAEV;MAAKQ;MAAML,KAAKD;IAAc,CAAA;AACnDL,QAAIM,GAAAA,IAAOM;EACb;AAEAnB,eAAMqB,IAAId,KAAK,EAAA,GACRA;AACT;",
   "names": ["cache", "WeakMap", "createVariables", "tokens", "parentPath", "isFont", "has", "res", "i", "keyIn", "val", "isPrefixed", "keyWithPrefix", "key", "slice", "isVariable", "niceKey", "simpleHash", "name", "finalValue", "createVariable", "set"]
 }

package/dist/cjs/helpers/getThemeCSSRules.js

@@ -18,6 +18,7 @@ __export(getThemeCSSRules_exports, {
 });
 module.exports = __toCommonJS(getThemeCSSRules_exports);
 var import_helpers = require("@tamagui/helpers"), import_constants = require("../constants/constants"), import_createVariable = require("../createVariable"), import_registerCSSVariable = require("./registerCSSVariable"), import_config = require("../config");
+const darkLight = ["dark", "light"], lightDark = ["light", "dark"];
 function getThemeCSSRules(props) {
   const cssRuleSets = [];
   if (!process.env.TAMAGUI_DOES_SSR_CSS || process.env.TAMAGUI_DOES_SSR_CSS === "mutates-themes" || process.env.TAMAGUI_DOES_SSR_CSS === "false") {
@@ -40,7 +41,7 @@ function getThemeCSSRules(props) {
           selectorsSet.add(`${CNP}${subName}`);
           continue;
         }
-        const childSelector = `${CNP}${subName.replace(/^(dark|light)_/, "")}`, order = isDark ? ["dark", "light"] : ["light", "dark"], [stronger, weaker] = order, numSelectors = Math.round(maxDepth * 1.5);
+        const childSelector = `${CNP}${subName.replace(/^(dark|light)_/, "")}`, order = isDark ? darkLight : lightDark, [stronger, weaker] = order, numSelectors = Math.round(maxDepth * 1.5);
         for (let depth = 0; depth < numSelectors; depth++) {
           const isOdd = depth % 2 === 1;
           if (isOdd && depth < 3)
@@ -51,8 +52,8 @@ function getThemeCSSRules(props) {
             const [_first, second, ...rest] = parentSelectors;
             parentSelectors = [second, ...rest, second];
           }
-          const lastParentSelector = parentSelectors[parentSelectors.length - 1], nextChildSelector = childSelector === lastParentSelector ? "" : childSelector;
-          selectorsSet.add(`${parentSelectors.join(" ")} ${nextChildSelector}`.trim());
+          const lastParentSelector = parentSelectors[parentSelectors.length - 1], nextChildSelector = childSelector === lastParentSelector ? "" : childSelector, parentSelectorString = parentSelectors.join(" ");
+          selectorsSet.add(`${parentSelectorString} ${nextChildSelector}`);
         }
       }
     }

package/dist/cjs/helpers/getThemeCSSRules.js.map

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

package/dist/esm/createVariables.js

@@ -11,9 +11,8 @@ const cache = /* @__PURE__ */ new WeakMap(), createVariables = (tokens, parentPa
       res[key] = val;
       continue;
     }
-    const niceKey = simpleHash(key);
-    let name = isFont ? niceKey.slice(0, 2) : i;
-    if (name = parentPath ? `${parentPath}-${name}` : niceKey, val && typeof val == "object") {
+    const niceKey = simpleHash(key, 1e3), name = parentPath && parentPath !== "color" ? `${parentPath}-${niceKey}` : niceKey;
+    if (val && typeof val == "object") {
       res[key] = createVariables(
         tokens[key],
         name,

package/dist/esm/createVariables.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/createVariables.ts"],
-  "mappings": "AAAA,SAAS,kBAAkB;AAG3B,SAAS,gBAAgB,kBAAkB;AAc3C,MAAM,QAAQ,oBAAI,QAAQ,GAIb,kBAAkB,CAC7B,QACA,aAAa,IACb,SAAS,OACiB;AAC1B,MAAI,MAAM,IAAI,MAAM,EAAG,QAAO;AAE9B,QAAM,MAAW,CAAC;AAClB,MAAI,IAAI;AACR,WAAS,SAAS,QAAQ;AACxB;AACA,UAAM,MAAM,OAAO,KAAK,GAClB,aAAa,MAAM,CAAC,MAAM,KAC1B,gBAAgB,aAAa,QAAQ,IAAI,KAAK,IAC9C,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;AAE1C,QADA,OAAO,aAAa,GAAG,UAAU,IAAI,IAAI,KAAK,SAC1C,OAAO,OAAO,OAAQ,UAAU;AAElC,UAAI,GAAG,IAAI;AAAA,QACT,OAAO,GAAG;AAAA,QACV;AAAA,QACA;AAAA;AAAA,MACF;AACA;AAAA,IACF;AACA,UAAM,aAAa,WAAW,GAAG,IAC7B,MACA,eAAe,EAAE,KAAK,MAAM,KAAK,cAAc,CAAC;AACpD,QAAI,GAAG,IAAI;AAAA,EACb;AAEA,eAAM,IAAI,KAAK,EAAI,GACZ;AACT;",
+  "mappings": "AAAA,SAAS,kBAAkB;AAG3B,SAAS,gBAAgB,kBAAkB;AAc3C,MAAM,QAAQ,oBAAI,QAAQ,GAIb,kBAAkB,CAC7B,QACA,aAAa,IACb,SAAS,OACiB;AAC1B,MAAI,MAAM,IAAI,MAAM,EAAG,QAAO;AAE9B,QAAM,MAAW,CAAC;AAClB,MAAI,IAAI;AACR,WAAS,SAAS,QAAQ;AACxB;AACA,UAAM,MAAM,OAAO,KAAK,GAClB,aAAa,MAAM,CAAC,MAAM,KAC1B,gBAAgB,aAAa,QAAQ,IAAI,KAAK,IAC9C,MAAM,aAAa,cAAc,MAAM,CAAC,IAAI;AAElD,QAAI,WAAW,GAAG,GAAG;AACnB,UAAI,GAAG,IAAI;AACX;AAAA,IACF;AACA,UAAM,UAAU,WAAW,KAAK,GAAI,GAC9B,OACJ,cAAc,eAAe,UAAU,GAAG,UAAU,IAAI,OAAO,KAAK;AAEtE,QAAI,OAAO,OAAO,OAAQ,UAAU;AAElC,UAAI,GAAG,IAAI;AAAA,QACT,OAAO,GAAG;AAAA,QACV;AAAA,QACA;AAAA;AAAA,MACF;AACA;AAAA,IACF;AACA,UAAM,aAAa,WAAW,GAAG,IAC7B,MACA,eAAe,EAAE,KAAK,MAAM,KAAK,cAAc,CAAC;AACpD,QAAI,GAAG,IAAI;AAAA,EACb;AAEA,eAAM,IAAI,KAAK,EAAI,GACZ;AACT;",
   "names": []
 }

package/dist/esm/createVariables.mjs

@@ -15,9 +15,9 @@ const cache = /* @__PURE__ */new WeakMap(),
         res[key] = val;
         continue;
       }
-      const niceKey = simpleHash(key);
-      let name = isFont ? niceKey.slice(0, 2) : i;
-      if (name = parentPath ? `${parentPath}-${name}` : niceKey, val && typeof val == "object") {
+      const niceKey = simpleHash(key, 1e3),
+        name = parentPath && parentPath !== "color" ? `${parentPath}-${niceKey}` : niceKey;
+      if (val && typeof val == "object") {
         res[key] = createVariables(tokens[key], name, !1
         /* note: don't pass isFont down, we want to avoid it past the first level */);
         continue;

package/dist/esm/createVariables.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["simpleHash","createVariable","isVariable","cache","WeakMap","createVariables","tokens","parentPath","isFont","has","res","i","keyIn","val","isPrefixed","keyWithPrefix","key","slice","niceKey","name","finalValue","set"],"sources":["../../src/createVariables.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,UAAA,QAAkB;AAG3B,SAASC,cAAA,EAAgBC,UAAA,QAAkB;AAc3C,MAAMC,KAAA,GAAQ,mBAAIC,OAAA,CAAQ;EAIbC,eAAA,GAAkBA,CAC7BC,MAAA,EACAC,UAAA,GAAa,IACbC,MAAA,GAAS,OACiB;IAC1B,IAAIL,KAAA,CAAMM,GAAA,CAAIH,MAAM,GAAG,OAAOA,MAAA;IAE9B,MAAMI,GAAA,GAAW,CAAC;IAClB,IAAIC,CAAA,GAAI;IACR,SAASC,KAAA,IAASN,MAAA,EAAQ;MACxBK,CAAA;MACA,MAAME,GAAA,GAAMP,MAAA,CAAOM,KAAK;QAClBE,UAAA,GAAaF,KAAA,CAAM,CAAC,MAAM;QAC1BG,aAAA,GAAgBD,UAAA,GAAaF,KAAA,GAAQ,IAAIA,KAAK;QAC9CI,GAAA,GAAMF,UAAA,GAAaC,aAAA,CAAcE,KAAA,CAAM,CAAC,IAAIL,KAAA;MAClD,IAAIV,UAAA,CAAWW,GAAG,GAAG;QACnBH,GAAA,CAAIM,GAAG,IAAIH,GAAA;QACX;MACF;MACA,MAAMK,OAAA,GAAUlB,UAAA,CAAWgB,GAAG;MAC9B,IAAIG,IAAA,GAAOX,MAAA,GAASU,OAAA,CAAQD,KAAA,CAAM,GAAG,CAAC,IAAIN,CAAA;MAE1C,IADAQ,IAAA,GAAOZ,UAAA,GAAa,GAAGA,UAAU,IAAIY,IAAI,KAAKD,OAAA,EAC1CL,GAAA,IAAO,OAAOA,GAAA,IAAQ,UAAU;QAElCH,GAAA,CAAIM,GAAG,IAAIX,eAAA,CACTC,MAAA,CAAOU,GAAG,GACVG,IAAA,EACA;QAAA,4EACF;QACA;MACF;MACA,MAAMC,UAAA,GAAalB,UAAA,CAAWW,GAAG,IAC7BA,GAAA,GACAZ,cAAA,CAAe;QAAEY,GAAA;QAAKM,IAAA;QAAMH,GAAA,EAAKD;MAAc,CAAC;MACpDL,GAAA,CAAIM,GAAG,IAAII,UAAA;IACb;IAEA,OAAAjB,KAAA,CAAMkB,GAAA,CAAIX,GAAA,EAAK,EAAI,GACZA,GAAA;EACT","ignoreList":[]}
+{"version":3,"names":["simpleHash","createVariable","isVariable","cache","WeakMap","createVariables","tokens","parentPath","isFont","has","res","i","keyIn","val","isPrefixed","keyWithPrefix","key","slice","niceKey","name","finalValue","set"],"sources":["../../src/createVariables.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,UAAA,QAAkB;AAG3B,SAASC,cAAA,EAAgBC,UAAA,QAAkB;AAc3C,MAAMC,KAAA,GAAQ,mBAAIC,OAAA,CAAQ;EAIbC,eAAA,GAAkBA,CAC7BC,MAAA,EACAC,UAAA,GAAa,IACbC,MAAA,GAAS,OACiB;IAC1B,IAAIL,KAAA,CAAMM,GAAA,CAAIH,MAAM,GAAG,OAAOA,MAAA;IAE9B,MAAMI,GAAA,GAAW,CAAC;IAClB,IAAIC,CAAA,GAAI;IACR,SAASC,KAAA,IAASN,MAAA,EAAQ;MACxBK,CAAA;MACA,MAAME,GAAA,GAAMP,MAAA,CAAOM,KAAK;QAClBE,UAAA,GAAaF,KAAA,CAAM,CAAC,MAAM;QAC1BG,aAAA,GAAgBD,UAAA,GAAaF,KAAA,GAAQ,IAAIA,KAAK;QAC9CI,GAAA,GAAMF,UAAA,GAAaC,aAAA,CAAcE,KAAA,CAAM,CAAC,IAAIL,KAAA;MAElD,IAAIV,UAAA,CAAWW,GAAG,GAAG;QACnBH,GAAA,CAAIM,GAAG,IAAIH,GAAA;QACX;MACF;MACA,MAAMK,OAAA,GAAUlB,UAAA,CAAWgB,GAAA,EAAK,GAAI;QAC9BG,IAAA,GACJZ,UAAA,IAAcA,UAAA,KAAe,UAAU,GAAGA,UAAU,IAAIW,OAAO,KAAKA,OAAA;MAEtE,IAAIL,GAAA,IAAO,OAAOA,GAAA,IAAQ,UAAU;QAElCH,GAAA,CAAIM,GAAG,IAAIX,eAAA,CACTC,MAAA,CAAOU,GAAG,GACVG,IAAA,EACA;QAAA,4EACF;QACA;MACF;MACA,MAAMC,UAAA,GAAalB,UAAA,CAAWW,GAAG,IAC7BA,GAAA,GACAZ,cAAA,CAAe;QAAEY,GAAA;QAAKM,IAAA;QAAMH,GAAA,EAAKD;MAAc,CAAC;MACpDL,GAAA,CAAIM,GAAG,IAAII,UAAA;IACb;IAEA,OAAAjB,KAAA,CAAMkB,GAAA,CAAIX,GAAA,EAAK,EAAI,GACZA,GAAA;EACT","ignoreList":[]}

package/dist/esm/createVariables.native.js

@@ -15,8 +15,8 @@ var cache = /* @__PURE__ */ new WeakMap(), createVariables = function(tokens) {
       res[key] = val;
       continue;
     }
-    var niceKey = simpleHash(key), name = isFont ? niceKey.slice(0, 2) : i;
-    if (name = parentPath ? "".concat(parentPath, "-").concat(name) : niceKey, val && (typeof val > "u" ? "undefined" : _type_of(val)) === "object") {
+    var niceKey = simpleHash(key, 1e3), name = parentPath && parentPath !== "color" ? "".concat(parentPath, "-").concat(niceKey) : niceKey;
+    if (val && (typeof val > "u" ? "undefined" : _type_of(val)) === "object") {
       res[key] = createVariables(tokens[key], name, !1);
       continue;
     }

package/dist/esm/createVariables.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/code/core/web/src/createVariables.ts"],
-  "mappings": "AAAA,SAASA,kBAAkB;AAG3B,SAASC,gBAAgBC,kBAAkB;;;;;AAc3C,IAAMC,QAAQ,oBAAIC,QAAAA,GAILC,kBAAkB,SAC7BC,QAAAA;MACAC,aAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAa,IACbC,SAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAS;AAET,MAAIL,MAAMM,IAAIH,MAAAA,EAAS,QAAOA;AAE9B,MAAMI,MAAW,CAAC,GACdC,IAAI;AACR,WAASC,SAASN,QAAQ;AACxBK;AACA,QAAME,MAAMP,OAAOM,KAAAA,GACbE,aAAaF,MAAM,CAAA,MAAO,KAC1BG,gBAAgBD,aAAaF,QAAS,IAAS,OAANA,KAAAA,GACzCI,MAAMF,aAAaC,cAAcE,MAAM,CAAA,IAAKL;AAClD,QAAIV,WAAWW,GAAAA,GAAM;AACnBH,UAAIM,GAAAA,IAAOH;AACX;IACF;AACA,QAAMK,UAAUlB,WAAWgB,GAAAA,GACvBG,OAAOX,SAASU,QAAQD,MAAM,GAAG,CAAA,IAAKN;AAE1C,QADAQ,OAAOZ,aAAc,GAAgBY,OAAdZ,YAAW,GAAA,EAAQ,OAALY,IAAAA,IAASD,SAC1CL,QAAO,OAAOA,MAAAA,MAAAA,cAAP,SAAOA,GAAAA,OAAQ,UAAU;AAElCH,UAAIM,GAAAA,IAAOX,gBACTC,OAAOU,GAAAA,GACPG,MACA,EAAA;AAEF;IACF;AACA,QAAMC,aAAalB,WAAWW,GAAAA,IAC1BA,MACAZ,eAAe;MAAEY;MAAKM;MAAMH,KAAKD;IAAc,CAAA;AACnDL,QAAIM,GAAAA,IAAOI;EACb;AAEAjB,eAAMkB,IAAIX,KAAK,EAAA,GACRA;AACT;",
+  "mappings": "AAAA,SAASA,kBAAkB;AAG3B,SAASC,gBAAgBC,kBAAkB;;;;;AAc3C,IAAMC,QAAQ,oBAAIC,QAAAA,GAILC,kBAAkB,SAC7BC,QAAAA;MACAC,aAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAa,IACbC,SAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAS;AAET,MAAIL,MAAMM,IAAIH,MAAAA,EAAS,QAAOA;AAE9B,MAAMI,MAAW,CAAC,GACdC,IAAI;AACR,WAASC,SAASN,QAAQ;AACxBK;AACA,QAAME,MAAMP,OAAOM,KAAAA,GACbE,aAAaF,MAAM,CAAA,MAAO,KAC1BG,gBAAgBD,aAAaF,QAAS,IAAS,OAANA,KAAAA,GACzCI,MAAMF,aAAaC,cAAcE,MAAM,CAAA,IAAKL;AAElD,QAAIV,WAAWW,GAAAA,GAAM;AACnBH,UAAIM,GAAAA,IAAOH;AACX;IACF;AACA,QAAMK,UAAUlB,WAAWgB,KAAK,GAAA,GAC1BG,OACJZ,cAAcA,eAAe,UAAW,GAAgBW,OAAdX,YAAW,GAAA,EAAW,OAARW,OAAAA,IAAYA;AAEtE,QAAIL,QAAO,OAAOA,MAAAA,MAAAA,cAAP,SAAOA,GAAAA,OAAQ,UAAU;AAElCH,UAAIM,GAAAA,IAAOX,gBACTC,OAAOU,GAAAA,GACPG,MACA,EAAA;AAEF;IACF;AACA,QAAMC,aAAalB,WAAWW,GAAAA,IAC1BA,MACAZ,eAAe;MAAEY;MAAKM;MAAMH,KAAKD;IAAc,CAAA;AACnDL,QAAIM,GAAAA,IAAOI;EACb;AAEAjB,eAAMkB,IAAIX,KAAK,EAAA,GACRA;AACT;",
   "names": ["simpleHash", "createVariable", "isVariable", "cache", "WeakMap", "createVariables", "tokens", "parentPath", "isFont", "has", "res", "i", "keyIn", "val", "isPrefixed", "keyWithPrefix", "key", "slice", "niceKey", "name", "finalValue", "set"]
 }

package/dist/esm/helpers/getThemeCSSRules.js

@@ -3,6 +3,7 @@ import { THEME_CLASSNAME_PREFIX } from "../constants/constants";
 import { variableToString } from "../createVariable";
 import { tokensValueToVariable } from "./registerCSSVariable";
 import { getSetting } from "../config";
+const darkLight = ["dark", "light"], lightDark = ["light", "dark"];
 function getThemeCSSRules(props) {
   const cssRuleSets = [];
   if (!process.env.TAMAGUI_DOES_SSR_CSS || process.env.TAMAGUI_DOES_SSR_CSS === "mutates-themes" || process.env.TAMAGUI_DOES_SSR_CSS === "false") {
@@ -25,7 +26,7 @@ function getThemeCSSRules(props) {
           selectorsSet.add(`${CNP}${subName}`);
           continue;
         }
-        const childSelector = `${CNP}${subName.replace(/^(dark|light)_/, "")}`, order = isDark ? ["dark", "light"] : ["light", "dark"], [stronger, weaker] = order, numSelectors = Math.round(maxDepth * 1.5);
+        const childSelector = `${CNP}${subName.replace(/^(dark|light)_/, "")}`, order = isDark ? darkLight : lightDark, [stronger, weaker] = order, numSelectors = Math.round(maxDepth * 1.5);
         for (let depth = 0; depth < numSelectors; depth++) {
           const isOdd = depth % 2 === 1;
           if (isOdd && depth < 3)
@@ -36,8 +37,8 @@ function getThemeCSSRules(props) {
             const [_first, second, ...rest] = parentSelectors;
             parentSelectors = [second, ...rest, second];
           }
-          const lastParentSelector = parentSelectors[parentSelectors.length - 1], nextChildSelector = childSelector === lastParentSelector ? "" : childSelector;
-          selectorsSet.add(`${parentSelectors.join(" ")} ${nextChildSelector}`.trim());
+          const lastParentSelector = parentSelectors[parentSelectors.length - 1], nextChildSelector = childSelector === lastParentSelector ? "" : childSelector, parentSelectorString = parentSelectors.join(" ");
+          selectorsSet.add(`${parentSelectorString} ${nextChildSelector}`);
         }
       }
     }

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

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

package/dist/esm/helpers/getThemeCSSRules.mjs

@@ -3,6 +3,8 @@ import { THEME_CLASSNAME_PREFIX } from "../constants/constants.mjs";
 import { variableToString } from "../createVariable.mjs";
 import { tokensValueToVariable } from "./registerCSSVariable.mjs";
 import { getSetting } from "../config.mjs";
+const darkLight = ["dark", "light"],
+  lightDark = ["light", "dark"];
 function getThemeCSSRules(props) {
   const cssRuleSets = [];
   if (!process.env.TAMAGUI_DOES_SSR_CSS || process.env.TAMAGUI_DOES_SSR_CSS === "mutates-themes" || process.env.TAMAGUI_DOES_SSR_CSS === "false") {
@@ -34,7 +36,7 @@ function getThemeCSSRules(props) {
           continue;
         }
         const childSelector = `${CNP}${subName.replace(/^(dark|light)_/, "")}`,
-          order = isDark ? ["dark", "light"] : ["light", "dark"],
+          order = isDark ? darkLight : lightDark,
           [stronger, weaker] = order,
           numSelectors = Math.round(maxDepth * 1.5);
         for (let depth = 0; depth < numSelectors; depth++) {
@@ -47,8 +49,9 @@ function getThemeCSSRules(props) {
             parentSelectors = [second, ...rest, second];
           }
           const lastParentSelector = parentSelectors[parentSelectors.length - 1],
-            nextChildSelector = childSelector === lastParentSelector ? "" : childSelector;
-          selectorsSet.add(`${parentSelectors.join(" ")} ${nextChildSelector}`.trim());
+            nextChildSelector = childSelector === lastParentSelector ? "" : childSelector,
+            parentSelectorString = parentSelectors.join(" ");
+          selectorsSet.add(`${parentSelectorString} ${nextChildSelector}`);
         }
       }
     }

package/dist/esm/helpers/getThemeCSSRules.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["simpleHash","THEME_CLASSNAME_PREFIX","variableToString","tokensValueToVariable","getSetting","getThemeCSSRules","props","cssRuleSets","process","env","TAMAGUI_DOES_SSR_CSS","config","themeName","theme","names","hasDarkLight","themes","CNP","vars","themeKey","variable","value","has","val","get","TAMAGUI_CSS_VARIABLE_PREFIX","isDarkBase","isLightBase","baseSelectors","map","name","selectorsSet","Set","maxDepth","subName","isDark","startsWith","isLight","add","childSelector","replace","order","stronger","weaker","numSelectors","Math","round","depth","isOdd","parents","Array","fill","_","idx","parentSelectors","length","slice","_first","second","rest","lastParentSelector","nextChildSelector","join","trim","selectors","sort","a","b","localeCompare","css","x","isBaseTheme","push","bgString","background","fgString","color","bodyRules","baseName","themeRules","darkSelector","lightSelector","filter","Boolean","prefersMediaSelectors","selectionStyles","rules","selectionSelectors","s","styles","Object","entries","flatMap","k","v","css2"],"sources":["../../../src/helpers/getThemeCSSRules.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["simpleHash","THEME_CLASSNAME_PREFIX","variableToString","tokensValueToVariable","getSetting","darkLight","lightDark","getThemeCSSRules","props","cssRuleSets","process","env","TAMAGUI_DOES_SSR_CSS","config","themeName","theme","names","hasDarkLight","themes","CNP","vars","themeKey","variable","value","has","val","get","TAMAGUI_CSS_VARIABLE_PREFIX","isDarkBase","isLightBase","baseSelectors","map","name","selectorsSet","Set","maxDepth","subName","isDark","startsWith","isLight","add","childSelector","replace","order","stronger","weaker","numSelectors","Math","round","depth","isOdd","parents","Array","fill","_","idx","parentSelectors","length","slice","_first","second","rest","lastParentSelector","nextChildSelector","parentSelectorString","join","selectors","sort","a","b","localeCompare","css","x","isBaseTheme","push","bgString","background","fgString","color","bodyRules","baseName","themeRules","darkSelector","lightSelector","trim","filter","Boolean","prefersMediaSelectors","selectionStyles","rules","selectionSelectors","s","styles","Object","entries","flatMap","k","v","css2"],"sources":["../../../src/helpers/getThemeCSSRules.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.108.4",
+  "version": "1.109.0",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,18 +27,18 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "1.108.4",
-    "@tamagui/constants": "1.108.4",
-    "@tamagui/helpers": "1.108.4",
-    "@tamagui/normalize-css-color": "1.108.4",
-    "@tamagui/timer": "1.108.4",
-    "@tamagui/types": "1.108.4",
-    "@tamagui/use-did-finish-ssr": "1.108.4",
-    "@tamagui/use-event": "1.108.4",
-    "@tamagui/use-force-update": "1.108.4"
+    "@tamagui/compose-refs": "1.109.0",
+    "@tamagui/constants": "1.109.0",
+    "@tamagui/helpers": "1.109.0",
+    "@tamagui/normalize-css-color": "1.109.0",
+    "@tamagui/timer": "1.109.0",
+    "@tamagui/types": "1.109.0",
+    "@tamagui/use-did-finish-ssr": "1.109.0",
+    "@tamagui/use-event": "1.109.0",
+    "@tamagui/use-force-update": "1.109.0"
   },
   "devDependencies": {
-    "@tamagui/build": "1.108.4",
+    "@tamagui/build": "1.109.0",
     "@testing-library/react": "^16.0.0",
     "csstype": "^3.0.10",
     "typescript": "^5.5.2",

package/src/createVariables.ts

@@ -34,13 +34,15 @@ export const createVariables = <A extends DeepTokenObject>(
     const isPrefixed = keyIn[0] === '$'
     const keyWithPrefix = isPrefixed ? keyIn : `$${keyIn}`
     const key = isPrefixed ? keyWithPrefix.slice(1) : keyIn
+
     if (isVariable(val)) {
       res[key] = val
       continue
     }
-    const niceKey = simpleHash(key)
-    let name = isFont ? niceKey.slice(0, 2) : i
-    name = parentPath ? `${parentPath}-${name}` : niceKey
+    const niceKey = simpleHash(key, 1000)
+    const name =
+      parentPath && parentPath !== 'color' ? `${parentPath}-${niceKey}` : niceKey
+
     if (val && typeof val === 'object') {
       // recurse
       res[key] = createVariables(

package/src/helpers/getThemeCSSRules.ts

@@ -7,6 +7,9 @@ import type { CreateTamaguiProps, ThemeParsed } from '../types'
 import { tokensValueToVariable } from './registerCSSVariable'
 import { getSetting } from '../config'
 
+const darkLight = ['dark', 'light']
+const lightDark = ['light', 'dark']
+
 export function getThemeCSSRules(props: {
   config: CreateTamaguiProps
   themeName: string
@@ -74,7 +77,7 @@ export function getThemeCSSRules(props: {
         }
 
         const childSelector = `${CNP}${subName.replace(/^(dark|light)_/, '')}`
-        const order = isDark ? ['dark', 'light'] : ['light', 'dark']
+        const order = isDark ? darkLight : lightDark
         const [stronger, weaker] = order
         const numSelectors = Math.round(maxDepth * 1.5)
 
@@ -102,7 +105,8 @@ export function getThemeCSSRules(props: {
             childSelector === lastParentSelector ? '' : childSelector
 
           // for light/dark/light:
-          selectorsSet.add(`${parentSelectors.join(' ')} ${nextChildSelector}`.trim())
+          const parentSelectorString = parentSelectors.join(' ')
+          selectorsSet.add(`${parentSelectorString} ${nextChildSelector}`)
           // selectorsSet.add(
           //   `${parentSelectors.join(' ')} ${nextChildSelector}.is_inversed`.trim()
           // )
@@ -129,7 +133,6 @@ export function getThemeCSSRules(props: {
         ? `background:${variableToString(theme.background)};`
         : ''
       const fgString = theme.color ? `color:${variableToString(theme.color)}` : ''
-
       const bodyRules = `body{${bgString}${fgString}}`
       const isDark = themeName.startsWith('dark')
       const baseName = isDark ? 'dark' : 'light'

package/types/createVariables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createVariables.d.ts","sourceRoot":"","sources":["../src/createVariables.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAGhD,KAAK,eAAe,CAAC,GAAG,SAAS,MAAM,GAAG,MAAM,GAAG,GAAG,IAAI;IACxD,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,eAAe,IAAI;KACzD,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,GAAG,MAAM,GAC5C,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAChB,CAAC,CAAC,GAAG,CAAC,SAAS,eAAe,GAC5B,kBAAkB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAC1B,KAAK;CACZ,CAAA;AAMD,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,eAAe,UAC/C,CAAC,4CAGR,kBAAkB,CAAC,CAAC,CAmCtB,CAAA"}
+{"version":3,"file":"createVariables.d.ts","sourceRoot":"","sources":["../src/createVariables.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAGhD,KAAK,eAAe,CAAC,GAAG,SAAS,MAAM,GAAG,MAAM,GAAG,GAAG,IAAI;IACxD,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,eAAe,IAAI;KACzD,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,GAAG,MAAM,GAC5C,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAChB,CAAC,CAAC,GAAG,CAAC,SAAS,eAAe,GAC5B,kBAAkB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAC1B,KAAK;CACZ,CAAA;AAMD,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,eAAe,UAC/C,CAAC,4CAGR,kBAAkB,CAAC,CAAC,CAqCtB,CAAA"}

package/types/helpers/getThemeCSSRules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getThemeCSSRules.d.ts","sourceRoot":"","sources":["../../src/helpers/getThemeCSSRules.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAI/D,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IACtC,MAAM,EAAE,kBAAkB,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,YAmKA"}
+{"version":3,"file":"getThemeCSSRules.d.ts","sourceRoot":"","sources":["../../src/helpers/getThemeCSSRules.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAO/D,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IACtC,MAAM,EAAE,kBAAkB,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,YAmKA"}