@tamagui/web 1.61.3 → 1.62.1

package/dist/esm/helpers/insertStyleRule.js

@@ -1,145 +1,90 @@
 import { isClient } from "@tamagui/constants";
 import { createVariable } from "../createVariable";
-const scannedCache = /* @__PURE__ */ new WeakMap();
-const totalSelectorsInserted = /* @__PURE__ */ new Map();
-const allSelectors = {};
-const allRules = {};
-const insertedTransforms = {};
-const getAllSelectors = () => allSelectors;
-const getAllRules = () => Object.values(allRules);
-const getAllTransforms = () => insertedTransforms;
+const scannedCache = /* @__PURE__ */ new WeakMap(), totalSelectorsInserted = /* @__PURE__ */ new Map(), allSelectors = {}, allRules = {}, insertedTransforms = {}, getAllSelectors = () => allSelectors, getAllRules = () => Object.values(allRules), getAllTransforms = () => insertedTransforms;
 function addTransform(identifier, css, rule) {
   const s = css.indexOf("transform:");
   if (s === -1) {
-    if (process.env.NODE_ENV === "development") {
-      console.error(`\u274C Invalid transform, likely used deg/% improperly ${identifier}`);
-    }
+    process.env.NODE_ENV === "development" && console.error(`\u274C Invalid transform, likely used deg/% improperly ${identifier}`);
     return;
   }
-  const startI = s + "transform:".length;
-  const endI = css.indexOf(";");
-  const value = css.slice(startI, endI);
-  if (!insertedTransforms[identifier]) {
-    insertedTransforms[identifier] = value;
-    return true;
-  }
+  const startI = s + 10, endI = css.indexOf(";"), value = css.slice(startI, endI);
+  if (!insertedTransforms[identifier])
+    return insertedTransforms[identifier] = value, !0;
 }
 function listenForSheetChanges() {
   if (!isClient)
     return;
-  const mo = new MutationObserver((entries) => {
-    for (const entry of entries) {
+  new MutationObserver((entries) => {
+    for (const entry of entries)
       if (entry instanceof HTMLStyleElement && entry.sheet || entry instanceof HTMLLinkElement && entry.href.endsWith(".css")) {
         scanAllSheets();
         break;
       }
-    }
-  });
-  mo.observe(document.head, {
-    childList: true
+  }).observe(document.head, {
+    childList: !0
   });
 }
 let lastScannedSheets = null;
-function scanAllSheets(collectThemes = false, tokens) {
-  if (process.env.NODE_ENV === "test")
-    return;
-  if (!isClient)
+function scanAllSheets(collectThemes = !1, tokens) {
+  if (process.env.NODE_ENV === "test" || !isClient)
     return;
   let themes;
-  const sheets = document.styleSheets || [];
-  const prev = lastScannedSheets;
-  const current = new Set(sheets);
+  const sheets = document.styleSheets || [], prev = lastScannedSheets, current = new Set(sheets);
   if (document.styleSheets) {
-    for (const sheet2 of current) {
+    for (const sheet2 of current)
       if (sheet2) {
-        const out = updateSheetStyles(sheet2, false, collectThemes, tokens);
-        if (out) {
-          themes = out;
-        }
+        const out = updateSheetStyles(sheet2, !1, collectThemes, tokens);
+        out && (themes = out);
       }
-    }
     lastScannedSheets = current;
   }
-  if (prev) {
-    for (const sheet2 of prev) {
-      if (sheet2 && !current.has(sheet2)) {
-        updateSheetStyles(sheet2, true);
-      }
-    }
-  }
+  if (prev)
+    for (const sheet2 of prev)
+      sheet2 && !current.has(sheet2) && updateSheetStyles(sheet2, !0);
   return themes;
 }
-function track(id, remove = false) {
+function track(id, remove = !1) {
   const next = (totalSelectorsInserted.get(id) || 0) + (remove ? -1 : 1);
-  totalSelectorsInserted.set(id, next);
-  return next;
+  return totalSelectorsInserted.set(id, next), next;
 }
-const bailAfterEnv = process.env.TAMAGUI_BAIL_AFTER_SCANNING_X_CSS_RULES;
-const bailAfter = bailAfterEnv ? +bailAfterEnv : 250;
-function updateSheetStyles(sheet2, remove = false, collectThemes = false, tokens) {
-  var _a, _b;
+const bailAfterEnv = process.env.TAMAGUI_BAIL_AFTER_SCANNING_X_CSS_RULES, bailAfter = bailAfterEnv ? +bailAfterEnv : 250;
+function updateSheetStyles(sheet2, remove = !1, collectThemes = !1, tokens) {
   let rules;
   try {
-    rules = sheet2.cssRules;
-    if (!rules) {
+    if (rules = sheet2.cssRules, !rules)
       return;
-    }
   } catch {
     return;
   }
-  const firstSelector = (_a = getTamaguiSelector(rules[0], collectThemes)) == null ? void 0 : _a[0];
-  const lastSelector = (_b = getTamaguiSelector(rules[rules.length - 1], collectThemes)) == null ? void 0 : _b[0];
-  const cacheKey = `${rules.length}${firstSelector}${lastSelector}`;
-  const lastScanned = scannedCache.get(sheet2);
-  if (!remove) {
-    if (lastScanned === cacheKey) {
-      return;
-    }
-  }
+  const firstSelector = getTamaguiSelector(rules[0], collectThemes)?.[0], lastSelector = getTamaguiSelector(rules[rules.length - 1], collectThemes)?.[0], cacheKey = `${rules.length}${firstSelector}${lastSelector}`, lastScanned = scannedCache.get(sheet2);
+  if (!remove && lastScanned === cacheKey)
+    return;
   const len = rules.length;
-  let fails = 0;
-  let dedupedThemes;
+  let fails = 0, dedupedThemes;
   for (let i = 0; i < len; i++) {
     const rule = rules[i];
     if (!(rule instanceof CSSStyleRule))
       continue;
     const response = getTamaguiSelector(rule, collectThemes);
-    if (response) {
+    if (response)
       fails = 0;
-    } else {
-      fails++;
-      if (fails > bailAfter) {
+    else {
+      if (fails++, fails > bailAfter)
         return;
-      }
       continue;
     }
     const [identifier, cssRule, isTheme] = response;
     if (isTheme) {
       const deduped = addThemesFromCSS(cssRule, tokens);
-      if (deduped) {
-        dedupedThemes ||= [];
-        dedupedThemes.push(deduped);
-      }
+      deduped && (dedupedThemes ||= [], dedupedThemes.push(deduped));
       continue;
     }
     const total = track(identifier, remove);
-    if (remove) {
-      if (total === 0) {
-        delete allSelectors[identifier];
-      }
-    } else if (!(identifier in allSelectors)) {
-      const isTransform = identifier.startsWith("_transform");
-      const shouldInsert = isTransform ? addTransform(identifier, cssRule.cssText, cssRule) : true;
-      if (shouldInsert) {
-        allSelectors[identifier] = cssRule.cssText;
-      }
-    }
+    remove ? total === 0 && delete allSelectors[identifier] : identifier in allSelectors || (!identifier.startsWith("_transform") || addTransform(identifier, cssRule.cssText, cssRule)) && (allSelectors[identifier] = cssRule.cssText);
   }
-  scannedCache.set(sheet2, cacheKey);
-  return dedupedThemes;
+  return scannedCache.set(sheet2, cacheKey), dedupedThemes;
 }
-let colorVarToVal;
-let rootComputedStyle = null;
+let colorVarToVal, rootComputedStyle = null;
 function addThemesFromCSS(cssStyleRule, tokens) {
   const selectors = cssStyleRule.selectorText.split(",");
   if (!selectors.length)
@@ -151,35 +96,25 @@ function addThemesFromCSS(cssStyleRule, tokens) {
       colorVarToVal[token.name] = token.val;
     }
   }
-  const rulesWithBraces = (cssStyleRule.cssText || "").slice(cssStyleRule.selectorText.length + 2, -1).trim();
-  const rules = rulesWithBraces.split(";");
-  const values = {};
+  const rules = (cssStyleRule.cssText || "").slice(cssStyleRule.selectorText.length + 2, -1).trim().split(";"), values = {};
   for (const rule of rules) {
     const sepI = rule.indexOf(":");
     if (sepI === -1)
       continue;
-    const key = rule.slice(rule.indexOf("--") + 2, sepI);
-    const val = rule.slice(sepI + 2);
+    const key = rule.slice(rule.indexOf("--") + 2, sepI), val = rule.slice(sepI + 2);
     let value;
     if (val[3] === "(") {
-      const varName = val.slice(6, -1);
-      const tokenVal = colorVarToVal[varName];
-      if (tokenVal) {
-        value = tokenVal;
-      } else {
-        rootComputedStyle ||= getComputedStyle(document.body);
-        value = rootComputedStyle.getPropertyValue("--" + varName);
-      }
-    } else {
+      const varName = val.slice(6, -1), tokenVal = colorVarToVal[varName];
+      tokenVal ? value = tokenVal : (rootComputedStyle ||= getComputedStyle(document.body), value = rootComputedStyle.getPropertyValue("--" + varName));
+    } else
       value = val;
-    }
     values[key] = createVariable(
       {
         key,
         name: key,
         val: value
       },
-      true
+      !0
     );
   }
   const dedupedEntry = {
@@ -187,106 +122,64 @@ function addThemesFromCSS(cssStyleRule, tokens) {
     theme: values
   };
   for (const selector of selectors) {
-    let scheme = selector.includes("t_dark") ? "dark" : selector.includes("t_light") ? "light" : "";
-    let name = selector.slice(selector.lastIndexOf(".t_") + 3);
-    if (name.startsWith(scheme)) {
-      name = name.slice(scheme.length + 1);
-    }
-    if (scheme === name) {
-      scheme = "";
-    }
+    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 = "");
     const themeName = `${scheme}${scheme && name ? "_" : ""}${name}`;
-    if (dedupedEntry.names.includes(themeName)) {
-      continue;
-    }
-    dedupedEntry.names.push(themeName);
+    dedupedEntry.names.includes(themeName) || dedupedEntry.names.push(themeName);
   }
   return dedupedEntry;
 }
-function getTamaguiSelector(rule, collectThemes = false) {
+function getTamaguiSelector(rule, collectThemes = !1) {
   if (rule instanceof CSSStyleRule) {
     const text = rule.selectorText;
     if (text[0] === ":" && text[1] === "r") {
-      if (text.startsWith(":root ._")) {
+      if (text.startsWith(":root ._"))
         return [getIdentifierFromTamaguiSelector(text), rule];
-      }
-      if (collectThemes) {
-        if (text.startsWith(":root.t_") || text.startsWith(":root .t_")) {
-          return [
-            text.slice(0, 20),
-            // just used as uid
-            rule,
-            true
-          ];
-        }
-      }
-    }
-  } else if (rule instanceof CSSMediaRule) {
-    if (rule.cssRules.length > 1)
-      return;
-    return getTamaguiSelector(rule.cssRules[0]);
-  }
+      if (collectThemes && (text.startsWith(":root.t_") || text.startsWith(":root .t_")))
+        return [
+          text.slice(0, 20),
+          // just used as uid
+          rule,
+          !0
+        ];
+    }
+  } else if (rule instanceof CSSMediaRule)
+    return rule.cssRules.length > 1 ? void 0 : getTamaguiSelector(rule.cssRules[0]);
 }
 const getIdentifierFromTamaguiSelector = (selector) => {
   let res = selector.slice(7);
-  if (selector.includes(":")) {
-    return res.replace(/:[a-z]+$/, "");
-  }
-  return res;
-};
-const sheet = isClient ? document.head.appendChild(document.createElement("style")).sheet : null;
+  return selector.includes(":") ? res.replace(/:[a-z]+$/, "") : res;
+}, sheet = isClient ? document.head.appendChild(document.createElement("style")).sheet : null;
 function updateRules(identifier, rules) {
-  if (identifier in allRules) {
-    return false;
-  }
-  allRules[identifier] = rules.join(" ");
-  if (identifier.startsWith("_transform")) {
-    return addTransform(identifier, rules[0]);
-  }
-  return true;
+  return identifier in allRules ? !1 : (allRules[identifier] = rules.join(" "), identifier.startsWith("_transform") ? addTransform(identifier, rules[0]) : !0);
 }
 function insertStyleRules(rulesToInsert) {
-  if (!rulesToInsert.length || !sheet) {
-    return;
-  }
-  for (const { identifier, rules } of rulesToInsert) {
-    if (!shouldInsertStyleRules(identifier)) {
-      continue;
-    }
-    allSelectors[identifier] = rules.join("\n");
-    track(identifier);
-    updateRules(identifier, rules);
-    for (const rule of rules) {
-      if (process.env.NODE_ENV === "production") {
-        sheet.insertRule(rule, sheet.cssRules.length);
-      } else {
-        try {
-          sheet.insertRule(rule, sheet.cssRules.length);
-        } catch (err) {
-          console.groupCollapsed(
-            `Error inserting rule into CSSStyleSheet: ${String(err)}`
-          );
-          console.log({ rule, rulesToInsert });
-          console.trace();
-          console.groupEnd();
-        }
+  if (!(!rulesToInsert.length || !sheet)) {
+    for (const { identifier, rules } of rulesToInsert)
+      if (shouldInsertStyleRules(identifier)) {
+        allSelectors[identifier] = rules.join(`
+`), track(identifier), updateRules(identifier, rules);
+        for (const rule of rules)
+          if (process.env.NODE_ENV === "production")
+            sheet.insertRule(rule, sheet.cssRules.length);
+          else
+            try {
+              sheet.insertRule(rule, sheet.cssRules.length);
+            } catch (err) {
+              console.groupCollapsed(
+                `Error inserting rule into CSSStyleSheet: ${String(err)}`
+              ), console.log({ rule, rulesToInsert }), console.trace(), console.groupEnd();
+            }
       }
-    }
   }
 }
 function shouldInsertStyleRules(identifier) {
-  if (process.env.IS_STATIC === "is_static") {
-    return true;
-  }
+  if (process.env.IS_STATIC === "is_static")
+    return !0;
   const total = totalSelectorsInserted.get(identifier);
-  if (process.env.NODE_ENV === "development") {
-    if (totalSelectorsInserted.size > +(process.env.TAMAGUI_STYLE_INSERTION_WARNING_LIMIT || 5e4)) {
-      console.warn(
-        `Warning: inserting many CSS rules, you may be animating something and generating many CSS insertions, which can degrade performance. Instead, try using the "disableClassName" property on elements that change styles often. To disable this warning set TAMAGUI_STYLE_INSERTION_WARNING_LIMIT from 50000 to something higher`
-      );
-    }
-  }
-  return total === void 0 || total < 2;
+  return process.env.NODE_ENV === "development" && totalSelectorsInserted.size > +(process.env.TAMAGUI_STYLE_INSERTION_WARNING_LIMIT || 5e4) && console.warn(
+    'Warning: inserting many CSS rules, you may be animating something and generating many CSS insertions, which can degrade performance. Instead, try using the "disableClassName" property on elements that change styles often. To disable this warning set TAMAGUI_STYLE_INSERTION_WARNING_LIMIT from 50000 to something higher'
+  ), total === void 0 || total < 2;
 }
 export {
   getAllRules,

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/isObj.js

@@ -1,4 +1,4 @@
-const isObj = (x) => x && !Array.isArray(x) && typeof x === "object";
+const isObj = (x) => x && !Array.isArray(x) && typeof x == "object";
 export {
   isObj
 };

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/isObj.ts"],
-  "mappings": "AAAO,MAAM,QAAQ,CAAC,MAAW,KAAK,CAAC,MAAM,QAAQ,CAAC,KAAK,OAAO,MAAM;",
+  "mappings": "AAAO,MAAM,QAAQ,CAAC,MAAW,KAAK,CAAC,MAAM,QAAQ,CAAC,KAAK,OAAO,KAAM;",
   "names": []
 }

package/dist/esm/helpers/isTamaguiComponent.js

@@ -1,6 +1,6 @@
 function isTamaguiComponent(comp, name) {
-  const config = comp == null ? void 0 : comp["staticConfig"];
-  return Boolean(config && (name ? name === config.componentName : true));
+  const config = comp?.staticConfig;
+  return !!(config && (!name || name === config.componentName));
 }
 export {
   isTamaguiComponent

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/isTamaguiComponent.tsx"],
-  "mappings": "AAEO,SAAS,mBACd,MACA,MAGA;AACA,QAAM,SAAS,6BAAO;AACtB,SAAO,QAAQ,WAAW,OAAO,SAAS,OAAO,gBAAgB,KAAK;AACxE;",
+  "mappings": "AAEO,SAAS,mBACd,MACA,MAGA;AACA,QAAM,SAAS,MAAO;AACtB,SAAO,GAAQ,WAAW,SAAO,SAAS,OAAO;AACnD;",
   "names": []
 }

package/dist/esm/helpers/isTamaguiElement.js

@@ -1,8 +1,6 @@
 import { isValidElement } from "react";
 import { isTamaguiComponent } from "./isTamaguiComponent";
-const isTamaguiElement = (child, name) => {
-  return isValidElement(child) && isTamaguiComponent(child.type, name);
-};
+const isTamaguiElement = (child, name) => isValidElement(child) && isTamaguiComponent(child.type, name);
 export {
   isTamaguiElement
 };

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/isTamaguiElement.tsx"],
-  "mappings": "AAAA,SAAS,sBAAsB;AAG/B,SAAS,0BAA0B;AAE5B,MAAM,mBAAmB,CAC9B,OACA,SACiC;AACjC,SAAO,eAAe,KAAK,KAAK,mBAAmB,MAAM,MAAM,IAAI;AACrE;",
+  "mappings": "AAAA,SAAS,sBAAsB;AAG/B,SAAS,0BAA0B;AAE5B,MAAM,mBAAmB,CAC9B,OACA,SAEO,eAAe,KAAK,KAAK,mBAAmB,MAAM,MAAM,IAAI;",
   "names": []
 }

package/dist/esm/helpers/matchMedia.js

@@ -1,12 +1,12 @@
-const matchMedia = typeof window !== "undefined" && window.matchMedia || matchMediaFallback;
+const matchMedia = typeof window < "u" && window.matchMedia || matchMediaFallback;
 function matchMediaFallback(_) {
   return {
-    match: (a, b) => false,
+    match: (a, b) => !1,
     addListener() {
     },
     removeListener() {
     },
-    matches: false
+    matches: !1
   };
 }
 function setupMatchMedia(_) {

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/matchMedia.ts"],
-  "mappings": "AAEO,MAAM,aACV,OAAO,WAAW,eAAe,OAAO,cAAe;AAE1D,SAAS,mBAAmB,GAA2B;AACrD,SAAO;AAAA,IACL,OAAO,CAAC,GAAG,MAAM;AAAA,IACjB,cAAc;AAAA,IAAC;AAAA,IACf,iBAAiB;AAAA,IAAC;AAAA,IAClB,SAAS;AAAA,EACX;AACF;AAEO,SAAS,gBAAgB,GAAe;AAE/C;",
+  "mappings": "AAEO,MAAM,aACV,OAAO,SAAW,OAAe,OAAO,cAAe;AAE1D,SAAS,mBAAmB,GAA2B;AACrD,SAAO;AAAA,IACL,OAAO,CAAC,GAAG,MAAM;AAAA,IACjB,cAAc;AAAA,IAAC;AAAA,IACf,iBAAiB;AAAA,IAAC;AAAA,IAClB,SAAS;AAAA,EACX;AACF;AAEO,SAAS,gBAAgB,GAAe;AAE/C;",
   "names": []
 }

package/dist/esm/helpers/mergeProps.js

@@ -1,21 +1,17 @@
 import { pseudoDescriptors } from "./pseudoDescriptors";
 const mergeProps = (a, b, inverseShorthands) => {
   const out = {};
-  for (const key in a) {
+  for (const key in a)
     mergeProp(out, a, b, key, inverseShorthands);
-  }
-  if (b) {
-    for (const key in b) {
+  if (b)
+    for (const key in b)
       mergeProp(out, b, void 0, key, inverseShorthands);
-    }
-  }
   return out;
 };
 function mergeProp(out, a, b, key, inverseShorthands) {
-  const shorthand = (inverseShorthands == null ? void 0 : inverseShorthands[key]) || null;
-  if (b && (key in b || shorthand && shorthand in b)) {
+  const shorthand = inverseShorthands?.[key] || null;
+  if (b && (key in b || shorthand && shorthand in b))
     return;
-  }
   const val = a[key];
   if (key in pseudoDescriptors) {
     out[key] = {

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/mergeProps.ts"],
-  "mappings": "AAcA,SAAS,yBAAyB;AAI3B,MAAM,aAAa,CAAC,GAAW,GAAY,sBAAkC;AAClF,QAAM,MAAiB,CAAC;AACxB,aAAW,OAAO,GAAG;AACnB,cAAU,KAAK,GAAG,GAAG,KAAK,iBAAiB;AAAA,EAC7C;AACA,MAAI,GAAG;AACL,eAAW,OAAO,GAAG;AACnB,gBAAU,KAAK,GAAG,QAAW,KAAK,iBAAiB;AAAA,IACrD;AAAA,EACF;AACA,SAAO;AACT;AAEA,SAAS,UACP,KACA,GACA,GACA,KACA,mBACA;AACA,QAAM,aAAY,uDAAoB,SAAQ;AAC9C,MAAI,MAAM,OAAO,KAAM,aAAa,aAAa,IAAK;AACpD;AAAA,EACF;AACA,QAAM,MAAM,EAAE,GAAG;AACjB,MAAI,OAAO,mBAAmB;AAC5B,QAAI,GAAG,IAAI;AAAA,MACT,GAAG,IAAI,GAAG;AAAA,MACV,GAAG;AAAA,IACL;AACA;AAAA,EACF;AACA,MAAI,aAAa,GAAG,IAAI;AAC1B;",
+  "mappings": "AAcA,SAAS,yBAAyB;AAI3B,MAAM,aAAa,CAAC,GAAW,GAAY,sBAAkC;AAClF,QAAM,MAAiB,CAAC;AACxB,aAAW,OAAO;AAChB,cAAU,KAAK,GAAG,GAAG,KAAK,iBAAiB;AAE7C,MAAI;AACF,eAAW,OAAO;AAChB,gBAAU,KAAK,GAAG,QAAW,KAAK,iBAAiB;AAGvD,SAAO;AACT;AAEA,SAAS,UACP,KACA,GACA,GACA,KACA,mBACA;AACA,QAAM,YAAY,oBAAoB,GAAG,KAAK;AAC9C,MAAI,MAAM,OAAO,KAAM,aAAa,aAAa;AAC/C;AAEF,QAAM,MAAM,EAAE,GAAG;AACjB,MAAI,OAAO,mBAAmB;AAC5B,QAAI,GAAG,IAAI;AAAA,MACT,GAAG,IAAI,GAAG;AAAA,MACV,GAAG;AAAA,IACL;AACA;AAAA,EACF;AACA,MAAI,aAAa,GAAG,IAAI;AAC1B;",
   "names": []
 }

package/dist/esm/helpers/mergeVariants.js

@@ -1,9 +1,8 @@
 const mergeVariants = (parentVariants, ourVariants) => {
   const variants = {};
   for (const key in ourVariants) {
-    const parentVariant = parentVariants == null ? void 0 : parentVariants[key];
-    const ourVariant = ourVariants[key];
-    if (!parentVariant || typeof ourVariant === "function") {
+    const parentVariant = parentVariants?.[key], ourVariant = ourVariants[key];
+    if (!parentVariant || typeof ourVariant == "function") {
       variants[key] = ourVariant;
       continue;
     }
@@ -13,26 +12,17 @@ const mergeVariants = (parentVariants, ourVariants) => {
     }
     variants[key] = {};
     for (const subKey in ourVariant) {
-      const val = ourVariant[subKey];
-      const parentVal = parentVariant == null ? void 0 : parentVariant[subKey];
-      if (typeof val === "function") {
-        variants[key][subKey] = val;
-      } else if (!parentVal || typeof parentVal === "function") {
-        variants[key][subKey] = val;
-      } else {
-        variants[key][subKey] = {
-          // keep order
-          ...parentVal,
-          ...val
-        };
-      }
-    }
-    if (parentVariant) {
-      variants[key] = {
-        ...parentVariant,
-        ...variants[key]
+      const val = ourVariant[subKey], parentVal = parentVariant?.[subKey];
+      typeof val == "function" || !parentVal || typeof parentVal == "function" ? variants[key][subKey] = val : variants[key][subKey] = {
+        // keep order
+        ...parentVal,
+        ...val
       };
     }
+    parentVariant && (variants[key] = {
+      ...parentVariant,
+      ...variants[key]
+    });
   }
   return {
     ...parentVariants,

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/mergeVariants.ts"],
-  "mappings": "AAKO,MAAM,gBAAgB,CAC3B,gBACA,gBACG;AACH,QAAM,WAAW,CAAC;AAElB,aAAW,OAAO,aAAa;AAC7B,UAAM,gBAAgB,iDAAiB;AACvC,UAAM,aAAa,YAAY,GAAG;AAGlC,QAAI,CAAC,iBAAiB,OAAO,eAAe,YAAY;AACtD,eAAS,GAAG,IAAI;AAChB;AAAA,IACF;AAGA,QAAI,iBAAiB,CAAC,YAAY;AAChC,eAAS,GAAG,IAAI,cAAc,GAAG;AACjC;AAAA,IACF;AAEA,aAAS,GAAG,IAAI,CAAC;AAEjB,eAAW,UAAU,YAAY;AAC/B,YAAM,MAAM,WAAW,MAAM;AAC7B,YAAM,YAAY,+CAAgB;AAClC,UAAI,OAAO,QAAQ,YAAY;AAC7B,iBAAS,GAAG,EAAE,MAAM,IAAI;AAAA,MAC1B,WAAW,CAAC,aAAa,OAAO,cAAc,YAAY;AACxD,iBAAS,GAAG,EAAE,MAAM,IAAI;AAAA,MAC1B,OAAO;AACL,iBAAS,GAAG,EAAE,MAAM,IAAI;AAAA;AAAA,UAEtB,GAAG;AAAA,UACH,GAAG;AAAA,QACL;AAAA,MACF;AAAA,IACF;AAGA,QAAI,eAAe;AACjB,eAAS,GAAG,IAAI;AAAA,QACd,GAAG;AAAA,QACH,GAAG,SAAS,GAAG;AAAA,MACjB;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AAAA,IACL,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF;",
+  "mappings": "AAKO,MAAM,gBAAgB,CAC3B,gBACA,gBACG;AACH,QAAM,WAAW,CAAC;AAElB,aAAW,OAAO,aAAa;AAC7B,UAAM,gBAAgB,iBAAiB,GAAG,GACpC,aAAa,YAAY,GAAG;AAGlC,QAAI,CAAC,iBAAiB,OAAO,cAAe,YAAY;AACtD,eAAS,GAAG,IAAI;AAChB;AAAA,IACF;AAGA,QAAI,iBAAiB,CAAC,YAAY;AAChC,eAAS,GAAG,IAAI,cAAc,GAAG;AACjC;AAAA,IACF;AAEA,aAAS,GAAG,IAAI,CAAC;AAEjB,eAAW,UAAU,YAAY;AAC/B,YAAM,MAAM,WAAW,MAAM,GACvB,YAAY,gBAAgB,MAAM;AACxC,MAAI,OAAO,OAAQ,cAER,CAAC,aAAa,OAAO,aAAc,aAD5C,SAAS,GAAG,EAAE,MAAM,IAAI,MAIxB,SAAS,GAAG,EAAE,MAAM,IAAI;AAAA;AAAA,QAEtB,GAAG;AAAA,QACH,GAAG;AAAA,MACL;AAAA,IAEJ;AAGA,IAAI,kBACF,SAAS,GAAG,IAAI;AAAA,MACd,GAAG;AAAA,MACH,GAAG,SAAS,GAAG;AAAA,IACjB;AAAA,EAEJ;AAEA,SAAO;AAAA,IACL,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF;",
   "names": []
 }

package/dist/esm/helpers/normalizeColor.js

@@ -4,26 +4,14 @@ import { rgba as rgba2 } from "@tamagui/normalize-css-color";
 const normalizeColor = (color, opacity) => {
   if (!color)
     return;
-  if (color[0] === "$" || color[0] === "v" && color.startsWith("var(")) {
+  if (color[0] === "$" || color[0] === "v" && color.startsWith("var(") || isWeb && opacity === 1)
     return color;
-  }
-  if (isWeb && opacity === 1) {
-    return color;
-  }
   const colorProcessed = normalizeCSSColor(color);
   if (colorProcessed != null) {
-    const { r, g, b, a } = rgba(colorProcessed);
-    const o = opacity ?? a ?? 1;
-    const alpha = o.toFixed(2);
+    const { r, g, b, a } = rgba(colorProcessed), alpha = (opacity ?? a ?? 1).toFixed(2);
     return `rgba(${r},${g},${b},${alpha})`;
   }
-  if (process.env.NODE_ENV === "development") {
-    console.warn(`Unknown color value: ${color}`);
-  }
-  if (process.env.TAMAGUI_TARGET === "native") {
-    return;
-  }
-  return color;
+  return process.env.NODE_ENV === "development" && console.warn(`Unknown color value: ${color}`), color;
 };
 export {
   normalizeColor,

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/normalizeColor.ts"],
-  "mappings": "AAAA,SAAS,aAAa;AACtB,SAAS,mBAAmB,YAAY;AAExC,SAAS,QAAAA,aAAY;AAEd,MAAM,iBAAiB,CAAC,OAAuB,YAAqB;AACzE,MAAI,CAAC;AAAO;AACZ,MAAI,MAAM,CAAC,MAAM,OAAQ,MAAM,CAAC,MAAM,OAAO,MAAM,WAAW,MAAM,GAAI;AACtE,WAAO;AAAA,EACT;AACA,MAAI,SAAS,YAAY,GAAG;AAC1B,WAAO;AAAA,EACT;AACA,QAAM,iBAAiB,kBAAkB,KAAK;AAC9C,MAAI,kBAAkB,MAAM;AAC1B,UAAM,EAAE,GAAG,GAAG,GAAG,EAAE,IAAI,KAAK,cAAc;AAC1C,UAAM,IAAI,WAAW,KAAK;AAC1B,UAAM,QAAQ,EAAE,QAAQ,CAAC;AACzB,WAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK;AAAA,EACrC;AACA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,YAAQ,KAAK,wBAAwB,KAAK,EAAE;AAAA,EAC9C;AACA,MAAI,QAAQ,IAAI,mBAAmB,UAAU;AAE3C;AAAA,EACF;AAEA,SAAO;AACT;",
+  "mappings": "AAAA,SAAS,aAAa;AACtB,SAAS,mBAAmB,YAAY;AAExC,SAAS,QAAAA,aAAY;AAEd,MAAM,iBAAiB,CAAC,OAAuB,YAAqB;AACzE,MAAI,CAAC;AAAO;AAIZ,MAHI,MAAM,CAAC,MAAM,OAAQ,MAAM,CAAC,MAAM,OAAO,MAAM,WAAW,MAAM,KAGhE,SAAS,YAAY;AACvB,WAAO;AAET,QAAM,iBAAiB,kBAAkB,KAAK;AAC9C,MAAI,kBAAkB,MAAM;AAC1B,UAAM,EAAE,GAAG,GAAG,GAAG,EAAE,IAAI,KAAK,cAAc,GAEpC,SADI,WAAW,KAAK,GACV,QAAQ,CAAC;AACzB,WAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK;AAAA,EACrC;AACA,SAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,KAAK,wBAAwB,KAAK,EAAE,GAOvC;AACT;",
   "names": ["rgba"]
 }