@tamagui/web 1.109.9 → 1.110.1

package/dist/esm/helpers/getVariantExtras.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["getVariableValue","cache","WeakMap","getVariantExtras","styleState","has","get","curProps","props","conf","context","theme","fonts","fontsParsed","language","getFontsForLanguage","next","tokens","tokensParsed","fontFamily","defaultFont","font","Proxy","target","key","tryKey","inverseShorthands","Reflect","set","fontLanguageCache","Object","fromEntries","entries","map","name","lang","langKey"],"sources":["../../../src/helpers/getVariantExtras.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,QAAwB;AAIjC,MAAMC,KAAA,GAAQ,mBAAIC,OAAA,CAAQ;EAEbC,gBAAA,GAAoBC,UAAA,IAA8B;IAC7D,IAAIH,KAAA,CAAMI,GAAA,CAAID,UAAU,GACtB,OAAOH,KAAA,CAAMK,GAAA,CAAIF,UAAU;IAG7B,MAAM;MAAEG,QAAA;MAAUC,KAAA;MAAOC,IAAA;MAAMC,OAAA;MAASC;IAAM,IAAIP,UAAA;IAClD,IAAIQ,KAAA,GAAQH,IAAA,CAAKI,WAAA;IACbH,OAAA,EAASI,QAAA,KACXF,KAAA,GAAQG,mBAAA,CAAoBN,IAAA,CAAKI,WAAA,EAAaH,OAAA,CAAQI,QAAQ;IAGhE,MAAME,IAAA,GAAO;MACXJ,KAAA;MACAK,MAAA,EAAQR,IAAA,CAAKS,YAAA;MACbP,KAAA;MACA,IAAIQ,WAAA,EAAa;QACf,OACEnB,gBAAA,CAAiBI,UAAA,CAAWe,UAAA,IAAcf,UAAA,CAAWG,QAAA,CAASY,UAAU,KACxEX,KAAA,CAAMW,UAAA,IACNnB,gBAAA,CAAiBI,UAAA,CAAWK,IAAA,CAAKW,WAAW;MAEhD;MACA,IAAIC,KAAA,EAAO;QACT,OACET,KAAA,CAAM,KAAKO,UAAU,MACpB,CAACX,KAAA,CAAMW,UAAA,IAAcX,KAAA,CAAMW,UAAA,CAAW,CAAC,MAAM,MAC1CP,KAAA,CAAMR,UAAA,CAAWK,IAAA,CAAKW,WAAY,IAClC;MAER;MAAA;MAAA;MAGAZ,KAAA,EAAO,IAAIc,KAAA,CAAMd,KAAA,EAAO;QAAA;QAEtBF,IAAIiB,MAAA,EAAQC,GAAA,EAAK;UACf,WAAWC,MAAA,IAAU,CAACD,GAAA,EAAKf,IAAA,CAAKiB,iBAAA,CAAkBF,GAAU,CAAC,GAC3D,IAAKC,MAAA,EACL,OAAIE,OAAA,CAAQtB,GAAA,CAAIE,QAAA,EAAUkB,MAAM,IAAUE,OAAA,CAAQrB,GAAA,CAAIC,QAAA,EAAUkB,MAAM,IAC/DE,OAAA,CAAQrB,GAAA,CAAIiB,MAAA,EAAQE,MAAM;QAErC;MACF,CAAC;IACH;IAEA,OAAAxB,KAAA,CAAM2B,GAAA,CAAIxB,UAAA,EAAYY,IAAI,GAEnBA,IAAA;EACT;EAEMa,iBAAA,GAAoB,mBAAI3B,OAAA,CAAQ;AAE/B,SAASa,oBAAoBH,KAAA,EAAqBE,QAAA,EAA+B;EACtF,IAAIe,iBAAA,CAAkBxB,GAAA,CAAIS,QAAQ,GAChC,OAAOe,iBAAA,CAAkBvB,GAAA,CAAIQ,QAAQ;EAEvC,MAAME,IAAA,GAAO;IACX,GAAGJ,KAAA;IACH,GAAGkB,MAAA,CAAOC,WAAA,CACRD,MAAA,CAAOE,OAAA,CAAQlB,QAAQ,EAAEmB,GAAA,CAAI,CAAC,CAACC,IAAA,EAAMC,IAAI,MAAM;MAC7C,IAAIA,IAAA,KAAS,WACX,OAAO,EAAC;MAEV,MAAMC,OAAA,GAAU,IAAIF,IAAI,IAAIC,IAAI;MAChC,OAAO,CAAC,IAAID,IAAI,IAAItB,KAAA,CAAMwB,OAAO,CAAC;IACpC,CAAC,CACH;EACF;EACA,OAAAP,iBAAA,CAAkBD,GAAA,CAAId,QAAA,EAAUE,IAAI,GAC7BA,IAAA;AACT","ignoreList":[]}
+{"version":3,"names":["getVariableValue","cache","WeakMap","getVariantExtras","styleState","has","get","props","conf","context","theme","fonts","fontsParsed","language","getFontsForLanguage","next","tokens","tokensParsed","fontFamily","defaultFont","font","set","fontLanguageCache","Object","fromEntries","entries","map","name","lang","langKey"],"sources":["../../../src/helpers/getVariantExtras.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,QAAwB;AAIjC,MAAMC,KAAA,GAAQ,mBAAIC,OAAA,CAAQ;EAEbC,gBAAA,GAAoBC,UAAA,IAA8B;IAC7D,IAAIH,KAAA,CAAMI,GAAA,CAAID,UAAU,GACtB,OAAOH,KAAA,CAAMK,GAAA,CAAIF,UAAU;IAG7B,MAAM;MAAEG,KAAA;MAAOC,IAAA;MAAMC,OAAA;MAASC;IAAM,IAAIN,UAAA;IACxC,IAAIO,KAAA,GAAQH,IAAA,CAAKI,WAAA;IACbH,OAAA,EAASI,QAAA,KACXF,KAAA,GAAQG,mBAAA,CAAoBN,IAAA,CAAKI,WAAA,EAAaH,OAAA,CAAQI,QAAQ;IAGhE,MAAME,IAAA,GAAO;MACXJ,KAAA;MACAK,MAAA,EAAQR,IAAA,CAAKS,YAAA;MACbP,KAAA;MACA,IAAIQ,WAAA,EAAa;QACf,OACElB,gBAAA,CAAiBI,UAAA,CAAWc,UAAA,IAAcd,UAAA,CAAWG,KAAA,CAAMW,UAAU,KACrEX,KAAA,CAAMW,UAAA,IACNlB,gBAAA,CAAiBI,UAAA,CAAWI,IAAA,CAAKW,WAAW;MAEhD;MACA,IAAIC,KAAA,EAAO;QACT,OACET,KAAA,CAAM,KAAKO,UAAU,MACpB,CAACX,KAAA,CAAMW,UAAA,IAAcX,KAAA,CAAMW,UAAA,CAAW,CAAC,MAAM,MAC1CP,KAAA,CAAMP,UAAA,CAAWI,IAAA,CAAKW,WAAY,IAClC;MAER;MACAZ;IACF;IAEA,OAAAN,KAAA,CAAMoB,GAAA,CAAIjB,UAAA,EAAYW,IAAI,GAEnBA,IAAA;EACT;EAEMO,iBAAA,GAAoB,mBAAIpB,OAAA,CAAQ;AAE/B,SAASY,oBAAoBH,KAAA,EAAqBE,QAAA,EAA+B;EACtF,IAAIS,iBAAA,CAAkBjB,GAAA,CAAIQ,QAAQ,GAChC,OAAOS,iBAAA,CAAkBhB,GAAA,CAAIO,QAAQ;EAEvC,MAAME,IAAA,GAAO;IACX,GAAGJ,KAAA;IACH,GAAGY,MAAA,CAAOC,WAAA,CACRD,MAAA,CAAOE,OAAA,CAAQZ,QAAQ,EAAEa,GAAA,CAAI,CAAC,CAACC,IAAA,EAAMC,IAAI,MAAM;MAC7C,IAAIA,IAAA,KAAS,WACX,OAAO,EAAC;MAEV,MAAMC,OAAA,GAAU,IAAIF,IAAI,IAAIC,IAAI;MAChC,OAAO,CAAC,IAAID,IAAI,IAAIhB,KAAA,CAAMkB,OAAO,CAAC;IACpC,CAAC,CACH;EACF;EACA,OAAAP,iBAAA,CAAkBD,GAAA,CAAIR,QAAA,EAAUE,IAAI,GAC7BA,IAAA;AACT","ignoreList":[]}

package/dist/esm/helpers/getVariantExtras.native.js

@@ -62,33 +62,19 @@ function _unsupported_iterable_to_array(o, minLen) {
 var cache = /* @__PURE__ */ new WeakMap(), getVariantExtras = function(styleState) {
   if (cache.has(styleState))
     return cache.get(styleState);
-  var curProps = styleState.curProps, props = styleState.props, conf = styleState.conf, context = styleState.context, theme = styleState.theme, fonts = conf.fontsParsed;
+  var props = styleState.props, conf = styleState.conf, context = styleState.context, theme = styleState.theme, fonts = conf.fontsParsed;
   context != null && context.language && (fonts = getFontsForLanguage(conf.fontsParsed, context.language));
   var next = {
     fonts,
     tokens: conf.tokensParsed,
     theme,
     get fontFamily() {
-      return getVariableValue(styleState.fontFamily || styleState.curProps.fontFamily) || props.fontFamily || getVariableValue(styleState.conf.defaultFont);
+      return getVariableValue(styleState.fontFamily || styleState.props.fontFamily) || props.fontFamily || getVariableValue(styleState.conf.defaultFont);
     },
     get font() {
       return fonts[this.fontFamily] || (!props.fontFamily || props.fontFamily[0] === "$" ? fonts[styleState.conf.defaultFont] : void 0);
     },
-    // TODO do this in splitstlye
-    // we avoid passing in default props for media queries because that would confuse things like SizableText.size:
-    props: new Proxy(props, {
-      // handles shorthands
-      get: function(target, key) {
-        for (var _i = 0, _iter = [
-          key,
-          conf.inverseShorthands[key]
-        ]; _i < _iter.length; _i++) {
-          var tryKey = _iter[_i];
-          if (tryKey)
-            return Reflect.has(curProps, tryKey) ? Reflect.get(curProps, tryKey) : Reflect.get(target, tryKey);
-        }
-      }
-    })
+    props
   };
   return cache.set(styleState, next), next;
 }, fontLanguageCache = /* @__PURE__ */ new WeakMap();

package/dist/esm/helpers/getVariantExtras.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/Users/n8/tamagui/code/core/web/src/helpers/getVariantExtras.tsx"],
-  "mappings": "AAAA,SAASA,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIjC,IAAMC,QAAQ,oBAAIC,QAAAA,GAELC,mBAAmB,SAACC,YAAAA;AAC/B,MAAIH,MAAMI,IAAID,UAAAA;AACZ,WAAOH,MAAMK,IAAIF,UAAAA;AAGnB,MAAQG,WAA0CH,WAA1CG,UAAUC,QAAgCJ,WAAhCI,OAAOC,OAAyBL,WAAzBK,MAAMC,UAAmBN,WAAnBM,SAASC,QAAUP,WAAVO,OACpCC,QAAQH,KAAKI;AACjB,EAAIH,WAAAA,QAAAA,QAASI,aACXF,QAAQG,oBAAoBN,KAAKI,aAAaH,QAAQI,QAAQ;AAGhE,MAAME,OAAO;IACXJ;IACAK,QAAQR,KAAKS;IACbP;IACA,IAAIQ,aAAa;AACf,aACEnB,iBAAiBI,WAAWe,cAAcf,WAAWG,SAASY,UAAU,KACxEX,MAAMW,cACNnB,iBAAiBI,WAAWK,KAAKW,WAAW;IAEhD;IACA,IAAIC,OAAO;AACT,aACET,MAAM,KAAKO,UAAU,MACpB,CAACX,MAAMW,cAAcX,MAAMW,WAAW,CAAA,MAAO,MAC1CP,MAAMR,WAAWK,KAAKW,WAAW,IACjCE;IAER;;;IAGAd,OAAO,IAAIe,MAAMf,OAAO;;MAEtBF,KAAAA,SAAIkB,QAAQC,KAAG;AACb,iBAAA,KAAA,GAAqB,QAAA;UAACA;UAAKhB,KAAKiB,kBAAkBD,GAAAA;WAAY,KAAzC,MAAA,QAAA,MAA2C;cAArDE,SAAU,MAAA,EAAA;AACnB,cAAKA;AACL,mBAAIC,QAAQvB,IAAIE,UAAUoB,MAAAA,IAAgBC,QAAQtB,IAAIC,UAAUoB,MAAAA,IACzDC,QAAQtB,IAAIkB,QAAQG,MAAAA;QAC7B;MACF;IACF,CAAA;EACF;AAEA1B,eAAM4B,IAAIzB,YAAYY,IAAAA,GAEfA;AACT,GAEMc,oBAAoB,oBAAI5B,QAAAA;AAEvB,SAASa,oBAAoBH,OAAqBE,UAA6B;AACpF,MAAIgB,kBAAkBzB,IAAIS,QAAAA;AACxB,WAAOgB,kBAAkBxB,IAAIQ,QAAAA;AAE/B,MAAME,OAAO,eAAA,CAAA,GACRJ,OACAmB,OAAOC,YACRD,OAAOE,QAAQnB,QAAAA,EAAUoB,IAAI,SAAA,OAAA;6CAAEC,OAAAA,OAAAA,CAAAA,GAAMC,OAAAA,OAAAA,CAAAA;AACnC,QAAIA,SAAS;AACX,aAAO,CAAA;AAET,QAAMC,UAAW,IAAWD,OAARD,MAAK,GAAA,EAAQ,OAALC,IAAAA;AAC5B,WAAO;MAAE,IAAQ,OAALD,IAAAA;MAAQvB,MAAMyB,OAAAA;;EAC5B,CAAA,CAAA,CAAA;AAGJP,2BAAkBD,IAAIf,UAAUE,IAAAA,GACzBA;AACT;",
-  "names": ["getVariableValue", "cache", "WeakMap", "getVariantExtras", "styleState", "has", "get", "curProps", "props", "conf", "context", "theme", "fonts", "fontsParsed", "language", "getFontsForLanguage", "next", "tokens", "tokensParsed", "fontFamily", "defaultFont", "font", "undefined", "Proxy", "target", "key", "inverseShorthands", "tryKey", "Reflect", "set", "fontLanguageCache", "Object", "fromEntries", "entries", "map", "name", "lang", "langKey"]
+  "mappings": "AAAA,SAASA,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIjC,IAAMC,QAAQ,oBAAIC,QAAAA,GAELC,mBAAmB,SAACC,YAAAA;AAC/B,MAAIH,MAAMI,IAAID,UAAAA;AACZ,WAAOH,MAAMK,IAAIF,UAAAA;AAGnB,MAAQG,QAAgCH,WAAhCG,OAAOC,OAAyBJ,WAAzBI,MAAMC,UAAmBL,WAAnBK,SAASC,QAAUN,WAAVM,OAC1BC,QAAQH,KAAKI;AACjB,EAAIH,WAAAA,QAAAA,QAASI,aACXF,QAAQG,oBAAoBN,KAAKI,aAAaH,QAAQI,QAAQ;AAGhE,MAAME,OAAO;IACXJ;IACAK,QAAQR,KAAKS;IACbP;IACA,IAAIQ,aAAa;AACf,aACElB,iBAAiBI,WAAWc,cAAcd,WAAWG,MAAMW,UAAU,KACrEX,MAAMW,cACNlB,iBAAiBI,WAAWI,KAAKW,WAAW;IAEhD;IACA,IAAIC,OAAO;AACT,aACET,MAAM,KAAKO,UAAU,MACpB,CAACX,MAAMW,cAAcX,MAAMW,WAAW,CAAA,MAAO,MAC1CP,MAAMP,WAAWI,KAAKW,WAAW,IACjCE;IAER;IACAd;EACF;AAEAN,eAAMqB,IAAIlB,YAAYW,IAAAA,GAEfA;AACT,GAEMQ,oBAAoB,oBAAIrB,QAAAA;AAEvB,SAASY,oBAAoBH,OAAqBE,UAA6B;AACpF,MAAIU,kBAAkBlB,IAAIQ,QAAAA;AACxB,WAAOU,kBAAkBjB,IAAIO,QAAAA;AAE/B,MAAME,OAAO,eAAA,CAAA,GACRJ,OACAa,OAAOC,YACRD,OAAOE,QAAQb,QAAAA,EAAUc,IAAI,SAAA,OAAA;6CAAEC,OAAAA,OAAAA,CAAAA,GAAMC,OAAAA,OAAAA,CAAAA;AACnC,QAAIA,SAAS;AACX,aAAO,CAAA;AAET,QAAMC,UAAW,IAAWD,OAARD,MAAK,GAAA,EAAQ,OAALC,IAAAA;AAC5B,WAAO;MAAE,IAAQ,OAALD,IAAAA;MAAQjB,MAAMmB,OAAAA;;EAC5B,CAAA,CAAA,CAAA;AAGJP,2BAAkBD,IAAIT,UAAUE,IAAAA,GACzBA;AACT;",
+  "names": ["getVariableValue", "cache", "WeakMap", "getVariantExtras", "styleState", "has", "get", "props", "conf", "context", "theme", "fonts", "fontsParsed", "language", "getFontsForLanguage", "next", "tokens", "tokensParsed", "fontFamily", "defaultFont", "font", "undefined", "set", "fontLanguageCache", "Object", "fromEntries", "entries", "map", "name", "lang", "langKey"]
 }

package/dist/esm/helpers/propMapper.js

@@ -8,9 +8,9 @@ import { getFontsForLanguage, getVariantExtras } from "./getVariantExtras";
 import { isObj } from "./isObj";
 import { pseudoDescriptors } from "./pseudoDescriptors";
 import { skipProps } from "./skipProps";
-const propMapper = (key, value, styleStateIn, subPropsIn) => {
+const propMapper = (key, value, styleState) => {
   if (lastFontFamilyToken = null, key === "elevationAndroid") return;
-  const { conf, styleProps, fontFamily, staticConfig } = styleStateIn;
+  const { conf, styleProps, fontFamily, staticConfig } = styleState;
   if (value === "unset") {
     const unsetVal = conf.unset?.[key];
     if (unsetVal != null)
@@ -18,17 +18,13 @@ const propMapper = (key, value, styleStateIn, subPropsIn) => {
     else
       return;
   }
-  const subProps = styleProps.fallbackProps || subPropsIn, styleState = subProps ? new Proxy(styleStateIn, {
-    get(_, k) {
-      return k === "curProps" ? subProps : Reflect.get(_, k);
-    }
-  }) : styleStateIn, { variants } = staticConfig;
+  styleProps.fallbackProps && (styleState.props = styleProps.fallbackProps);
+  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(", ")}`
   ), !styleProps.noExpand && variants && key in variants) {
-    styleState.curProps[key] = value;
     const variantValue = resolveVariants(key, value, styleProps, styleState, "");
     if (variantValue)
       return variantValue;
@@ -47,8 +43,7 @@ const propMapper = (key, value, styleStateIn, subPropsIn) => {
     key,
     value,
     variantValue,
-    variants,
-    curProps: { ...styleState.curProps }
+    variants
   }), console.groupEnd()), !variantValue) {
     if (process.env.TAMAGUI_WARN_ON_MISSING_VARIANT === "1" && typeof value != "boolean") {
       const name = staticConfig.componentName || "[UnnamedComponent]";
@@ -101,7 +96,7 @@ const variableToFontNameCache = /* @__PURE__ */ new WeakMap(), fontFamilyCache =
       if (styleProps.noExpand)
         res[subKey] = val;
       else if (variants && subKey in variants) {
-        if (styleState.curProps[subKey] = val, parentVariantKey && parentVariantKey === key)
+        if (parentVariantKey && parentVariantKey === key)
           res[subKey] = // SYNC WITH *1
           val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val;
         else {

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/propMapper.ts"],
-  "mappings": "AAAA,OAA0B;AAC1B,SAAS,uBAAuB;AAEhC,SAAS,iBAAiB;AAG1B,SAAS,kBAAkB,kBAAkB;AAS7C,SAAS,mBAAmB;AAC5B,SAAS,sBAAsB;AAC/B,SAAS,qBAAqB,wBAAwB;AACtD,SAAS,aAAa;AACtB,SAAS,yBAAyB;AAClC,SAAS,iBAAiB;AAEnB,MAAM,aAAyB,CAAC,KAAK,OAAO,cAAc,eAAe;AAK5E,MAJF,sBAAsB,MAIhB,QAAQ,mBAAoB;AAGlC,QAAM,EAAE,MAAM,YAAY,YAAY,aAAa,IAAI;AAEvD,MAAI,UAAU,SAAS;AACrB,UAAM,WAAW,KAAK,QAAQ,GAAG;AACjC,QAAI,YAAY;AACd,cAAQ;AAAA;AAGR;AAAA,EAEJ;AAKA,QAAM,WAAW,WAAW,iBAAiB,YACvC,aAAa,WACf,IAAI,MAAM,cAAc;AAAA,IACtB,IAAI,GAAG,GAAG;AACR,aAAO,MAAM,aAAa,WAAW,QAAQ,IAAI,GAAG,CAAC;AAAA,IACvD;AAAA,EACF,CAAC,IACD,cAEE,EAAE,SAAS,IAAI;AAerB,MAZE,QAAQ,IAAI,aAAa,iBACzB,cACA,WAAW,CAAC,MAAM,OAClB,EAAE,cAAc,KAAK,gBAErB,QAAQ;AAAA,IACN,2BAA2B,UAAU,sBAAsB,OAAO;AAAA,MAChE,KAAK;AAAA,IACP,EAAE,KAAK,IAAI,CAAC;AAAA,EACd,GAGE,CAAC,WAAW,YACV,YAAY,OAAO,UAAU;AAC/B,eAAW,SAAS,GAAG,IAAI;AAE3B,UAAM,eAAe,gBAAgB,KAAK,OAAO,YAAY,YAAY,EAAE;AAC3E,QAAI;AACF,aAAO;AAAA,EAEX;AAkBF,MAdK,WAAW,2BACV,OAAO,KAAK,eACd,MAAM,KAAK,WAAW,GAAG,IAIzB,UACE,MAAM,CAAC,MAAM,MACf,QAAQ,eAAe,KAAK,OAAO,WAAW,eAAe,UAAU,IAC9D,WAAW,KAAK,MACzB,QAAQ,qBAAqB,KAAK,OAAO,WAAW,aAAa,KAIjE,SAAS,MAAM;AACjB,UAAM,UAAU,WAAW,WAAW,OAAO,YAAY,KAAK,KAAK,MAAM;AAAA,MACvE,CAAC,KAAK,KAAK;AAAA,IACb;AACA,WAAI,QAAQ,gBAAgB,uBAC1B,gBAAgB,IAAI,QAAQ,mBAAmB,GAE1C;AAAA,EACT;AACF,GAEM,kBAAiC,CACrC,KACA,OACA,YACA,YACA,qBACG;AACH,QAAM,EAAE,cAAc,MAAM,MAAM,IAAI,YAChC,EAAE,SAAS,IAAI;AACrB,MAAI,CAAC,SAAU;AAEf,MAAI,eAAe,qBAAqB,SAAS,GAAG,GAAG,OAAO,IAAI;AAclE,MAZI,QAAQ,IAAI,aAAa,iBAAiB,UAAU,cACtD,QAAQ,eAAe,wDAA0B,GAAG,EAAE,GACtD,QAAQ,KAAK;AAAA,IACX;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,UAAU,EAAE,GAAG,WAAW,SAAS;AAAA,EACrC,CAAC,GACD,QAAQ,SAAS,IAGf,CAAC,cAAc;AAGjB,QAAI,QAAQ,IAAI,oCAAoC,OAE9C,OAAO,SAAU,WAAW;AAC9B,YAAM,OAAO,aAAa,iBAAiB;AAC3C,cAAQ;AAAA,QACN,qBAAqB,IAAI,iBAAiB,GAAG,6BAA6B,KAAK;AAAA,MACjF;AAAA,IACF;AAEF;AAAA,EACF;AAEA,MAAI,OAAO,gBAAiB,YAAY;AACtC,UAAM,KAAK,cACL,SAAS,iBAAiB,UAAU;AAC1C,mBAAe,GAAG,OAAO,MAAM,GAE3B,QAAQ,IAAI,aAAa,iBAAiB,UAAU,cACtD,QAAQ,eAAe,kCAAkC,GAAG,GAC5D,QAAQ,KAAK,EAAE,IAAI,cAAc,OAAO,CAAC,GACzC,QAAQ,SAAS;AAAA,EAErB;AAEA,MAAI;AAEJ,MAAI,MAAM,YAAY,GAAG;AACvB,UAAM,mBACJ,aAAa,cAAc,aAAa,KAAK,kBAAkB,UAAU;AAE3E,IAAI,qBACF,mBAAmB,gCAAgC,kBAAkB,IAAI,GACzE,WAAW,aAAa,kBAEpB,QAAQ,IAAI,aAAa,iBAAiB,UAAU,aACtD,QAAQ,KAAK,2BAA2B,gBAAgB,IAI5D,eAAe;AAAA,MACb;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,MAAI,cAAc;AAChB,UAAM,WAAW,eAAe,cAAc,CAAC,CAAC,WAAW,WAAW;AACtE,IAAI,QAAQ,IAAI,aAAa,iBAAiB,UAAU,aACtD,QAAQ,KAAK,6BAA6B,cAAc,MAAM,QAAQ;AAExE,UAAM,OAAO,OAAO,QAAQ,QAAQ;AAGpC,WAAI,oBAAoB,iBAAiB,CAAC,MAAM,OAC9C,gBAAgB,IAAI,MAAM,iBAAiB,gBAAgB,CAAC,GAGvD;AAAA,EACT;AACF;AAIO,SAAS,gCAAgC,OAAY,MAA6B;AACvF,MAAI,WAAW,KAAK,GAAG;AACrB,UAAM,MAAM,wBAAwB,IAAI,KAAK;AAC7C,QAAI,IAAK,QAAO;AAChB,eAAW,OAAO,KAAK,aAAa;AAClC,YAAM,iBAAiB,KAAK,YAAY,GAAG,EAAE;AAC7C,UAAI,WAAW,cAAc,MAC3B,wBAAwB,IAAI,gBAAgB,GAAG,GAC3C,mBAAmB;AACrB,eAAO;AAAA,IAGb;AAAA,EACF,WAAW,OAAO,SAAU,YACtB,MAAM,CAAC,MAAM;AACf,WAAO;AAGb;AAEA,MAAM,0BAA0B,oBAAI,QAA0B,GAGxD,kBAAkB,oBAAI,QAAQ,GACvB,0BAA0B,CAAC,aAC/B,YAAY,gBAAgB,IAAI,QAAQ,GAG3C,2BAAkD,CACtD,KACA,OACA,YACA,YACA,qBACG;AACH,QAAM,EAAE,MAAM,cAAc,OAAO,MAAM,IAAI,YACvC,EAAE,SAAS,IAAI,cACf,MAAM,CAAC;AAEb,EAAI,QAAQ,IAAI,aAAa,iBAAiB,UAAU,aACtD,QAAQ,KAAK,iCAAiC,KAAK,KAAK;AAG1D,aAAW,QAAQ,OAAO;AACxB,UAAM,SAAS,KAAK,WAAW,IAAI,KAAK,MAClC,MAAM,MAAM,IAAI;AAEtB,QAAI,GAAC,WAAW,UAAU,UAAU,YAIpC;AAAA,UAAI,WAAW;AACb,YAAI,MAAM,IAAI;AAAA,eAEV,YAAY,UAAU,UAAU;AAMlC,YAJA,WAAW,SAAS,MAAM,IAAI,KAI1B,oBAAoB,qBAAqB;AAC3C,cAAI,MAAM;AAAA,UAER,IAAI,CAAC,MAAM,MACP,eAAe,QAAQ,KAAK,WAAW,eAAe,UAAU,IAChE;AAAA,aACD;AACL,gBAAM,aAAa,gBAAgB,QAAQ,KAAK,YAAY,YAAY,GAAG;AAG3E,cAAI;AACF,uBAAW,CAACA,MAAKC,IAAG,KAAK;AACvB,cAAIA,QAAO,SACPD,QAAO,qBACT,IAAIA,IAAG,MAAM,CAAC,GACd,OAAO,OAAO,IAAIA,IAAG,GAAGC,IAAG,KAE3B,IAAID,IAAG,IAAIC;AAAA,QAInB;AACA;AAAA,MACF;AAGF,UAAI,WAAW,GAAG,GAAG;AACnB,YAAI,MAAM,IAAI,qBAAqB,QAAQ,KAAK,WAAW,aAAa,GACpE,QAAQ,IAAI,aAAa,iBAAiB,UAAU,aACtD,QAAQ,KAAK,YAAY,QAAQ,IAAI,MAAM,CAAC;AAE9C;AAAA,MACF;AAEA,UAAI,OAAO,OAAQ,UAAU;AAC3B,cAAM;AAAA;AAAA,UAEJ,IAAI,CAAC,MAAM,MACP,eAAe,QAAQ,KAAK,WAAW,eAAe,UAAU,IAChE;AAAA;AAEN,YAAI,MAAM,IAAI;AACd;AAAA,MACF;AAEA,UAAI,MAAM,GAAG,GAAG;AACd,cAAM,YAAY,yBAAyB,QAAQ,KAAK,YAAY,YAAY,GAAG;AAEnF,QAAI,QAAQ,IAAI,aAAa,iBAAiB,UAAU,aACtD,QAAQ,KAAK,UAAU,QAAQ,SAAS,GAI1C,IAAI,MAAM,MAAM,CAAC,GACjB,OAAO,OAAO,IAAI,MAAM,GAAG,SAAS;AAAA,MACtC;AAEE,YAAI,MAAM,IAAI;AAGhB,MAAI,QAAQ,IAAI,aAAa,iBACvB,SACE,IAAI,MAAM,IAAI,CAAC,MAAM,OACvB,QAAQ;AAAA,QACN,uCAA6B,MAAM,IAAI;AAAA,QACvC;AAAA,QACA,IAAI,MAAM;AAAA,QACV;AAAA,MACF;AAAA;AAAA,EAIR;AAEA,SAAO;AACT,GAEM,YAAY,CAAC,QAAQ,SAAS,UAAU,SAAS,QAAQ,EAAE,IAAI,CAAC,UAAU;AAAA,EAC9E;AAAA,EACA,YAAY,MAAM,IAAI;AACxB,EAAE;AAGF,SAAS,qBAAqB,SAAc,OAAY,MAA6B;AACnF,MAAI,OAAO,WAAY;AACrB,WAAO;AAET,QAAM,QAAQ,QAAQ,KAAK;AAC3B,MAAI;AACF,WAAO;AAET,MAAI,SAAS,MAAM;AACjB,UAAM,EAAE,aAAa,IAAI;AACzB,eAAW,EAAE,MAAM,WAAW,KAAK;AACjC,UAAI,cAAc,WAAW,SAAS,aAAa,IAAI;AACrD,eAAO,QAAQ,UAAU;AAG7B,UAAM,kBAAkB,QAAQ,aAAa;AAC7C,QAAI,mBAAmB,KAAK,eAAe,IAAI,KAAK;AAClD,aAAO;AAAA,EAEX;AAEA,SAAO,QAAQ,IAAI,OAAO,KAAK,EAAE,KAAK,QAAQ,KAAK;AACrD;AAEA,MAAM,gBAAgB;AAAA,EACpB,UAAU;AAAA,EACV,YAAY;AACd;AAEA,IAAI,sBAA2B;AAExB,MAAM,iBAAiB,CAC5B,KACA,OACA,YAA+B,QAC/B,eACG;AACH,MAAI,cAAc;AAChB,WAAO;AAGT,QAAM,EAAE,OAAO,OAAO,UAAU,GAAG,SAAS,YAAY,aAAa,IAAI,YAEnE,eAAe,KAAK;AAC1B,MAAI,UACA,SAAS;AAEb,QAAM,oBAAoB,cAAc,SAAS,GAAG;AACpD,MAAI,mBAAmB;AACrB,UAAM,MAAM,QAAQ,KAAK,KAAK,aAAa,iBAAiB,EAAE,KAAK;AACnE,IAAI,OAAO,SACT,YAAY,SACZ,WAAW,KACX,SAAS;AAAA,EAEb;AAEA,MAAI,SAAS,SAAS,OAAO;AAE3B,QADA,WAAW,MAAM,KAAK,GAClB,WAAW,4BAA4B,UAAU;AACnD,aAAI,QAAQ,IAAI,aAAa,iBAAiB,WAAW,UAAU,aACjE,QAAQ;AAAA,QACN,2BAA2B,KAAK,QAAQ,GAAG;AAAA,MAC7C,GAEK;AAET,IAAI,QAAQ,IAAI,aAAa,iBAAiB,WAAW,UAAU,aACjE,QAAQ,KAAK,gBAAgB,GAAG,mBAAmB,KAAK,KAAK,UAAU,GAAG,EAAE,GAE9E,SAAS;AAAA,EACX,OAAO;AACL,QAAI,SAAS,KAAK;AAChB,eAAS,IACT,WAAW,KAAK,eAAe,KAAK;AAAA,SAC/B;AACL,cAAQ,KAAK;AAAA,QACX,KAAK,cAAc;AAIjB,sBAHoB,SAAS,WACzB,oBAAoB,KAAK,aAAa,QAAQ,QAAQ,IACtD,KAAK,aACc,KAAK,GAAG,UAAU,OACzC,sBAAsB,OACtB,SAAS;AACT;AAAA,QACF;AAAA,QACA,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK,cAAc;AACjB,gBAAM,cAAc,KAAK,eAAe,SAClC,MAAM,cAAc;AAC1B,cAAI,KAAK;AACP,kBAAM,cAAc,SAAS,WACzB,oBAAoB,KAAK,aAAa,QAAQ,QAAQ,IACtD,KAAK;AAET,wBADa,YAAY,GAAG,KAAK,YAAY,WAAW,KACtC,cAAc,GAAG,KAAK,GAAG,IAAI,KAAK,KAAK,OACzD,SAAS;AAAA,UACX;AACA;AAAA,QACF;AAAA,MACF;AACA,iBAAW,OAAO;AAChB,YAAI,OAAO,gBAAgB,GAAG,GAAG;AAC/B,gBAAM,MAAM,aAAa,GAAG,EAAE,KAAK;AACnC,UAAI,OAAO,SACT,WAAW,KACX,SAAS;AAAA,QAEb;AAAA,IAEJ;AAEA,QAAI,CAAC,QAAQ;AACX,YAAM,WAAW,aAAa,MAAM,KAAK;AACzC,MAAI,YAAY,SACd,WAAW,UACX,SAAS;AAAA,IAEb;AAAA,EACF;AAEA,MAAI,QAAQ;AACV,UAAM,MAAM,qBAAqB,KAAK,UAAU,SAAS;AACzD,WAAI,QAAQ,IAAI,aAAa,iBAAiB,WAAW,UAAU,aACjE,QAAQ,KAAK,YAAY,WAAW,UAAU,GAAG,GAE5C;AAAA,EACT;AAIA,EAAI,QAAQ,IAAI,aAAa,iBAAiB,WAAW,UAAU,aACjE,QAAQ,KAAK,+BAA+B,GAAG,YAAY;AAE/D;AAEA,SAAS,qBACP,KACA,UACA,eACA;AACA,MAAI,kBAAkB,OAAQ,QAAO;AACrC,MAAI,WAAW,QAAQ,GAAG;AACxB,QAAI,kBAAkB;AACpB,aAAO,SAAS;AAGlB,UAAM,MAAM,UAAU;AAIpB,WAAI,OAAO,OAAQ,aACV,IAAI,kBAAkB,QAAQ,QAAQ,MAAS,IAIM,SAAS;AAAA,EAC3E;AACA,SAAO;AACT;",
+  "mappings": "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",
   "names": ["key", "val"]
 }

package/dist/esm/helpers/propMapper.mjs

@@ -8,29 +8,23 @@ import { getFontsForLanguage, getVariantExtras } from "./getVariantExtras.mjs";
 import { isObj } from "./isObj.mjs";
 import { pseudoDescriptors } from "./pseudoDescriptors.mjs";
 import { skipProps } from "./skipProps.mjs";
-const propMapper = (key, value, styleStateIn, subPropsIn) => {
+const propMapper = (key, value, styleState) => {
     if (lastFontFamilyToken = null, key === "elevationAndroid") return;
     const {
       conf,
       styleProps,
       fontFamily,
       staticConfig
-    } = styleStateIn;
+    } = styleState;
     if (value === "unset") {
       const unsetVal = conf.unset?.[key];
       if (unsetVal != null) value = unsetVal;else return;
     }
-    const subProps = styleProps.fallbackProps || subPropsIn,
-      styleState = subProps ? new Proxy(styleStateIn, {
-        get(_, k) {
-          return k === "curProps" ? subProps : Reflect.get(_, k);
-        }
-      }) : styleStateIn,
-      {
-        variants
-      } = staticConfig;
+    styleProps.fallbackProps && (styleState.props = styleProps.fallbackProps);
+    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(", ")}`), !styleProps.noExpand && variants && key in variants) {
-      styleState.curProps[key] = value;
       const variantValue = resolveVariants(key, value, styleProps, styleState, "");
       if (variantValue) return variantValue;
     }
@@ -54,10 +48,7 @@ const propMapper = (key, value, styleStateIn, subPropsIn) => {
       key,
       value,
       variantValue,
-      variants,
-      curProps: {
-        ...styleState.curProps
-      }
+      variants
     }), console.groupEnd()), !variantValue) {
       if (process.env.TAMAGUI_WARN_ON_MISSING_VARIANT === "1" && typeof value != "boolean") {
         const name = staticConfig.componentName || "[UnnamedComponent]";
@@ -116,7 +107,7 @@ const variableToFontNameCache = /* @__PURE__ */new WeakMap(),
         val = value[_key];
       if (!(!styleProps.noSkip && subKey in skipProps)) {
         if (styleProps.noExpand) res[subKey] = val;else if (variants && subKey in variants) {
-          if (styleState.curProps[subKey] = val, parentVariantKey && parentVariantKey === key) res[subKey] =
+          if (parentVariantKey && parentVariantKey === key) res[subKey] =
           // SYNC WITH *1
           val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val;else {
             const variantOut = resolveVariants(subKey, val, styleProps, styleState, key);

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

@@ -1 +1 @@
-{"version":3,"names":["tokenCategories","getConfig","getVariableValue","isVariable","expandStyle","normalizeStyle","getFontsForLanguage","getVariantExtras","isObj","pseudoDescriptors","skipProps","propMapper","key","value","styleStateIn","subPropsIn","lastFontFamilyToken","conf","styleProps","fontFamily","staticConfig","unsetVal","unset","subProps","fallbackProps","styleState","Proxy","get","_","k","Reflect","variants","process","env","NODE_ENV","fontsParsed","console","warn","Object","keys","join","noExpand","curProps","variantValue","resolveVariants","disableExpandShorthands","shorthands","getTokenForKey","resolveValues","resolveVariableValue","result","fontFamilyCache","set","parentVariantKey","debug","getVariantDefinition","groupCollapsed","info","groupEnd","TAMAGUI_WARN_ON_MISSING_VARIANT","name","componentName","fn","extras","fontFamilyResult","fontFamilyUpdate","inverseShorthands","getFontFamilyFromNameOrVariable","resolveTokensAndVariants","expanded","noNormalize","next","entries","input","val","variableToFontNameCache","familyVariable","family","WeakMap","getPropMappedFontFamily","theme","res","_key","subKey","noSkip","variantOut","key2","val2","assign","fVal","subObject","tokenCats","map","spreadName","variant","exact","tokensParsed","fontSizeVariant","fontSizeTokens","has","fontShorthand","fontSize","fontWeight","resolveAs","context","valOrVar","hasSet","customTokenAccept","accept","skipThemeTokenResolution","specificTokens","language","defaultFont","fam","cat","spaceVar","space","out","variable"],"sources":["../../../src/helpers/propMapper.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["tokenCategories","getConfig","getVariableValue","isVariable","expandStyle","normalizeStyle","getFontsForLanguage","getVariantExtras","isObj","pseudoDescriptors","skipProps","propMapper","key","value","styleState","lastFontFamilyToken","conf","styleProps","fontFamily","staticConfig","unsetVal","unset","fallbackProps","props","variants","process","env","NODE_ENV","fontsParsed","console","warn","Object","keys","join","noExpand","variantValue","resolveVariants","disableExpandShorthands","shorthands","getTokenForKey","resolveValues","resolveVariableValue","result","fontFamilyCache","set","parentVariantKey","debug","getVariantDefinition","groupCollapsed","info","groupEnd","TAMAGUI_WARN_ON_MISSING_VARIANT","name","componentName","fn","extras","fontFamilyResult","fontFamilyUpdate","inverseShorthands","getFontFamilyFromNameOrVariable","resolveTokensAndVariants","expanded","noNormalize","next","entries","input","val","variableToFontNameCache","get","familyVariable","family","WeakMap","getPropMappedFontFamily","theme","res","_key","subKey","noSkip","variantOut","key2","val2","assign","fVal","subObject","tokenCats","map","spreadName","variant","exact","tokensParsed","fontSizeVariant","fontSizeTokens","has","fontShorthand","fontSize","fontWeight","resolveAs","context","valOrVar","hasSet","customTokenAccept","accept","skipThemeTokenResolution","specificTokens","language","defaultFont","fam","cat","spaceVar","space","out","variable"],"sources":["../../../src/helpers/propMapper.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

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

@@ -16,14 +16,6 @@ function _array_like_to_array(arr, len) {
 function _array_with_holes(arr) {
   if (Array.isArray(arr)) return arr;
 }
-function _define_property(obj, key, value) {
-  return key in obj ? Object.defineProperty(obj, key, {
-    value,
-    enumerable: !0,
-    configurable: !0,
-    writable: !0
-  }) : obj[key] = value, obj;
-}
 function _iterable_to_array_limit(arr, i) {
   var _i = arr == null ? null : typeof Symbol < "u" && arr[Symbol.iterator] || arr["@@iterator"];
   if (_i != null) {
@@ -46,17 +38,6 @@ function _iterable_to_array_limit(arr, i) {
 function _non_iterable_rest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _object_spread(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {}, ownKeys = Object.keys(source);
-    typeof Object.getOwnPropertySymbols == "function" && (ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-      return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-    }))), ownKeys.forEach(function(key) {
-      _define_property(target, key, source[key]);
-    });
-  }
-  return target;
-}
 function _sliced_to_array(arr, i) {
   return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
 }
@@ -72,9 +53,9 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
   }
 }
-var propMapper = function(key, value, styleStateIn, subPropsIn) {
+var propMapper = function(key, value, styleState) {
   if (lastFontFamilyToken = null, !(!isAndroid && key === "elevationAndroid")) {
-    var conf = styleStateIn.conf, styleProps = styleStateIn.styleProps, fontFamily = styleStateIn.fontFamily, staticConfig = styleStateIn.staticConfig;
+    var conf = styleState.conf, styleProps = styleState.styleProps, fontFamily = styleState.fontFamily, staticConfig = styleState.staticConfig;
     if (value === "unset") {
       var _conf_unset, unsetVal = (_conf_unset = conf.unset) === null || _conf_unset === void 0 ? void 0 : _conf_unset[key];
       if (unsetVal != null)
@@ -82,13 +63,9 @@ var propMapper = function(key, value, styleStateIn, subPropsIn) {
       else
         return;
     }
-    var subProps = styleProps.fallbackProps || subPropsIn, styleState = subProps ? new Proxy(styleStateIn, {
-      get: function(_, k) {
-        return k === "curProps" ? subProps : Reflect.get(_, k);
-      }
-    }) : styleStateIn, variants = staticConfig.variants;
+    styleProps.fallbackProps && (styleState.props = styleProps.fallbackProps);
+    var variants = staticConfig.variants;
     if (process.env.NODE_ENV === "development" && fontFamily && fontFamily[0] === "$" && !(fontFamily in conf.fontsParsed) && console.warn('Warning: no fontFamily "'.concat(fontFamily, '" found in config: ').concat(Object.keys(conf.fontsParsed).join(", "))), !styleProps.noExpand && variants && key in variants) {
-      styleState.curProps[key] = value;
       var variantValue = resolveVariants(key, value, styleProps, styleState, "");
       if (variantValue)
         return variantValue;
@@ -111,8 +88,7 @@ var propMapper = function(key, value, styleStateIn, subPropsIn) {
       key,
       value,
       variantValue,
-      variants,
-      curProps: _object_spread({}, styleState.curProps)
+      variants
     }), console.groupEnd()), !variantValue) {
       if (process.env.TAMAGUI_WARN_ON_MISSING_VARIANT === "1" && typeof value != "boolean") {
         var name = staticConfig.componentName || "[UnnamedComponent]";
@@ -164,7 +140,7 @@ var variableToFontNameCache = /* @__PURE__ */ new WeakMap(), fontFamilyCache = /
       if (styleProps.noExpand)
         res[subKey] = val;
       else if (variants && subKey in variants) {
-        if (styleState.curProps[subKey] = val, parentVariantKey && parentVariantKey === key)
+        if (parentVariantKey && parentVariantKey === key)
           res[subKey] = // SYNC WITH *1
           val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val;
         else {

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/Users/n8/tamagui/code/core/web/src/helpers/propMapper.ts"],
-  "mappings": "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",
-  "names": ["isAndroid", "tokenCategories", "getConfig", "getVariableValue", "isVariable", "expandStyle", "normalizeStyle", "getFontsForLanguage", "getVariantExtras", "isObj", "pseudoDescriptors", "skipProps", "propMapper", "key", "value", "styleStateIn", "subPropsIn", "lastFontFamilyToken", "conf", "styleProps", "fontFamily", "staticConfig", "unsetVal", "unset", "subProps", "fallbackProps", "styleState", "Proxy", "get", "_", "k", "Reflect", "variants", "process", "env", "NODE_ENV", "fontsParsed", "console", "warn", "Object", "keys", "join", "noExpand", "curProps", "variantValue", "resolveVariants", "disableExpandShorthands", "shorthands", "getTokenForKey", "resolveValues", "resolveVariableValue", "result", "fontFamilyCache", "set", "parentVariantKey", "debug", "getVariantDefinition", "groupCollapsed", "info", "groupEnd", "TAMAGUI_WARN_ON_MISSING_VARIANT", "name", "componentName", "fn", "extras", "fontFamilyResult", "fontFamilyUpdate", "inverseShorthands", "getFontFamilyFromNameOrVariable", "resolveTokensAndVariants", "expanded", "noNormalize", "next", "entries", "input", "val", "variableToFontNameCache", "familyVariable", "family", "WeakMap", "getPropMappedFontFamily", "theme", "res", "_key", "subKey", "noSkip", "variantOut", "assign", "fVal", "subObject", "tokenCats", "map", "spreadName", "variant", "exact", "tokensParsed", "fontSizeVariant", "fontSizeTokens", "has", "fontShorthand", "fontSize", "fontWeight", "resolveAs", "context", "valOrVar", "hasSet", "customTokenAccept", "accept", "skipThemeTokenResolution", "specificTokens", "language", "defaultFont", "fam", "font", "cat", "spaceVar", "space", "out", "undefined"]
+  "mappings": "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",
+  "names": ["isAndroid", "tokenCategories", "getConfig", "getVariableValue", "isVariable", "expandStyle", "normalizeStyle", "getFontsForLanguage", "getVariantExtras", "isObj", "pseudoDescriptors", "skipProps", "propMapper", "key", "value", "styleState", "lastFontFamilyToken", "conf", "styleProps", "fontFamily", "staticConfig", "unsetVal", "unset", "fallbackProps", "props", "variants", "process", "env", "NODE_ENV", "fontsParsed", "console", "warn", "Object", "keys", "join", "noExpand", "variantValue", "resolveVariants", "disableExpandShorthands", "shorthands", "getTokenForKey", "resolveValues", "resolveVariableValue", "result", "fontFamilyCache", "set", "parentVariantKey", "debug", "getVariantDefinition", "groupCollapsed", "info", "groupEnd", "TAMAGUI_WARN_ON_MISSING_VARIANT", "name", "componentName", "fn", "extras", "fontFamilyResult", "fontFamilyUpdate", "inverseShorthands", "getFontFamilyFromNameOrVariable", "resolveTokensAndVariants", "expanded", "noNormalize", "next", "entries", "input", "val", "variableToFontNameCache", "get", "familyVariable", "family", "WeakMap", "getPropMappedFontFamily", "theme", "res", "_key", "subKey", "noSkip", "variantOut", "assign", "fVal", "subObject", "tokenCats", "map", "spreadName", "variant", "exact", "tokensParsed", "fontSizeVariant", "fontSizeTokens", "has", "fontShorthand", "fontSize", "fontWeight", "resolveAs", "context", "valOrVar", "hasSet", "customTokenAccept", "accept", "skipThemeTokenResolution", "specificTokens", "language", "defaultFont", "fam", "font", "cat", "spaceVar", "space", "out", "undefined"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.109.9",
+  "version": "1.110.1",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,18 +27,18 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "1.109.9",
-    "@tamagui/constants": "1.109.9",
-    "@tamagui/helpers": "1.109.9",
-    "@tamagui/normalize-css-color": "1.109.9",
-    "@tamagui/timer": "1.109.9",
-    "@tamagui/types": "1.109.9",
-    "@tamagui/use-did-finish-ssr": "1.109.9",
-    "@tamagui/use-event": "1.109.9",
-    "@tamagui/use-force-update": "1.109.9"
+    "@tamagui/compose-refs": "1.110.1",
+    "@tamagui/constants": "1.110.1",
+    "@tamagui/helpers": "1.110.1",
+    "@tamagui/normalize-css-color": "1.110.1",
+    "@tamagui/timer": "1.110.1",
+    "@tamagui/types": "1.110.1",
+    "@tamagui/use-did-finish-ssr": "1.110.1",
+    "@tamagui/use-event": "1.110.1",
+    "@tamagui/use-force-update": "1.110.1"
   },
   "devDependencies": {
-    "@tamagui/build": "1.109.9",
+    "@tamagui/build": "1.110.1",
     "@testing-library/react": "^16.0.0",
     "csstype": "^3.0.10",
     "typescript": "^5.5.2",

package/src/createComponent.tsx

@@ -480,11 +480,8 @@ export function createComponent<
         // if not set, use context
         if (propVal === undefined) {
           if (contextValue) {
-            const isValidValue = key in validStyles || key in variants
-            if (isValidValue) {
-              styledContextProps ||= {}
-              styledContextProps[key] = contextValue[key]
-            }
+            styledContextProps ||= {}
+            styledContextProps[key] = contextValue[key]
           }
         }
         // if set in props, update context

package/src/helpers/getSplitStyles.tsx

@@ -188,17 +188,7 @@ export const getSplitStyles: StyleSplitter = (
   /**
    * Not the biggest fan of creating an object but it is a nice API
    */
-  let curPropsState
   const styleState: GetStyleState = {
-    // this should go away, right now we're doing really crazy cumulative props,
-    // as variants are resolved basically we go back and merge the results onto
-    // the curProps, so that each following variant function recieves the current
-    // "styles" with variants expanded. powerful, but i think too fancy
-    // there's some part of the ui kit that depends on it we'd have to find and fix
-    get curProps() {
-      curPropsState ||= {}
-      return curPropsState
-    },
     classNames,
     conf,
     props,
@@ -339,13 +329,6 @@ export const getSplitStyles: StyleSplitter = (
       }
     }
 
-    // if (valInit !== props[keyInit]) {
-    //   // we collect updated props as we go, for functional variants later
-    //   // functional variants receive a prop object that represents the current
-    //   // props at that point in the loop
-    //   styleState.curProps[keyInit] = valInit
-    // }
-
     if (process.env.TAMAGUI_TARGET === 'native') {
       if (!isValidStyleKeyInit) {
         if (!isAndroid) {
@@ -550,7 +533,6 @@ export const getSplitStyles: StyleSplitter = (
           variant: variants?.[keyInit],
           isVariant,
           isHOCShouldPassThrough,
-          curProps: { ...styleState.curProps },
           parentStaticConfig,
         })
       }
@@ -634,7 +616,6 @@ export const getSplitStyles: StyleSplitter = (
             shouldPassProp,
             isHOCShouldPassThrough,
             usedKeys: { ...usedKeys },
-            curProps: { ...styleState.curProps },
           })
           log('expanded', expanded, '\nusedKeys', { ...usedKeys }, '\ncurrent', {
             ...styleState.style,
@@ -1497,13 +1478,13 @@ export const getSubStyle = (
   styleIn: Object,
   avoidMergeTransform?: boolean
 ): TextStyle => {
-  const { staticConfig, props, conf, styleProps } = styleState
+  const { staticConfig, conf, styleProps } = styleState
   const styleOut: TextStyle = {}
 
   for (let key in styleIn) {
     const val = styleIn[key]
     key = conf.shorthands[key] || key
-    const expanded = propMapper(key, val, styleState, { ...props, ...props[subKey] })
+    const expanded = propMapper(key, val, styleState)
     if (!expanded || (!staticConfig.isHOC && key in skipProps && !styleProps.noSkip)) {
       continue
     }

package/src/helpers/getVariantExtras.tsx

@@ -9,7 +9,7 @@ export const getVariantExtras = (styleState: GetStyleState) => {
     return cache.get(styleState)
   }
 
-  const { curProps, props, conf, context, theme } = styleState
+  const { props, conf, context, theme } = styleState
   let fonts = conf.fontsParsed
   if (context?.language) {
     fonts = getFontsForLanguage(conf.fontsParsed, context.language)
@@ -21,7 +21,7 @@ export const getVariantExtras = (styleState: GetStyleState) => {
     theme,
     get fontFamily() {
       return (
-        getVariableValue(styleState.fontFamily || styleState.curProps.fontFamily) ||
+        getVariableValue(styleState.fontFamily || styleState.props.fontFamily) ||
         props.fontFamily ||
         getVariableValue(styleState.conf.defaultFont)
       )
@@ -34,18 +34,7 @@ export const getVariantExtras = (styleState: GetStyleState) => {
           : undefined)
       )
     },
-    // TODO do this in splitstlye
-    // we avoid passing in default props for media queries because that would confuse things like SizableText.size:
-    props: new Proxy(props, {
-      // handles shorthands
-      get(target, key) {
-        for (const tryKey of [key, conf.inverseShorthands[key as any]]) {
-          if (!tryKey) continue
-          if (Reflect.has(curProps, tryKey)) return Reflect.get(curProps, tryKey)
-          return Reflect.get(target, tryKey)
-        }
-      },
-    }),
+    props,
   }
 
   cache.set(styleState, next)