@tamagui/core 1.85.7 → 1.85.8

package/dist/native.js

@@ -1465,7 +1465,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)
@@ -1483,7 +1483,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
@@ -1497,20 +1497,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) {
@@ -3806,7 +3803,9 @@ var require_propMapper_native = __commonJS({
         let expanded = (0, import_expandStylesAndRemoveNullishValues.expandStylesAndRemoveNullishValues)(
           variantValue,
           !!styleProps.noNormalize
-        ), next = Object.entries(expanded);
+        );
+        process.env.NODE_ENV === "development" && debug === "verbose" && console.info("   expanding styles from ", variantValue, "to", expanded);
+        let next = Object.entries(expanded);
         return fontFamilyResult && fontFamilyResult[0] === "$" && fontFamilyCache.set(next, (0, import_createVariable.getVariableValue)(fontFamilyResult)), next;
       }
     };
@@ -3844,7 +3843,7 @@ var require_propMapper_native = __commonJS({
           continue;
         }
         if ((0, import_createVariable.isVariable)(val)) {
-          res[subKey] = resolveVariableValue(subKey, val, styleProps.resolveValues);
+          res[subKey] = resolveVariableValue(subKey, val, styleProps.resolveValues), process.env.NODE_ENV === "development" && debug === "verbose" && console.info("variable", subKey, res[subKey]);
           continue;
         }
         if (typeof val == "string") {