@tamagui/web 1.141.4 → 1.142.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -24,7 +24,8 @@ __export(getVariantExtras_exports, {
24
24
  getVariantExtras: () => getVariantExtras
25
25
  });
26
26
  module.exports = __toCommonJS(getVariantExtras_exports);
27
- var import_createVariable = require("../createVariable.cjs");
27
+ var import_config = require("../config.cjs"),
28
+ import_createVariable = require("../createVariable.cjs");
28
29
  const cache = /* @__PURE__ */new WeakMap(),
29
30
  getVariantExtras = styleState => {
30
31
  if (cache.has(styleState)) return cache.get(styleState);
@@ -32,7 +33,8 @@ const cache = /* @__PURE__ */new WeakMap(),
32
33
  props,
33
34
  conf,
34
35
  context,
35
- theme
36
+ theme,
37
+ styleProps
36
38
  } = styleState;
37
39
  let fonts = conf.fontsParsed;
38
40
  context?.language && (fonts = getFontsForLanguage(conf.fontsParsed, context.language));
@@ -40,11 +42,12 @@ const cache = /* @__PURE__ */new WeakMap(),
40
42
  fonts,
41
43
  tokens: conf.tokensParsed,
42
44
  theme,
45
+ context: styleProps?.styledContext,
43
46
  get fontFamily() {
44
- return (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.props.fontFamily) || props.fontFamily || (0, import_createVariable.getVariableValue)(styleState.conf.defaultFont);
47
+ return (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.props.fontFamily) || props.fontFamily || (0, import_createVariable.getVariableValue)((0, import_config.getSetting)("defaultFont"));
45
48
  },
46
49
  get font() {
47
- return fonts[this.fontFamily] || (!props.fontFamily || props.fontFamily[0] === "$" ? fonts[styleState.conf.defaultFont] : void 0);
50
+ return fonts[this.fontFamily] || (!props.fontFamily || props.fontFamily[0] === "$" ? fonts[(0, import_config.getSetting)("defaultFont") || ""] : void 0);
48
51
  },
49
52
  props
50
53
  };
@@ -18,22 +18,23 @@ __export(getVariantExtras_exports, {
18
18
  getVariantExtras: () => getVariantExtras
19
19
  });
20
20
  module.exports = __toCommonJS(getVariantExtras_exports);
21
- var import_createVariable = require("../createVariable");
21
+ var import_config = require("../config"), import_createVariable = require("../createVariable");
22
22
  const cache = /* @__PURE__ */ new WeakMap(), getVariantExtras = (styleState) => {
23
23
  if (cache.has(styleState))
24
24
  return cache.get(styleState);
25
- const { props, conf, context, theme } = styleState;
25
+ const { props, conf, context, theme, styleProps } = styleState;
26
26
  let fonts = conf.fontsParsed;
27
27
  context?.language && (fonts = getFontsForLanguage(conf.fontsParsed, context.language));
28
28
  const next = {
29
29
  fonts,
30
30
  tokens: conf.tokensParsed,
31
31
  theme,
32
+ context: styleProps?.styledContext,
32
33
  get fontFamily() {
33
- return (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.props.fontFamily) || props.fontFamily || (0, import_createVariable.getVariableValue)(styleState.conf.defaultFont);
34
+ return (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.props.fontFamily) || props.fontFamily || (0, import_createVariable.getVariableValue)((0, import_config.getSetting)("defaultFont"));
34
35
  },
35
36
  get font() {
36
- return fonts[this.fontFamily] || (!props.fontFamily || props.fontFamily[0] === "$" ? fonts[styleState.conf.defaultFont] : void 0);
37
+ return fonts[this.fontFamily] || (!props.fontFamily || props.fontFamily[0] === "$" ? fonts[(0, import_config.getSetting)("defaultFont") || ""] : void 0);
37
38
  },
38
39
  props
39
40
  };
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/helpers/getVariantExtras.tsx"],
4
- "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAiC;AAGjC,MAAM,QAAQ,oBAAI,QAAQ,GAEb,mBAAmB,CAAC,eAA8B;AAC7D,MAAI,MAAM,IAAI,UAAU;AACtB,WAAO,MAAM,IAAI,UAAU;AAG7B,QAAM,EAAE,OAAO,MAAM,SAAS,MAAM,IAAI;AACxC,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,MAAM,UAAU,KACrE,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,IACA;AAAA,EACF;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;",
4
+ "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA2B,sBAC3B,wBAAiC;AAGjC,MAAM,QAAQ,oBAAI,QAAQ,GAEb,mBAAmB,CAAC,eAA8B;AAC7D,MAAI,MAAM,IAAI,UAAU;AACtB,WAAO,MAAM,IAAI,UAAU;AAG7B,QAAM,EAAE,OAAO,MAAM,SAAS,OAAO,WAAW,IAAI;AACpD,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,SAAS,YAAY;AAAA,IACrB,IAAI,aAAa;AACf,iBACE,wCAAiB,WAAW,cAAc,WAAW,MAAM,UAAU,KACrE,MAAM,kBACN,4CAAiB,0BAAW,aAAa,CAAC;AAAA,IAE9C;AAAA,IACA,IAAI,OAAO;AACT,aACE,MAAM,KAAK,UAAU,MACpB,CAAC,MAAM,cAAc,MAAM,WAAW,CAAC,MAAM,MAC1C,UAAM,0BAAW,aAAa,KAAK,EAAE,IACrC;AAAA,IAER;AAAA,IACA;AAAA,EACF;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;",
5
5
  "names": []
6
6
  }
@@ -26,7 +26,8 @@ __export(getVariantExtras_exports, {
26
26
  getVariantExtras: () => getVariantExtras
27
27
  });
28
28
  module.exports = __toCommonJS(getVariantExtras_exports);
29
- var import_createVariable = require("../createVariable.native.js"),
29
+ var import_config = require("../config.native.js"),
30
+ import_createVariable = require("../createVariable.native.js"),
30
31
  cache = /* @__PURE__ */new WeakMap(),
31
32
  getVariantExtras = function (styleState) {
32
33
  if (cache.has(styleState)) return cache.get(styleState);
@@ -34,7 +35,8 @@ var import_createVariable = require("../createVariable.native.js"),
34
35
  props,
35
36
  conf,
36
37
  context,
37
- theme
38
+ theme,
39
+ styleProps
38
40
  } = styleState,
39
41
  fonts = conf.fontsParsed;
40
42
  context?.language && (fonts = getFontsForLanguage(conf.fontsParsed, context.language));
@@ -42,11 +44,12 @@ var import_createVariable = require("../createVariable.native.js"),
42
44
  fonts,
43
45
  tokens: conf.tokensParsed,
44
46
  theme,
47
+ context: styleProps?.styledContext,
45
48
  get fontFamily() {
46
- return (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.props.fontFamily) || props.fontFamily || (0, import_createVariable.getVariableValue)(styleState.conf.defaultFont);
49
+ return (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.props.fontFamily) || props.fontFamily || (0, import_createVariable.getVariableValue)((0, import_config.getSetting)("defaultFont"));
47
50
  },
48
51
  get font() {
49
- return fonts[this.fontFamily] || (!props.fontFamily || props.fontFamily[0] === "$" ? fonts[styleState.conf.defaultFont] : void 0);
52
+ return fonts[this.fontFamily] || (!props.fontFamily || props.fontFamily[0] === "$" ? fonts[(0, import_config.getSetting)("defaultFont") || ""] : void 0);
50
53
  },
51
54
  props
52
55
  };
@@ -1 +1 @@
1
- {"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","getVariantExtras_exports","__export","getFontsForLanguage","getVariantExtras","module","exports","import_createVariable","require","cache","WeakMap","styleState","has","get","props","conf","context","theme","fonts","fontsParsed","language","next","tokens","tokensParsed","fontFamily","getVariableValue","defaultFont","font","set","fontLanguageCache","Object","fromEntries","entries","map","param","name","lang","langKey"],"sources":["../../../src/helpers/getVariantExtras.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,wBAAA;AAAAC,QAAA,CAAAD,wBAAA;EAAAE,mBAAA,EAAAA,CAAA,KAAAA,mBAAA;EAAAC,gBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAV,YAAiC,CAAAK,wBAAA;AAGjC,IAAAM,qBAAc,GAAAC,OAAI,8BAEL;EAAAC,KAAA,GAAoB,eAA8B,IAAAC,OAAA;EAAAN,gBAAA,YAAAA,CAAAO,UAAA;IAC7D,IAAIF,KAAA,CAAMG,GAAA,CAAID,UAAU,GACtB,OAAOF,KAAA,CAAMI,GAAA,CAAIF,UAAU;IAG7B;QAAMG,KAAE;QAAAC,IAAO;QAAAC,OAAM;QAAAC;MAAS,IAAMN,UAAI;MAAAO,KAAA,GAAAH,IAAA,CAAAI,WAAA;IACxCH,OAAI,EAAAI,QAAa,KAAAF,KAAA,GAAAf,mBAAA,CAAAY,IAAA,CAAAI,WAAA,EAAAH,OAAA,CAAAI,QAAA;IACb,IAAAC,IAAA,GAAS;MAIbH,KAAM;MACJI,MAAA,EAAAP,IAAA,CAAAQ,YAAA;MACAN,KAAA;MACA,IAAAO,WAAA;QACA,OAAI,IAAAjB,qBAAa,CAAAkB,gBAAA,EAAAd,UAAA,CAAAa,UAAA,IAAAb,UAAA,CAAAG,KAAA,CAAAU,UAAA,KAAAV,KAAA,CAAAU,UAAA,QAAAjB,qBAAA,CAAAkB,gBAAA,EAAAd,UAAA,CAAAI,IAAA,CAAAW,WAAA;MACf;MAKF,IAAAC,KAAA;QACA,OAAIT,KAAO,MAAAM,UAAA,OAAAV,KAAA,CAAAU,UAAA,IAAAV,KAAA,CAAAU,UAAA,cAAAN,KAAA,CAAAP,UAAA,CAAAI,IAAA,CAAAW,WAAA;MACT;MAMFZ;IAAA;IAEF,OAAAL,KAAA,CAAAmB,GAAA,CAAAjB,UAAA,EAAAU,IAAA,GAAAA,IAAA;EAEA;EAAAQ,iBAAU,kBAEH,IAAAnB,OAAA;AACT,SAEMP,mBAAoBA,CAAAe,KAAA,EAAAE,QAAI;EAEvB,IAAAS,iBAAS,CAAAjB,GAAA,CAAAQ,QAAyC,GACvD,OAAIS,iBAAsB,CAAAhB,GAAA,CAAAO,QAAQ;EAChC,IAAAC,IAAA,GAAO;IAET,GAAAH,KAAM;IACJ,GAAGY,MAAA,CAAAC,WAAA,CAAAD,MAAA,CAAAE,OAAA,CAAAZ,QAAA,EAAAa,GAAA,WAAAC,KAAA;MACH,IAAG,CAAAC,IAAO,EAAAC,IAAA,IAAAF,KAAA;MACR,IAAAE,IAAO,cAAQ,EACb,OAAI;MACF,IAAAC,OAAO,GAAC,IAAAF,IAAA,IAAAC,IAAA;MAEV,QACA,IAAAD,IAAQ,IACTjB,KAAA,CAAAmB,OAAA,EACH;IACF;EACA;EAEF,OAAAR,iBAAA,CAAAD,GAAA,CAAAR,QAAA,EAAAC,IAAA,GAAAA,IAAA","ignoreList":[]}
1
+ {"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","getVariantExtras_exports","__export","getFontsForLanguage","getVariantExtras","module","exports","import_config","require","import_createVariable","cache","WeakMap","styleState","has","get","props","conf","context","theme","styleProps","fonts","fontsParsed","language","next","tokens","tokensParsed","styledContext","fontFamily","getVariableValue","getSetting","font","set","fontLanguageCache","Object","fromEntries","entries","map","param","name","lang","langKey"],"sources":["../../../src/helpers/getVariantExtras.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,wBAAA;AAAAC,QAAA,CAAAD,wBAAA;EAAAE,mBAAA,EAAAA,CAAA,KAAAA,mBAAA;EAAAC,gBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAV,YAA2B,CAAAK,wBAC3B;AAGA,IAAAM,aAAc,GAAAC,OAAA,sBAAI;EAAQC,qBAEb,GAAoBD,OAAA,8BAA8B;EAAAE,KAAA,sBAAAC,OAAA;EAAAP,gBAAA,YAAAA,CAAAQ,UAAA;IAC7D,IAAIF,KAAA,CAAMG,GAAA,CAAID,UAAU,GACtB,OAAOF,KAAA,CAAMI,GAAA,CAAIF,UAAU;IAG7B;QAAMG,KAAE;QAAAC,IAAO;QAAAC,OAAM;QAAAC,KAAS;QAAAC;MAAO,IAAWP,UAAI;MAAAQ,KAAA,GAAAJ,IAAA,CAAAK,WAAA;IACpDJ,OAAI,EAAAK,QAAa,KAAAF,KAAA,GAAAjB,mBAAA,CAAAa,IAAA,CAAAK,WAAA,EAAAJ,OAAA,CAAAK,QAAA;IACb,IAAAC,IAAA,GAAS;MAIbH,KAAM;MACJI,MAAA,EAAAR,IAAA,CAAAS,YAAA;MACAP,KAAA;MACAD,OAAA,EAAAE,UAAA,EAAAO,aAAA;MACA,IAAAC,UAASA,CAAA;QACT,OAAI,IAAAlB,qBAAa,CAAAmB,gBAAA,EAAAhB,UAAA,CAAAe,UAAA,IAAAf,UAAA,CAAAG,KAAA,CAAAY,UAAA,KAAAZ,KAAA,CAAAY,UAAA,QAAAlB,qBAAA,CAAAmB,gBAAA,MAAArB,aAAA,CAAAsB,UAAA;MACf;MAKF,IAAAC,KAAA;QACA,OAAIV,KAAO,MAAAO,UAAA,OAAAZ,KAAA,CAAAY,UAAA,IAAAZ,KAAA,CAAAY,UAAA,cAAAP,KAAA,KAAAb,aAAA,CAAAsB,UAAA;MACT;MAMFd;IAAA;IAEF,OAAAL,KAAA,CAAAqB,GAAA,CAAAnB,UAAA,EAAAW,IAAA,GAAAA,IAAA;EAEA;EAAAS,iBAAU,kBAEH,IAAArB,OAAA;AACT,SAEMR,mBAAoBA,CAAAiB,KAAA,EAAAE,QAAI;EAEvB,IAAAU,iBAAS,CAAAnB,GAAA,CAAAS,QAAyC,GACvD,OAAIU,iBAAsB,CAAAlB,GAAA,CAAAQ,QAAQ;EAChC,IAAAC,IAAA,GAAO;IAET,GAAAH,KAAM;IACJ,GAAGa,MAAA,CAAAC,WAAA,CAAAD,MAAA,CAAAE,OAAA,CAAAb,QAAA,EAAAc,GAAA,WAAAC,KAAA;MACH,IAAG,CAAAC,IAAO,EAAAC,IAAA,IAAAF,KAAA;MACR,IAAAE,IAAO,cAAQ,EACb,OAAI;MACF,IAAAC,OAAO,GAAC,IAAAF,IAAA,IAAAC,IAAA;MAEV,QACA,IAAAD,IAAQ,IACTlB,KAAA,CAAAoB,OAAA,EACH;IACF;EACA;EAEF,OAAAR,iBAAA,CAAAD,GAAA,CAAAT,QAAA,EAAAC,IAAA,GAAAA,IAAA","ignoreList":[]}
@@ -1,19 +1,21 @@
1
+ import { getSetting } from "../config";
1
2
  import { getVariableValue } from "../createVariable";
2
3
  const cache = /* @__PURE__ */ new WeakMap(), getVariantExtras = (styleState) => {
3
4
  if (cache.has(styleState))
4
5
  return cache.get(styleState);
5
- const { props, conf, context, theme } = styleState;
6
+ const { props, conf, context, theme, styleProps } = styleState;
6
7
  let fonts = conf.fontsParsed;
7
8
  context?.language && (fonts = getFontsForLanguage(conf.fontsParsed, context.language));
8
9
  const next = {
9
10
  fonts,
10
11
  tokens: conf.tokensParsed,
11
12
  theme,
13
+ context: styleProps?.styledContext,
12
14
  get fontFamily() {
13
- return getVariableValue(styleState.fontFamily || styleState.props.fontFamily) || props.fontFamily || getVariableValue(styleState.conf.defaultFont);
15
+ return getVariableValue(styleState.fontFamily || styleState.props.fontFamily) || props.fontFamily || getVariableValue(getSetting("defaultFont"));
14
16
  },
15
17
  get font() {
16
- return fonts[this.fontFamily] || (!props.fontFamily || props.fontFamily[0] === "$" ? fonts[styleState.conf.defaultFont] : void 0);
18
+ return fonts[this.fontFamily] || (!props.fontFamily || props.fontFamily[0] === "$" ? fonts[getSetting("defaultFont") || ""] : void 0);
17
19
  },
18
20
  props
19
21
  };
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/helpers/getVariantExtras.tsx"],
4
- "mappings": "AAAA,SAAS,wBAAwB;AAGjC,MAAM,QAAQ,oBAAI,QAAQ,GAEb,mBAAmB,CAAC,eAA8B;AAC7D,MAAI,MAAM,IAAI,UAAU;AACtB,WAAO,MAAM,IAAI,UAAU;AAG7B,QAAM,EAAE,OAAO,MAAM,SAAS,MAAM,IAAI;AACxC,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,MAAM,UAAU,KACrE,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,IACA;AAAA,EACF;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;",
4
+ "mappings": "AAAA,SAAS,kBAAkB;AAC3B,SAAS,wBAAwB;AAGjC,MAAM,QAAQ,oBAAI,QAAQ,GAEb,mBAAmB,CAAC,eAA8B;AAC7D,MAAI,MAAM,IAAI,UAAU;AACtB,WAAO,MAAM,IAAI,UAAU;AAG7B,QAAM,EAAE,OAAO,MAAM,SAAS,OAAO,WAAW,IAAI;AACpD,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,SAAS,YAAY;AAAA,IACrB,IAAI,aAAa;AACf,aACE,iBAAiB,WAAW,cAAc,WAAW,MAAM,UAAU,KACrE,MAAM,cACN,iBAAiB,WAAW,aAAa,CAAC;AAAA,IAE9C;AAAA,IACA,IAAI,OAAO;AACT,aACE,MAAM,KAAK,UAAU,MACpB,CAAC,MAAM,cAAc,MAAM,WAAW,CAAC,MAAM,MAC1C,MAAM,WAAW,aAAa,KAAK,EAAE,IACrC;AAAA,IAER;AAAA,IACA;AAAA,EACF;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;",
5
5
  "names": []
6
6
  }
@@ -1,3 +1,4 @@
1
+ import { getSetting } from "../config.mjs";
1
2
  import { getVariableValue } from "../createVariable.mjs";
2
3
  const cache = /* @__PURE__ */new WeakMap(),
3
4
  getVariantExtras = styleState => {
@@ -6,7 +7,8 @@ const cache = /* @__PURE__ */new WeakMap(),
6
7
  props,
7
8
  conf,
8
9
  context,
9
- theme
10
+ theme,
11
+ styleProps
10
12
  } = styleState;
11
13
  let fonts = conf.fontsParsed;
12
14
  context?.language && (fonts = getFontsForLanguage(conf.fontsParsed, context.language));
@@ -14,11 +16,12 @@ const cache = /* @__PURE__ */new WeakMap(),
14
16
  fonts,
15
17
  tokens: conf.tokensParsed,
16
18
  theme,
19
+ context: styleProps?.styledContext,
17
20
  get fontFamily() {
18
- return getVariableValue(styleState.fontFamily || styleState.props.fontFamily) || props.fontFamily || getVariableValue(styleState.conf.defaultFont);
21
+ return getVariableValue(styleState.fontFamily || styleState.props.fontFamily) || props.fontFamily || getVariableValue(getSetting("defaultFont"));
19
22
  },
20
23
  get font() {
21
- return fonts[this.fontFamily] || (!props.fontFamily || props.fontFamily[0] === "$" ? fonts[styleState.conf.defaultFont] : void 0);
24
+ return fonts[this.fontFamily] || (!props.fontFamily || props.fontFamily[0] === "$" ? fonts[getSetting("defaultFont") || ""] : void 0);
22
25
  },
23
26
  props
24
27
  };
@@ -1 +1 @@
1
- {"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;AAGjC,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":[]}
1
+ {"version":3,"names":["getSetting","getVariableValue","cache","WeakMap","getVariantExtras","styleState","has","get","props","conf","context","theme","styleProps","fonts","fontsParsed","language","getFontsForLanguage","next","tokens","tokensParsed","styledContext","fontFamily","font","set","fontLanguageCache","Object","fromEntries","entries","map","name","lang","langKey"],"sources":["../../../src/helpers/getVariantExtras.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,UAAA,QAAkB;AAC3B,SAASC,gBAAA,QAAwB;AAGjC,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,KAAA;MAAOC;IAAW,IAAIP,UAAA;IACpD,IAAIQ,KAAA,GAAQJ,IAAA,CAAKK,WAAA;IACbJ,OAAA,EAASK,QAAA,KACXF,KAAA,GAAQG,mBAAA,CAAoBP,IAAA,CAAKK,WAAA,EAAaJ,OAAA,CAAQK,QAAQ;IAGhE,MAAME,IAAA,GAAO;MACXJ,KAAA;MACAK,MAAA,EAAQT,IAAA,CAAKU,YAAA;MACbR,KAAA;MACAD,OAAA,EAASE,UAAA,EAAYQ,aAAA;MACrB,IAAIC,WAAA,EAAa;QACf,OACEpB,gBAAA,CAAiBI,UAAA,CAAWgB,UAAA,IAAchB,UAAA,CAAWG,KAAA,CAAMa,UAAU,KACrEb,KAAA,CAAMa,UAAA,IACNpB,gBAAA,CAAiBD,UAAA,CAAW,aAAa,CAAC;MAE9C;MACA,IAAIsB,KAAA,EAAO;QACT,OACET,KAAA,CAAM,KAAKQ,UAAU,MACpB,CAACb,KAAA,CAAMa,UAAA,IAAcb,KAAA,CAAMa,UAAA,CAAW,CAAC,MAAM,MAC1CR,KAAA,CAAMb,UAAA,CAAW,aAAa,KAAK,EAAE,IACrC;MAER;MACAQ;IACF;IAEA,OAAAN,KAAA,CAAMqB,GAAA,CAAIlB,UAAA,EAAYY,IAAI,GAEnBA,IAAA;EACT;EAEMO,iBAAA,GAAoB,mBAAIrB,OAAA,CAAQ;AAE/B,SAASa,oBAAoBH,KAAA,EAAqBE,QAAA,EAA+B;EACtF,IAAIS,iBAAA,CAAkBlB,GAAA,CAAIS,QAAQ,GAChC,OAAOS,iBAAA,CAAkBjB,GAAA,CAAIQ,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":[]}
@@ -1,3 +1,4 @@
1
+ import { getSetting } from "../config.native.js";
1
2
  import { getVariableValue } from "../createVariable.native.js";
2
3
  var cache = /* @__PURE__ */new WeakMap(),
3
4
  getVariantExtras = function (styleState) {
@@ -6,7 +7,8 @@ var cache = /* @__PURE__ */new WeakMap(),
6
7
  props,
7
8
  conf,
8
9
  context,
9
- theme
10
+ theme,
11
+ styleProps
10
12
  } = styleState,
11
13
  fonts = conf.fontsParsed;
12
14
  context?.language && (fonts = getFontsForLanguage(conf.fontsParsed, context.language));
@@ -14,11 +16,12 @@ var cache = /* @__PURE__ */new WeakMap(),
14
16
  fonts,
15
17
  tokens: conf.tokensParsed,
16
18
  theme,
19
+ context: styleProps?.styledContext,
17
20
  get fontFamily() {
18
- return getVariableValue(styleState.fontFamily || styleState.props.fontFamily) || props.fontFamily || getVariableValue(styleState.conf.defaultFont);
21
+ return getVariableValue(styleState.fontFamily || styleState.props.fontFamily) || props.fontFamily || getVariableValue(getSetting("defaultFont"));
19
22
  },
20
23
  get font() {
21
- return fonts[this.fontFamily] || (!props.fontFamily || props.fontFamily[0] === "$" ? fonts[styleState.conf.defaultFont] : void 0);
24
+ return fonts[this.fontFamily] || (!props.fontFamily || props.fontFamily[0] === "$" ? fonts[getSetting("defaultFont") || ""] : void 0);
22
25
  },
23
26
  props
24
27
  };
@@ -1 +1 @@
1
- {"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","param","name","lang","langKey"],"sources":["../../../src/helpers/getVariantExtras.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,QAAwB;AAGjC,IAAAC,KAAM,kBAAQ,IAAAC,OAAI;EAAQC,gBAEb,YAAAA,CAAoBC,UAA8B;IAC7D,IAAIH,KAAA,CAAMI,GAAA,CAAID,UAAU,GACtB,OAAOH,KAAA,CAAMK,GAAA,CAAIF,UAAU;IAG7B;QAAMG,KAAE;QAAAC,IAAO;QAAAC,OAAM;QAAAC;MAAS,IAAMN,UAAI;MAAAO,KAAA,GAAAH,IAAA,CAAAI,WAAA;IACxCH,OAAI,EAAAI,QAAa,KAAAF,KAAA,GAAAG,mBAAA,CAAAN,IAAA,CAAAI,WAAA,EAAAH,OAAA,CAAAI,QAAA;IACb,IAAAE,IAAA,GAAS;MAIbJ,KAAM;MACJK,MAAA,EAAAR,IAAA,CAAAS,YAAA;MACAP,KAAA;MACA,IAAAQ,WAAA;QACA,OAAIlB,gBAAa,CAAAI,UAAA,CAAAc,UAAA,IAAAd,UAAA,CAAAG,KAAA,CAAAW,UAAA,KAAAX,KAAA,CAAAW,UAAA,IAAAlB,gBAAA,CAAAI,UAAA,CAAAI,IAAA,CAAAW,WAAA;MACf;MAKF,IAAAC,KAAA;QACA,OAAIT,KAAO,MAAAO,UAAA,OAAAX,KAAA,CAAAW,UAAA,IAAAX,KAAA,CAAAW,UAAA,cAAAP,KAAA,CAAAP,UAAA,CAAAI,IAAA,CAAAW,WAAA;MACT;MAMFZ;IAAA;IAEF,OAAAN,KAAA,CAAAoB,GAAA,CAAAjB,UAAA,EAAAW,IAAA,GAAAA,IAAA;EAEA;EAAAO,iBAAU,kBAEH,IAAApB,OAAA;AACT,SAEMY,mBAAoBA,CAAAH,KAAA,EAAAE,QAAI;EAEvB,IAAAS,iBAAS,CAAAjB,GAAA,CAAAQ,QAAyC,GACvD,OAAIS,iBAAsB,CAAAhB,GAAA,CAAAO,QAAQ;EAChC,IAAAE,IAAA,GAAO;IAET,GAAAJ,KAAM;IACJ,GAAGY,MAAA,CAAAC,WAAA,CAAAD,MAAA,CAAAE,OAAA,CAAAZ,QAAA,EAAAa,GAAA,WAAAC,KAAA;MACH,IAAG,CAAAC,IAAO,EAAAC,IAAA,IAAAF,KAAA;MACR,IAAAE,IAAO,cAAQ,EACb,OAAI;MACF,IAAAC,OAAO,GAAC,IAAAF,IAAA,IAAAC,IAAA;MAEV,QACA,IAAAD,IAAQ,IACTjB,KAAA,CAAAmB,OAAA,EACH;IACF;EACA;EAEF,OAAAR,iBAAA,CAAAD,GAAA,CAAAR,QAAA,EAAAE,IAAA,GAAAA,IAAA","ignoreList":[]}
1
+ {"version":3,"names":["getSetting","getVariableValue","cache","WeakMap","getVariantExtras","styleState","has","get","props","conf","context","theme","styleProps","fonts","fontsParsed","language","getFontsForLanguage","next","tokens","tokensParsed","styledContext","fontFamily","font","set","fontLanguageCache","Object","fromEntries","entries","map","param","name","lang","langKey"],"sources":["../../../src/helpers/getVariantExtras.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,UAAA,QAAkB;AAC3B,SAASC,gBAAA,QAAwB;AAGjC,IAAAC,KAAM,kBAAQ,IAAAC,OAAI;EAAQC,gBAEb,YAAAA,CAAoBC,UAA8B;IAC7D,IAAIH,KAAA,CAAMI,GAAA,CAAID,UAAU,GACtB,OAAOH,KAAA,CAAMK,GAAA,CAAIF,UAAU;IAG7B;QAAMG,KAAE;QAAAC,IAAO;QAAAC,OAAM;QAAAC,KAAS;QAAAC;MAAO,IAAWP,UAAI;MAAAQ,KAAA,GAAAJ,IAAA,CAAAK,WAAA;IACpDJ,OAAI,EAAAK,QAAa,KAAAF,KAAA,GAAAG,mBAAA,CAAAP,IAAA,CAAAK,WAAA,EAAAJ,OAAA,CAAAK,QAAA;IACb,IAAAE,IAAA,GAAS;MAIbJ,KAAM;MACJK,MAAA,EAAAT,IAAA,CAAAU,YAAA;MACAR,KAAA;MACAD,OAAA,EAAAE,UAAA,EAAAQ,aAAA;MACA,IAAAC,UAASA,CAAA;QACT,OAAIpB,gBAAa,CAAAI,UAAA,CAAAgB,UAAA,IAAAhB,UAAA,CAAAG,KAAA,CAAAa,UAAA,KAAAb,KAAA,CAAAa,UAAA,IAAApB,gBAAA,CAAAD,UAAA;MACf;MAKF,IAAAsB,KAAA;QACA,OAAIT,KAAO,MAAAQ,UAAA,OAAAb,KAAA,CAAAa,UAAA,IAAAb,KAAA,CAAAa,UAAA,cAAAR,KAAA,CAAAb,UAAA;MACT;MAMFQ;IAAA;IAEF,OAAAN,KAAA,CAAAqB,GAAA,CAAAlB,UAAA,EAAAY,IAAA,GAAAA,IAAA;EAEA;EAAAO,iBAAU,kBAEH,IAAArB,OAAA;AACT,SAEMa,mBAAoBA,CAAAH,KAAA,EAAAE,QAAI;EAEvB,IAAAS,iBAAS,CAAAlB,GAAA,CAAAS,QAAyC,GACvD,OAAIS,iBAAsB,CAAAjB,GAAA,CAAAQ,QAAQ;EAChC,IAAAE,IAAA,GAAO;IAET,GAAAJ,KAAM;IACJ,GAAGY,MAAA,CAAAC,WAAA,CAAAD,MAAA,CAAAE,OAAA,CAAAZ,QAAA,EAAAa,GAAA,WAAAC,KAAA;MACH,IAAG,CAAAC,IAAO,EAAAC,IAAA,IAAAF,KAAA;MACR,IAAAE,IAAO,cAAQ,EACb,OAAI;MACF,IAAAC,OAAO,GAAC,IAAAF,IAAA,IAAAC,IAAA;MAEV,QACA,IAAAD,IAAQ,IACTjB,KAAA,CAAAmB,OAAA,EACH;IACF;EACA;EAEF,OAAAR,iBAAA,CAAAD,GAAA,CAAAR,QAAA,EAAAE,IAAA,GAAAA,IAAA","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/web",
3
- "version": "1.141.4",
3
+ "version": "1.142.0",
4
4
  "type": "module",
5
5
  "source": "src/index.ts",
6
6
  "main": "dist/cjs",
@@ -28,16 +28,16 @@
28
28
  "reset.css"
29
29
  ],
30
30
  "dependencies": {
31
- "@tamagui/compose-refs": "1.141.4",
32
- "@tamagui/constants": "1.141.4",
33
- "@tamagui/helpers": "1.141.4",
34
- "@tamagui/is-equal-shallow": "1.141.4",
35
- "@tamagui/normalize-css-color": "1.141.4",
36
- "@tamagui/timer": "1.141.4",
37
- "@tamagui/types": "1.141.4",
38
- "@tamagui/use-did-finish-ssr": "1.141.4",
39
- "@tamagui/use-event": "1.141.4",
40
- "@tamagui/use-force-update": "1.141.4"
31
+ "@tamagui/compose-refs": "1.142.0",
32
+ "@tamagui/constants": "1.142.0",
33
+ "@tamagui/helpers": "1.142.0",
34
+ "@tamagui/is-equal-shallow": "1.142.0",
35
+ "@tamagui/normalize-css-color": "1.142.0",
36
+ "@tamagui/timer": "1.142.0",
37
+ "@tamagui/types": "1.142.0",
38
+ "@tamagui/use-did-finish-ssr": "1.142.0",
39
+ "@tamagui/use-event": "1.142.0",
40
+ "@tamagui/use-force-update": "1.142.0"
41
41
  },
42
42
  "peerDependencies": {
43
43
  "react": "*",
@@ -45,7 +45,7 @@
45
45
  "react-native": "*"
46
46
  },
47
47
  "devDependencies": {
48
- "@tamagui/build": "1.141.4",
48
+ "@tamagui/build": "1.142.0",
49
49
  "@testing-library/react": "^16.1.0",
50
50
  "csstype": "^3.0.10",
51
51
  "react": "*",
@@ -59,16 +59,19 @@
59
59
  "./reset.css": "./reset.css",
60
60
  ".": {
61
61
  "react-native": {
62
+ "module": "./dist/esm/index.native.js",
62
63
  "import": "./dist/esm/index.native.js",
63
64
  "require": "./dist/cjs/index.native.js"
64
65
  },
65
66
  "types": "./types/index.d.ts",
67
+ "module": "./dist/esm/index.mjs",
66
68
  "import": "./dist/esm/index.mjs",
67
69
  "require": "./dist/cjs/index.cjs",
68
70
  "default": "./dist/cjs/index.native.js"
69
71
  },
70
72
  "./inject-styles": {
71
73
  "types": "./types/inject-styles.d.ts",
74
+ "module": "./dist/esm/inject-styles.mjs",
72
75
  "import": "./dist/esm/inject-styles.mjs",
73
76
  "require": "./dist/cjs/inject-styles.cjs",
74
77
  "default": "./dist/cjs/inject-styles.cjs"
@@ -1,3 +1,4 @@
1
+ import { getSetting } from '../config'
1
2
  import { getVariableValue } from '../createVariable'
2
3
  import type { GenericFonts, GetStyleState, LanguageContextType } from '../types'
3
4
 
@@ -8,7 +9,7 @@ export const getVariantExtras = (styleState: GetStyleState) => {
8
9
  return cache.get(styleState)
9
10
  }
10
11
 
11
- const { props, conf, context, theme } = styleState
12
+ const { props, conf, context, theme, styleProps } = styleState
12
13
  let fonts = conf.fontsParsed
13
14
  if (context?.language) {
14
15
  fonts = getFontsForLanguage(conf.fontsParsed, context.language)
@@ -18,18 +19,19 @@ export const getVariantExtras = (styleState: GetStyleState) => {
18
19
  fonts,
19
20
  tokens: conf.tokensParsed,
20
21
  theme,
22
+ context: styleProps?.styledContext,
21
23
  get fontFamily() {
22
24
  return (
23
25
  getVariableValue(styleState.fontFamily || styleState.props.fontFamily) ||
24
26
  props.fontFamily ||
25
- getVariableValue(styleState.conf.defaultFont)
27
+ getVariableValue(getSetting('defaultFont'))
26
28
  )
27
29
  },
28
30
  get font() {
29
31
  return (
30
32
  fonts[this.fontFamily] ||
31
33
  (!props.fontFamily || props.fontFamily[0] === '$'
32
- ? fonts[styleState.conf.defaultFont!]
34
+ ? fonts[getSetting('defaultFont') || '']
33
35
  : undefined)
34
36
  )
35
37
  },
@@ -1 +1 @@
1
- {"version":3,"file":"getVariantExtras.d.ts","sourceRoot":"","sources":["../../src/helpers/getVariantExtras.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAIhF,eAAO,MAAM,gBAAgB,GAAI,YAAY,aAAa,QAoCzD,CAAA;AAID,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,mBAAmB,OAkBrF"}
1
+ {"version":3,"file":"getVariantExtras.d.ts","sourceRoot":"","sources":["../../src/helpers/getVariantExtras.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAIhF,eAAO,MAAM,gBAAgB,GAAI,YAAY,aAAa,QAqCzD,CAAA;AAID,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,mBAAmB,OAkBrF"}