@tamagui/core 1.85.7 → 1.85.9-1705340264375

package/dist/test.native.js

@@ -1430,7 +1430,7 @@ var require_insertStyleRule_native = __commonJS({
       }
       return scannedCache.set(sheet2, cacheKey), dedupedThemes;
     }
-    var colorVarToVal, rootComputedStyle = null, schemes = { dark: !0, light: !0 };
+    var colorVarToVal, rootComputedStyle = null;
     function addThemesFromCSS(cssStyleRule, tokens) {
       let selectors = cssStyleRule.selectorText.split(",");
       if (!selectors.length)
@@ -1448,7 +1448,7 @@ var require_insertStyleRule_native = __commonJS({
         if (sepI === -1)
           continue;
         let key = rule.slice(rule.indexOf("--") + 2, sepI), val = rule.slice(sepI + 2), value;
-        if (val[3] === "(") {
+        if (val.startsWith("var(")) {
           let varName = val.slice(6, -1), tokenVal = colorVarToVal[varName];
           tokenVal ? value = tokenVal : (rootComputedStyle ||= getComputedStyle(document.body), value = rootComputedStyle.getPropertyValue("--" + varName));
         } else
@@ -1462,20 +1462,17 @@ var require_insertStyleRule_native = __commonJS({
           !0
         );
       }
-      return {
-        names: [
-          ...new Set(
-            selectors.map((selector) => {
-              let parts = selector.replace(/(.t_|:root)/g, "").trim().split(" "), secondToLast = parts[parts.length - 2] || "", scheme = secondToLast.includes("dark") ? "dark" : secondToLast.includes("light") ? "light" : "", name = (() => {
-                let _ = parts[parts.length - 1];
-                return scheme && _.startsWith(scheme) && (_ = _.slice(scheme.length + 1)), _;
-              })();
-              return scheme === name || schemes[name] ? scheme : `${scheme}${scheme && name ? "_" : ""}${name}`;
-            })
-          )
-        ],
+      let dedupedEntry = {
+        names: [],
         theme: values
       };
+      for (let selector of selectors) {
+        let scheme = selector.includes("t_dark") ? "dark" : selector.includes("t_light") ? "light" : "", name = selector.slice(selector.lastIndexOf(".t_") + 3);
+        name.startsWith(scheme) && (name = name.slice(scheme.length + 1)), scheme === name && (scheme = "");
+        let themeName = `${scheme}${scheme && name ? "_" : ""}${name}`;
+        dedupedEntry.names.includes(themeName) || dedupedEntry.names.push(themeName);
+      }
+      return dedupedEntry;
     }
     function getTamaguiSelector(rule, collectThemes = !1) {
       if (rule instanceof CSSStyleRule) {
@@ -2137,11 +2134,11 @@ var require_useTheme_native = __commonJS({
       }
       return !1;
     }
-    var activeThemeManagers = /* @__PURE__ */ new Set(), _uidToManager = /* @__PURE__ */ new WeakMap(), _idToUID = {}, getId = (id) => _idToUID[id], getThemeManager = (id) => _uidToManager.get(getId(id)), registerThemeManager = (t) => {
-      if (!_idToUID[t.id]) {
-        let id = _idToUID[t.id] = {};
-        _uidToManager.set(id, t);
-      }
+    var activeThemeManagers = /* @__PURE__ */ new Set(), _idToManager = /* @__PURE__ */ new Map(), getThemeManager = (id) => {
+      var _a;
+      return (_a = _idToManager.get(id)) == null ? void 0 : _a.deref();
+    }, registerThemeManager = (t) => {
+      _idToManager.set(t.id, new WeakRef(t));
     }, useChangeThemeEffect = (props, isRoot = !1, keys, shouldUpdate) => {
       let { disable } = props, parentManagerId = (0, import_react3.useContext)(import_ThemeManagerContext.ThemeManagerIDContext), parentManager = getThemeManager(parentManagerId);
       if (!isRoot && !parentManager || disable)