@tamagui/web 1.109.5 → 1.109.7

package/dist/cjs/helpers/getVariantExtras.js

@@ -30,12 +30,10 @@ const cache = /* @__PURE__ */ new WeakMap(), getVariantExtras = (styleState) =>
     tokens: conf.tokensParsed,
     theme,
     get fontFamily() {
-      return (0, import_createVariable.getVariableValue)(
-        styleState.fontFamily || styleState.curProps.fontFamily || styleState.conf.defaultFont
-      );
+      return (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.curProps.fontFamily) || props.fontFamily || (0, import_createVariable.getVariableValue)(styleState.conf.defaultFont);
     },
     get font() {
-      return fonts[this.fontFamily] || fonts[styleState.conf.defaultFont];
+      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:

package/dist/cjs/helpers/getVariantExtras.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/getVariantExtras.tsx"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAiC;AAIjC,MAAM,QAAQ,oBAAI,QAAQ,GAEb,mBAAmB,CAAC,eAA8B;AAC7D,MAAI,MAAM,IAAI,UAAU;AACtB,WAAO,MAAM,IAAI,UAAU;AAG7B,QAAM,EAAE,UAAU,OAAO,MAAM,SAAS,MAAM,IAAI;AAClD,MAAI,QAAQ,KAAK;AACjB,EAAI,SAAS,aACX,QAAQ,oBAAoB,KAAK,aAAa,QAAQ,QAAQ;AAGhE,QAAM,OAAO;AAAA,IACX;AAAA,IACA,QAAQ,KAAK;AAAA,IACb;AAAA,IACA,IAAI,aAAa;AACf,iBAAO;AAAA,QACL,WAAW,cACT,WAAW,SAAS,cACpB,WAAW,KAAK;AAAA,MACpB;AAAA,IACF;AAAA,IACA,IAAI,OAAO;AACT,aAAO,MAAM,KAAK,UAAU,KAAK,MAAM,WAAW,KAAK,WAAY;AAAA,IACrE;AAAA;AAAA;AAAA,IAGA,OAAO,IAAI,MAAM,OAAO;AAAA;AAAA,MAEtB,IAAI,QAAQ,KAAK;AACf,mBAAW,UAAU,CAAC,KAAK,KAAK,kBAAkB,GAAU,CAAC;AAC3D,cAAK;AACL,mBAAI,QAAQ,IAAI,UAAU,MAAM,IAAU,QAAQ,IAAI,UAAU,MAAM,IAC/D,QAAQ,IAAI,QAAQ,MAAM;AAAA,MAErC;AAAA,IACF,CAAC;AAAA,EACH;AAEA,eAAM,IAAI,YAAY,IAAI,GAEnB;AACT,GAEM,oBAAoB,oBAAI,QAAQ;AAE/B,SAAS,oBAAoB,OAAqB,UAA+B;AACtF,MAAI,kBAAkB,IAAI,QAAQ;AAChC,WAAO,kBAAkB,IAAI,QAAQ;AAEvC,QAAM,OAAO;AAAA,IACX,GAAG;AAAA,IACH,GAAG,OAAO;AAAA,MACR,OAAO,QAAQ,QAAQ,EAAE,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM;AAC7C,YAAI,SAAS;AACX,iBAAO,CAAC;AAEV,cAAM,UAAU,IAAI,IAAI,IAAI,IAAI;AAChC,eAAO,CAAC,IAAI,IAAI,IAAI,MAAM,OAAO,CAAC;AAAA,MACpC,CAAC;AAAA,IACH;AAAA,EACF;AACA,2BAAkB,IAAI,UAAU,IAAI,GAC7B;AACT;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAiC;AAIjC,MAAM,QAAQ,oBAAI,QAAQ,GAEb,mBAAmB,CAAC,eAA8B;AAC7D,MAAI,MAAM,IAAI,UAAU;AACtB,WAAO,MAAM,IAAI,UAAU;AAG7B,QAAM,EAAE,UAAU,OAAO,MAAM,SAAS,MAAM,IAAI;AAClD,MAAI,QAAQ,KAAK;AACjB,EAAI,SAAS,aACX,QAAQ,oBAAoB,KAAK,aAAa,QAAQ,QAAQ;AAGhE,QAAM,OAAO;AAAA,IACX;AAAA,IACA,QAAQ,KAAK;AAAA,IACb;AAAA,IACA,IAAI,aAAa;AACf,iBACE,wCAAiB,WAAW,cAAc,WAAW,SAAS,UAAU,KACxE,MAAM,kBACN,wCAAiB,WAAW,KAAK,WAAW;AAAA,IAEhD;AAAA,IACA,IAAI,OAAO;AACT,aACE,MAAM,KAAK,UAAU,MACpB,CAAC,MAAM,cAAc,MAAM,WAAW,CAAC,MAAM,MAC1C,MAAM,WAAW,KAAK,WAAY,IAClC;AAAA,IAER;AAAA;AAAA;AAAA,IAGA,OAAO,IAAI,MAAM,OAAO;AAAA;AAAA,MAEtB,IAAI,QAAQ,KAAK;AACf,mBAAW,UAAU,CAAC,KAAK,KAAK,kBAAkB,GAAU,CAAC;AAC3D,cAAK;AACL,mBAAI,QAAQ,IAAI,UAAU,MAAM,IAAU,QAAQ,IAAI,UAAU,MAAM,IAC/D,QAAQ,IAAI,QAAQ,MAAM;AAAA,MAErC;AAAA,IACF,CAAC;AAAA,EACH;AAEA,eAAM,IAAI,YAAY,IAAI,GAEnB;AACT,GAEM,oBAAoB,oBAAI,QAAQ;AAE/B,SAAS,oBAAoB,OAAqB,UAA+B;AACtF,MAAI,kBAAkB,IAAI,QAAQ;AAChC,WAAO,kBAAkB,IAAI,QAAQ;AAEvC,QAAM,OAAO;AAAA,IACX,GAAG;AAAA,IACH,GAAG,OAAO;AAAA,MACR,OAAO,QAAQ,QAAQ,EAAE,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM;AAC7C,YAAI,SAAS;AACX,iBAAO,CAAC;AAEV,cAAM,UAAU,IAAI,IAAI,IAAI,IAAI;AAChC,eAAO,CAAC,IAAI,IAAI,IAAI,MAAM,OAAO,CAAC;AAAA,MACpC,CAAC;AAAA,IACH;AAAA,EACF;AACA,2BAAkB,IAAI,UAAU,IAAI,GAC7B;AACT;",
   "names": []
 }

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

@@ -90,10 +90,10 @@ var cache = /* @__PURE__ */ new WeakMap(), getVariantExtras = function(styleStat
     tokens: conf.tokensParsed,
     theme,
     get fontFamily() {
-      return (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.curProps.fontFamily || styleState.conf.defaultFont);
+      return (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.curProps.fontFamily) || props.fontFamily || (0, import_createVariable.getVariableValue)(styleState.conf.defaultFont);
     },
     get font() {
-      return fonts[this.fontFamily] || fonts[styleState.conf.defaultFont];
+      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:

package/dist/cjs/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,4BAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIjC,IAAMA,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,iBAAOC,wCACLhB,WAAWe,cACTf,WAAWG,SAASY,cACpBf,WAAWK,KAAKY,WAAW;IAEjC;IACA,IAAIC,OAAO;AACT,aAAOV,MAAM,KAAKO,UAAU,KAAKP,MAAMR,WAAWK,KAAKY,WAAW;IACpE;;;IAGAb,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": ["cache", "WeakMap", "getVariantExtras", "styleState", "has", "get", "curProps", "props", "conf", "context", "theme", "fonts", "fontsParsed", "language", "getFontsForLanguage", "next", "tokens", "tokensParsed", "fontFamily", "getVariableValue", "defaultFont", "font", "Proxy", "target", "key", "inverseShorthands", "tryKey", "Reflect", "set", "fontLanguageCache", "Object", "fromEntries", "entries", "map", "name", "lang", "langKey"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA,4BAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIjC,IAAMA,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,iBACEC,wCAAiBhB,WAAWe,cAAcf,WAAWG,SAASY,UAAU,KACxEX,MAAMW,kBACNC,wCAAiBhB,WAAWK,KAAKY,WAAW;IAEhD;IACA,IAAIC,OAAO;AACT,aACEV,MAAM,KAAKO,UAAU,MACpB,CAACX,MAAMW,cAAcX,MAAMW,WAAW,CAAA,MAAO,MAC1CP,MAAMR,WAAWK,KAAKY,WAAW,IACjCE;IAER;;;IAGAf,OAAO,IAAIgB,MAAMhB,OAAO;;MAEtBF,KAAAA,SAAImB,QAAQC,KAAG;AACb,iBAAA,KAAA,GAAqB,QAAA;UAACA;UAAKjB,KAAKkB,kBAAkBD,GAAAA;WAAY,KAAzC,MAAA,QAAA,MAA2C;cAArDE,SAAU,MAAA,EAAA;AACnB,cAAKA;AACL,mBAAIC,QAAQxB,IAAIE,UAAUqB,MAAAA,IAAgBC,QAAQvB,IAAIC,UAAUqB,MAAAA,IACzDC,QAAQvB,IAAImB,QAAQG,MAAAA;QAC7B;MACF;IACF,CAAA;EACF;AAEA3B,eAAM6B,IAAI1B,YAAYY,IAAAA,GAEfA;AACT,GAEMe,oBAAoB,oBAAI7B,QAAAA;AAEvB,SAASa,oBAAoBH,OAAqBE,UAA6B;AACpF,MAAIiB,kBAAkB1B,IAAIS,QAAAA;AACxB,WAAOiB,kBAAkBzB,IAAIQ,QAAAA;AAE/B,MAAME,OAAO,eAAA,CAAA,GACRJ,OACAoB,OAAOC,YACRD,OAAOE,QAAQpB,QAAAA,EAAUqB,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;MAAQxB,MAAM0B,OAAAA;;EAC5B,CAAA,CAAA,CAAA;AAGJP,2BAAkBD,IAAIhB,UAAUE,IAAAA,GACzBA;AACT;",
+  "names": ["cache", "WeakMap", "getVariantExtras", "styleState", "has", "get", "curProps", "props", "conf", "context", "theme", "fonts", "fontsParsed", "language", "getFontsForLanguage", "next", "tokens", "tokensParsed", "fontFamily", "getVariableValue", "defaultFont", "font", "undefined", "Proxy", "target", "key", "inverseShorthands", "tryKey", "Reflect", "set", "fontLanguageCache", "Object", "fromEntries", "entries", "map", "name", "lang", "langKey"]
 }

package/dist/esm/helpers/getVariantExtras.js

@@ -10,12 +10,10 @@ const cache = /* @__PURE__ */ new WeakMap(), getVariantExtras = (styleState) =>
     tokens: conf.tokensParsed,
     theme,
     get fontFamily() {
-      return getVariableValue(
-        styleState.fontFamily || styleState.curProps.fontFamily || styleState.conf.defaultFont
-      );
+      return getVariableValue(styleState.fontFamily || styleState.curProps.fontFamily) || props.fontFamily || getVariableValue(styleState.conf.defaultFont);
     },
     get font() {
-      return fonts[this.fontFamily] || fonts[styleState.conf.defaultFont];
+      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:

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/getVariantExtras.tsx"],
-  "mappings": "AAAA,SAAS,wBAAwB;AAIjC,MAAM,QAAQ,oBAAI,QAAQ,GAEb,mBAAmB,CAAC,eAA8B;AAC7D,MAAI,MAAM,IAAI,UAAU;AACtB,WAAO,MAAM,IAAI,UAAU;AAG7B,QAAM,EAAE,UAAU,OAAO,MAAM,SAAS,MAAM,IAAI;AAClD,MAAI,QAAQ,KAAK;AACjB,EAAI,SAAS,aACX,QAAQ,oBAAoB,KAAK,aAAa,QAAQ,QAAQ;AAGhE,QAAM,OAAO;AAAA,IACX;AAAA,IACA,QAAQ,KAAK;AAAA,IACb;AAAA,IACA,IAAI,aAAa;AACf,aAAO;AAAA,QACL,WAAW,cACT,WAAW,SAAS,cACpB,WAAW,KAAK;AAAA,MACpB;AAAA,IACF;AAAA,IACA,IAAI,OAAO;AACT,aAAO,MAAM,KAAK,UAAU,KAAK,MAAM,WAAW,KAAK,WAAY;AAAA,IACrE;AAAA;AAAA;AAAA,IAGA,OAAO,IAAI,MAAM,OAAO;AAAA;AAAA,MAEtB,IAAI,QAAQ,KAAK;AACf,mBAAW,UAAU,CAAC,KAAK,KAAK,kBAAkB,GAAU,CAAC;AAC3D,cAAK;AACL,mBAAI,QAAQ,IAAI,UAAU,MAAM,IAAU,QAAQ,IAAI,UAAU,MAAM,IAC/D,QAAQ,IAAI,QAAQ,MAAM;AAAA,MAErC;AAAA,IACF,CAAC;AAAA,EACH;AAEA,eAAM,IAAI,YAAY,IAAI,GAEnB;AACT,GAEM,oBAAoB,oBAAI,QAAQ;AAE/B,SAAS,oBAAoB,OAAqB,UAA+B;AACtF,MAAI,kBAAkB,IAAI,QAAQ;AAChC,WAAO,kBAAkB,IAAI,QAAQ;AAEvC,QAAM,OAAO;AAAA,IACX,GAAG;AAAA,IACH,GAAG,OAAO;AAAA,MACR,OAAO,QAAQ,QAAQ,EAAE,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM;AAC7C,YAAI,SAAS;AACX,iBAAO,CAAC;AAEV,cAAM,UAAU,IAAI,IAAI,IAAI,IAAI;AAChC,eAAO,CAAC,IAAI,IAAI,IAAI,MAAM,OAAO,CAAC;AAAA,MACpC,CAAC;AAAA,IACH;AAAA,EACF;AACA,2BAAkB,IAAI,UAAU,IAAI,GAC7B;AACT;",
+  "mappings": "AAAA,SAAS,wBAAwB;AAIjC,MAAM,QAAQ,oBAAI,QAAQ,GAEb,mBAAmB,CAAC,eAA8B;AAC7D,MAAI,MAAM,IAAI,UAAU;AACtB,WAAO,MAAM,IAAI,UAAU;AAG7B,QAAM,EAAE,UAAU,OAAO,MAAM,SAAS,MAAM,IAAI;AAClD,MAAI,QAAQ,KAAK;AACjB,EAAI,SAAS,aACX,QAAQ,oBAAoB,KAAK,aAAa,QAAQ,QAAQ;AAGhE,QAAM,OAAO;AAAA,IACX;AAAA,IACA,QAAQ,KAAK;AAAA,IACb;AAAA,IACA,IAAI,aAAa;AACf,aACE,iBAAiB,WAAW,cAAc,WAAW,SAAS,UAAU,KACxE,MAAM,cACN,iBAAiB,WAAW,KAAK,WAAW;AAAA,IAEhD;AAAA,IACA,IAAI,OAAO;AACT,aACE,MAAM,KAAK,UAAU,MACpB,CAAC,MAAM,cAAc,MAAM,WAAW,CAAC,MAAM,MAC1C,MAAM,WAAW,KAAK,WAAY,IAClC;AAAA,IAER;AAAA;AAAA;AAAA,IAGA,OAAO,IAAI,MAAM,OAAO;AAAA;AAAA,MAEtB,IAAI,QAAQ,KAAK;AACf,mBAAW,UAAU,CAAC,KAAK,KAAK,kBAAkB,GAAU,CAAC;AAC3D,cAAK;AACL,mBAAI,QAAQ,IAAI,UAAU,MAAM,IAAU,QAAQ,IAAI,UAAU,MAAM,IAC/D,QAAQ,IAAI,QAAQ,MAAM;AAAA,MAErC;AAAA,IACF,CAAC;AAAA,EACH;AAEA,eAAM,IAAI,YAAY,IAAI,GAEnB;AACT,GAEM,oBAAoB,oBAAI,QAAQ;AAE/B,SAAS,oBAAoB,OAAqB,UAA+B;AACtF,MAAI,kBAAkB,IAAI,QAAQ;AAChC,WAAO,kBAAkB,IAAI,QAAQ;AAEvC,QAAM,OAAO;AAAA,IACX,GAAG;AAAA,IACH,GAAG,OAAO;AAAA,MACR,OAAO,QAAQ,QAAQ,EAAE,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM;AAC7C,YAAI,SAAS;AACX,iBAAO,CAAC;AAEV,cAAM,UAAU,IAAI,IAAI,IAAI,IAAI;AAChC,eAAO,CAAC,IAAI,IAAI,IAAI,MAAM,OAAO,CAAC;AAAA,MACpC,CAAC;AAAA,IACH;AAAA,EACF;AACA,2BAAkB,IAAI,UAAU,IAAI,GAC7B;AACT;",
   "names": []
 }

package/dist/esm/helpers/getVariantExtras.mjs

@@ -16,10 +16,10 @@ const cache = /* @__PURE__ */new WeakMap(),
       tokens: conf.tokensParsed,
       theme,
       get fontFamily() {
-        return getVariableValue(styleState.fontFamily || styleState.curProps.fontFamily || styleState.conf.defaultFont);
+        return getVariableValue(styleState.fontFamily || styleState.curProps.fontFamily) || props.fontFamily || getVariableValue(styleState.conf.defaultFont);
       },
       get font() {
-        return fonts[this.fontFamily] || fonts[styleState.conf.defaultFont];
+        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:

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,OAAOnB,gBAAA,CACLI,UAAA,CAAWe,UAAA,IACTf,UAAA,CAAWG,QAAA,CAASY,UAAA,IACpBf,UAAA,CAAWK,IAAA,CAAKW,WACpB;MACF;MACA,IAAIC,KAAA,EAAO;QACT,OAAOT,KAAA,CAAM,KAAKO,UAAU,KAAKP,KAAA,CAAMR,UAAA,CAAWK,IAAA,CAAKW,WAAY;MACrE;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","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":[]}

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

@@ -69,10 +69,10 @@ var cache = /* @__PURE__ */ new WeakMap(), getVariantExtras = function(styleStat
     tokens: conf.tokensParsed,
     theme,
     get fontFamily() {
-      return getVariableValue(styleState.fontFamily || styleState.curProps.fontFamily || styleState.conf.defaultFont);
+      return getVariableValue(styleState.fontFamily || styleState.curProps.fontFamily) || props.fontFamily || getVariableValue(styleState.conf.defaultFont);
     },
     get font() {
-      return fonts[this.fontFamily] || fonts[styleState.conf.defaultFont];
+      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:

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,aAAOnB,iBACLI,WAAWe,cACTf,WAAWG,SAASY,cACpBf,WAAWK,KAAKW,WAAW;IAEjC;IACA,IAAIC,OAAO;AACT,aAAOT,MAAM,KAAKO,UAAU,KAAKP,MAAMR,WAAWK,KAAKW,WAAW;IACpE;;;IAGAZ,OAAO,IAAIc,MAAMd,OAAO;;MAEtBF,KAAAA,SAAIiB,QAAQC,KAAG;AACb,iBAAA,KAAA,GAAqB,QAAA;UAACA;UAAKf,KAAKgB,kBAAkBD,GAAAA;WAAY,KAAzC,MAAA,QAAA,MAA2C;cAArDE,SAAU,MAAA,EAAA;AACnB,cAAKA;AACL,mBAAIC,QAAQtB,IAAIE,UAAUmB,MAAAA,IAAgBC,QAAQrB,IAAIC,UAAUmB,MAAAA,IACzDC,QAAQrB,IAAIiB,QAAQG,MAAAA;QAC7B;MACF;IACF,CAAA;EACF;AAEAzB,eAAM2B,IAAIxB,YAAYY,IAAAA,GAEfA;AACT,GAEMa,oBAAoB,oBAAI3B,QAAAA;AAEvB,SAASa,oBAAoBH,OAAqBE,UAA6B;AACpF,MAAIe,kBAAkBxB,IAAIS,QAAAA;AACxB,WAAOe,kBAAkBvB,IAAIQ,QAAAA;AAE/B,MAAME,OAAO,eAAA,CAAA,GACRJ,OACAkB,OAAOC,YACRD,OAAOE,QAAQlB,QAAAA,EAAUmB,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;MAAQtB,MAAMwB,OAAAA;;EAC5B,CAAA,CAAA,CAAA;AAGJP,2BAAkBD,IAAId,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", "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,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"]
 }

package/package.json

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

package/src/helpers/getVariantExtras.tsx

@@ -20,14 +20,19 @@ export const getVariantExtras = (styleState: GetStyleState) => {
     tokens: conf.tokensParsed,
     theme,
     get fontFamily() {
-      return getVariableValue(
-        styleState.fontFamily ||
-          styleState.curProps.fontFamily ||
-          styleState.conf.defaultFont
+      return (
+        getVariableValue(styleState.fontFamily || styleState.curProps.fontFamily) ||
+        props.fontFamily ||
+        getVariableValue(styleState.conf.defaultFont)
       )
     },
     get font() {
-      return fonts[this.fontFamily] || fonts[styleState.conf.defaultFont!]
+      return (
+        fonts[this.fontFamily] ||
+        (!props.fontFamily || props.fontFamily[0] === '$'
+          ? fonts[styleState.conf.defaultFont!]
+          : undefined)
+      )
     },
     // TODO do this in splitstlye
     // we avoid passing in default props for media queries because that would confuse things like SizableText.size:

package/types/helpers/getVariantExtras.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getVariantExtras.d.ts","sourceRoot":"","sources":["../../src/helpers/getVariantExtras.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAItE,eAAO,MAAM,gBAAgB,eAAgB,aAAa,QA0CzD,CAAA;AAID,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,mBAAmB,OAkBrF"}
+{"version":3,"file":"getVariantExtras.d.ts","sourceRoot":"","sources":["../../src/helpers/getVariantExtras.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAItE,eAAO,MAAM,gBAAgB,eAAgB,aAAa,QA+CzD,CAAA;AAID,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,mBAAmB,OAkBrF"}