@tamagui/web 1.85.5 → 1.85.6

package/dist/cjs/helpers/insertStyleRule.js

@@ -144,18 +144,20 @@ function addThemesFromCSS(cssStyleRule, tokens) {
       !0
     );
   }
-  const dedupedEntry = {
-    names: [],
+  return {
+    names: [
+      ...new Set(
+        selectors.map((selector) => {
+          const parts = selector.replace(/(.t_|:root)/g, "").trim().split(" "), [first] = parts, scheme = first.includes("dark") ? "dark" : first.includes("light") ? "light" : "", name = (() => {
+            let _ = parts[parts.length - 1];
+            return scheme && _.startsWith(scheme) && (_ = _.slice(scheme.length + 1)), _;
+          })();
+          return `${scheme}${scheme && name ? "_" : ""}${name}`;
+        })
+      )
+    ],
     theme: values
   };
-  for (const selector of selectors) {
-    const di = selector.indexOf("t_dark"), li = selector.indexOf("t_light");
-    let scheme = di && li ? di < li ? "dark" : "light" : "", name = selector.slice(selector.lastIndexOf(".t_") + 3);
-    name.startsWith(scheme) && (name = name.slice(scheme.length + 1)), scheme === name && (scheme = "");
-    const themeName = `${scheme}${scheme && name ? "_" : ""}${name}`;
-    dedupedEntry.names.includes(themeName) || dedupedEntry.names.push(themeName);
-  }
-  return dedupedEntry;
 }
 function getTamaguiSelector(rule, collectThemes = !1) {
   if (rule instanceof CSSStyleRule) {

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/insertStyleRule.tsx"],
-  "mappings": "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",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAyB,+BAEzB,wBAA+B;AAW/B,MAAM,eAAe,oBAAI,QAA+B,GAClD,yBAAyB,oBAAI,IAAoB,GACjD,eAAuC,CAAC,GACxC,WAAmC,CAAC,GAC7B,qBAAqB,CAAC,GAEtB,kBAAkB,MAAM,cACxB,cAAc,MAAM,OAAO,OAAO,QAAQ,GAC1C,mBAAmB,MAAM;AAGtC,SAAS,aAAa,YAAoB,KAAa,MAAgB;AACrE,QAAM,IAAI,IAAI,QAAQ,YAAY;AAClC,MAAI,MAAM,IAAI;AACZ,IAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,MAAM,0DAAqD,UAAU,EAAE;AAEjF;AAAA,EACF;AACA,QAAM,SAAS,IAAI,IACb,OAAO,IAAI,QAAQ,GAAG,GACtB,QAAQ,IAAI,MAAM,QAAQ,IAAI;AACpC,MAAI,CAAC,mBAAmB,UAAU;AAChC,8BAAmB,UAAU,IAAI,OAC1B;AAEX;AAWO,SAAS,wBAAwB;AACtC,MAAI,CAAC;AAAU;AAcf,EAZW,IAAI,iBAAiB,CAAC,YAAY;AAC3C,eAAW,SAAS;AAClB,UACG,iBAAiB,oBAAoB,MAAM,SAC3C,iBAAiB,mBAAmB,MAAM,KAAK,SAAS,MAAM,GAC/D;AACA,sBAAc;AACd;AAAA,MACF;AAAA,EAEJ,CAAC,EAEE,QAAQ,SAAS,MAAM;AAAA,IACxB,WAAW;AAAA,EACb,CAAC;AACH;AAEA,IAAI,oBAA+C;AAE5C,SAAS,cACd,gBAAgB,IAChB,QAC2B;AAE3B,MADI,QAAQ,IAAI,aAAa,UACzB,CAAC;AAAU;AAEf,MAAI;AAEJ,QAAM,SAAS,SAAS,eAAe,CAAC,GAClC,OAAO,mBACP,UAAU,IAAI,IAAI,MAAgC;AACxD,MAAI,SAAS,aAAa;AACxB,eAAWA,UAAS;AAClB,UAAIA,QAAO;AACT,cAAM,MAAM,kBAAkBA,QAAO,IAAO,eAAe,MAAM;AACjE,QAAI,QACF,SAAS;AAAA,MAEb;AAEF,wBAAoB;AAAA,EACtB;AAEA,MAAI;AACF,eAAWA,UAAS;AAClB,MAAIA,UAAS,CAAC,QAAQ,IAAIA,MAAK,KAC7B,kBAAkBA,QAAO,EAAI;AAKnC,SAAO;AACT;AAEA,SAAS,MAAM,IAAY,SAAS,IAAO;AACzC,QAAM,QAAQ,uBAAuB,IAAI,EAAE,KAAK,MAAM,SAAS,KAAK;AACpE,gCAAuB,IAAI,IAAI,IAAI,GAC5B;AACT;AAEA,MAAM,eAAe,QAAQ,IAAI,yCAC3B,YAAY,eAAe,CAAC,eAAe;AAEjD,SAAS,kBACPA,QACA,SAAS,IACT,gBAAgB,IAChB,QAC2B;AAzH7B;AA4HE,MAAI;AACJ,MAAI;AAEF,QADA,QAAQA,OAAM,UACV,CAAC;AACH;AAAA,EAEJ,QAAQ;AACN;AAAA,EACF;AAEA,QAAM,iBAAgB,wBAAmB,MAAM,CAAC,GAAG,aAAa,MAA1C,mBAA8C,IAC9D,gBAAe,wBAAmB,MAAM,MAAM,SAAS,CAAC,GAAG,aAAa,MAAzD,mBAA6D,IAC5E,WAAW,GAAG,MAAM,MAAM,GAAG,aAAa,GAAG,YAAY,IACzD,cAAc,aAAa,IAAIA,MAAK;AAE1C,MAAI,CAAC,UAEC,gBAAgB;AAClB;AAIJ,QAAM,MAAM,MAAM;AAClB,MAAI,QAAQ,GAER;AAEJ,WAAS,IAAI,GAAG,IAAI,KAAK,KAAK;AAC5B,UAAM,OAAO,MAAM,CAAC;AACpB,QAAI,EAAE,gBAAgB;AAAe;AAErC,UAAM,WAAW,mBAAmB,MAAM,aAAa;AAEvD,QAAI;AAEF,cAAQ;AAAA,SACH;AAEL,UADA,SACI,QAAQ;AAEV;AAEF;AAAA,IACF;AAEA,UAAM,CAAC,YAAY,SAAS,OAAO,IAAI;AAEvC,QAAI,SAAS;AACX,YAAM,UAAU,iBAAiB,SAAS,MAAM;AAChD,MAAI,YACF,kBAAkB,CAAC,GACnB,cAAc,KAAK,OAAO;AAE5B;AAAA,IACF;AAGA,UAAM,QAAQ,MAAM,YAAY,MAAM;AAEtC,IAAI,SACE,UAAU,KACZ,OAAO,aAAa,UAAU,IAErB,cAAc,iBACL,YAAW,WAAW,YAAY,KAElD,aAAa,YAAY,QAAQ,SAAS,OAAO,OAGnD,aAAa,UAAU,IAAI,QAAQ;AAAA,EAGzC;AAEA,sBAAa,IAAIA,QAAO,QAAQ,GAEzB;AACT;AAEA,IAAI,eACA,oBAAgD;AAEpD,SAAS,iBAAiB,cAA4B,QAAuB;AAC3E,QAAM,YAAY,aAAa,aAAa,MAAM,GAAG;AAErD,MAAI,CAAC,UAAU;AAAQ;AAEvB,MAAI,UAAU,CAAC,eAAe;AAC5B,oBAAgB,CAAC;AACjB,eAAW,OAAO,OAAO,OAAO;AAC9B,YAAM,QAAQ,OAAO,MAAM,GAAG;AAC9B,oBAAc,MAAM,IAAI,IAAI,MAAM;AAAA,IACpC;AAAA,EACF;AAKA,QAAM,SAHmB,aAAa,WAAW,IAC9C,MAAM,aAAa,aAAa,SAAS,GAAG,EAAE,EAC9C,KAAK,EACsB,MAAM,GAAG,GAGjC,SAAsB,CAAC;AAE7B,aAAW,QAAQ,OAAO;AACxB,UAAM,OAAO,KAAK,QAAQ,GAAG;AAC7B,QAAI,SAAS;AAAI;AACjB,UAAM,MAAM,KAAK,MAAM,KAAK,QAAQ,IAAI,IAAI,GAAG,IAAI,GAC7C,MAAM,KAAK,MAAM,OAAO,CAAC;AAC/B,QAAI;AACJ,QAAI,IAAI,CAAC,MAAM,KAAK;AAElB,YAAM,UAAU,IAAI,MAAM,GAAG,EAAE,GACzB,WAAW,cAAc,OAAO;AAEtC,MAAI,WACF,QAAQ,YAER,sBAAsB,iBAAiB,SAAS,IAAI,GACpD,QAAQ,kBAAkB,iBAAiB,OAAO,OAAO;AAAA,IAE7D;AACE,cAAQ;AAEV,WAAO,GAAG,QAAI;AAAA,MACZ;AAAA,QACE;AAAA,QACA,MAAM;AAAA,QACN,KAAK;AAAA,MACP;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAmCA,SAPmC;AAAA,IACjC,OA3BY;AAAA,MACZ,GAAG,IAAI;AAAA,QACL,UAAU,IAAI,CAAC,aAAa;AAC1B,gBAAM,QAAQ,SACX,QAAQ,gBAAgB,EAAE,EAC1B,KAAK,EACL,MAAM,GAAG,GACN,CAAC,KAAK,IAAI,OACV,SAAS,MAAM,SAAS,MAAM,IAChC,SACA,MAAM,SAAS,OAAO,IACpB,UACA,IACA,QAAQ,MAAM;AAClB,gBAAI,IAAI,MAAM,MAAM,SAAS,CAAC;AAC9B,mBAAI,UAAU,EAAE,WAAW,MAAM,MAE/B,IAAI,EAAE,MAAM,OAAO,SAAS,CAAC,IAExB;AAAA,UACT,GAAG;AACH,iBAAO,GAAG,MAAM,GAAG,UAAU,OAAO,MAAM,EAAE,GAAG,IAAI;AAAA,QACrD,CAAC;AAAA,MACH;AAAA,IACF;AAAA,IAIE,OAAO;AAAA,EACT;AAKF;AAEA,SAAS,mBACP,MACA,gBAAgB,IAC4D;AAC5E,MAAI,gBAAgB,cAAc;AAChC,UAAM,OAAO,KAAK;AAClB,QAAI,KAAK,CAAC,MAAM,OAAO,KAAK,CAAC,MAAM,KAAK;AACtC,UAAI,KAAK,WAAW,UAAU;AAC5B,eAAO,CAAC,iCAAiC,IAAI,GAAG,IAAI;AAEtD,UAAI,kBACE,KAAK,WAAW,UAAU,KAAK,KAAK,WAAW,WAAW;AAC5D,eAAO;AAAA,UACL,KAAK,MAAM,GAAG,EAAE;AAAA;AAAA,UAChB;AAAA,UACA;AAAA,QACF;AAAA,IAGN;AAAA,EACF,WAAW,gBAAgB;AAEzB,WAAI,KAAK,SAAS,SAAS,IAAG,SACvB,mBAAmB,KAAK,SAAS,CAAC,CAAC;AAE9C;AAEA,MAAM,mCAAmC,CAAC,aAAqB;AAC7D,MAAI,MAAM,SAAS,MAAM,CAAC;AAC1B,SAAI,SAAS,SAAS,GAAG,IAChB,IAAI,QAAQ,YAAY,EAAE,IAE5B;AACT,GAEM,QAAQ,4BACV,SAAS,KAAK,YAAY,SAAS,cAAc,OAAO,CAAC,EAAE,QAC3D;AAEG,SAAS,YAAY,YAAoB,OAAiB;AAC/D,SAAI,cAAc,WACT,MAET,SAAS,UAAU,IAAI,MAAM,KAAK,GAAG,GACjC,WAAW,WAAW,YAAY,IAC7B,aAAa,YAAY,MAAM,CAAC,CAAC,IAEnC;AACT;AAEO,SAAS,iBAAiB,eAA8B;AAC7D,MAAI,GAAC,cAAc,UAAU,CAAC;AAI9B,eAAW,EAAE,YAAY,MAAM,KAAK;AAClC,UAAK,uBAAuB,UAAU,GAItC;AAAA,qBAAa,UAAU,IAAI,MAAM,KAAK;AAAA,CAAI,GAC1C,MAAM,UAAU,GAChB,YAAY,YAAY,KAAK;AAE7B,mBAAW,QAAQ;AACjB,cAAI,QAAQ,IAAI,aAAa;AAC3B,kBAAM,WAAW,MAAM,MAAM,SAAS,MAAM;AAAA;AAE5C,gBAAI;AACF,oBAAM,WAAW,MAAM,MAAM,SAAS,MAAM;AAAA,YAC9C,SAAS,KAAK;AACZ,sBAAQ;AAAA,gBACN,4CAA4C,OAAO,GAAG,CAAC;AAAA,cACzD,GACA,QAAQ,KAAK,EAAE,MAAM,cAAc,CAAC,GACpC,QAAQ,MAAM,GACd,QAAQ,SAAS;AAAA,YACnB;AAAA;AAAA;AAIR;AAMA,MAAM,eAAe,QAAQ,IAAI,gCAC7B,CAAC,QAAQ,IAAI,gCACb;AAEG,SAAS,uBAAuB,YAAoB;AACzD,MAAI,QAAQ,IAAI,cAAc;AAC5B,WAAO;AAET,QAAM,QAAQ,uBAAuB,IAAI,UAAU;AAEnD,SAAI,QAAQ,IAAI,aAAa,iBAEzB,uBAAuB,OACvB,EAAE,QAAQ,IAAI,yCAAyC,QAEvD,QAAQ;AAAA,IACN;AAAA,EACF,GAKG,UAAU,UAAa,QAAQ;AACxC;",
   "names": ["sheet"]
 }

package/dist/cjs/helpers/insertStyleRule.native.js

@@ -145,18 +145,20 @@ function addThemesFromCSS(cssStyleRule, tokens) {
       !0
     );
   }
-  const dedupedEntry = {
-    names: [],
+  return {
+    names: [
+      ...new Set(
+        selectors.map((selector) => {
+          const parts = selector.replace(/(.t_|:root)/g, "").trim().split(" "), [first] = parts, scheme = first.includes("dark") ? "dark" : first.includes("light") ? "light" : "", name = (() => {
+            let _ = parts[parts.length - 1];
+            return scheme && _.startsWith(scheme) && (_ = _.slice(scheme.length + 1)), _;
+          })();
+          return `${scheme}${scheme && name ? "_" : ""}${name}`;
+        })
+      )
+    ],
     theme: values
   };
-  for (const selector of selectors) {
-    const di = selector.indexOf("t_dark"), li = selector.indexOf("t_light");
-    let scheme = di && li ? di < li ? "dark" : "light" : "", name = selector.slice(selector.lastIndexOf(".t_") + 3);
-    name.startsWith(scheme) && (name = name.slice(scheme.length + 1)), scheme === name && (scheme = "");
-    const themeName = `${scheme}${scheme && name ? "_" : ""}${name}`;
-    dedupedEntry.names.includes(themeName) || dedupedEntry.names.push(themeName);
-  }
-  return dedupedEntry;
 }
 function getTamaguiSelector(rule, collectThemes = !1) {
   if (rule instanceof CSSStyleRule) {

package/dist/cjs/helpers/insertStyleRule.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/insertStyleRule.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAyB,+BAEzB,wBAA+B;AAW/B,MAAM,eAAe,oBAAI,QAA+B,GAClD,yBAAyB,oBAAI,IAAoB,GACjD,eAAuC,CAAC,GACxC,WAAmC,CAAC,GAC7B,qBAAqB,CAAC,GAEtB,kBAAkB,MAAM,cACxB,cAAc,MAAM,OAAO,OAAO,QAAQ,GAC1C,mBAAmB,MAAM;AAGtC,SAAS,aAAa,YAAoB,KAAa,MAAgB;AACrE,QAAM,IAAI,IAAI,QAAQ,YAAY;AAClC,MAAI,MAAM,IAAI;AACZ,IAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,MAAM,0DAAqD,UAAU,EAAE;AAEjF;AAAA,EACF;AACA,QAAM,SAAS,IAAI,IACb,OAAO,IAAI,QAAQ,GAAG,GACtB,QAAQ,IAAI,MAAM,QAAQ,IAAI;AACpC,MAAI,CAAC,mBAAmB,UAAU;AAChC,8BAAmB,UAAU,IAAI,OAC1B;AAEX;AAWO,SAAS,wBAAwB;AACtC,MAAI,CAAC;AAAU;AAcf,EAZW,IAAI,iBAAiB,CAAC,YAAY;AAC3C,eAAW,SAAS;AAClB,UACG,iBAAiB,oBAAoB,MAAM,SAC3C,iBAAiB,mBAAmB,MAAM,KAAK,SAAS,MAAM,GAC/D;AACA,sBAAc;AACd;AAAA,MACF;AAAA,EAEJ,CAAC,EAEE,QAAQ,SAAS,MAAM;AAAA,IACxB,WAAW;AAAA,EACb,CAAC;AACH;AAEA,IAAI,oBAA+C;AAE5C,SAAS,cACd,gBAAgB,IAChB,QAC2B;AAE3B,MADI,QAAQ,IAAI,aAAa,UACzB,CAAC;AAAU;AAEf,MAAI;AAEJ,QAAM,SAAS,SAAS,eAAe,CAAC,GAClC,OAAO,mBACP,UAAU,IAAI,IAAI,MAAgC;AACxD,MAAI,SAAS,aAAa;AACxB,eAAWA,UAAS;AAClB,UAAIA,QAAO;AACT,cAAM,MAAM,kBAAkBA,QAAO,IAAO,eAAe,MAAM;AACjE,QAAI,QACF,SAAS;AAAA,MAEb;AAEF,wBAAoB;AAAA,EACtB;AAEA,MAAI;AACF,eAAWA,UAAS;AAClB,MAAIA,UAAS,CAAC,QAAQ,IAAIA,MAAK,KAC7B,kBAAkBA,QAAO,EAAI;AAKnC,SAAO;AACT;AAEA,SAAS,MAAM,IAAY,SAAS,IAAO;AACzC,QAAM,QAAQ,uBAAuB,IAAI,EAAE,KAAK,MAAM,SAAS,KAAK;AACpE,gCAAuB,IAAI,IAAI,IAAI,GAC5B;AACT;AAEA,MAAM,eAAe,QAAQ,IAAI,yCAC3B,YAAY,eAAe,CAAC,eAAe;AAEjD,SAAS,kBACPA,QACA,SAAS,IACT,gBAAgB,IAChB,QAC2B;AAzH7B;AA4HE,MAAI;AACJ,MAAI;AAEF,QADA,QAAQA,OAAM,UACV,CAAC;AACH;AAAA,EAEJ,QAAQ;AACN;AAAA,EACF;AAEA,QAAM,iBAAgB,wBAAmB,MAAM,CAAC,GAAG,aAAa,MAA1C,mBAA8C,IAC9D,gBAAe,wBAAmB,MAAM,MAAM,SAAS,CAAC,GAAG,aAAa,MAAzD,mBAA6D,IAC5E,WAAW,GAAG,MAAM,MAAM,GAAG,aAAa,GAAG,YAAY,IACzD,cAAc,aAAa,IAAIA,MAAK;AAE1C,MAAI,CAAC,UAEC,gBAAgB;AAClB;AAIJ,QAAM,MAAM,MAAM;AAClB,MAAI,QAAQ,GAER;AAEJ,WAAS,IAAI,GAAG,IAAI,KAAK,KAAK;AAC5B,UAAM,OAAO,MAAM,CAAC;AACpB,QAAI,EAAE,gBAAgB;AAAe;AAErC,UAAM,WAAW,mBAAmB,MAAM,aAAa;AAEvD,QAAI;AAEF,cAAQ;AAAA,SACH;AAEL,UADA,SACI,QAAQ;AAEV;AAEF;AAAA,IACF;AAEA,UAAM,CAAC,YAAY,SAAS,OAAO,IAAI;AAEvC,QAAI,SAAS;AACX,YAAM,UAAU,iBAAiB,SAAS,MAAM;AAChD,MAAI,YACF,kBAAkB,CAAC,GACnB,cAAc,KAAK,OAAO;AAE5B;AAAA,IACF;AAGA,UAAM,QAAQ,MAAM,YAAY,MAAM;AAEtC,IAAI,SACE,UAAU,KACZ,OAAO,aAAa,UAAU,IAErB,cAAc,iBACL,YAAW,WAAW,YAAY,KAElD,aAAa,YAAY,QAAQ,SAAS,OAAO,OAGnD,aAAa,UAAU,IAAI,QAAQ;AAAA,EAGzC;AAEA,sBAAa,IAAIA,QAAO,QAAQ,GAEzB;AACT;AAEA,IAAI,eACA,oBAAgD;AAEpD,SAAS,iBAAiB,cAA4B,QAAuB;AAC3E,QAAM,YAAY,aAAa,aAAa,MAAM,GAAG;AAErD,MAAI,CAAC,UAAU;AAAQ;AAEvB,MAAI,UAAU,CAAC,eAAe;AAC5B,oBAAgB,CAAC;AACjB,eAAW,OAAO,OAAO,OAAO;AAC9B,YAAM,QAAQ,OAAO,MAAM,GAAG;AAC9B,oBAAc,MAAM,IAAI,IAAI,MAAM;AAAA,IACpC;AAAA,EACF;AAKA,QAAM,SAHmB,aAAa,WAAW,IAC9C,MAAM,aAAa,aAAa,SAAS,GAAG,EAAE,EAC9C,KAAK,EACsB,MAAM,GAAG,GAGjC,SAAsB,CAAC;AAE7B,aAAW,QAAQ,OAAO;AACxB,UAAM,OAAO,KAAK,QAAQ,GAAG;AAC7B,QAAI,SAAS;AAAI;AACjB,UAAM,MAAM,KAAK,MAAM,KAAK,QAAQ,IAAI,IAAI,GAAG,IAAI,GAC7C,MAAM,KAAK,MAAM,OAAO,CAAC;AAC/B,QAAI;AACJ,QAAI,IAAI,CAAC,MAAM,KAAK;AAElB,YAAM,UAAU,IAAI,MAAM,GAAG,EAAE,GACzB,WAAW,cAAc,OAAO;AAEtC,MAAI,WACF,QAAQ,YAER,sBAAsB,iBAAiB,SAAS,IAAI,GACpD,QAAQ,kBAAkB,iBAAiB,OAAO,OAAO;AAAA,IAE7D;AACE,cAAQ;AAEV,WAAO,GAAG,QAAI;AAAA,MACZ;AAAA,QACE;AAAA,QACA,MAAM;AAAA,QACN,KAAK;AAAA,MACP;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,QAAM,eAA6B;AAAA,IACjC,OAAO,CAAC;AAAA,IACR,OAAO;AAAA,EACT;AAGA,aAAW,YAAY,WAAW;AAChC,UAAM,KAAK,SAAS,QAAQ,QAAQ,GAC9B,KAAK,SAAS,QAAQ,SAAS;AACrC,QAAI,SAAS,MAAM,KAAM,KAAK,KAAK,SAAS,UAAW,IACnD,OAAO,SAAS,MAAM,SAAS,YAAY,KAAK,IAAI,CAAC;AAEzD,IAAI,KAAK,WAAW,MAAM,MAExB,OAAO,KAAK,MAAM,OAAO,SAAS,CAAC,IAGjC,WAAW,SACb,SAAS;AAEX,UAAM,YAAY,GAAG,MAAM,GAAG,UAAU,OAAO,MAAM,EAAE,GAAG,IAAI;AAE9D,IAAI,aAAa,MAAM,SAAS,SAAS,KAIzC,aAAa,MAAM,KAAK,SAAS;AAAA,EACnC;AAEA,SAAO;AACT;AAEA,SAAS,mBACP,MACA,gBAAgB,IAC4D;AAC5E,MAAI,gBAAgB,cAAc;AAChC,UAAM,OAAO,KAAK;AAClB,QAAI,KAAK,CAAC,MAAM,OAAO,KAAK,CAAC,MAAM,KAAK;AACtC,UAAI,KAAK,WAAW,UAAU;AAC5B,eAAO,CAAC,iCAAiC,IAAI,GAAG,IAAI;AAEtD,UAAI,kBACE,KAAK,WAAW,UAAU,KAAK,KAAK,WAAW,WAAW;AAC5D,eAAO;AAAA,UACL,KAAK,MAAM,GAAG,EAAE;AAAA;AAAA,UAChB;AAAA,UACA;AAAA,QACF;AAAA,IAGN;AAAA,EACF,WAAW,gBAAgB;AAEzB,WAAI,KAAK,SAAS,SAAS,IAAG,SACvB,mBAAmB,KAAK,SAAS,CAAC,CAAC;AAE9C;AAEA,MAAM,mCAAmC,CAAC,aAAqB;AAC7D,MAAI,MAAM,SAAS,MAAM,CAAC;AAC1B,SAAI,SAAS,SAAS,GAAG,IAChB,IAAI,QAAQ,YAAY,EAAE,IAE5B;AACT,GAEM,QAAQ,4BACV,SAAS,KAAK,YAAY,SAAS,cAAc,OAAO,CAAC,EAAE,QAC3D;AAEG,SAAS,YAAY,YAAoB,OAAiB;AAC/D,SAAI,cAAc,WACT,MAET,SAAS,UAAU,IAAI,MAAM,KAAK,GAAG,GACjC,WAAW,WAAW,YAAY,IAC7B,aAAa,YAAY,MAAM,CAAC,CAAC,IAEnC;AACT;AAEO,SAAS,iBAAiB,eAA8B;AAC7D,MAAI,GAAC,cAAc,UAAU,CAAC;AAI9B,eAAW,EAAE,YAAY,MAAM,KAAK;AAClC,UAAK,uBAAuB,UAAU,GAItC;AAAA,qBAAa,UAAU,IAAI,MAAM,KAAK;AAAA,CAAI,GAC1C,MAAM,UAAU,GAChB,YAAY,YAAY,KAAK;AAE7B,mBAAW,QAAQ;AACjB,cAAI,QAAQ,IAAI,aAAa;AAC3B,kBAAM,WAAW,MAAM,MAAM,SAAS,MAAM;AAAA;AAE5C,gBAAI;AACF,oBAAM,WAAW,MAAM,MAAM,SAAS,MAAM;AAAA,YAC9C,SAAS,KAAK;AACZ,sBAAQ;AAAA,gBACN,4CAA4C,OAAO,GAAG,CAAC;AAAA,cACzD,GACA,QAAQ,KAAK,EAAE,MAAM,cAAc,CAAC,GACpC,QAAQ,MAAM,GACd,QAAQ,SAAS;AAAA,YACnB;AAAA;AAAA;AAIR;AAMA,MAAM,eAAe,QAAQ,IAAI,gCAC7B,CAAC,QAAQ,IAAI,gCACb;AAEG,SAAS,uBAAuB,YAAoB;AACzD,MAAI,QAAQ,IAAI,cAAc;AAC5B,WAAO;AAET,QAAM,QAAQ,uBAAuB,IAAI,UAAU;AAEnD,SAAI,QAAQ,IAAI,aAAa,iBAEzB,uBAAuB,OACvB,EAAE,QAAQ,IAAI,yCAAyC,QAEvD,QAAQ;AAAA,IACN;AAAA,EACF,GAKG,UAAU,UAAa,QAAQ;AACxC;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAyB,+BAEzB,wBAA+B;AAW/B,MAAM,eAAe,oBAAI,QAA+B,GAClD,yBAAyB,oBAAI,IAAoB,GACjD,eAAuC,CAAC,GACxC,WAAmC,CAAC,GAC7B,qBAAqB,CAAC,GAEtB,kBAAkB,MAAM,cACxB,cAAc,MAAM,OAAO,OAAO,QAAQ,GAC1C,mBAAmB,MAAM;AAGtC,SAAS,aAAa,YAAoB,KAAa,MAAgB;AACrE,QAAM,IAAI,IAAI,QAAQ,YAAY;AAClC,MAAI,MAAM,IAAI;AACZ,IAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,MAAM,0DAAqD,UAAU,EAAE;AAEjF;AAAA,EACF;AACA,QAAM,SAAS,IAAI,IACb,OAAO,IAAI,QAAQ,GAAG,GACtB,QAAQ,IAAI,MAAM,QAAQ,IAAI;AACpC,MAAI,CAAC,mBAAmB,UAAU;AAChC,8BAAmB,UAAU,IAAI,OAC1B;AAEX;AAWO,SAAS,wBAAwB;AACtC,MAAI,CAAC;AAAU;AAcf,EAZW,IAAI,iBAAiB,CAAC,YAAY;AAC3C,eAAW,SAAS;AAClB,UACG,iBAAiB,oBAAoB,MAAM,SAC3C,iBAAiB,mBAAmB,MAAM,KAAK,SAAS,MAAM,GAC/D;AACA,sBAAc;AACd;AAAA,MACF;AAAA,EAEJ,CAAC,EAEE,QAAQ,SAAS,MAAM;AAAA,IACxB,WAAW;AAAA,EACb,CAAC;AACH;AAEA,IAAI,oBAA+C;AAE5C,SAAS,cACd,gBAAgB,IAChB,QAC2B;AAE3B,MADI,QAAQ,IAAI,aAAa,UACzB,CAAC;AAAU;AAEf,MAAI;AAEJ,QAAM,SAAS,SAAS,eAAe,CAAC,GAClC,OAAO,mBACP,UAAU,IAAI,IAAI,MAAgC;AACxD,MAAI,SAAS,aAAa;AACxB,eAAWA,UAAS;AAClB,UAAIA,QAAO;AACT,cAAM,MAAM,kBAAkBA,QAAO,IAAO,eAAe,MAAM;AACjE,QAAI,QACF,SAAS;AAAA,MAEb;AAEF,wBAAoB;AAAA,EACtB;AAEA,MAAI;AACF,eAAWA,UAAS;AAClB,MAAIA,UAAS,CAAC,QAAQ,IAAIA,MAAK,KAC7B,kBAAkBA,QAAO,EAAI;AAKnC,SAAO;AACT;AAEA,SAAS,MAAM,IAAY,SAAS,IAAO;AACzC,QAAM,QAAQ,uBAAuB,IAAI,EAAE,KAAK,MAAM,SAAS,KAAK;AACpE,gCAAuB,IAAI,IAAI,IAAI,GAC5B;AACT;AAEA,MAAM,eAAe,QAAQ,IAAI,yCAC3B,YAAY,eAAe,CAAC,eAAe;AAEjD,SAAS,kBACPA,QACA,SAAS,IACT,gBAAgB,IAChB,QAC2B;AAzH7B;AA4HE,MAAI;AACJ,MAAI;AAEF,QADA,QAAQA,OAAM,UACV,CAAC;AACH;AAAA,EAEJ,QAAQ;AACN;AAAA,EACF;AAEA,QAAM,iBAAgB,wBAAmB,MAAM,CAAC,GAAG,aAAa,MAA1C,mBAA8C,IAC9D,gBAAe,wBAAmB,MAAM,MAAM,SAAS,CAAC,GAAG,aAAa,MAAzD,mBAA6D,IAC5E,WAAW,GAAG,MAAM,MAAM,GAAG,aAAa,GAAG,YAAY,IACzD,cAAc,aAAa,IAAIA,MAAK;AAE1C,MAAI,CAAC,UAEC,gBAAgB;AAClB;AAIJ,QAAM,MAAM,MAAM;AAClB,MAAI,QAAQ,GAER;AAEJ,WAAS,IAAI,GAAG,IAAI,KAAK,KAAK;AAC5B,UAAM,OAAO,MAAM,CAAC;AACpB,QAAI,EAAE,gBAAgB;AAAe;AAErC,UAAM,WAAW,mBAAmB,MAAM,aAAa;AAEvD,QAAI;AAEF,cAAQ;AAAA,SACH;AAEL,UADA,SACI,QAAQ;AAEV;AAEF;AAAA,IACF;AAEA,UAAM,CAAC,YAAY,SAAS,OAAO,IAAI;AAEvC,QAAI,SAAS;AACX,YAAM,UAAU,iBAAiB,SAAS,MAAM;AAChD,MAAI,YACF,kBAAkB,CAAC,GACnB,cAAc,KAAK,OAAO;AAE5B;AAAA,IACF;AAGA,UAAM,QAAQ,MAAM,YAAY,MAAM;AAEtC,IAAI,SACE,UAAU,KACZ,OAAO,aAAa,UAAU,IAErB,cAAc,iBACL,YAAW,WAAW,YAAY,KAElD,aAAa,YAAY,QAAQ,SAAS,OAAO,OAGnD,aAAa,UAAU,IAAI,QAAQ;AAAA,EAGzC;AAEA,sBAAa,IAAIA,QAAO,QAAQ,GAEzB;AACT;AAEA,IAAI,eACA,oBAAgD;AAEpD,SAAS,iBAAiB,cAA4B,QAAuB;AAC3E,QAAM,YAAY,aAAa,aAAa,MAAM,GAAG;AAErD,MAAI,CAAC,UAAU;AAAQ;AAEvB,MAAI,UAAU,CAAC,eAAe;AAC5B,oBAAgB,CAAC;AACjB,eAAW,OAAO,OAAO,OAAO;AAC9B,YAAM,QAAQ,OAAO,MAAM,GAAG;AAC9B,oBAAc,MAAM,IAAI,IAAI,MAAM;AAAA,IACpC;AAAA,EACF;AAKA,QAAM,SAHmB,aAAa,WAAW,IAC9C,MAAM,aAAa,aAAa,SAAS,GAAG,EAAE,EAC9C,KAAK,EACsB,MAAM,GAAG,GAGjC,SAAsB,CAAC;AAE7B,aAAW,QAAQ,OAAO;AACxB,UAAM,OAAO,KAAK,QAAQ,GAAG;AAC7B,QAAI,SAAS;AAAI;AACjB,UAAM,MAAM,KAAK,MAAM,KAAK,QAAQ,IAAI,IAAI,GAAG,IAAI,GAC7C,MAAM,KAAK,MAAM,OAAO,CAAC;AAC/B,QAAI;AACJ,QAAI,IAAI,CAAC,MAAM,KAAK;AAElB,YAAM,UAAU,IAAI,MAAM,GAAG,EAAE,GACzB,WAAW,cAAc,OAAO;AAEtC,MAAI,WACF,QAAQ,YAER,sBAAsB,iBAAiB,SAAS,IAAI,GACpD,QAAQ,kBAAkB,iBAAiB,OAAO,OAAO;AAAA,IAE7D;AACE,cAAQ;AAEV,WAAO,GAAG,QAAI;AAAA,MACZ;AAAA,QACE;AAAA,QACA,MAAM;AAAA,QACN,KAAK;AAAA,MACP;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAmCA,SAPmC;AAAA,IACjC,OA3BY;AAAA,MACZ,GAAG,IAAI;AAAA,QACL,UAAU,IAAI,CAAC,aAAa;AAC1B,gBAAM,QAAQ,SACX,QAAQ,gBAAgB,EAAE,EAC1B,KAAK,EACL,MAAM,GAAG,GACN,CAAC,KAAK,IAAI,OACV,SAAS,MAAM,SAAS,MAAM,IAChC,SACA,MAAM,SAAS,OAAO,IACpB,UACA,IACA,QAAQ,MAAM;AAClB,gBAAI,IAAI,MAAM,MAAM,SAAS,CAAC;AAC9B,mBAAI,UAAU,EAAE,WAAW,MAAM,MAE/B,IAAI,EAAE,MAAM,OAAO,SAAS,CAAC,IAExB;AAAA,UACT,GAAG;AACH,iBAAO,GAAG,MAAM,GAAG,UAAU,OAAO,MAAM,EAAE,GAAG,IAAI;AAAA,QACrD,CAAC;AAAA,MACH;AAAA,IACF;AAAA,IAIE,OAAO;AAAA,EACT;AAKF;AAEA,SAAS,mBACP,MACA,gBAAgB,IAC4D;AAC5E,MAAI,gBAAgB,cAAc;AAChC,UAAM,OAAO,KAAK;AAClB,QAAI,KAAK,CAAC,MAAM,OAAO,KAAK,CAAC,MAAM,KAAK;AACtC,UAAI,KAAK,WAAW,UAAU;AAC5B,eAAO,CAAC,iCAAiC,IAAI,GAAG,IAAI;AAEtD,UAAI,kBACE,KAAK,WAAW,UAAU,KAAK,KAAK,WAAW,WAAW;AAC5D,eAAO;AAAA,UACL,KAAK,MAAM,GAAG,EAAE;AAAA;AAAA,UAChB;AAAA,UACA;AAAA,QACF;AAAA,IAGN;AAAA,EACF,WAAW,gBAAgB;AAEzB,WAAI,KAAK,SAAS,SAAS,IAAG,SACvB,mBAAmB,KAAK,SAAS,CAAC,CAAC;AAE9C;AAEA,MAAM,mCAAmC,CAAC,aAAqB;AAC7D,MAAI,MAAM,SAAS,MAAM,CAAC;AAC1B,SAAI,SAAS,SAAS,GAAG,IAChB,IAAI,QAAQ,YAAY,EAAE,IAE5B;AACT,GAEM,QAAQ,4BACV,SAAS,KAAK,YAAY,SAAS,cAAc,OAAO,CAAC,EAAE,QAC3D;AAEG,SAAS,YAAY,YAAoB,OAAiB;AAC/D,SAAI,cAAc,WACT,MAET,SAAS,UAAU,IAAI,MAAM,KAAK,GAAG,GACjC,WAAW,WAAW,YAAY,IAC7B,aAAa,YAAY,MAAM,CAAC,CAAC,IAEnC;AACT;AAEO,SAAS,iBAAiB,eAA8B;AAC7D,MAAI,GAAC,cAAc,UAAU,CAAC;AAI9B,eAAW,EAAE,YAAY,MAAM,KAAK;AAClC,UAAK,uBAAuB,UAAU,GAItC;AAAA,qBAAa,UAAU,IAAI,MAAM,KAAK;AAAA,CAAI,GAC1C,MAAM,UAAU,GAChB,YAAY,YAAY,KAAK;AAE7B,mBAAW,QAAQ;AACjB,cAAI,QAAQ,IAAI,aAAa;AAC3B,kBAAM,WAAW,MAAM,MAAM,SAAS,MAAM;AAAA;AAE5C,gBAAI;AACF,oBAAM,WAAW,MAAM,MAAM,SAAS,MAAM;AAAA,YAC9C,SAAS,KAAK;AACZ,sBAAQ;AAAA,gBACN,4CAA4C,OAAO,GAAG,CAAC;AAAA,cACzD,GACA,QAAQ,KAAK,EAAE,MAAM,cAAc,CAAC,GACpC,QAAQ,MAAM,GACd,QAAQ,SAAS;AAAA,YACnB;AAAA;AAAA;AAIR;AAMA,MAAM,eAAe,QAAQ,IAAI,gCAC7B,CAAC,QAAQ,IAAI,gCACb;AAEG,SAAS,uBAAuB,YAAoB;AACzD,MAAI,QAAQ,IAAI,cAAc;AAC5B,WAAO;AAET,QAAM,QAAQ,uBAAuB,IAAI,UAAU;AAEnD,SAAI,QAAQ,IAAI,aAAa,iBAEzB,uBAAuB,OACvB,EAAE,QAAQ,IAAI,yCAAyC,QAEvD,QAAQ;AAAA,IACN;AAAA,EACF,GAKG,UAAU,UAAa,QAAQ;AACxC;",
   "names": ["sheet"]
 }

package/dist/esm/helpers/insertStyleRule.js

@@ -117,18 +117,20 @@ function addThemesFromCSS(cssStyleRule, tokens) {
       !0
     );
   }
-  const dedupedEntry = {
-    names: [],
+  return {
+    names: [
+      ...new Set(
+        selectors.map((selector) => {
+          const parts = selector.replace(/(.t_|:root)/g, "").trim().split(" "), [first] = parts, scheme = first.includes("dark") ? "dark" : first.includes("light") ? "light" : "", name = (() => {
+            let _ = parts[parts.length - 1];
+            return scheme && _.startsWith(scheme) && (_ = _.slice(scheme.length + 1)), _;
+          })();
+          return `${scheme}${scheme && name ? "_" : ""}${name}`;
+        })
+      )
+    ],
     theme: values
   };
-  for (const selector of selectors) {
-    const di = selector.indexOf("t_dark"), li = selector.indexOf("t_light");
-    let scheme = di && li ? di < li ? "dark" : "light" : "", name = selector.slice(selector.lastIndexOf(".t_") + 3);
-    name.startsWith(scheme) && (name = name.slice(scheme.length + 1)), scheme === name && (scheme = "");
-    const themeName = `${scheme}${scheme && name ? "_" : ""}${name}`;
-    dedupedEntry.names.includes(themeName) || dedupedEntry.names.push(themeName);
-  }
-  return dedupedEntry;
 }
 function getTamaguiSelector(rule, collectThemes = !1) {
   if (rule instanceof CSSStyleRule) {

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/insertStyleRule.native.js

@@ -117,18 +117,20 @@ function addThemesFromCSS(cssStyleRule, tokens) {
       !0
     );
   }
-  const dedupedEntry = {
-    names: [],
+  return {
+    names: [
+      ...new Set(
+        selectors.map((selector) => {
+          const parts = selector.replace(/(.t_|:root)/g, "").trim().split(" "), [first] = parts, scheme = first.includes("dark") ? "dark" : first.includes("light") ? "light" : "", name = (() => {
+            let _ = parts[parts.length - 1];
+            return scheme && _.startsWith(scheme) && (_ = _.slice(scheme.length + 1)), _;
+          })();
+          return `${scheme}${scheme && name ? "_" : ""}${name}`;
+        })
+      )
+    ],
     theme: values
   };
-  for (const selector of selectors) {
-    const di = selector.indexOf("t_dark"), li = selector.indexOf("t_light");
-    let scheme = di && li ? di < li ? "dark" : "light" : "", name = selector.slice(selector.lastIndexOf(".t_") + 3);
-    name.startsWith(scheme) && (name = name.slice(scheme.length + 1)), scheme === name && (scheme = "");
-    const themeName = `${scheme}${scheme && name ? "_" : ""}${name}`;
-    dedupedEntry.names.includes(themeName) || dedupedEntry.names.push(themeName);
-  }
-  return dedupedEntry;
 }
 function getTamaguiSelector(rule, collectThemes = !1) {
   if (rule instanceof CSSStyleRule) {

package/dist/esm/helpers/insertStyleRule.native.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/package.json

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

package/src/helpers/insertStyleRule.tsx

@@ -255,34 +255,38 @@ function addThemesFromCSS(cssStyleRule: CSSStyleRule, tokens?: TokensParsed) {
     ) as any
   }
 
+  const names = [
+    ...new Set(
+      selectors.map((selector) => {
+        const parts = selector
+          .replace(/(.t_|:root)/g, '')
+          .trim()
+          .split(' ')
+        const [first] = parts
+        const scheme = first.includes('dark')
+          ? 'dark'
+          : first.includes('light')
+            ? 'light'
+            : ''
+        const name = (() => {
+          let _ = parts[parts.length - 1]
+          if (scheme && _.startsWith(scheme)) {
+            // we have some hardcoded for component themes t_light_name
+            _ = _.slice(scheme.length + 1)
+          }
+          return _
+        })()
+        return `${scheme}${scheme && name ? '_' : ''}${name}`
+      })
+    ),
+  ]
+
   const dedupedEntry: DedupedTheme = {
-    names: [],
+    names,
     theme: values,
   }
 
   // loop selectors and build deduped
-  for (const selector of selectors) {
-    const di = selector.indexOf('t_dark')
-    const li = selector.indexOf('t_light')
-    let scheme = di && li ? (di < li ? 'dark' : 'light') : ''
-    let name = selector.slice(selector.lastIndexOf('.t_') + 3)
-
-    if (name.startsWith(scheme)) {
-      // we have some hardcoded for component themes t_light_name
-      name = name.slice(scheme.length + 1)
-    }
-    // for base dark and light
-    if (scheme === name) {
-      scheme = ''
-    }
-    const themeName = `${scheme}${scheme && name ? '_' : ''}${name}`
-
-    if (dedupedEntry.names.includes(themeName)) {
-      continue
-    }
-
-    dedupedEntry.names.push(themeName)
-  }
 
   return dedupedEntry
 }

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

@@ -1 +1 @@
-{"version":3,"file":"insertStyleRule.d.ts","sourceRoot":"","sources":["../../src/helpers/insertStyleRule.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,aAAa,EACb,aAAa,EAEb,YAAY,EACb,MAAM,UAAU,CAAA;AAQjB,eAAO,MAAM,kBAAkB,IAAK,CAAA;AAEpC,eAAO,MAAM,eAAe,8BAAqB,CAAA;AACjD,eAAO,MAAM,WAAW,gBAAgC,CAAA;AACxD,eAAO,MAAM,gBAAgB,UAA2B,CAAA;AA6BxD,wBAAgB,qBAAqB,SAkBpC;AAID,wBAAgB,aAAa,CAC3B,aAAa,UAAQ,EACrB,MAAM,CAAC,EAAE,YAAY,GACpB,aAAa,GAAG,SAAS,CA8B3B;AA+ND,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,uBAS9D;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,aAAa,QA+B5D;AAUD,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,WAmBxD"}
+{"version":3,"file":"insertStyleRule.d.ts","sourceRoot":"","sources":["../../src/helpers/insertStyleRule.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,aAAa,EACb,aAAa,EAEb,YAAY,EACb,MAAM,UAAU,CAAA;AAQjB,eAAO,MAAM,kBAAkB,IAAK,CAAA;AAEpC,eAAO,MAAM,eAAe,8BAAqB,CAAA;AACjD,eAAO,MAAM,WAAW,gBAAgC,CAAA;AACxD,eAAO,MAAM,gBAAgB,UAA2B,CAAA;AA6BxD,wBAAgB,qBAAqB,SAkBpC;AAID,wBAAgB,aAAa,CAC3B,aAAa,UAAQ,EACrB,MAAM,CAAC,EAAE,YAAY,GACpB,aAAa,GAAG,SAAS,CA8B3B;AAmOD,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,uBAS9D;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,aAAa,QA+B5D;AAUD,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,WAmBxD"}