@tamagui/web 1.46.2 → 1.47.0

package/dist/esm/helpers/mergeProps.js

@@ -1,18 +1,17 @@
 import { pseudoDescriptors } from "./pseudoDescriptors";
-const mergeProps = (a, b, leaveOutClassNames = false, inverseShorthands) => {
+const mergeProps = (a, b, inverseShorthands) => {
   const out = {};
-  const outCns = leaveOutClassNames ? {} : null;
   for (const key in a) {
-    mergeProp(out, outCns, a, b, key, leaveOutClassNames, inverseShorthands);
+    mergeProp(out, a, b, key, inverseShorthands);
   }
   if (b) {
     for (const key in b) {
-      mergeProp(out, outCns, b, void 0, key, leaveOutClassNames, inverseShorthands);
+      mergeProp(out, b, void 0, key, inverseShorthands);
     }
   }
-  return [out, outCns];
+  return out;
 };
-function mergeProp(out, outCns, a, b, key, leaveOutClassNames, inverseShorthands) {
+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)) {
     return;
@@ -25,14 +24,7 @@ function mergeProp(out, outCns, a, b, key, leaveOutClassNames, inverseShorthands
     };
     return;
   }
-  if (shorthand) {
-    key = shorthand;
-  }
-  if (leaveOutClassNames && (val == null ? void 0 : val[0]) === "_") {
-    outCns[key] = val;
-  } else {
-    out[key] = val;
-  }
+  out[shorthand || key] = val;
 }
 export {
   mergeProps

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,CACxB,GACA,GACA,qBAAqB,OACrB,sBACG;AACH,QAAM,MAAiB,CAAC;AACxB,QAAM,SAAoB,qBAAqB,CAAC,IAAK;AACrD,aAAW,OAAO,GAAG;AACnB,cAAU,KAAK,QAAQ,GAAG,GAAG,KAAK,oBAAoB,iBAAiB;AAAA,EACzE;AACA,MAAI,GAAG;AACL,eAAW,OAAO,GAAG;AACnB,gBAAU,KAAK,QAAQ,GAAG,QAAW,KAAK,oBAAoB,iBAAiB;AAAA,IACjF;AAAA,EACF;AACA,SAAO,CAAC,KAAK,MAAM;AACrB;AAEA,SAAS,UACP,KACA,QACA,GACA,GACA,KACA,oBACA,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,WAAW;AACb,UAAM;AAAA,EACR;AACA,MAAI,uBAAsB,2BAAM,QAAO,KAAK;AAC1C,WAAO,GAAG,IAAI;AAAA,EAChB,OAAO;AACL,QAAI,GAAG,IAAI;AAAA,EACb;AACF;",
+  "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;",
   "names": []
 }

package/dist/esm/helpers/normalizeColor.js

@@ -12,7 +12,8 @@ const normalizeColor = (color, opacity) => {
   const colorProcessed = NCC.normalizeCSSColor(color);
   if (typeof colorProcessed === "number") {
     const { r, g, b, a } = rgba(colorProcessed);
-    const alpha = (opacity ?? a ?? 1).toFixed(2);
+    const o = +(opacity ?? a ?? 1);
+    const alpha = o.toFixed(2);
     return `rgba(${r},${g},${b},${alpha})`;
   }
   if (process.env.TAMAGUI_TARGET === "native") {

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/normalizeColor.ts"],
-  "mappings": "AAAA,SAAS,aAAa;AACtB,YAAY,SAAS;AAEd,MAAM,OAAO,IAAI;AACjB,MAAM,QAAQ,IAAI;AAElB,MAAM,iBAAiB,CAAC,OAAuB,YAAqB;AACzE,MAAI,CAAC;AAAO;AACZ,MAAI,MAAM,CAAC,MAAM;AAAK,WAAO;AAC7B,MAAI,SAAS,YAAY;AAAG,WAAO;AACnC,QAAM,iBAAiB,IAAI,kBAAkB,KAAK;AAClD,MAAI,OAAO,mBAAmB,UAAU;AACtC,UAAM,EAAE,GAAG,GAAG,GAAG,EAAE,IAAI,KAAK,cAAc;AAC1C,UAAM,SAAS,WAAW,KAAK,GAAG,QAAQ,CAAC;AAC3C,WAAO,QAAQ,KAAK,KAAK,KAAK;AAAA,EAChC;AACA,MAAI,QAAQ,IAAI,mBAAmB,UAAU;AAC3C,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK,wBAAwB,OAAO;AAAA,IAC9C;AAEA;AAAA,EACF;AACA,SAAO;AACT;",
+  "mappings": "AAAA,SAAS,aAAa;AACtB,YAAY,SAAS;AAEd,MAAM,OAAO,IAAI;AACjB,MAAM,QAAQ,IAAI;AAElB,MAAM,iBAAiB,CAAC,OAAuB,YAAqB;AACzE,MAAI,CAAC;AAAO;AACZ,MAAI,MAAM,CAAC,MAAM;AAAK,WAAO;AAC7B,MAAI,SAAS,YAAY;AAAG,WAAO;AACnC,QAAM,iBAAiB,IAAI,kBAAkB,KAAK;AAClD,MAAI,OAAO,mBAAmB,UAAU;AACtC,UAAM,EAAE,GAAG,GAAG,GAAG,EAAE,IAAI,KAAK,cAAc;AAC1C,UAAM,IAAI,EAAE,WAAW,KAAK;AAC5B,UAAM,QAAQ,EAAE,QAAQ,CAAC;AACzB,WAAO,QAAQ,KAAK,KAAK,KAAK;AAAA,EAChC;AACA,MAAI,QAAQ,IAAI,mBAAmB,UAAU;AAC3C,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK,wBAAwB,OAAO;AAAA,IAC9C;AAEA;AAAA,EACF;AACA,SAAO;AACT;",
   "names": []
 }

package/dist/esm/helpers/normalizeValueWithProperty.js

@@ -1,68 +1,17 @@
 import { isWeb } from "@tamagui/constants";
+import { stylePropsUnitless } from "@tamagui/helpers";
 import { getAllSelectors } from "./insertStyleRule";
-import { names, normalizeColor } from "./normalizeColor";
-import { normalizeStylePropKeys } from "./normalizeStylePropKeys";
-const colorCache = /* @__PURE__ */ new Map();
 function normalizeValueWithProperty(value, property) {
-  if (property && property in unitlessNumbers) {
+  if (!isWeb)
     return value;
-  }
   let res = value;
-  if (property && (property in normalizeStylePropKeys || value in names)) {
-    if (colorCache.has(value)) {
-      return colorCache.get(value);
-    }
-    res = normalizeColor(value);
-    if (colorCache.size > 1e3) {
-      colorCache.clear();
-    }
-    colorCache.set(value, res);
-  } else if (isWeb && typeof value === "number" && (property === void 0 || !(property in unitlessNumbers || property in stringNumbers))) {
+  if ((property === void 0 || !(property in stylePropsUnitless)) && typeof value === "number") {
     res = `${value}px`;
-  } else if (isWeb && property !== void 0 && property in stringNumbers) {
+  } else if (property !== void 0) {
     res = `${res}`;
   }
   return res;
 }
-const stringNumbers = {
-  zIndex: true
-};
-const unitlessNumbers = {
-  WebkitLineClamp: true,
-  animationIterationCount: true,
-  aspectRatio: true,
-  borderImageOutset: true,
-  borderImageSlice: true,
-  borderImageWidth: true,
-  columnCount: true,
-  flex: true,
-  flexGrow: true,
-  flexOrder: true,
-  flexPositive: true,
-  flexShrink: true,
-  flexNegative: true,
-  fontWeight: true,
-  gridRow: true,
-  gridRowEnd: true,
-  gridRowGap: true,
-  gridRowStart: true,
-  gridColumn: true,
-  gridColumnEnd: true,
-  gridColumnGap: true,
-  gridColumnStart: true,
-  lineClamp: true,
-  opacity: true,
-  order: true,
-  orphans: true,
-  tabSize: true,
-  widows: true,
-  zoom: true,
-  scale: true,
-  scaleX: true,
-  scaleY: true,
-  scaleZ: true,
-  shadowOpacity: true
-};
 const rcache = {};
 function reverseMapClassNameToValue(key, className) {
   const selectors = getAllSelectors();
@@ -82,7 +31,7 @@ function reverseMapClassNameToValue(key, className) {
   let res;
   if (cssVal.startsWith("var(")) {
     res = cssVal;
-  } else if (unitlessNumbers[key]) {
+  } else if (stylePropsUnitless[key]) {
     res = +cssVal;
   } else if (cssVal.endsWith("px")) {
     res = +cssVal.replace("px", "");

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/normalizeValueWithProperty.ts"],
-  "mappings": "AAKA,SAAS,aAAa;AAEtB,SAAS,uBAAuB;AAChC,SAAS,OAAO,sBAAsB;AACtC,SAAS,8BAA8B;AAEvC,MAAM,aAAa,oBAAI,IAAI;AAEpB,SAAS,2BAA2B,OAAY,UAAwB;AAC7E,MAAI,YAAY,YAAY,iBAAiB;AAC3C,WAAO;AAAA,EACT;AACA,MAAI,MAAM;AACV,MAAI,aAAa,YAAY,0BAA0B,SAAS,QAAQ;AACtE,QAAI,WAAW,IAAI,KAAK,GAAG;AACzB,aAAO,WAAW,IAAI,KAAK;AAAA,IAC7B;AACA,UAAM,eAAe,KAAK;AAE1B,QAAI,WAAW,OAAO,KAAM;AAC1B,iBAAW,MAAM;AAAA,IACnB;AACA,eAAW,IAAI,OAAO,GAAG;AAAA,EAC3B,WACE,SACA,OAAO,UAAU,aAChB,aAAa,UACZ,EAAE,YAAY,mBAAmB,YAAY,iBAC/C;AACA,UAAM,GAAG;AAAA,EACX,WAAW,SAAS,aAAa,UAAa,YAAY,eAAe;AACvE,UAAM,GAAG;AAAA,EACX;AACA,SAAO;AACT;AAEA,MAAM,gBAAgB;AAAA,EACpB,QAAQ;AACV;AAEA,MAAM,kBAAkB;AAAA,EACtB,iBAAiB;AAAA,EACjB,yBAAyB;AAAA,EACzB,aAAa;AAAA,EACb,mBAAmB;AAAA,EACnB,kBAAkB;AAAA,EAClB,kBAAkB;AAAA,EAClB,aAAa;AAAA,EACb,MAAM;AAAA,EACN,UAAU;AAAA,EACV,WAAW;AAAA,EACX,cAAc;AAAA,EACd,YAAY;AAAA,EACZ,cAAc;AAAA,EACd,YAAY;AAAA,EACZ,SAAS;AAAA,EACT,YAAY;AAAA,EACZ,YAAY;AAAA,EACZ,cAAc;AAAA,EACd,YAAY;AAAA,EACZ,eAAe;AAAA,EACf,eAAe;AAAA,EACf,iBAAiB;AAAA,EACjB,WAAW;AAAA,EACX,SAAS;AAAA,EACT,OAAO;AAAA,EACP,SAAS;AAAA,EACT,SAAS;AAAA,EACT,QAAQ;AAAA,EACR,MAAM;AAAA,EACN,OAAO;AAAA,EACP,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,eAAe;AACjB;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,8BAA8B;AAAA,MACzD;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,gBAAgB,GAAG,GAAG;AAC/B,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,0BAA0B;AAEnC,SAAS,uBAAuB;AAIzB,SAAS,2BAA2B,OAAY,UAAwB;AAC7E,MAAI,CAAC;AAAO,WAAO;AACnB,MAAI,MAAM;AACV,OACG,aAAa,UAAa,EAAE,YAAY,wBACzC,OAAO,UAAU,UACjB;AACA,UAAM,GAAG;AAAA,EACX,WAAW,aAAa,QAAW;AACjC,UAAM,GAAG;AAAA,EACX;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,8BAA8B;AAAA,MACzD;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;",
   "names": []
 }

package/dist/esm/helpers/{createPropMapper.js → propMapper.js}

@@ -1,65 +1,55 @@
 import { isAndroid, isWeb } from "@tamagui/constants";
+import { tokenCategories } from "@tamagui/helpers";
 import { isDevTools } from "../constants/isDevTools";
 import { getVariableValue, isVariable } from "../createVariable";
 import { expandStyle } from "./expandStyle";
 import { expandStylesAndRemoveNullishValues } from "./expandStyles";
 import { getFontsForLanguage, getVariantExtras } from "./getVariantExtras";
 import { isObj } from "./isObj";
-import { mergeProps } from "./mergeProps";
 import { pseudoDescriptors } from "./pseudoDescriptors";
-const createPropMapper = (staticConfig) => {
-  const defaultProps = mergeProps(staticConfig.defaultProps || {}, {}, false)[0];
-  const mapper = (key, value, styleStateIn, subPropsIn, avoidDefaultProps = false) => {
-    if (!(process.env.TAMAGUI_TARGET === "native" && isAndroid)) {
-      if (key === "elevationAndroid")
-        return;
-    }
-    const subProps = styleStateIn.state.fallbackProps || subPropsIn;
-    const styleState = subProps ? {
-      ...styleStateIn,
-      curProps: subProps
-    } : styleStateIn;
-    const { conf, state, fontFamily } = styleState;
-    const returnVariablesAs = state.resolveVariablesAs === "value" ? "value" : "auto";
-    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(", ")}`);
+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, {
+    get(_, k) {
+      return k === "curProps" ? subProps : Reflect.get(_, k);
     }
-    const variantValue = resolveVariants(
-      key,
-      value,
-      styleState,
-      defaultProps,
-      returnVariablesAs,
-      "",
-      avoidDefaultProps
-    );
+  }) : 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 && value != null) {
+    const variantValue = resolveVariants(key, value, styleProps, styleState, "");
     if (variantValue) {
       return variantValue;
     }
-    let shouldReturn = false;
-    if (key in conf.shorthands) {
-      shouldReturn = true;
-      key = conf.shorthands[key];
-    }
-    if (value) {
-      if (value[0] === "$") {
-        value = getToken(key, value, styleState, returnVariablesAs);
-      } else if (isVariable(value)) {
-        value = resolveVariableValue(key, value, returnVariablesAs);
-      }
-    }
-    if (shouldReturn || value != null) {
-      return expandStyle(key, value) || [[key, value]];
+  }
+  let shouldReturn = false;
+  if (key in conf.shorthands) {
+    shouldReturn = true;
+    key = conf.shorthands[key];
+  }
+  if (value) {
+    if (value[0] === "$") {
+      value = getToken(key, value, styleProps, styleState);
+    } else if (isVariable(value)) {
+      value = resolveVariableValue(value, styleProps);
     }
-  };
-  return mapper;
+  }
+  if (shouldReturn || value != null) {
+    return expandStyle(key, value) || [[key, value]];
+  }
 };
-const resolveVariants = (key, value, styleState, defaultProps, returnVariablesAs, parentVariantKey, avoidDefaultProps = false) => {
+const resolveVariants = (key, value, styleProps, styleState, parentVariantKey) => {
   const { staticConfig, conf, debug } = styleState;
   const { variants } = staticConfig;
-  if (!variants || !(key in variants) || value == null) {
+  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}`);
@@ -85,30 +75,13 @@ const resolveVariants = (key, value, styleState, defaultProps, returnVariablesAs
   }
   if (typeof variantValue === "function") {
     const fn = variantValue;
-    variantValue = fn(
-      value,
-      getVariantExtras(styleState, defaultProps, avoidDefaultProps)
-    );
+    variantValue = fn(value, getVariantExtras(styleState));
     if (process.env.NODE_ENV === "development" && debug === "verbose") {
       console.groupCollapsed("   expanded functional variant", key);
       console.log({ fn, variantValue });
       console.groupEnd();
     }
   }
-  if (process.env.NODE_ENV === "development" && debug === "verbose") {
-    console.log(`   attaching updated curProps`, {
-      new: variantValue,
-      before: styleState.curProps,
-      after: {
-        ...styleState.curProps,
-        ...variantValue
-      }
-    });
-  }
-  styleState.curProps = {
-    ...styleState.curProps,
-    ...variantValue
-  };
   let fontFamilyResult;
   if (isObj(variantValue)) {
     const fontFamilyUpdate = variantValue.fontFamily || variantValue[conf.inverseShorthands.fontFamily];
@@ -122,11 +95,9 @@ const resolveVariants = (key, value, styleState, defaultProps, returnVariablesAs
     variantValue = resolveTokensAndVariants(
       key,
       variantValue,
+      styleProps,
       styleState,
-      defaultProps,
-      returnVariablesAs,
-      parentVariantKey,
-      avoidDefaultProps
+      parentVariantKey
     );
   }
   if (variantValue) {
@@ -153,7 +124,7 @@ function getFontFamilyFromNameOrVariable(input, conf) {
       }
     }
   } else if (typeof input === "string") {
-    if ((input == null ? void 0 : input[0]) === "$") {
+    if (input[0] === "$") {
       return input;
     }
   }
@@ -163,7 +134,7 @@ const fontFamilyCache = /* @__PURE__ */ new WeakMap();
 const getPropMappedFontFamily = (expanded) => {
   return expanded && fontFamilyCache.get(expanded);
 };
-const resolveTokensAndVariants = (key, value, styleState, defaultProps, returnVariablesAs, parentVariantKey, avoidDefaultProps) => {
+const resolveTokensAndVariants = (key, value, styleProps, styleState, parentVariantKey) => {
   var _a;
   const { conf, staticConfig, debug, theme } = styleState;
   const { variants } = staticConfig;
@@ -175,19 +146,12 @@ const resolveTokensAndVariants = (key, value, styleState, defaultProps, returnVa
     const fKey = conf.shorthands[rKey] || rKey;
     const val = value[rKey];
     if (variants && fKey in variants) {
+      styleState.curProps[fKey] = val;
       if (parentVariantKey && parentVariantKey === key) {
         res[fKey] = // SYNC WITH *1
-        val[0] === "$" ? getToken(fKey, val, styleState, returnVariablesAs) : val;
+        val[0] === "$" ? getToken(fKey, val, styleProps, styleState) : val;
       } else {
-        const variantOut = resolveVariants(
-          fKey,
-          val,
-          styleState,
-          defaultProps,
-          returnVariablesAs,
-          key,
-          avoidDefaultProps
-        );
+        const variantOut = resolveVariants(fKey, val, styleProps, styleState, key);
         if (variantOut) {
           for (const [key2, val2] of variantOut) {
             if (val2 == null)
@@ -204,27 +168,19 @@ const resolveTokensAndVariants = (key, value, styleState, defaultProps, returnVa
       continue;
     }
     if (isVariable(val)) {
-      res[fKey] = !isWeb || returnVariablesAs === "value" ? val.val : val.variable;
+      res[fKey] = resolveVariableValue(val, styleProps);
       continue;
     }
     if (typeof val === "string") {
       const fVal = (
         // SYNC WITH *1
-        val[0] === "$" ? getToken(fKey, val, styleState, returnVariablesAs) : val
+        val[0] === "$" ? getToken(fKey, val, styleProps, styleState) : val
       );
       res[fKey] = fVal;
       continue;
     }
     if (isObj(val)) {
-      const subObject = resolveTokensAndVariants(
-        fKey,
-        val,
-        styleState,
-        defaultProps,
-        returnVariablesAs,
-        key,
-        avoidDefaultProps
-      );
+      const subObject = resolveTokensAndVariants(fKey, val, styleProps, styleState, key);
       if (process.env.NODE_ENV === "development" && debug === "verbose") {
         console.log(`object`, fKey, subObject);
       }
@@ -270,14 +226,14 @@ const fontShorthand = {
   fontSize: "size",
   fontWeight: "weight"
 };
-const getToken = (key, value, styleState, resolveAs, debug) => {
+const getToken = (key, value, styleProps, styleState) => {
   var _a, _b;
   const { theme, conf, languageContext, fontFamily } = styleState;
   const tokensParsed = conf.tokensParsed;
   let valOrVar;
   let hasSet = false;
   if (value in theme) {
-    if (process.env.NODE_ENV === "development" && debug === "verbose") {
+    if (process.env.NODE_ENV === "development" && styleState.debug === "verbose") {
       console.log(` - getting theme value for ${key} from ${value} = ${theme[value].val}`);
     }
     valOrVar = theme[value];
@@ -327,60 +283,28 @@ const getToken = (key, value, styleState, resolveAs, debug) => {
     }
   }
   if (hasSet) {
-    const out = resolveVariableValue(key, valOrVar, resolveAs);
+    const out = resolveVariableValue(valOrVar, styleProps);
     return out;
   }
-  if (process.env.NODE_ENV === "development" && isDevTools && debug === "verbose") {
+  if (process.env.NODE_ENV === "development" && isDevTools && styleState.debug === "verbose") {
     console.groupCollapsed("  \uFE52 propMap (val)", key, value);
-    console.log({ valOrVar, theme, hasSet, resolveAs }, theme[key]);
+    console.log({ valOrVar, theme, hasSet }, theme[key]);
     console.groupEnd();
   }
   return value;
 };
-function resolveVariableValue(key, valOrVar, resolveAs = "auto") {
+function resolveVariableValue(valOrVar, { resolveVariablesAs }) {
   if (isVariable(valOrVar)) {
-    if (resolveAs === "variable") {
-      return valOrVar;
-    }
-    if (!isWeb || resolveAs === "value") {
+    if (!isWeb || resolveVariablesAs === "value") {
       return valOrVar.val;
     }
     return valOrVar.variable;
   }
   return valOrVar;
 }
-const tokenCategories = {
-  radius: {
-    borderRadius: true,
-    borderTopLeftRadius: true,
-    borderTopRightRadius: true,
-    borderBottomLeftRadius: true,
-    borderBottomRightRadius: true
-  },
-  size: {
-    width: true,
-    height: true,
-    minWidth: true,
-    minHeight: true,
-    maxWidth: true,
-    maxHeight: true
-  },
-  zIndex: {
-    zIndex: true
-  },
-  color: {
-    color: true,
-    backgroundColor: true,
-    borderColor: true,
-    borderBottomColor: true,
-    borderTopColor: true,
-    borderLeftColor: true,
-    borderRightColor: true
-  }
-};
 export {
-  createPropMapper,
   getFontFamilyFromNameOrVariable,
-  getPropMappedFontFamily
+  getPropMappedFontFamily,
+  propMapper
 };
-//# sourceMappingURL=createPropMapper.js.map
+//# sourceMappingURL=propMapper.js.map

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

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

package/dist/esm/helpers/pseudoDescriptors.js

@@ -19,7 +19,6 @@ const pseudoDescriptors = {
   },
   exitStyle: {
     name: "exit",
-    stateKey: "isExiting",
     priority: 5
   }
 };

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/pseudoDescriptors.ts"],
-  "mappings": "AAEO,MAAM,oBAGT;AAAA,EACF,YAAY;AAAA,IACV,MAAM;AAAA,IACN,UAAU;AAAA,EACZ;AAAA,EACA,YAAY;AAAA,IACV,MAAM;AAAA,IACN,UAAU;AAAA,IACV,UAAU;AAAA,EACZ;AAAA,EACA,YAAY;AAAA,IACV,MAAM;AAAA,IACN,UAAU;AAAA,EACZ;AAAA,EACA,YAAY;AAAA,IACV,MAAM;AAAA,IACN,UAAU;AAAA,IACV,UAAU;AAAA,EACZ;AAAA,EACA,WAAW;AAAA,IACT,MAAM;AAAA,IACN,UAAU;AAAA,IACV,UAAU;AAAA,EACZ;AACF;",
+  "mappings": "AAEO,MAAM,oBAGT;AAAA,EACF,YAAY;AAAA,IACV,MAAM;AAAA,IACN,UAAU;AAAA,EACZ;AAAA,EACA,YAAY;AAAA,IACV,MAAM;AAAA,IACN,UAAU;AAAA,IACV,UAAU;AAAA,EACZ;AAAA,EACA,YAAY;AAAA,IACV,MAAM;AAAA,IACN,UAAU;AAAA,EACZ;AAAA,EACA,YAAY;AAAA,IACV,MAAM;AAAA,IACN,UAAU;AAAA,IACV,UAAU;AAAA,EACZ;AAAA,EACA,WAAW;AAAA,IACT,MAAM;AAAA,IACN,UAAU;AAAA,EACZ;AACF;",
   "names": []
 }

package/dist/esm/helpers/useShallowSetState.js

@@ -1,21 +1,13 @@
-import { useCallback } from "react";
 function useShallowSetState(setter, debug, debugName) {
-  return useCallback(
-    (next) => {
-      setter((prev) => {
-        for (const key in next) {
-          if (prev[key] !== next[key]) {
-            if (process.env.NODE_ENV === "development" && debug === "verbose") {
-              console.warn(` \u25B2 setState ${debugName}`, next);
-            }
-            return { ...prev, ...next };
-          }
-        }
-        return prev;
-      });
-    },
-    [setter]
-  );
+  return (next) => setter((prev) => shallow(prev, next));
+}
+function shallow(prev, next) {
+  for (const key in next) {
+    if (prev[key] !== next[key]) {
+      return { ...prev, ...next };
+    }
+  }
+  return prev;
 }
 export {
   useShallowSetState

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/useShallowSetState.tsx"],
-  "mappings": "AAAA,SAAgB,mBAAmB;AAI5B,SAAS,mBACd,QACA,OACA,WACA;AACA,SAAO;AAAA,IACL,CAAC,SAAyB;AACxB,aAAO,CAAC,SAAS;AACf,mBAAW,OAAO,MAAM;AACtB,cAAI,KAAK,GAAG,MAAM,KAAK,GAAG,GAAG;AAC3B,gBAAI,QAAQ,IAAI,aAAa,iBAAiB,UAAU,WAAW;AACjE,sBAAQ,KAAK,oBAAe,aAAa,IAAI;AAAA,YAC/C;AACA,mBAAO,EAAE,GAAG,MAAM,GAAG,KAAK;AAAA,UAC5B;AAAA,QACF;AACA,eAAO;AAAA,MACT,CAAC;AAAA,IACH;AAAA,IACA,CAAC,MAAM;AAAA,EACT;AACF;",
+  "mappings": "AAIO,SAAS,mBACd,QACA,OACA,WACA;AACA,SAAO,CAAC,SAAyB,OAAO,CAAC,SAAS,QAAQ,MAAM,IAAI,CAAC;AACvE;AAEA,SAAS,QAAQ,MAAM,MAAM;AAC3B,aAAW,OAAO,MAAM;AACtB,QAAI,KAAK,GAAG,MAAM,KAAK,GAAG,GAAG;AAC3B,aAAO,EAAE,GAAG,MAAM,GAAG,KAAK;AAAA,IAC5B;AAAA,EACF;AACA,SAAO;AACT;",
   "names": []
 }

package/dist/esm/helpers/withStaticProperties.js

@@ -1,5 +1,14 @@
+const WarnReAssignSymbol = Symbol();
 const withStaticProperties = function(component, staticProps) {
   const next = typeof component === "function" ? component : { ...component };
+  if (process.env.NODE_ENV === "development") {
+    if (next[WarnReAssignSymbol]) {
+      throw new Error(
+        `Error: You're calling withStaticProperties() on a component that already has withStaticProperties() assigned to it! This will cause super strange errors.`
+      );
+    }
+    next[WarnReAssignSymbol] = true;
+  }
   Object.assign(next, staticProps);
   return next;
 };

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/withStaticProperties.tsx"],
-  "mappings": "AAAO,MAAM,uBAAuB,SAClC,WACA,aACO;AAEP,QAAM,OAAO,OAAO,cAAc,aAAa,YAAY,EAAE,GAAI,UAAkB;AACnF,SAAO,OAAO,MAAM,WAAW;AAC/B,SAAO;AACT;",
+  "mappings": "AAAA,MAAM,qBAAqB,OAAO;AAE3B,MAAM,uBAAuB,SAClC,WACA,aACO;AAEP,QAAM,OAAO,OAAO,cAAc,aAAa,YAAY,EAAE,GAAI,UAAkB;AAGnF,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,KAAK,kBAAkB,GAAG;AAC5B,YAAM,IAAI;AAAA,QACR;AAAA,MACF;AAAA,IACF;AACA,SAAK,kBAAkB,IAAI;AAAA,EAC7B;AAEA,SAAO,OAAO,MAAM,WAAW;AAC/B,SAAO;AACT;",
   "names": []
 }

package/dist/esm/hooks/useMedia.js

@@ -1,10 +1,9 @@
 import { useIsomorphicLayoutEffect } from "@tamagui/constants";
-import { useMemo, useSyncExternalStore } from "react";
+import { useMemo, useRef, useSyncExternalStore } from "react";
 import { getConfig } from "../config";
 import { createProxy } from "../helpers/createProxy";
 import { matchMedia } from "../helpers/matchMedia";
 import { pseudoDescriptors } from "../helpers/pseudoDescriptors";
-import { useSafeRef } from "./useSafeRef";
 let mediaState = (
   // development only safeguard
   process.env.NODE_ENV === "development" ? createProxy(
@@ -23,7 +22,7 @@ let mediaState = (
 const mediaQueryConfig = {};
 const getMedia = () => mediaState;
 const mediaKeys = /* @__PURE__ */ new Set();
-const isMediaKey = (key) => mediaKeys.has(key) || key.startsWith("$platform-") || key.startsWith("$theme-");
+const isMediaKey = (key) => mediaKeys.has(key) || key[0] === "$" && (key.startsWith("$platform-") || key.startsWith("$theme-"));
 let initState;
 const getInitialMediaState = () => {
   return (getConfig().disableSSR ? mediaState : initState) || {};
@@ -117,18 +116,16 @@ function subscribe(subscriber) {
   return () => listeners.delete(subscriber);
 }
 function useMedia(uid, debug) {
-  const internal = useSafeRef(void 0);
-  if (!internal.current) {
-    internal.current = {
-      prev: initState
-    };
-  }
+  const internal = useRef();
   const state = useSyncExternalStore(
     subscribe,
     () => {
+      if (!internal.current) {
+        return initState;
+      }
       const { touched, prev } = internal.current;
       const componentState = uid ? shouldUpdate.get(uid) : void 0;
-      if ((componentState == null ? void 0 : componentState.enabled) === false) {
+      if (!(componentState == null ? void 0 : componentState.enabled) === false) {
         return prev;
       }
       const testKeys = (componentState == null ? void 0 : componentState.keys) ?? ((!componentState || componentState.enabled) && touched ? [...touched] : null);
@@ -145,6 +142,7 @@ function useMedia(uid, debug) {
     return new Proxy(state, {
       get(_, key) {
         if (typeof key === "string") {
+          internal.current ||= { prev: initState };
           internal.current.touched ||= /* @__PURE__ */ new Set();
           internal.current.touched.add(key);
         }