@tamagui/web 1.61.2 → 1.62.0

package/dist/esm/helpers/normalizeValueWithProperty.js

@@ -3,70 +3,35 @@ import { stylePropsAll, stylePropsUnitless } from "@tamagui/helpers";
 import { getAllSelectors } from "./insertStyleRule";
 const stylePropsAllPlusTransforms = {
   ...stylePropsAll,
-  translateX: true,
-  translateY: true
+  translateX: !0,
+  translateY: !0
 };
 function normalizeValueWithProperty(value, property) {
-  if (!isWeb)
+  if (!isWeb || typeof value == "boolean" || property && property in stylePropsUnitless || property && !(property in stylePropsAllPlusTransforms))
     return value;
-  if (typeof value === "boolean") {
-    return value;
-  }
-  if (property && property in stylePropsUnitless) {
-    return value;
-  }
-  if (property && !(property in stylePropsAllPlusTransforms)) {
-    return value;
-  }
   let res = value;
-  if (value && typeof value === "object")
-    return value;
-  if (typeof value === "number") {
-    res = `${value}px`;
-  } else if (property) {
-    res = `${res}`;
-  }
-  return res;
+  return value && typeof value == "object" ? value : (typeof value == "number" ? res = `${value}px` : property && (res = `${res}`), res);
 }
 const rcache = {};
 function reverseMapClassNameToValue(key, className) {
-  const selectors = getAllSelectors();
-  const cssRule = selectors[className];
-  if (rcache[cssRule]) {
+  const cssRule = getAllSelectors()[className];
+  if (rcache[cssRule])
     return rcache[cssRule];
-  }
   if (!cssRule) {
-    if (process.env.NODE_ENV === "development") {
-      console.warn(
-        `No CSS rule found for ${key} looking for selector ".${className}", you may not be injecting extracted CSS`
-      );
-    }
+    process.env.NODE_ENV === "development" && console.warn(
+      `No CSS rule found for ${key} looking for selector ".${className}", you may not be injecting extracted CSS`
+    );
     return;
   }
   const cssVal = cssRule.replace(/.*:/, "").replace(/;.*/, "").trim();
   let res;
-  if (cssVal.startsWith("var(")) {
-    res = cssVal;
-  } else if (stylePropsUnitless[key]) {
-    res = +cssVal;
-  } else if (cssVal.endsWith("px")) {
-    res = +cssVal.replace("px", "");
-  } else {
-    res = cssVal;
-  }
-  rcache[cssRule] = res;
-  if (process.env.NODE_ENV === "development") {
-    if (typeof res === "number" && isNaN(res)) {
-      console.log("Tamagui invalid parsed value, NaN:", {
-        res,
-        cssVal,
-        cssRule,
-        key,
-        className
-      });
-    }
-  }
-  return res;
+  return cssVal.startsWith("var(") ? res = cssVal : stylePropsUnitless[key] ? res = +cssVal : cssVal.endsWith("px") ? res = +cssVal.replace("px", "") : res = cssVal, rcache[cssRule] = res, process.env.NODE_ENV === "development" && typeof res == "number" && isNaN(res) && console.log("Tamagui invalid parsed value, NaN:", {
+    res,
+    cssVal,
+    cssRule,
+    key,
+    className
+  }), res;
 }
 export {
   normalizeValueWithProperty,

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/normalizeValueWithProperty.ts"],
-  "mappings": "AAKA,SAAS,aAAa;AACtB,SAAS,eAAe,0BAAuC;AAE/D,SAAS,uBAAuB;AAIhC,MAAM,8BAA8B;AAAA,EAClC,GAAG;AAAA,EACH,YAAY;AAAA,EACZ,YAAY;AACd;AAEO,SAAS,2BAA2B,OAAY,UAAwB;AAC7E,MAAI,CAAC;AAAO,WAAO;AACnB,MAAI,OAAO,UAAU,WAAW;AAC9B,WAAO;AAAA,EACT;AACA,MAAI,YAAY,YAAY,oBAAoB;AAC9C,WAAO;AAAA,EACT;AACA,MAAI,YAAY,EAAE,YAAY,8BAA8B;AAC1D,WAAO;AAAA,EACT;AACA,MAAI,MAAM;AAEV,MAAI,SAAS,OAAO,UAAU;AAAU,WAAO;AAC/C,MAAI,OAAO,UAAU,UAAU;AAC7B,UAAM,GAAG,KAAK;AAAA,EAChB,WAAW,UAAU;AACnB,UAAM,GAAG,GAAG;AAAA,EACd;AACA,SAAO;AACT;AAIA,MAAM,SAAS,CAAC;AACT,SAAS,2BAA2B,KAAa,WAAmB;AACzE,QAAM,YAAY,gBAAgB;AAClC,QAAM,UAAU,UAAU,SAAS;AACnC,MAAI,OAAO,OAAO,GAAG;AACnB,WAAO,OAAO,OAAO;AAAA,EACvB;AAEA,MAAI,CAAC,SAAS;AACZ,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ;AAAA,QACN,yBAAyB,GAAG,2BAA2B,SAAS;AAAA,MAClE;AAAA,IACF;AACA;AAAA,EACF;AACA,QAAM,SAAS,QAAQ,QAAQ,OAAO,EAAE,EAAE,QAAQ,OAAO,EAAE,EAAE,KAAK;AAClE,MAAI;AACJ,MAAI,OAAO,WAAW,MAAM,GAAG;AAC7B,UAAM;AAAA,EACR,WAAW,mBAAmB,GAAG,GAAG;AAClC,UAAM,CAAC;AAAA,EACT,WAAW,OAAO,SAAS,IAAI,GAAG;AAChC,UAAM,CAAC,OAAO,QAAQ,MAAM,EAAE;AAAA,EAChC,OAAO;AACL,UAAM;AAAA,EACR;AACA,SAAO,OAAO,IAAI;AAClB,MAAI,QAAQ,IAAI,aAAa,eAAe;AAE1C,QAAI,OAAO,QAAQ,YAAY,MAAM,GAAG,GAAG;AAEzC,cAAQ,IAAI,sCAAsC;AAAA,QAChD;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AACA,SAAO;AACT;",
+  "mappings": "AAKA,SAAS,aAAa;AACtB,SAAS,eAAe,0BAAuC;AAE/D,SAAS,uBAAuB;AAIhC,MAAM,8BAA8B;AAAA,EAClC,GAAG;AAAA,EACH,YAAY;AAAA,EACZ,YAAY;AACd;AAEO,SAAS,2BAA2B,OAAY,UAAwB;AAQ7E,MAPI,CAAC,SACD,OAAO,SAAU,aAGjB,YAAY,YAAY,sBAGxB,YAAY,EAAE,YAAY;AAC5B,WAAO;AAET,MAAI,MAAM;AAEV,SAAI,SAAS,OAAO,SAAU,WAAiB,SAC3C,OAAO,SAAU,WACnB,MAAM,GAAG,KAAK,OACL,aACT,MAAM,GAAG,GAAG,KAEP;AACT;AAIA,MAAM,SAAS,CAAC;AACT,SAAS,2BAA2B,KAAa,WAAmB;AAEzE,QAAM,UADY,gBAAgB,EACR,SAAS;AACnC,MAAI,OAAO,OAAO;AAChB,WAAO,OAAO,OAAO;AAGvB,MAAI,CAAC,SAAS;AACZ,IAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ;AAAA,MACN,yBAAyB,GAAG,2BAA2B,SAAS;AAAA,IAClE;AAEF;AAAA,EACF;AACA,QAAM,SAAS,QAAQ,QAAQ,OAAO,EAAE,EAAE,QAAQ,OAAO,EAAE,EAAE,KAAK;AAClE,MAAI;AACJ,SAAI,OAAO,WAAW,MAAM,IAC1B,MAAM,SACG,mBAAmB,GAAG,IAC/B,MAAM,CAAC,SACE,OAAO,SAAS,IAAI,IAC7B,MAAM,CAAC,OAAO,QAAQ,MAAM,EAAE,IAE9B,MAAM,QAER,OAAO,OAAO,IAAI,KACd,QAAQ,IAAI,aAAa,iBAEvB,OAAO,OAAQ,YAAY,MAAM,GAAG,KAEtC,QAAQ,IAAI,sCAAsC;AAAA,IAChD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC,GAGE;AACT;",
   "names": []
 }

package/dist/esm/helpers/objectIdentityKey.js

@@ -4,14 +4,13 @@ function objectIdentityKey(obj) {
     k += key;
     const arg = obj[key];
     let type = typeof arg;
-    if (!arg || type !== "object") {
+    if (!arg || type !== "object")
       k += type + arg;
-    } else if (cache.has(arg)) {
+    else if (cache.has(arg))
       k += cache.get(arg);
-    } else {
+    else {
       let v = Math.random();
-      cache.set(arg, v);
-      k += v;
+      cache.set(arg, v), k += v;
     }
   }
   return k;

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/objectIdentityKey.tsx"],
-  "mappings": "AAAO,SAAS,kBAAkB,KAAa;AAC7C,MAAI,IAAI;AACR,aAAW,OAAO,KAAK;AACrB,SAAK;AACL,UAAM,MAAM,IAAI,GAAG;AACnB,QAAI,OAAO,OAAO;AAClB,QAAI,CAAC,OAAO,SAAS,UAAU;AAC7B,WAAK,OAAO;AAAA,IACd,WAAW,MAAM,IAAI,GAAG,GAAG;AACzB,WAAK,MAAM,IAAI,GAAG;AAAA,IACpB,OAAO;AACL,UAAI,IAAI,KAAK,OAAO;AACpB,YAAM,IAAI,KAAK,CAAC;AAChB,WAAK;AAAA,IACP;AAAA,EACF;AACA,SAAO;AACT;AAEA,MAAM,QAAQ,oBAAI,QAAQ;",
+  "mappings": "AAAO,SAAS,kBAAkB,KAAa;AAC7C,MAAI,IAAI;AACR,aAAW,OAAO,KAAK;AACrB,SAAK;AACL,UAAM,MAAM,IAAI,GAAG;AACnB,QAAI,OAAO,OAAO;AAClB,QAAI,CAAC,OAAO,SAAS;AACnB,WAAK,OAAO;AAAA,aACH,MAAM,IAAI,GAAG;AACtB,WAAK,MAAM,IAAI,GAAG;AAAA,SACb;AACL,UAAI,IAAI,KAAK,OAAO;AACpB,YAAM,IAAI,KAAK,CAAC,GAChB,KAAK;AAAA,IACP;AAAA,EACF;AACA,SAAO;AACT;AAEA,MAAM,QAAQ,oBAAI,QAAQ;",
   "names": []
 }

package/dist/esm/helpers/propMapper.js

@@ -1,4 +1,4 @@
-import { isAndroid, isWeb } from "@tamagui/constants";
+import { isWeb } from "@tamagui/constants";
 import { tokenCategories } from "@tamagui/helpers";
 import { getConfig } from "../config";
 import { isDevTools } from "../constants/isDevTools";
@@ -9,97 +9,54 @@ import { getFontsForLanguage, getVariantExtras } from "./getVariantExtras";
 import { isObj } from "./isObj";
 import { pseudoDescriptors } from "./pseudoDescriptors";
 const propMapper = (key, value, styleStateIn, subPropsIn) => {
-  if (!(process.env.TAMAGUI_TARGET === "native" && isAndroid)) {
-    if (key === "elevationAndroid")
-      return;
-  }
-  const subProps = styleStateIn.styleProps.fallbackProps || subPropsIn;
-  const styleState = subProps ? new Proxy(styleStateIn, {
+  if (key === "elevationAndroid")
+    return;
+  const subProps = styleStateIn.styleProps.fallbackProps || subPropsIn, styleState = subProps ? new Proxy(styleStateIn, {
     get(_, k) {
       return k === "curProps" ? subProps : Reflect.get(_, k);
     }
-  }) : styleStateIn;
-  const { conf, styleProps, fontFamily, staticConfig } = styleState;
-  const { variants } = staticConfig;
-  if (process.env.NODE_ENV === "development" && fontFamily && fontFamily[0] === "$" && !(fontFamily in conf.fontsParsed)) {
-    console.warn(
-      `Warning: no fontFamily "${fontFamily}" found in config: ${Object.keys(conf.fontsParsed).join(
-        ", "
-      )}`
-    );
-  }
-  if (variants && key in variants) {
+  }) : styleStateIn, { conf, styleProps, fontFamily, staticConfig } = styleState, { variants } = staticConfig;
+  if (process.env.NODE_ENV === "development" && fontFamily && fontFamily[0] === "$" && !(fontFamily in conf.fontsParsed) && console.warn(
+    `Warning: no fontFamily "${fontFamily}" found in config: ${Object.keys(conf.fontsParsed).join(
+      ", "
+    )}`
+  ), variants && key in variants) {
     styleState.curProps[key] = value;
     const variantValue = resolveVariants(key, value, styleProps, styleState, "");
-    if (variantValue) {
+    if (variantValue)
       return variantValue;
-    }
-  }
-  let shouldReturn = false;
-  if (key in conf.shorthands) {
-    shouldReturn = true;
-    key = conf.shorthands[key];
   }
-  if (value) {
-    if (value[0] === "$") {
-      value = getTokenForKey(key, value, styleProps.resolveVariablesAs, styleState);
-    } else if (isVariable(value)) {
-      value = resolveVariableValue(value, styleProps.resolveVariablesAs);
-    }
-  }
-  if (shouldReturn || value != null) {
+  let shouldReturn = !1;
+  if (key in conf.shorthands && (shouldReturn = !0, key = conf.shorthands[key]), value && (value[0] === "$" ? value = getTokenForKey(key, value, styleProps.resolveVariablesAs, styleState) : isVariable(value) && (value = resolveVariableValue(value, styleProps.resolveVariablesAs))), shouldReturn || value != null)
     return expandStyle(key, value) || [[key, value]];
-  }
-};
-const resolveVariants = (key, value, styleProps, styleState, parentVariantKey) => {
-  const { staticConfig, conf, debug } = styleState;
-  const { variants } = staticConfig;
+}, resolveVariants = (key, value, styleProps, styleState, parentVariantKey) => {
+  const { staticConfig, conf, debug } = styleState, { variants } = staticConfig;
   if (!variants)
     return;
   let variantValue = getVariantDefinition(variants[key], key, value, conf);
-  if (process.env.NODE_ENV === "development" && debug === "verbose") {
-    console.groupCollapsed(`\u2666\uFE0F\u2666\uFE0F\u2666\uFE0F resolve variant ${key}`);
-    console.log({
-      key,
-      value,
-      variantValue,
-      variants,
-      curProps: { ...styleState.curProps }
-    });
-    console.groupEnd();
-  }
-  if (!variantValue) {
-    if (process.env.TAMAGUI_WARN_ON_MISSING_VARIANT === "1") {
-      if (typeof value !== "boolean") {
-        const name = staticConfig.componentName || "[UnnamedComponent]";
-        console.warn(
-          `No variant found: ${name} has variant "${key}", but no matching value "${value}"`
-        );
-      }
+  if (process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed(`\u2666\uFE0F\u2666\uFE0F\u2666\uFE0F resolve variant ${key}`), console.log({
+    key,
+    value,
+    variantValue,
+    variants,
+    curProps: { ...styleState.curProps }
+  }), console.groupEnd()), !variantValue) {
+    if (process.env.TAMAGUI_WARN_ON_MISSING_VARIANT === "1" && typeof value != "boolean") {
+      const name = staticConfig.componentName || "[UnnamedComponent]";
+      console.warn(
+        `No variant found: ${name} has variant "${key}", but no matching value "${value}"`
+      );
     }
     return;
   }
-  if (typeof variantValue === "function") {
-    const fn = variantValue;
-    const extras = getVariantExtras(styleState);
-    variantValue = fn(value, extras);
-    if (process.env.NODE_ENV === "development" && debug === "verbose") {
-      console.groupCollapsed("   expanded functional variant", key);
-      console.log({ fn, variantValue, extras });
-      console.groupEnd();
-    }
+  if (typeof variantValue == "function") {
+    const fn = variantValue, extras = getVariantExtras(styleState);
+    variantValue = fn(value, extras), process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed("   expanded functional variant", key), console.log({ fn, variantValue, extras }), console.groupEnd());
   }
   let fontFamilyResult;
   if (isObj(variantValue)) {
     const fontFamilyUpdate = variantValue.fontFamily || variantValue[conf.inverseShorthands.fontFamily];
-    if (fontFamilyUpdate) {
-      fontFamilyResult = getFontFamilyFromNameOrVariable(fontFamilyUpdate, conf);
-      styleState.fontFamily = fontFamilyResult;
-      if (process.env.NODE_ENV === "development" && debug === "verbose") {
-        console.log(`   updating font family`, fontFamilyResult);
-      }
-    }
-    variantValue = resolveTokensAndVariants(
+    fontFamilyUpdate && (fontFamilyResult = getFontFamilyFromNameOrVariable(fontFamilyUpdate, conf), styleState.fontFamily = fontFamilyResult, process.env.NODE_ENV === "development" && debug === "verbose" && console.log("   updating font family", fontFamilyResult)), variantValue = resolveTokensAndVariants(
       key,
       variantValue,
       styleProps,
@@ -108,12 +65,8 @@ const resolveVariants = (key, value, styleProps, styleState, parentVariantKey) =
     );
   }
   if (variantValue) {
-    const expanded = expandStylesAndRemoveNullishValues(variantValue);
-    const next = Object.entries(expanded);
-    if (fontFamilyResult && fontFamilyResult[0] === "$") {
-      fontFamilyCache.set(next, getVariableValue(fontFamilyResult));
-    }
-    return next;
+    const expanded = expandStylesAndRemoveNullishValues(variantValue), next = Object.entries(expanded);
+    return fontFamilyResult && fontFamilyResult[0] === "$" && fontFamilyCache.set(next, getVariableValue(fontFamilyResult)), next;
   }
 };
 function getFontFamilyFromNameOrVariable(input, conf) {
@@ -123,54 +76,26 @@ function getFontFamilyFromNameOrVariable(input, conf) {
       return val;
     for (const key in conf.fontsParsed) {
       const familyVariable = conf.fontsParsed[key].family;
-      if (isVariable(familyVariable)) {
-        variableToFontNameCache.set(familyVariable, key);
-        if (familyVariable === input) {
-          return key;
-        }
-      }
-    }
-  } else if (typeof input === "string") {
-    if (input[0] === "$") {
-      return input;
+      if (isVariable(familyVariable) && (variableToFontNameCache.set(familyVariable, key), familyVariable === input))
+        return key;
     }
-  }
+  } else if (typeof input == "string" && input[0] === "$")
+    return input;
 }
-const variableToFontNameCache = /* @__PURE__ */ new WeakMap();
-const fontFamilyCache = /* @__PURE__ */ new WeakMap();
-const getPropMappedFontFamily = (expanded) => {
-  return expanded && fontFamilyCache.get(expanded);
-};
-const resolveTokensAndVariants = (key, value, styleProps, styleState, parentVariantKey) => {
-  var _a;
-  const { conf, staticConfig, debug, theme } = styleState;
-  const { variants } = staticConfig;
-  const res = {};
-  if (process.env.NODE_ENV === "development" && debug === "verbose") {
-    console.log(`   - resolveTokensAndVariants`, key, value);
-  }
+const variableToFontNameCache = /* @__PURE__ */ new WeakMap(), fontFamilyCache = /* @__PURE__ */ new WeakMap(), getPropMappedFontFamily = (expanded) => expanded && fontFamilyCache.get(expanded), resolveTokensAndVariants = (key, value, styleProps, styleState, parentVariantKey) => {
+  const { conf, staticConfig, debug, theme } = styleState, { variants } = staticConfig, res = {};
+  process.env.NODE_ENV === "development" && debug === "verbose" && console.log("   - resolveTokensAndVariants", key, value);
   for (const rKey in value) {
-    const fKey = conf.shorthands[rKey] || rKey;
-    const val = value[rKey];
+    const fKey = conf.shorthands[rKey] || rKey, val = value[rKey];
     if (variants && fKey in variants) {
-      styleState.curProps[fKey] = val;
-      if (parentVariantKey && parentVariantKey === key) {
+      if (styleState.curProps[fKey] = val, parentVariantKey && parentVariantKey === key)
         res[fKey] = // SYNC WITH *1
         val[0] === "$" ? getTokenForKey(fKey, val, styleProps.resolveVariablesAs, styleState) : val;
-      } else {
+      else {
         const variantOut = resolveVariants(fKey, val, styleProps, styleState, key);
-        if (variantOut) {
-          for (const [key2, val2] of variantOut) {
-            if (val2 == null)
-              continue;
-            if (key2 in pseudoDescriptors) {
-              res[key2] ??= {};
-              Object.assign(res[key2], val2);
-            } else {
-              res[key2] = val2;
-            }
-          }
-        }
+        if (variantOut)
+          for (const [key2, val2] of variantOut)
+            val2 != null && (key2 in pseudoDescriptors ? (res[key2] ??= {}, Object.assign(res[key2], val2)) : res[key2] = val2);
       }
       continue;
     }
@@ -178,7 +103,7 @@ const resolveTokensAndVariants = (key, value, styleProps, styleState, parentVari
       res[fKey] = resolveVariableValue(val, styleProps.resolveVariablesAs);
       continue;
     }
-    if (typeof val === "string") {
+    if (typeof val == "string") {
       const fVal = (
         // SYNC WITH *1
         val[0] === "$" ? getTokenForKey(fKey, val, styleProps.resolveVariablesAs, styleState) : val
@@ -188,131 +113,69 @@ const resolveTokensAndVariants = (key, value, styleProps, styleState, parentVari
     }
     if (isObj(val)) {
       const subObject = resolveTokensAndVariants(fKey, val, styleProps, styleState, key);
-      if (process.env.NODE_ENV === "development" && debug === "verbose") {
-        console.log(`object`, fKey, subObject);
-      }
-      res[fKey] ??= {};
-      Object.assign(res[fKey], subObject);
-    } else {
+      process.env.NODE_ENV === "development" && debug === "verbose" && console.log("object", fKey, subObject), res[fKey] ??= {}, Object.assign(res[fKey], subObject);
+    } else
       res[fKey] = val;
-    }
-    if (process.env.NODE_ENV === "development") {
-      if (debug) {
-        if (((_a = res[fKey]) == null ? void 0 : _a[0]) === "$") {
-          console.warn(`\u26A0\uFE0F Missing token in theme ${theme.name}:`, fKey, res[fKey], theme);
-        }
-      }
-    }
+    process.env.NODE_ENV === "development" && debug && res[fKey]?.[0] === "$" && console.warn(`\u26A0\uFE0F Missing token in theme ${theme.name}:`, fKey, res[fKey], theme);
   }
   return res;
-};
-const tokenCats = ["size", "color", "radius", "space", "zIndex"].map((name) => ({
+}, tokenCats = ["size", "color", "radius", "space", "zIndex"].map((name) => ({
   name,
   spreadName: `...${name}`
 }));
 function getVariantDefinition(variant, key, value, conf) {
-  if (typeof variant === "function") {
+  if (typeof variant == "function")
     return variant;
-  }
-  if (variant[value]) {
+  if (variant[value])
     return variant[value];
-  }
   const { tokensParsed } = conf;
-  for (const { name, spreadName } of tokenCats) {
-    if (spreadName in variant && value in tokensParsed[name]) {
+  for (const { name, spreadName } of tokenCats)
+    if (spreadName in variant && value in tokensParsed[name])
       return variant[spreadName];
-    }
-  }
   const fontSizeVariant = variant["...fontSize"];
-  if (fontSizeVariant && conf.fontSizeTokens.has(value)) {
-    return fontSizeVariant;
-  }
-  return variant[`:${typeof value}`] || variant["..."] || variant["...size"];
+  return fontSizeVariant && conf.fontSizeTokens.has(value) ? fontSizeVariant : variant[`:${typeof value}`] || variant["..."] || variant["...size"];
 }
 const fontShorthand = {
   fontSize: "size",
   fontWeight: "weight"
-};
-const getTokenForKey = (key, value, resolveAs = "none", styleState) => {
-  var _a, _b;
-  if (resolveAs === "none") {
+}, getTokenForKey = (key, value, resolveAs = "none", styleState) => {
+  if (resolveAs === "none")
     return value;
-  }
-  const { theme, conf = getConfig(), context, fontFamily } = styleState;
-  const tokensParsed = conf.tokensParsed;
-  let valOrVar;
-  let hasSet = false;
-  if (theme && value in theme) {
-    if (process.env.NODE_ENV === "development" && styleState.debug === "verbose") {
-      console.log(` - getting theme value for ${key} from ${value}`);
-    }
-    valOrVar = theme[value];
-    hasSet = true;
-  } else {
-    if (value in conf.specificTokens) {
-      hasSet = true;
-      valOrVar = conf.specificTokens[value];
-    } else {
-      switch (key) {
-        case "fontFamily": {
-          const fontsParsed = (context == null ? void 0 : context.language) ? getFontsForLanguage(conf.fontsParsed, context.language) : conf.fontsParsed;
-          valOrVar = ((_a = fontsParsed[value]) == null ? void 0 : _a.family) || value;
-          hasSet = true;
-          break;
-        }
-        case "fontSize":
-        case "lineHeight":
-        case "letterSpacing":
-        case "fontWeight": {
-          const fam = fontFamily || conf.defaultFont;
-          if (fam) {
-            const fontsParsed = (context == null ? void 0 : context.language) ? getFontsForLanguage(conf.fontsParsed, context.language) : conf.fontsParsed;
-            const font = fontsParsed[fam];
-            valOrVar = ((_b = font == null ? void 0 : font[fontShorthand[key] || key]) == null ? void 0 : _b[value]) || value;
-            hasSet = true;
-          }
-          break;
-        }
+  const { theme, conf = getConfig(), context, fontFamily } = styleState, tokensParsed = conf.tokensParsed;
+  let valOrVar, hasSet = !1;
+  if (theme && value in theme)
+    process.env.NODE_ENV === "development" && styleState.debug === "verbose" && console.log(` - getting theme value for ${key} from ${value}`), valOrVar = theme[value], hasSet = !0;
+  else if (value in conf.specificTokens)
+    hasSet = !0, valOrVar = conf.specificTokens[value];
+  else {
+    switch (key) {
+      case "fontFamily": {
+        valOrVar = (context?.language ? getFontsForLanguage(conf.fontsParsed, context.language) : conf.fontsParsed)[value]?.family || value, hasSet = !0;
+        break;
       }
-      for (const cat in tokenCategories) {
-        if (key in tokenCategories[cat]) {
-          const res = tokensParsed[cat][value];
-          if (res != null) {
-            valOrVar = res;
-            hasSet = true;
-          }
-        }
+      case "fontSize":
+      case "lineHeight":
+      case "letterSpacing":
+      case "fontWeight": {
+        const fam = fontFamily || conf.defaultFont;
+        fam && (valOrVar = (context?.language ? getFontsForLanguage(conf.fontsParsed, context.language) : conf.fontsParsed)[fam]?.[fontShorthand[key] || key]?.[value] || value, hasSet = !0);
+        break;
       }
-      if (!hasSet) {
-        const spaceVar = tokensParsed.space[value];
-        if (spaceVar != null) {
-          valOrVar = spaceVar;
-          hasSet = true;
-        }
+    }
+    for (const cat in tokenCategories)
+      if (key in tokenCategories[cat]) {
+        const res = tokensParsed[cat][value];
+        res != null && (valOrVar = res, hasSet = !0);
       }
+    if (!hasSet) {
+      const spaceVar = tokensParsed.space[value];
+      spaceVar != null && (valOrVar = spaceVar, hasSet = !0);
     }
   }
-  if (hasSet) {
-    const out = resolveVariableValue(valOrVar, resolveAs);
-    return out;
-  }
-  if (process.env.NODE_ENV === "development" && isDevTools && styleState.debug === "verbose") {
-    console.groupCollapsed("  \uFE52 propMap (val)", key, value);
-    console.log({ valOrVar, theme, hasSet }, theme ? theme[key] : "");
-    console.groupEnd();
-  }
-  return value;
+  return hasSet ? resolveVariableValue(valOrVar, resolveAs) : (process.env.NODE_ENV === "development" && isDevTools && styleState.debug === "verbose" && (console.groupCollapsed("  \uFE52 propMap (val)", key, value), console.log({ valOrVar, theme, hasSet }, theme ? theme[key] : ""), console.groupEnd()), value);
 };
 function resolveVariableValue(valOrVar, resolveVariablesAs) {
-  if (resolveVariablesAs === "none")
-    return valOrVar;
-  if (isVariable(valOrVar)) {
-    if (!isWeb || resolveVariablesAs === "value") {
-      return valOrVar.val;
-    }
-    return valOrVar.variable;
-  }
-  return valOrVar;
+  return resolveVariablesAs === "none" ? valOrVar : isVariable(valOrVar) ? !isWeb || resolveVariablesAs === "value" ? valOrVar.val : valOrVar.variable : valOrVar;
 }
 export {
   getFontFamilyFromNameOrVariable,

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

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

package/dist/esm/helpers/proxyThemeToParents.js

@@ -2,43 +2,31 @@ import { getTokenObject } from "../config";
 import { GetThemeUnwrapped } from "../hooks/getThemeUnwrapped";
 const themesRaw = {};
 function proxyThemesToParents(dedupedThemes) {
-  for (const { names, theme } of dedupedThemes) {
-    for (const name of names) {
+  for (const { names, theme } of dedupedThemes)
+    for (const name of names)
       themesRaw[name] = theme;
-    }
-  }
   const themes = {};
-  for (const { names, theme } of dedupedThemes) {
+  for (const { names, theme } of dedupedThemes)
     for (const themeName of names) {
       const proxiedTheme = proxyThemeToParents(themeName, theme);
       themes[themeName] = proxiedTheme;
     }
-  }
   return themes;
 }
 function proxyThemeToParents(themeName, theme) {
-  const cur = [];
-  const parents = themeName.split("_").slice(0, -1).map((part) => {
-    cur.push(part);
-    return cur.join("_");
-  });
-  const numParents = parents.length;
+  const cur = [], parents = themeName.split("_").slice(0, -1).map((part) => (cur.push(part), cur.join("_"))), numParents = parents.length;
   return new Proxy(theme, {
     get(target, key) {
       if (key === GetThemeUnwrapped)
         return theme;
       if (key == null || // dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
       // if someone is crazy enough to use "undefined" as a theme key then this not working is on them
-      key == "undefined" || Reflect.has(target, key)) {
+      key == "undefined" || Reflect.has(target, key))
         return Reflect.get(target, key);
-      }
       for (let i = numParents - 1; i >= 0; i--) {
         const parent = themesRaw[parents[i]];
-        if (!parent)
-          continue;
-        if (Reflect.has(parent, key)) {
+        if (parent && Reflect.has(parent, key))
           return Reflect.get(parent, key);
-        }
       }
       return getTokenObject(key) ?? Reflect.get(target, key);
     }

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/proxyThemeToParents.ts"],
-  "mappings": "AAAA,SAAmB,sBAAiC;AACpD,SAAS,yBAAyB;AAG3B,MAAM,YAAyC,CAAC;AAIhD,SAAS,qBACd,eAC6B;AAE7B,aAAW,EAAE,OAAO,MAAM,KAAK,eAAe;AAC5C,eAAW,QAAQ,OAAO;AACxB,gBAAU,IAAI,IAAI;AAAA,IACpB;AAAA,EACF;AAEA,QAAM,SAAsC,CAAC;AAM7C,aAAW,EAAE,OAAO,MAAM,KAAK,eAAe;AAC5C,eAAW,aAAa,OAAO;AAC7B,YAAM,eAAe,oBAAoB,WAAW,KAAK;AACzD,aAAO,SAAS,IAAI;AAAA,IACtB;AAAA,EACF;AAEA,SAAO;AACT;AAEO,SAAS,oBAAoB,WAAmB,OAAoB;AACzE,QAAM,MAAgB,CAAC;AAIvB,QAAM,UAAU,UACb,MAAM,GAAG,EACT,MAAM,GAAG,EAAE,EACX,IAAI,CAAC,SAAS;AACb,QAAI,KAAK,IAAI;AACb,WAAO,IAAI,KAAK,GAAG;AAAA,EACrB,CAAC;AAEH,QAAM,aAAa,QAAQ;AAG3B,SAAO,IAAI,MAAM,OAAO;AAAA,IACtB,IAAI,QAAQ,KAAK;AACf,UAAI,QAAQ;AAAmB,eAAO;AACtC,UACE,OAAO;AAAA;AAAA,MAGP,OAAO,eACP,QAAQ,IAAI,QAAQ,GAAG,GACvB;AACA,eAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,MAChC;AAEA,eAAS,IAAI,aAAa,GAAG,KAAK,GAAG,KAAK;AACxC,cAAM,SAAS,UAAU,QAAQ,CAAC,CAAC;AACnC,YAAI,CAAC;AAAQ;AACb,YAAI,QAAQ,IAAI,QAAQ,GAAG,GAAG;AAC5B,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,QAChC;AAAA,MACF;AACA,aAAO,eAAe,GAAU,KAAK,QAAQ,IAAI,QAAQ,GAAG;AAAA,IAC9D;AAAA,EACF,CAAC;AACH;",
+  "mappings": "AAAA,SAAmB,sBAAiC;AACpD,SAAS,yBAAyB;AAG3B,MAAM,YAAyC,CAAC;AAIhD,SAAS,qBACd,eAC6B;AAE7B,aAAW,EAAE,OAAO,MAAM,KAAK;AAC7B,eAAW,QAAQ;AACjB,gBAAU,IAAI,IAAI;AAItB,QAAM,SAAsC,CAAC;AAM7C,aAAW,EAAE,OAAO,MAAM,KAAK;AAC7B,eAAW,aAAa,OAAO;AAC7B,YAAM,eAAe,oBAAoB,WAAW,KAAK;AACzD,aAAO,SAAS,IAAI;AAAA,IACtB;AAGF,SAAO;AACT;AAEO,SAAS,oBAAoB,WAAmB,OAAoB;AACzE,QAAM,MAAgB,CAAC,GAIjB,UAAU,UACb,MAAM,GAAG,EACT,MAAM,GAAG,EAAE,EACX,IAAI,CAAC,UACJ,IAAI,KAAK,IAAI,GACN,IAAI,KAAK,GAAG,EACpB,GAEG,aAAa,QAAQ;AAG3B,SAAO,IAAI,MAAM,OAAO;AAAA,IACtB,IAAI,QAAQ,KAAK;AACf,UAAI,QAAQ;AAAmB,eAAO;AACtC,UACE,OAAO;AAAA;AAAA,MAGP,OAAO,eACP,QAAQ,IAAI,QAAQ,GAAG;AAEvB,eAAO,QAAQ,IAAI,QAAQ,GAAG;AAGhC,eAAS,IAAI,aAAa,GAAG,KAAK,GAAG,KAAK;AACxC,cAAM,SAAS,UAAU,QAAQ,CAAC,CAAC;AACnC,YAAK,UACD,QAAQ,IAAI,QAAQ,GAAG;AACzB,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,MAElC;AACA,aAAO,eAAe,GAAU,KAAK,QAAQ,IAAI,QAAQ,GAAG;AAAA,IAC9D;AAAA,EACF,CAAC;AACH;",
   "names": []
 }