@tamagui/font-size 1.113.2 → 1.114.1

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.
@@ -28,11 +28,12 @@ const getFontSize = (inSize, opts) => {
28
28
  if (!token)
29
29
  return inSize;
30
30
  const conf = (0, import_core.getConfig)();
31
- return conf.fontsParsed[opts?.font || conf.defaultFontToken].size[token];
31
+ return conf.fontsParsed[opts?.font || conf.defaultFontToken]?.size[token];
32
32
  }, getFontSizeToken = (inSize, opts) => {
33
33
  if (typeof inSize == "number")
34
34
  return null;
35
- const relativeSize = opts?.relativeSize || 0, conf = (0, import_core.getConfig)(), fontSize = conf.fontsParsed[opts?.font || conf.defaultFontToken].size, size = (inSize === "$true" && !("$true" in fontSize) ? "$4" : inSize) ?? ("$true" in fontSize ? "$true" : "$4"), sizeTokens = Object.keys(fontSize);
35
+ const relativeSize = opts?.relativeSize || 0, conf = (0, import_core.getConfig)(), fontSize = conf.fontsParsed[opts?.font || conf.defaultFontToken]?.size || // fallback to size tokens
36
+ conf.tokensParsed.size, size = (inSize === "$true" && !("$true" in fontSize) ? "$4" : inSize) ?? ("$true" in fontSize ? "$true" : "$4"), sizeTokens = Object.keys(fontSize);
36
37
  let foundIndex = sizeTokens.indexOf(size);
37
38
  foundIndex === -1 && size.endsWith(".5") && (foundIndex = sizeTokens.indexOf(size.replace(".5", ""))), process.env.NODE_ENV === "development" && foundIndex === -1 && console.warn("No font size found", size, opts, "in size tokens", sizeTokens);
38
39
  const tokenIndex = Math.min(
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/getFontSize.ts"],
4
- "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAsC;AAO/B,MAAM,cAAc,CACzB,QACA,SACW;AACX,QAAM,MAAM,oBAAoB,QAAQ,IAAI;AAC5C,aAAI,wBAAW,GAAG,IACT,CAAC,IAAI,MAEP,MAAM,CAAC,MAAM;AACtB,GAEa,sBAAsB,CACjC,QACA,SACG;AACH,QAAM,QAAQ,iBAAiB,QAAQ,IAAI;AAC3C,MAAI,CAAC;AACH,WAAO;AAET,QAAM,WAAO,uBAAU;AACvB,SAAO,KAAK,YAAY,MAAM,QAAQ,KAAK,gBAAgB,EAAE,KAAK,KAAK;AACzE,GAEa,mBAAmB,CAC9B,QACA,SAC0B;AAC1B,MAAI,OAAO,UAAW;AACpB,WAAO;AAGT,QAAM,eAAe,MAAM,gBAAgB,GACrC,WAAO,uBAAU,GACjB,WAAW,KAAK,YAAY,MAAM,QAAQ,KAAK,gBAAgB,EAAE,MACjE,QACH,WAAW,WAAW,EAAE,WAAW,YAAY,OAAO,YACtD,WAAW,WAAW,UAAU,OAE7B,aAAa,OAAO,KAAK,QAAQ;AAEvC,MAAI,aAAa,WAAW,QAAQ,IAAI;AACxC,EAAI,eAAe,MACb,KAAK,SAAS,IAAI,MACpB,aAAa,WAAW,QAAQ,KAAK,QAAQ,MAAM,EAAE,CAAC,IAGtD,QAAQ,IAAI,aAAa,iBACvB,eAAe,MACjB,QAAQ,KAAK,sBAAsB,MAAM,MAAM,kBAAkB,UAAU;AAG/E,QAAM,aAAa,KAAK;AAAA,IACtB,KAAK,IAAI,GAAG,aAAa,YAAY;AAAA,IACrC,WAAW,SAAS;AAAA,EACtB;AACA,SAAQ,WAAW,UAAU,KAAK;AACpC;",
4
+ "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAsC;AAO/B,MAAM,cAAc,CACzB,QACA,SACW;AACX,QAAM,MAAM,oBAAoB,QAAQ,IAAI;AAC5C,aAAI,wBAAW,GAAG,IACT,CAAC,IAAI,MAEP,MAAM,CAAC,MAAM;AACtB,GAEa,sBAAsB,CACjC,QACA,SACG;AACH,QAAM,QAAQ,iBAAiB,QAAQ,IAAI;AAC3C,MAAI,CAAC;AACH,WAAO;AAET,QAAM,WAAO,uBAAU;AAEvB,SADa,KAAK,YAAY,MAAM,QAAQ,KAAK,gBAAgB,GACpD,KAAK,KAAK;AACzB,GAEa,mBAAmB,CAC9B,QACA,SAC0B;AAC1B,MAAI,OAAO,UAAW;AACpB,WAAO;AAGT,QAAM,eAAe,MAAM,gBAAgB,GACrC,WAAO,uBAAU,GAEjB,WADO,KAAK,YAAY,MAAM,QAAQ,KAAK,gBAAgB,GAEzD;AAAA,EAEN,KAAK,aAAa,MACd,QACH,WAAW,WAAW,EAAE,WAAW,YAAY,OAAO,YACtD,WAAW,WAAW,UAAU,OAE7B,aAAa,OAAO,KAAK,QAAQ;AAEvC,MAAI,aAAa,WAAW,QAAQ,IAAI;AACxC,EAAI,eAAe,MACb,KAAK,SAAS,IAAI,MACpB,aAAa,WAAW,QAAQ,KAAK,QAAQ,MAAM,EAAE,CAAC,IAGtD,QAAQ,IAAI,aAAa,iBACvB,eAAe,MACjB,QAAQ,KAAK,sBAAsB,MAAM,MAAM,kBAAkB,UAAU;AAG/E,QAAM,aAAa,KAAK;AAAA,IACtB,KAAK,IAAI,GAAG,aAAa,YAAY;AAAA,IACrC,WAAW,SAAS;AAAA,EACtB;AACA,SAAQ,WAAW,UAAU,KAAK;AACpC;",
5
5
  "names": []
6
6
  }
@@ -27,12 +27,13 @@ var import_core = require("@tamagui/core"), getFontSize = function(inSize, opts)
27
27
  var token = getFontSizeToken(inSize, opts);
28
28
  if (!token)
29
29
  return inSize;
30
- var conf = (0, import_core.getConfig)();
31
- return conf.fontsParsed[(opts == null ? void 0 : opts.font) || conf.defaultFontToken].size[token];
30
+ var conf = (0, import_core.getConfig)(), font = conf.fontsParsed[(opts == null ? void 0 : opts.font) || conf.defaultFontToken];
31
+ return font == null ? void 0 : font.size[token];
32
32
  }, getFontSizeToken = function(inSize, opts) {
33
33
  if (typeof inSize == "number")
34
34
  return null;
35
- var relativeSize = (opts == null ? void 0 : opts.relativeSize) || 0, conf = (0, import_core.getConfig)(), fontSize = conf.fontsParsed[(opts == null ? void 0 : opts.font) || conf.defaultFontToken].size, _ref, size = (_ref = inSize === "$true" && !("$true" in fontSize) ? "$4" : inSize) !== null && _ref !== void 0 ? _ref : "$true" in fontSize ? "$true" : "$4", sizeTokens = Object.keys(fontSize), foundIndex = sizeTokens.indexOf(size);
35
+ var relativeSize = (opts == null ? void 0 : opts.relativeSize) || 0, conf = (0, import_core.getConfig)(), font = conf.fontsParsed[(opts == null ? void 0 : opts.font) || conf.defaultFontToken], fontSize = (font == null ? void 0 : font.size) || // fallback to size tokens
36
+ conf.tokensParsed.size, _ref, size = (_ref = inSize === "$true" && !("$true" in fontSize) ? "$4" : inSize) !== null && _ref !== void 0 ? _ref : "$true" in fontSize ? "$true" : "$4", sizeTokens = Object.keys(fontSize), foundIndex = sizeTokens.indexOf(size);
36
37
  foundIndex === -1 && size.endsWith(".5") && (foundIndex = sizeTokens.indexOf(size.replace(".5", ""))), process.env.NODE_ENV === "development" && foundIndex === -1 && console.warn("No font size found", size, opts, "in size tokens", sizeTokens);
37
38
  var tokenIndex = Math.min(Math.max(0, foundIndex + relativeSize), sizeTokens.length - 1), _sizeTokens_tokenIndex;
38
39
  return (_sizeTokens_tokenIndex = sizeTokens[tokenIndex]) !== null && _sizeTokens_tokenIndex !== void 0 ? _sizeTokens_tokenIndex : size;
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Users/n8/tamagui/code/core/font-size/src/getFontSize.ts"],
4
- "mappings": ";;;;;;;;;;;;;;;AACA;;;;;;;kBAAsC,0BAOzBA,cAAc,SACzBC,QACAC,MAAAA;AAEA,MAAMC,MAAMC,oBAAoBH,QAAQC,IAAAA;AACxC,aAAIG,wBAAWF,GAAAA,IACN,CAACA,IAAIG,MAEPH,MAAM,CAACA,MAAM;AACtB,GAEaC,sBAAsB,SACjCH,QACAC,MAAAA;AAEA,MAAMK,QAAQC,iBAAiBP,QAAQC,IAAAA;AACvC,MAAI,CAACK;AACH,WAAON;AAET,MAAMQ,WAAOC,uBAAAA;AACb,SAAOD,KAAKE,aAAYT,QAAAA,OAAAA,SAAAA,KAAMU,SAAQH,KAAKI,gBAAgB,EAAEC,KAAKP,KAAAA;AACpE,GAEaC,mBAAmB,SAC9BP,QACAC,MAAAA;AAEA,MAAI,OAAOD,UAAW;AACpB,WAAO;AAGT,MAAMc,gBAAeb,QAAAA,OAAAA,SAAAA,KAAMa,iBAAgB,GACrCN,WAAOC,uBAAAA,GACPM,WAAWP,KAAKE,aAAYT,QAAAA,OAAAA,SAAAA,KAAMU,SAAQH,KAAKI,gBAAgB,EAAEC,MAEpEb,MADGa,QACHb,OAAAA,WAAW,WAAW,EAAE,WAAWe,YAAY,OAAOf,YAAAA,QAAtDA,SAAAA,SAAAA,OACA,WAAWe,WAAW,UAAU,MAE7BC,aAAaC,OAAOC,KAAKH,QAAAA,GAE3BI,aAAaH,WAAWI,QAAQP,IAAAA;AACpC,EAAIM,eAAe,MACbN,KAAKQ,SAAS,IAAA,MAChBF,aAAaH,WAAWI,QAAQP,KAAKS,QAAQ,MAAM,EAAA,CAAA,IAGnDC,QAAQC,IAAIC,aAAa,iBACvBN,eAAe,MACjBO,QAAQC,KAAK,sBAAsBd,MAAMZ,MAAM,kBAAkBe,UAAAA;AAGrE,MAAMY,aAAaC,KAAKC,IACtBD,KAAKE,IAAI,GAAGZ,aAAaL,YAAAA,GACzBE,WAAWgB,SAAS,CAAA,GAEdhB;AAAR,UAAQA,yBAAAA,WAAWY,UAAAA,OAAW,QAAtBZ,2BAAAA,SAAAA,yBAA0BH;AACpC;",
5
- "names": ["getFontSize", "inSize", "opts", "res", "getFontSizeVariable", "isVariable", "val", "token", "getFontSizeToken", "conf", "getConfig", "fontsParsed", "font", "defaultFontToken", "size", "relativeSize", "fontSize", "sizeTokens", "Object", "keys", "foundIndex", "indexOf", "endsWith", "replace", "process", "env", "NODE_ENV", "console", "warn", "tokenIndex", "Math", "min", "max", "length"]
4
+ "mappings": ";;;;;;;;;;;;;;;AACA;;;;;;;kBAAsC,0BAOzBA,cAAc,SACzBC,QACAC,MAAAA;AAEA,MAAMC,MAAMC,oBAAoBH,QAAQC,IAAAA;AACxC,aAAIG,wBAAWF,GAAAA,IACN,CAACA,IAAIG,MAEPH,MAAM,CAACA,MAAM;AACtB,GAEaC,sBAAsB,SACjCH,QACAC,MAAAA;AAEA,MAAMK,QAAQC,iBAAiBP,QAAQC,IAAAA;AACvC,MAAI,CAACK;AACH,WAAON;AAET,MAAMQ,WAAOC,uBAAAA,GACPC,OAAOF,KAAKG,aAAYV,QAAAA,OAAAA,SAAAA,KAAMS,SAAQF,KAAKI,gBAAgB;AACjE,SAAOF,QAAAA,OAAAA,SAAAA,KAAMG,KAAKP,KAAAA;AACpB,GAEaC,mBAAmB,SAC9BP,QACAC,MAAAA;AAEA,MAAI,OAAOD,UAAW;AACpB,WAAO;AAGT,MAAMc,gBAAeb,QAAAA,OAAAA,SAAAA,KAAMa,iBAAgB,GACrCN,WAAOC,uBAAAA,GACPC,OAAOF,KAAKG,aAAYV,QAAAA,OAAAA,SAAAA,KAAMS,SAAQF,KAAKI,gBAAgB,GAC3DG,YACJL,QAAAA,OAAAA,SAAAA,KAAMG;EAENL,KAAKQ,aAAaH,MAEjBb,MADGa,QACHb,OAAAA,WAAW,WAAW,EAAE,WAAWe,YAAY,OAAOf,YAAAA,QAAtDA,SAAAA,SAAAA,OACA,WAAWe,WAAW,UAAU,MAE7BE,aAAaC,OAAOC,KAAKJ,QAAAA,GAE3BK,aAAaH,WAAWI,QAAQR,IAAAA;AACpC,EAAIO,eAAe,MACbP,KAAKS,SAAS,IAAA,MAChBF,aAAaH,WAAWI,QAAQR,KAAKU,QAAQ,MAAM,EAAA,CAAA,IAGnDC,QAAQC,IAAIC,aAAa,iBACvBN,eAAe,MACjBO,QAAQC,KAAK,sBAAsBf,MAAMZ,MAAM,kBAAkBgB,UAAAA;AAGrE,MAAMY,aAAaC,KAAKC,IACtBD,KAAKE,IAAI,GAAGZ,aAAaN,YAAAA,GACzBG,WAAWgB,SAAS,CAAA,GAEdhB;AAAR,UAAQA,yBAAAA,WAAWY,UAAAA,OAAW,QAAtBZ,2BAAAA,SAAAA,yBAA0BJ;AACpC;",
5
+ "names": ["getFontSize", "inSize", "opts", "res", "getFontSizeVariable", "isVariable", "val", "token", "getFontSizeToken", "conf", "getConfig", "font", "fontsParsed", "defaultFontToken", "size", "relativeSize", "fontSize", "tokensParsed", "sizeTokens", "Object", "keys", "foundIndex", "indexOf", "endsWith", "replace", "process", "env", "NODE_ENV", "console", "warn", "tokenIndex", "Math", "min", "max", "length"]
6
6
  }
@@ -7,11 +7,12 @@ const getFontSize = (inSize, opts) => {
7
7
  if (!token)
8
8
  return inSize;
9
9
  const conf = getConfig();
10
- return conf.fontsParsed[opts?.font || conf.defaultFontToken].size[token];
10
+ return conf.fontsParsed[opts?.font || conf.defaultFontToken]?.size[token];
11
11
  }, getFontSizeToken = (inSize, opts) => {
12
12
  if (typeof inSize == "number")
13
13
  return null;
14
- const relativeSize = opts?.relativeSize || 0, conf = getConfig(), fontSize = conf.fontsParsed[opts?.font || conf.defaultFontToken].size, size = (inSize === "$true" && !("$true" in fontSize) ? "$4" : inSize) ?? ("$true" in fontSize ? "$true" : "$4"), sizeTokens = Object.keys(fontSize);
14
+ const relativeSize = opts?.relativeSize || 0, conf = getConfig(), fontSize = conf.fontsParsed[opts?.font || conf.defaultFontToken]?.size || // fallback to size tokens
15
+ conf.tokensParsed.size, size = (inSize === "$true" && !("$true" in fontSize) ? "$4" : inSize) ?? ("$true" in fontSize ? "$true" : "$4"), sizeTokens = Object.keys(fontSize);
15
16
  let foundIndex = sizeTokens.indexOf(size);
16
17
  foundIndex === -1 && size.endsWith(".5") && (foundIndex = sizeTokens.indexOf(size.replace(".5", ""))), process.env.NODE_ENV === "development" && foundIndex === -1 && console.warn("No font size found", size, opts, "in size tokens", sizeTokens);
17
18
  const tokenIndex = Math.min(
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/getFontSize.ts"],
4
- "mappings": "AACA,SAAS,WAAW,kBAAkB;AAO/B,MAAM,cAAc,CACzB,QACA,SACW;AACX,QAAM,MAAM,oBAAoB,QAAQ,IAAI;AAC5C,SAAI,WAAW,GAAG,IACT,CAAC,IAAI,MAEP,MAAM,CAAC,MAAM;AACtB,GAEa,sBAAsB,CACjC,QACA,SACG;AACH,QAAM,QAAQ,iBAAiB,QAAQ,IAAI;AAC3C,MAAI,CAAC;AACH,WAAO;AAET,QAAM,OAAO,UAAU;AACvB,SAAO,KAAK,YAAY,MAAM,QAAQ,KAAK,gBAAgB,EAAE,KAAK,KAAK;AACzE,GAEa,mBAAmB,CAC9B,QACA,SAC0B;AAC1B,MAAI,OAAO,UAAW;AACpB,WAAO;AAGT,QAAM,eAAe,MAAM,gBAAgB,GACrC,OAAO,UAAU,GACjB,WAAW,KAAK,YAAY,MAAM,QAAQ,KAAK,gBAAgB,EAAE,MACjE,QACH,WAAW,WAAW,EAAE,WAAW,YAAY,OAAO,YACtD,WAAW,WAAW,UAAU,OAE7B,aAAa,OAAO,KAAK,QAAQ;AAEvC,MAAI,aAAa,WAAW,QAAQ,IAAI;AACxC,EAAI,eAAe,MACb,KAAK,SAAS,IAAI,MACpB,aAAa,WAAW,QAAQ,KAAK,QAAQ,MAAM,EAAE,CAAC,IAGtD,QAAQ,IAAI,aAAa,iBACvB,eAAe,MACjB,QAAQ,KAAK,sBAAsB,MAAM,MAAM,kBAAkB,UAAU;AAG/E,QAAM,aAAa,KAAK;AAAA,IACtB,KAAK,IAAI,GAAG,aAAa,YAAY;AAAA,IACrC,WAAW,SAAS;AAAA,EACtB;AACA,SAAQ,WAAW,UAAU,KAAK;AACpC;",
4
+ "mappings": "AACA,SAAS,WAAW,kBAAkB;AAO/B,MAAM,cAAc,CACzB,QACA,SACW;AACX,QAAM,MAAM,oBAAoB,QAAQ,IAAI;AAC5C,SAAI,WAAW,GAAG,IACT,CAAC,IAAI,MAEP,MAAM,CAAC,MAAM;AACtB,GAEa,sBAAsB,CACjC,QACA,SACG;AACH,QAAM,QAAQ,iBAAiB,QAAQ,IAAI;AAC3C,MAAI,CAAC;AACH,WAAO;AAET,QAAM,OAAO,UAAU;AAEvB,SADa,KAAK,YAAY,MAAM,QAAQ,KAAK,gBAAgB,GACpD,KAAK,KAAK;AACzB,GAEa,mBAAmB,CAC9B,QACA,SAC0B;AAC1B,MAAI,OAAO,UAAW;AACpB,WAAO;AAGT,QAAM,eAAe,MAAM,gBAAgB,GACrC,OAAO,UAAU,GAEjB,WADO,KAAK,YAAY,MAAM,QAAQ,KAAK,gBAAgB,GAEzD;AAAA,EAEN,KAAK,aAAa,MACd,QACH,WAAW,WAAW,EAAE,WAAW,YAAY,OAAO,YACtD,WAAW,WAAW,UAAU,OAE7B,aAAa,OAAO,KAAK,QAAQ;AAEvC,MAAI,aAAa,WAAW,QAAQ,IAAI;AACxC,EAAI,eAAe,MACb,KAAK,SAAS,IAAI,MACpB,aAAa,WAAW,QAAQ,KAAK,QAAQ,MAAM,EAAE,CAAC,IAGtD,QAAQ,IAAI,aAAa,iBACvB,eAAe,MACjB,QAAQ,KAAK,sBAAsB,MAAM,MAAM,kBAAkB,UAAU;AAG/E,QAAM,aAAa,KAAK;AAAA,IACtB,KAAK,IAAI,GAAG,aAAa,YAAY;AAAA,IACrC,WAAW,SAAS;AAAA,EACtB;AACA,SAAQ,WAAW,UAAU,KAAK;AACpC;",
5
5
  "names": []
6
6
  }
@@ -7,13 +7,15 @@ const getFontSize = (inSize, opts) => {
7
7
  const token = getFontSizeToken(inSize, opts);
8
8
  if (!token) return inSize;
9
9
  const conf = getConfig();
10
- return conf.fontsParsed[opts?.font || conf.defaultFontToken].size[token];
10
+ return conf.fontsParsed[opts?.font || conf.defaultFontToken]?.size[token];
11
11
  },
12
12
  getFontSizeToken = (inSize, opts) => {
13
13
  if (typeof inSize == "number") return null;
14
14
  const relativeSize = opts?.relativeSize || 0,
15
15
  conf = getConfig(),
16
- fontSize = conf.fontsParsed[opts?.font || conf.defaultFontToken].size,
16
+ fontSize = conf.fontsParsed[opts?.font || conf.defaultFontToken]?.size ||
17
+ // fallback to size tokens
18
+ conf.tokensParsed.size,
17
19
  size = (inSize === "$true" && !("$true" in fontSize) ? "$4" : inSize) ?? ("$true" in fontSize ? "$true" : "$4"),
18
20
  sizeTokens = Object.keys(fontSize);
19
21
  let foundIndex = sizeTokens.indexOf(size);
@@ -1 +1 @@
1
- {"version":3,"names":["getConfig","isVariable","getFontSize","inSize","opts","res","getFontSizeVariable","val","token","getFontSizeToken","conf","fontsParsed","font","defaultFontToken","size","relativeSize","fontSize","sizeTokens","Object","keys","foundIndex","indexOf","endsWith","replace","process","env","NODE_ENV","console","warn","tokenIndex","Math","min","max","length"],"sources":["../../src/getFontSize.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,SAAA,EAAWC,UAAA,QAAkB;AAO/B,MAAMC,WAAA,GAAcA,CACzBC,MAAA,EACAC,IAAA,KACW;IACX,MAAMC,GAAA,GAAMC,mBAAA,CAAoBH,MAAA,EAAQC,IAAI;IAC5C,OAAIH,UAAA,CAAWI,GAAG,IACT,CAACA,GAAA,CAAIE,GAAA,GAEPF,GAAA,GAAM,CAACA,GAAA,GAAM;EACtB;EAEaC,mBAAA,GAAsBA,CACjCH,MAAA,EACAC,IAAA,KACG;IACH,MAAMI,KAAA,GAAQC,gBAAA,CAAiBN,MAAA,EAAQC,IAAI;IAC3C,IAAI,CAACI,KAAA,EACH,OAAOL,MAAA;IAET,MAAMO,IAAA,GAAOV,SAAA,CAAU;IACvB,OAAOU,IAAA,CAAKC,WAAA,CAAYP,IAAA,EAAMQ,IAAA,IAAQF,IAAA,CAAKG,gBAAgB,EAAEC,IAAA,CAAKN,KAAK;EACzE;EAEaC,gBAAA,GAAmBA,CAC9BN,MAAA,EACAC,IAAA,KAC0B;IAC1B,IAAI,OAAOD,MAAA,IAAW,UACpB,OAAO;IAGT,MAAMY,YAAA,GAAeX,IAAA,EAAMW,YAAA,IAAgB;MACrCL,IAAA,GAAOV,SAAA,CAAU;MACjBgB,QAAA,GAAWN,IAAA,CAAKC,WAAA,CAAYP,IAAA,EAAMQ,IAAA,IAAQF,IAAA,CAAKG,gBAAgB,EAAEC,IAAA;MACjEA,IAAA,IACHX,MAAA,KAAW,WAAW,EAAE,WAAWa,QAAA,IAAY,OAAOb,MAAA,MACtD,WAAWa,QAAA,GAAW,UAAU;MAE7BC,UAAA,GAAaC,MAAA,CAAOC,IAAA,CAAKH,QAAQ;IAEvC,IAAII,UAAA,GAAaH,UAAA,CAAWI,OAAA,CAAQP,IAAI;IACpCM,UAAA,KAAe,MACbN,IAAA,CAAKQ,QAAA,CAAS,IAAI,MACpBF,UAAA,GAAaH,UAAA,CAAWI,OAAA,CAAQP,IAAA,CAAKS,OAAA,CAAQ,MAAM,EAAE,CAAC,IAGtDC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,iBACvBN,UAAA,KAAe,MACjBO,OAAA,CAAQC,IAAA,CAAK,sBAAsBd,IAAA,EAAMV,IAAA,EAAM,kBAAkBa,UAAU;IAG/E,MAAMY,UAAA,GAAaC,IAAA,CAAKC,GAAA,CACtBD,IAAA,CAAKE,GAAA,CAAI,GAAGZ,UAAA,GAAaL,YAAY,GACrCE,UAAA,CAAWgB,MAAA,GAAS,CACtB;IACA,OAAQhB,UAAA,CAAWY,UAAU,KAAKf,IAAA;EACpC","ignoreList":[]}
1
+ {"version":3,"names":["getConfig","isVariable","getFontSize","inSize","opts","res","getFontSizeVariable","val","token","getFontSizeToken","conf","fontsParsed","font","defaultFontToken","size","relativeSize","fontSize","tokensParsed","sizeTokens","Object","keys","foundIndex","indexOf","endsWith","replace","process","env","NODE_ENV","console","warn","tokenIndex","Math","min","max","length"],"sources":["../../src/getFontSize.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,SAAA,EAAWC,UAAA,QAAkB;AAO/B,MAAMC,WAAA,GAAcA,CACzBC,MAAA,EACAC,IAAA,KACW;IACX,MAAMC,GAAA,GAAMC,mBAAA,CAAoBH,MAAA,EAAQC,IAAI;IAC5C,OAAIH,UAAA,CAAWI,GAAG,IACT,CAACA,GAAA,CAAIE,GAAA,GAEPF,GAAA,GAAM,CAACA,GAAA,GAAM;EACtB;EAEaC,mBAAA,GAAsBA,CACjCH,MAAA,EACAC,IAAA,KACG;IACH,MAAMI,KAAA,GAAQC,gBAAA,CAAiBN,MAAA,EAAQC,IAAI;IAC3C,IAAI,CAACI,KAAA,EACH,OAAOL,MAAA;IAET,MAAMO,IAAA,GAAOV,SAAA,CAAU;IAEvB,OADaU,IAAA,CAAKC,WAAA,CAAYP,IAAA,EAAMQ,IAAA,IAAQF,IAAA,CAAKG,gBAAgB,GACpDC,IAAA,CAAKN,KAAK;EACzB;EAEaC,gBAAA,GAAmBA,CAC9BN,MAAA,EACAC,IAAA,KAC0B;IAC1B,IAAI,OAAOD,MAAA,IAAW,UACpB,OAAO;IAGT,MAAMY,YAAA,GAAeX,IAAA,EAAMW,YAAA,IAAgB;MACrCL,IAAA,GAAOV,SAAA,CAAU;MAEjBgB,QAAA,GADON,IAAA,CAAKC,WAAA,CAAYP,IAAA,EAAMQ,IAAA,IAAQF,IAAA,CAAKG,gBAAgB,GAEzDC,IAAA;MAAA;MAENJ,IAAA,CAAKO,YAAA,CAAaH,IAAA;MACdA,IAAA,IACHX,MAAA,KAAW,WAAW,EAAE,WAAWa,QAAA,IAAY,OAAOb,MAAA,MACtD,WAAWa,QAAA,GAAW,UAAU;MAE7BE,UAAA,GAAaC,MAAA,CAAOC,IAAA,CAAKJ,QAAQ;IAEvC,IAAIK,UAAA,GAAaH,UAAA,CAAWI,OAAA,CAAQR,IAAI;IACpCO,UAAA,KAAe,MACbP,IAAA,CAAKS,QAAA,CAAS,IAAI,MACpBF,UAAA,GAAaH,UAAA,CAAWI,OAAA,CAAQR,IAAA,CAAKU,OAAA,CAAQ,MAAM,EAAE,CAAC,IAGtDC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,iBACvBN,UAAA,KAAe,MACjBO,OAAA,CAAQC,IAAA,CAAK,sBAAsBf,IAAA,EAAMV,IAAA,EAAM,kBAAkBc,UAAU;IAG/E,MAAMY,UAAA,GAAaC,IAAA,CAAKC,GAAA,CACtBD,IAAA,CAAKE,GAAA,CAAI,GAAGZ,UAAA,GAAaN,YAAY,GACrCG,UAAA,CAAWgB,MAAA,GAAS,CACtB;IACA,OAAQhB,UAAA,CAAWY,UAAU,KAAKhB,IAAA;EACpC","ignoreList":[]}
@@ -6,12 +6,13 @@ var getFontSize = function(inSize, opts) {
6
6
  var token = getFontSizeToken(inSize, opts);
7
7
  if (!token)
8
8
  return inSize;
9
- var conf = getConfig();
10
- return conf.fontsParsed[opts?.font || conf.defaultFontToken].size[token];
9
+ var conf = getConfig(), font = conf.fontsParsed[opts?.font || conf.defaultFontToken];
10
+ return font?.size[token];
11
11
  }, getFontSizeToken = function(inSize, opts) {
12
12
  if (typeof inSize == "number")
13
13
  return null;
14
- var relativeSize = opts?.relativeSize || 0, conf = getConfig(), fontSize = conf.fontsParsed[opts?.font || conf.defaultFontToken].size, _ref, size = (_ref = inSize === "$true" && !("$true" in fontSize) ? "$4" : inSize) !== null && _ref !== void 0 ? _ref : "$true" in fontSize ? "$true" : "$4", sizeTokens = Object.keys(fontSize), foundIndex = sizeTokens.indexOf(size);
14
+ var relativeSize = opts?.relativeSize || 0, conf = getConfig(), font = conf.fontsParsed[opts?.font || conf.defaultFontToken], fontSize = font?.size || // fallback to size tokens
15
+ conf.tokensParsed.size, _ref, size = (_ref = inSize === "$true" && !("$true" in fontSize) ? "$4" : inSize) !== null && _ref !== void 0 ? _ref : "$true" in fontSize ? "$true" : "$4", sizeTokens = Object.keys(fontSize), foundIndex = sizeTokens.indexOf(size);
15
16
  foundIndex === -1 && size.endsWith(".5") && (foundIndex = sizeTokens.indexOf(size.replace(".5", ""))), process.env.NODE_ENV === "development" && foundIndex === -1 && console.warn("No font size found", size, opts, "in size tokens", sizeTokens);
16
17
  var tokenIndex = Math.min(Math.max(0, foundIndex + relativeSize), sizeTokens.length - 1), _sizeTokens_tokenIndex;
17
18
  return (_sizeTokens_tokenIndex = sizeTokens[tokenIndex]) !== null && _sizeTokens_tokenIndex !== void 0 ? _sizeTokens_tokenIndex : size;
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Users/n8/tamagui/code/core/font-size/src/getFontSize.ts"],
4
- "mappings": "AACA,SAASA,WAAWC,kBAAkB;AAO/B,IAAMC,cAAc,SACzBC,QACAC,MAAAA;AAEA,MAAMC,MAAMC,oBAAoBH,QAAQC,IAAAA;AACxC,SAAIH,WAAWI,GAAAA,IACN,CAACA,IAAIE,MAEPF,MAAM,CAACA,MAAM;AACtB,GAEaC,sBAAsB,SACjCH,QACAC,MAAAA;AAEA,MAAMI,QAAQC,iBAAiBN,QAAQC,IAAAA;AACvC,MAAI,CAACI;AACH,WAAOL;AAET,MAAMO,OAAOV,UAAAA;AACb,SAAOU,KAAKC,YAAYP,MAAMQ,QAAQF,KAAKG,gBAAgB,EAAEC,KAAKN,KAAAA;AACpE,GAEaC,mBAAmB,SAC9BN,QACAC,MAAAA;AAEA,MAAI,OAAOD,UAAW;AACpB,WAAO;AAGT,MAAMY,eAAeX,MAAMW,gBAAgB,GACrCL,OAAOV,UAAAA,GACPgB,WAAWN,KAAKC,YAAYP,MAAMQ,QAAQF,KAAKG,gBAAgB,EAAEC,MAEpEX,MADGW,QACHX,OAAAA,WAAW,WAAW,EAAE,WAAWa,YAAY,OAAOb,YAAAA,QAAtDA,SAAAA,SAAAA,OACA,WAAWa,WAAW,UAAU,MAE7BC,aAAaC,OAAOC,KAAKH,QAAAA,GAE3BI,aAAaH,WAAWI,QAAQP,IAAAA;AACpC,EAAIM,eAAe,MACbN,KAAKQ,SAAS,IAAA,MAChBF,aAAaH,WAAWI,QAAQP,KAAKS,QAAQ,MAAM,EAAA,CAAA,IAGnDC,QAAQC,IAAIC,aAAa,iBACvBN,eAAe,MACjBO,QAAQC,KAAK,sBAAsBd,MAAMV,MAAM,kBAAkBa,UAAAA;AAGrE,MAAMY,aAAaC,KAAKC,IACtBD,KAAKE,IAAI,GAAGZ,aAAaL,YAAAA,GACzBE,WAAWgB,SAAS,CAAA,GAEdhB;AAAR,UAAQA,yBAAAA,WAAWY,UAAAA,OAAW,QAAtBZ,2BAAAA,SAAAA,yBAA0BH;AACpC;",
5
- "names": ["getConfig", "isVariable", "getFontSize", "inSize", "opts", "res", "getFontSizeVariable", "val", "token", "getFontSizeToken", "conf", "fontsParsed", "font", "defaultFontToken", "size", "relativeSize", "fontSize", "sizeTokens", "Object", "keys", "foundIndex", "indexOf", "endsWith", "replace", "process", "env", "NODE_ENV", "console", "warn", "tokenIndex", "Math", "min", "max", "length"]
4
+ "mappings": "AACA,SAASA,WAAWC,kBAAkB;AAO/B,IAAMC,cAAc,SACzBC,QACAC,MAAAA;AAEA,MAAMC,MAAMC,oBAAoBH,QAAQC,IAAAA;AACxC,SAAIH,WAAWI,GAAAA,IACN,CAACA,IAAIE,MAEPF,MAAM,CAACA,MAAM;AACtB,GAEaC,sBAAsB,SACjCH,QACAC,MAAAA;AAEA,MAAMI,QAAQC,iBAAiBN,QAAQC,IAAAA;AACvC,MAAI,CAACI;AACH,WAAOL;AAET,MAAMO,OAAOV,UAAAA,GACPW,OAAOD,KAAKE,YAAYR,MAAMO,QAAQD,KAAKG,gBAAgB;AACjE,SAAOF,MAAMG,KAAKN,KAAAA;AACpB,GAEaC,mBAAmB,SAC9BN,QACAC,MAAAA;AAEA,MAAI,OAAOD,UAAW;AACpB,WAAO;AAGT,MAAMY,eAAeX,MAAMW,gBAAgB,GACrCL,OAAOV,UAAAA,GACPW,OAAOD,KAAKE,YAAYR,MAAMO,QAAQD,KAAKG,gBAAgB,GAC3DG,WACJL,MAAMG;EAENJ,KAAKO,aAAaH,MAEjBX,MADGW,QACHX,OAAAA,WAAW,WAAW,EAAE,WAAWa,YAAY,OAAOb,YAAAA,QAAtDA,SAAAA,SAAAA,OACA,WAAWa,WAAW,UAAU,MAE7BE,aAAaC,OAAOC,KAAKJ,QAAAA,GAE3BK,aAAaH,WAAWI,QAAQR,IAAAA;AACpC,EAAIO,eAAe,MACbP,KAAKS,SAAS,IAAA,MAChBF,aAAaH,WAAWI,QAAQR,KAAKU,QAAQ,MAAM,EAAA,CAAA,IAGnDC,QAAQC,IAAIC,aAAa,iBACvBN,eAAe,MACjBO,QAAQC,KAAK,sBAAsBf,MAAMV,MAAM,kBAAkBc,UAAAA;AAGrE,MAAMY,aAAaC,KAAKC,IACtBD,KAAKE,IAAI,GAAGZ,aAAaN,YAAAA,GACzBG,WAAWgB,SAAS,CAAA,GAEdhB;AAAR,UAAQA,yBAAAA,WAAWY,UAAAA,OAAW,QAAtBZ,2BAAAA,SAAAA,yBAA0BJ;AACpC;",
5
+ "names": ["getConfig", "isVariable", "getFontSize", "inSize", "opts", "res", "getFontSizeVariable", "val", "token", "getFontSizeToken", "conf", "font", "fontsParsed", "defaultFontToken", "size", "relativeSize", "fontSize", "tokensParsed", "sizeTokens", "Object", "keys", "foundIndex", "indexOf", "endsWith", "replace", "process", "env", "NODE_ENV", "console", "warn", "tokenIndex", "Math", "min", "max", "length"]
6
6
  }
@@ -7,11 +7,12 @@ const getFontSize = (inSize, opts) => {
7
7
  if (!token)
8
8
  return inSize;
9
9
  const conf = getConfig();
10
- return conf.fontsParsed[opts?.font || conf.defaultFontToken].size[token];
10
+ return conf.fontsParsed[opts?.font || conf.defaultFontToken]?.size[token];
11
11
  }, getFontSizeToken = (inSize, opts) => {
12
12
  if (typeof inSize == "number")
13
13
  return null;
14
- const relativeSize = opts?.relativeSize || 0, conf = getConfig(), fontSize = conf.fontsParsed[opts?.font || conf.defaultFontToken].size, size = (inSize === "$true" && !("$true" in fontSize) ? "$4" : inSize) ?? ("$true" in fontSize ? "$true" : "$4"), sizeTokens = Object.keys(fontSize);
14
+ const relativeSize = opts?.relativeSize || 0, conf = getConfig(), fontSize = conf.fontsParsed[opts?.font || conf.defaultFontToken]?.size || // fallback to size tokens
15
+ conf.tokensParsed.size, size = (inSize === "$true" && !("$true" in fontSize) ? "$4" : inSize) ?? ("$true" in fontSize ? "$true" : "$4"), sizeTokens = Object.keys(fontSize);
15
16
  let foundIndex = sizeTokens.indexOf(size);
16
17
  foundIndex === -1 && size.endsWith(".5") && (foundIndex = sizeTokens.indexOf(size.replace(".5", ""))), process.env.NODE_ENV === "development" && foundIndex === -1 && console.warn("No font size found", size, opts, "in size tokens", sizeTokens);
17
18
  const tokenIndex = Math.min(
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/getFontSize.ts"],
4
- "mappings": "AACA,SAAS,WAAW,kBAAkB;AAO/B,MAAM,cAAc,CACzB,QACA,SACW;AACX,QAAM,MAAM,oBAAoB,QAAQ,IAAI;AAC5C,SAAI,WAAW,GAAG,IACT,CAAC,IAAI,MAEP,MAAM,CAAC,MAAM;AACtB,GAEa,sBAAsB,CACjC,QACA,SACG;AACH,QAAM,QAAQ,iBAAiB,QAAQ,IAAI;AAC3C,MAAI,CAAC;AACH,WAAO;AAET,QAAM,OAAO,UAAU;AACvB,SAAO,KAAK,YAAY,MAAM,QAAQ,KAAK,gBAAgB,EAAE,KAAK,KAAK;AACzE,GAEa,mBAAmB,CAC9B,QACA,SAC0B;AAC1B,MAAI,OAAO,UAAW;AACpB,WAAO;AAGT,QAAM,eAAe,MAAM,gBAAgB,GACrC,OAAO,UAAU,GACjB,WAAW,KAAK,YAAY,MAAM,QAAQ,KAAK,gBAAgB,EAAE,MACjE,QACH,WAAW,WAAW,EAAE,WAAW,YAAY,OAAO,YACtD,WAAW,WAAW,UAAU,OAE7B,aAAa,OAAO,KAAK,QAAQ;AAEvC,MAAI,aAAa,WAAW,QAAQ,IAAI;AACxC,EAAI,eAAe,MACb,KAAK,SAAS,IAAI,MACpB,aAAa,WAAW,QAAQ,KAAK,QAAQ,MAAM,EAAE,CAAC,IAGtD,QAAQ,IAAI,aAAa,iBACvB,eAAe,MACjB,QAAQ,KAAK,sBAAsB,MAAM,MAAM,kBAAkB,UAAU;AAG/E,QAAM,aAAa,KAAK;AAAA,IACtB,KAAK,IAAI,GAAG,aAAa,YAAY;AAAA,IACrC,WAAW,SAAS;AAAA,EACtB;AACA,SAAQ,WAAW,UAAU,KAAK;AACpC;",
4
+ "mappings": "AACA,SAAS,WAAW,kBAAkB;AAO/B,MAAM,cAAc,CACzB,QACA,SACW;AACX,QAAM,MAAM,oBAAoB,QAAQ,IAAI;AAC5C,SAAI,WAAW,GAAG,IACT,CAAC,IAAI,MAEP,MAAM,CAAC,MAAM;AACtB,GAEa,sBAAsB,CACjC,QACA,SACG;AACH,QAAM,QAAQ,iBAAiB,QAAQ,IAAI;AAC3C,MAAI,CAAC;AACH,WAAO;AAET,QAAM,OAAO,UAAU;AAEvB,SADa,KAAK,YAAY,MAAM,QAAQ,KAAK,gBAAgB,GACpD,KAAK,KAAK;AACzB,GAEa,mBAAmB,CAC9B,QACA,SAC0B;AAC1B,MAAI,OAAO,UAAW;AACpB,WAAO;AAGT,QAAM,eAAe,MAAM,gBAAgB,GACrC,OAAO,UAAU,GAEjB,WADO,KAAK,YAAY,MAAM,QAAQ,KAAK,gBAAgB,GAEzD;AAAA,EAEN,KAAK,aAAa,MACd,QACH,WAAW,WAAW,EAAE,WAAW,YAAY,OAAO,YACtD,WAAW,WAAW,UAAU,OAE7B,aAAa,OAAO,KAAK,QAAQ;AAEvC,MAAI,aAAa,WAAW,QAAQ,IAAI;AACxC,EAAI,eAAe,MACb,KAAK,SAAS,IAAI,MACpB,aAAa,WAAW,QAAQ,KAAK,QAAQ,MAAM,EAAE,CAAC,IAGtD,QAAQ,IAAI,aAAa,iBACvB,eAAe,MACjB,QAAQ,KAAK,sBAAsB,MAAM,MAAM,kBAAkB,UAAU;AAG/E,QAAM,aAAa,KAAK;AAAA,IACtB,KAAK,IAAI,GAAG,aAAa,YAAY;AAAA,IACrC,WAAW,SAAS;AAAA,EACtB;AACA,SAAQ,WAAW,UAAU,KAAK;AACpC;",
5
5
  "names": []
6
6
  }
@@ -7,13 +7,15 @@ const getFontSize = (inSize, opts) => {
7
7
  const token = getFontSizeToken(inSize, opts);
8
8
  if (!token) return inSize;
9
9
  const conf = getConfig();
10
- return conf.fontsParsed[opts?.font || conf.defaultFontToken].size[token];
10
+ return conf.fontsParsed[opts?.font || conf.defaultFontToken]?.size[token];
11
11
  },
12
12
  getFontSizeToken = (inSize, opts) => {
13
13
  if (typeof inSize == "number") return null;
14
14
  const relativeSize = opts?.relativeSize || 0,
15
15
  conf = getConfig(),
16
- fontSize = conf.fontsParsed[opts?.font || conf.defaultFontToken].size,
16
+ fontSize = conf.fontsParsed[opts?.font || conf.defaultFontToken]?.size ||
17
+ // fallback to size tokens
18
+ conf.tokensParsed.size,
17
19
  size = (inSize === "$true" && !("$true" in fontSize) ? "$4" : inSize) ?? ("$true" in fontSize ? "$true" : "$4"),
18
20
  sizeTokens = Object.keys(fontSize);
19
21
  let foundIndex = sizeTokens.indexOf(size);
@@ -1 +1 @@
1
- {"version":3,"names":["getConfig","isVariable","getFontSize","inSize","opts","res","getFontSizeVariable","val","token","getFontSizeToken","conf","fontsParsed","font","defaultFontToken","size","relativeSize","fontSize","sizeTokens","Object","keys","foundIndex","indexOf","endsWith","replace","process","env","NODE_ENV","console","warn","tokenIndex","Math","min","max","length"],"sources":["../../src/getFontSize.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,SAAA,EAAWC,UAAA,QAAkB;AAO/B,MAAMC,WAAA,GAAcA,CACzBC,MAAA,EACAC,IAAA,KACW;IACX,MAAMC,GAAA,GAAMC,mBAAA,CAAoBH,MAAA,EAAQC,IAAI;IAC5C,OAAIH,UAAA,CAAWI,GAAG,IACT,CAACA,GAAA,CAAIE,GAAA,GAEPF,GAAA,GAAM,CAACA,GAAA,GAAM;EACtB;EAEaC,mBAAA,GAAsBA,CACjCH,MAAA,EACAC,IAAA,KACG;IACH,MAAMI,KAAA,GAAQC,gBAAA,CAAiBN,MAAA,EAAQC,IAAI;IAC3C,IAAI,CAACI,KAAA,EACH,OAAOL,MAAA;IAET,MAAMO,IAAA,GAAOV,SAAA,CAAU;IACvB,OAAOU,IAAA,CAAKC,WAAA,CAAYP,IAAA,EAAMQ,IAAA,IAAQF,IAAA,CAAKG,gBAAgB,EAAEC,IAAA,CAAKN,KAAK;EACzE;EAEaC,gBAAA,GAAmBA,CAC9BN,MAAA,EACAC,IAAA,KAC0B;IAC1B,IAAI,OAAOD,MAAA,IAAW,UACpB,OAAO;IAGT,MAAMY,YAAA,GAAeX,IAAA,EAAMW,YAAA,IAAgB;MACrCL,IAAA,GAAOV,SAAA,CAAU;MACjBgB,QAAA,GAAWN,IAAA,CAAKC,WAAA,CAAYP,IAAA,EAAMQ,IAAA,IAAQF,IAAA,CAAKG,gBAAgB,EAAEC,IAAA;MACjEA,IAAA,IACHX,MAAA,KAAW,WAAW,EAAE,WAAWa,QAAA,IAAY,OAAOb,MAAA,MACtD,WAAWa,QAAA,GAAW,UAAU;MAE7BC,UAAA,GAAaC,MAAA,CAAOC,IAAA,CAAKH,QAAQ;IAEvC,IAAII,UAAA,GAAaH,UAAA,CAAWI,OAAA,CAAQP,IAAI;IACpCM,UAAA,KAAe,MACbN,IAAA,CAAKQ,QAAA,CAAS,IAAI,MACpBF,UAAA,GAAaH,UAAA,CAAWI,OAAA,CAAQP,IAAA,CAAKS,OAAA,CAAQ,MAAM,EAAE,CAAC,IAGtDC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,iBACvBN,UAAA,KAAe,MACjBO,OAAA,CAAQC,IAAA,CAAK,sBAAsBd,IAAA,EAAMV,IAAA,EAAM,kBAAkBa,UAAU;IAG/E,MAAMY,UAAA,GAAaC,IAAA,CAAKC,GAAA,CACtBD,IAAA,CAAKE,GAAA,CAAI,GAAGZ,UAAA,GAAaL,YAAY,GACrCE,UAAA,CAAWgB,MAAA,GAAS,CACtB;IACA,OAAQhB,UAAA,CAAWY,UAAU,KAAKf,IAAA;EACpC","ignoreList":[]}
1
+ {"version":3,"names":["getConfig","isVariable","getFontSize","inSize","opts","res","getFontSizeVariable","val","token","getFontSizeToken","conf","fontsParsed","font","defaultFontToken","size","relativeSize","fontSize","tokensParsed","sizeTokens","Object","keys","foundIndex","indexOf","endsWith","replace","process","env","NODE_ENV","console","warn","tokenIndex","Math","min","max","length"],"sources":["../../src/getFontSize.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,SAAA,EAAWC,UAAA,QAAkB;AAO/B,MAAMC,WAAA,GAAcA,CACzBC,MAAA,EACAC,IAAA,KACW;IACX,MAAMC,GAAA,GAAMC,mBAAA,CAAoBH,MAAA,EAAQC,IAAI;IAC5C,OAAIH,UAAA,CAAWI,GAAG,IACT,CAACA,GAAA,CAAIE,GAAA,GAEPF,GAAA,GAAM,CAACA,GAAA,GAAM;EACtB;EAEaC,mBAAA,GAAsBA,CACjCH,MAAA,EACAC,IAAA,KACG;IACH,MAAMI,KAAA,GAAQC,gBAAA,CAAiBN,MAAA,EAAQC,IAAI;IAC3C,IAAI,CAACI,KAAA,EACH,OAAOL,MAAA;IAET,MAAMO,IAAA,GAAOV,SAAA,CAAU;IAEvB,OADaU,IAAA,CAAKC,WAAA,CAAYP,IAAA,EAAMQ,IAAA,IAAQF,IAAA,CAAKG,gBAAgB,GACpDC,IAAA,CAAKN,KAAK;EACzB;EAEaC,gBAAA,GAAmBA,CAC9BN,MAAA,EACAC,IAAA,KAC0B;IAC1B,IAAI,OAAOD,MAAA,IAAW,UACpB,OAAO;IAGT,MAAMY,YAAA,GAAeX,IAAA,EAAMW,YAAA,IAAgB;MACrCL,IAAA,GAAOV,SAAA,CAAU;MAEjBgB,QAAA,GADON,IAAA,CAAKC,WAAA,CAAYP,IAAA,EAAMQ,IAAA,IAAQF,IAAA,CAAKG,gBAAgB,GAEzDC,IAAA;MAAA;MAENJ,IAAA,CAAKO,YAAA,CAAaH,IAAA;MACdA,IAAA,IACHX,MAAA,KAAW,WAAW,EAAE,WAAWa,QAAA,IAAY,OAAOb,MAAA,MACtD,WAAWa,QAAA,GAAW,UAAU;MAE7BE,UAAA,GAAaC,MAAA,CAAOC,IAAA,CAAKJ,QAAQ;IAEvC,IAAIK,UAAA,GAAaH,UAAA,CAAWI,OAAA,CAAQR,IAAI;IACpCO,UAAA,KAAe,MACbP,IAAA,CAAKS,QAAA,CAAS,IAAI,MACpBF,UAAA,GAAaH,UAAA,CAAWI,OAAA,CAAQR,IAAA,CAAKU,OAAA,CAAQ,MAAM,EAAE,CAAC,IAGtDC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,iBACvBN,UAAA,KAAe,MACjBO,OAAA,CAAQC,IAAA,CAAK,sBAAsBf,IAAA,EAAMV,IAAA,EAAM,kBAAkBc,UAAU;IAG/E,MAAMY,UAAA,GAAaC,IAAA,CAAKC,GAAA,CACtBD,IAAA,CAAKE,GAAA,CAAI,GAAGZ,UAAA,GAAaN,YAAY,GACrCG,UAAA,CAAWgB,MAAA,GAAS,CACtB;IACA,OAAQhB,UAAA,CAAWY,UAAU,KAAKhB,IAAA;EACpC","ignoreList":[]}
@@ -6,12 +6,13 @@ var getFontSize = function(inSize, opts) {
6
6
  var token = getFontSizeToken(inSize, opts);
7
7
  if (!token)
8
8
  return inSize;
9
- var conf = getConfig();
10
- return conf.fontsParsed[(opts == null ? void 0 : opts.font) || conf.defaultFontToken].size[token];
9
+ var conf = getConfig(), font = conf.fontsParsed[(opts == null ? void 0 : opts.font) || conf.defaultFontToken];
10
+ return font == null ? void 0 : font.size[token];
11
11
  }, getFontSizeToken = function(inSize, opts) {
12
12
  if (typeof inSize == "number")
13
13
  return null;
14
- var relativeSize = (opts == null ? void 0 : opts.relativeSize) || 0, conf = getConfig(), fontSize = conf.fontsParsed[(opts == null ? void 0 : opts.font) || conf.defaultFontToken].size, _ref, size = (_ref = inSize === "$true" && !("$true" in fontSize) ? "$4" : inSize) !== null && _ref !== void 0 ? _ref : "$true" in fontSize ? "$true" : "$4", sizeTokens = Object.keys(fontSize), foundIndex = sizeTokens.indexOf(size);
14
+ var relativeSize = (opts == null ? void 0 : opts.relativeSize) || 0, conf = getConfig(), font = conf.fontsParsed[(opts == null ? void 0 : opts.font) || conf.defaultFontToken], fontSize = (font == null ? void 0 : font.size) || // fallback to size tokens
15
+ conf.tokensParsed.size, _ref, size = (_ref = inSize === "$true" && !("$true" in fontSize) ? "$4" : inSize) !== null && _ref !== void 0 ? _ref : "$true" in fontSize ? "$true" : "$4", sizeTokens = Object.keys(fontSize), foundIndex = sizeTokens.indexOf(size);
15
16
  foundIndex === -1 && size.endsWith(".5") && (foundIndex = sizeTokens.indexOf(size.replace(".5", ""))), process.env.NODE_ENV === "development" && foundIndex === -1 && console.warn("No font size found", size, opts, "in size tokens", sizeTokens);
16
17
  var tokenIndex = Math.min(Math.max(0, foundIndex + relativeSize), sizeTokens.length - 1), _sizeTokens_tokenIndex;
17
18
  return (_sizeTokens_tokenIndex = sizeTokens[tokenIndex]) !== null && _sizeTokens_tokenIndex !== void 0 ? _sizeTokens_tokenIndex : size;
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Users/n8/tamagui/code/core/font-size/src/getFontSize.ts"],
4
- "mappings": "AACA,SAASA,WAAWC,kBAAkB;AAO/B,IAAMC,cAAc,SACzBC,QACAC,MAAAA;AAEA,MAAMC,MAAMC,oBAAoBH,QAAQC,IAAAA;AACxC,SAAIH,WAAWI,GAAAA,IACN,CAACA,IAAIE,MAEPF,MAAM,CAACA,MAAM;AACtB,GAEaC,sBAAsB,SACjCH,QACAC,MAAAA;AAEA,MAAMI,QAAQC,iBAAiBN,QAAQC,IAAAA;AACvC,MAAI,CAACI;AACH,WAAOL;AAET,MAAMO,OAAOV,UAAAA;AACb,SAAOU,KAAKC,aAAYP,QAAAA,OAAAA,SAAAA,KAAMQ,SAAQF,KAAKG,gBAAgB,EAAEC,KAAKN,KAAAA;AACpE,GAEaC,mBAAmB,SAC9BN,QACAC,MAAAA;AAEA,MAAI,OAAOD,UAAW;AACpB,WAAO;AAGT,MAAMY,gBAAeX,QAAAA,OAAAA,SAAAA,KAAMW,iBAAgB,GACrCL,OAAOV,UAAAA,GACPgB,WAAWN,KAAKC,aAAYP,QAAAA,OAAAA,SAAAA,KAAMQ,SAAQF,KAAKG,gBAAgB,EAAEC,MAEpEX,MADGW,QACHX,OAAAA,WAAW,WAAW,EAAE,WAAWa,YAAY,OAAOb,YAAAA,QAAtDA,SAAAA,SAAAA,OACA,WAAWa,WAAW,UAAU,MAE7BC,aAAaC,OAAOC,KAAKH,QAAAA,GAE3BI,aAAaH,WAAWI,QAAQP,IAAAA;AACpC,EAAIM,eAAe,MACbN,KAAKQ,SAAS,IAAA,MAChBF,aAAaH,WAAWI,QAAQP,KAAKS,QAAQ,MAAM,EAAA,CAAA,IAGnDC,QAAQC,IAAIC,aAAa,iBACvBN,eAAe,MACjBO,QAAQC,KAAK,sBAAsBd,MAAMV,MAAM,kBAAkBa,UAAAA;AAGrE,MAAMY,aAAaC,KAAKC,IACtBD,KAAKE,IAAI,GAAGZ,aAAaL,YAAAA,GACzBE,WAAWgB,SAAS,CAAA,GAEdhB;AAAR,UAAQA,yBAAAA,WAAWY,UAAAA,OAAW,QAAtBZ,2BAAAA,SAAAA,yBAA0BH;AACpC;",
5
- "names": ["getConfig", "isVariable", "getFontSize", "inSize", "opts", "res", "getFontSizeVariable", "val", "token", "getFontSizeToken", "conf", "fontsParsed", "font", "defaultFontToken", "size", "relativeSize", "fontSize", "sizeTokens", "Object", "keys", "foundIndex", "indexOf", "endsWith", "replace", "process", "env", "NODE_ENV", "console", "warn", "tokenIndex", "Math", "min", "max", "length"]
4
+ "mappings": "AACA,SAASA,WAAWC,kBAAkB;AAO/B,IAAMC,cAAc,SACzBC,QACAC,MAAAA;AAEA,MAAMC,MAAMC,oBAAoBH,QAAQC,IAAAA;AACxC,SAAIH,WAAWI,GAAAA,IACN,CAACA,IAAIE,MAEPF,MAAM,CAACA,MAAM;AACtB,GAEaC,sBAAsB,SACjCH,QACAC,MAAAA;AAEA,MAAMI,QAAQC,iBAAiBN,QAAQC,IAAAA;AACvC,MAAI,CAACI;AACH,WAAOL;AAET,MAAMO,OAAOV,UAAAA,GACPW,OAAOD,KAAKE,aAAYR,QAAAA,OAAAA,SAAAA,KAAMO,SAAQD,KAAKG,gBAAgB;AACjE,SAAOF,QAAAA,OAAAA,SAAAA,KAAMG,KAAKN,KAAAA;AACpB,GAEaC,mBAAmB,SAC9BN,QACAC,MAAAA;AAEA,MAAI,OAAOD,UAAW;AACpB,WAAO;AAGT,MAAMY,gBAAeX,QAAAA,OAAAA,SAAAA,KAAMW,iBAAgB,GACrCL,OAAOV,UAAAA,GACPW,OAAOD,KAAKE,aAAYR,QAAAA,OAAAA,SAAAA,KAAMO,SAAQD,KAAKG,gBAAgB,GAC3DG,YACJL,QAAAA,OAAAA,SAAAA,KAAMG;EAENJ,KAAKO,aAAaH,MAEjBX,MADGW,QACHX,OAAAA,WAAW,WAAW,EAAE,WAAWa,YAAY,OAAOb,YAAAA,QAAtDA,SAAAA,SAAAA,OACA,WAAWa,WAAW,UAAU,MAE7BE,aAAaC,OAAOC,KAAKJ,QAAAA,GAE3BK,aAAaH,WAAWI,QAAQR,IAAAA;AACpC,EAAIO,eAAe,MACbP,KAAKS,SAAS,IAAA,MAChBF,aAAaH,WAAWI,QAAQR,KAAKU,QAAQ,MAAM,EAAA,CAAA,IAGnDC,QAAQC,IAAIC,aAAa,iBACvBN,eAAe,MACjBO,QAAQC,KAAK,sBAAsBf,MAAMV,MAAM,kBAAkBc,UAAAA;AAGrE,MAAMY,aAAaC,KAAKC,IACtBD,KAAKE,IAAI,GAAGZ,aAAaN,YAAAA,GACzBG,WAAWgB,SAAS,CAAA,GAEdhB;AAAR,UAAQA,yBAAAA,WAAWY,UAAAA,OAAW,QAAtBZ,2BAAAA,SAAAA,yBAA0BJ;AACpC;",
5
+ "names": ["getConfig", "isVariable", "getFontSize", "inSize", "opts", "res", "getFontSizeVariable", "val", "token", "getFontSizeToken", "conf", "font", "fontsParsed", "defaultFontToken", "size", "relativeSize", "fontSize", "tokensParsed", "sizeTokens", "Object", "keys", "foundIndex", "indexOf", "endsWith", "replace", "process", "env", "NODE_ENV", "console", "warn", "tokenIndex", "Math", "min", "max", "length"]
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/font-size",
3
- "version": "1.113.2",
3
+ "version": "1.114.1",
4
4
  "sideEffects": false,
5
5
  "source": "src/index.ts",
6
6
  "types": "./types/index.d.ts",
@@ -30,10 +30,10 @@
30
30
  "lint:fix": "biome check --write src"
31
31
  },
32
32
  "dependencies": {
33
- "@tamagui/core": "1.113.2"
33
+ "@tamagui/core": "1.114.1"
34
34
  },
35
35
  "devDependencies": {
36
- "@tamagui/build": "1.113.2",
36
+ "@tamagui/build": "1.114.1",
37
37
  "react": "^18.2.0 || ^19.0.0"
38
38
  },
39
39
  "publishConfig": {
@@ -26,7 +26,8 @@ export const getFontSizeVariable = (
26
26
  return inSize
27
27
  }
28
28
  const conf = getConfig()
29
- return conf.fontsParsed[opts?.font || conf.defaultFontToken].size[token]
29
+ const font = conf.fontsParsed[opts?.font || conf.defaultFontToken]
30
+ return font?.size[token]
30
31
  }
31
32
 
32
33
  export const getFontSizeToken = (
@@ -39,7 +40,11 @@ export const getFontSizeToken = (
39
40
  // backwards compat
40
41
  const relativeSize = opts?.relativeSize || 0
41
42
  const conf = getConfig()
42
- const fontSize = conf.fontsParsed[opts?.font || conf.defaultFontToken].size
43
+ const font = conf.fontsParsed[opts?.font || conf.defaultFontToken]
44
+ const fontSize =
45
+ font?.size ||
46
+ // fallback to size tokens
47
+ conf.tokensParsed.size
43
48
  const size =
44
49
  (inSize === '$true' && !('$true' in fontSize) ? '$4' : inSize) ??
45
50
  ('$true' in fontSize ? '$true' : '$4')
@@ -1 +1 @@
1
- {"version":3,"file":"getFontSize.d.ts","sourceRoot":"","sources":["../src/getFontSize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAG/D,KAAK,eAAe,GAAG;IACrB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,IAAI,CAAC,EAAE,UAAU,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,WAAW,WACd,cAAc,GAAG,IAAI,GAAG,SAAS,SAClC,eAAe,KACrB,MAMF,CAAA;AAED,eAAO,MAAM,mBAAmB,WACtB,cAAc,GAAG,IAAI,GAAG,SAAS,SAClC,eAAe,qFAQvB,CAAA;AAED,eAAO,MAAM,gBAAgB,WACnB,cAAc,GAAG,IAAI,GAAG,SAAS,SAClC,eAAe,KACrB,cAAc,GAAG,IA8BnB,CAAA"}
1
+ {"version":3,"file":"getFontSize.d.ts","sourceRoot":"","sources":["../src/getFontSize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAG/D,KAAK,eAAe,GAAG;IACrB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,IAAI,CAAC,EAAE,UAAU,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,WAAW,WACd,cAAc,GAAG,IAAI,GAAG,SAAS,SAClC,eAAe,KACrB,MAMF,CAAA;AAED,eAAO,MAAM,mBAAmB,WACtB,cAAc,GAAG,IAAI,GAAG,SAAS,SAClC,eAAe,qFASvB,CAAA;AAED,eAAO,MAAM,gBAAgB,WACnB,cAAc,GAAG,IAAI,GAAG,SAAS,SAClC,eAAe,KACrB,cAAc,GAAG,IAkCnB,CAAA"}