@tamagui/font-size 1.1.7 → 1.1.8

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.
@@ -43,7 +43,7 @@ const getFontSizeToken = (inSize, opts) => {
43
43
  if (typeof inSize === "number") {
44
44
  return null;
45
45
  }
46
- const size = inSize || "$4";
46
+ const size = inSize || "$true";
47
47
  const relativeSize = (opts == null ? void 0 : opts.relativeSize) || 0;
48
48
  const conf = (0, import_core.getConfig)();
49
49
  const fontSize = conf.fontsParsed[(opts == null ? void 0 : opts.font) || "$body"].size;
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/getFontSize.ts"],
4
- "sourcesContent": ["import {\n FontSizeTokens,\n FontTokens,\n getConfig,\n getTokens,\n isVariable,\n} from '@tamagui/core'\n\ntype GetFontSizeOpts = {\n relativeSize?: number\n font?: FontTokens\n}\n\nexport const getFontSize = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts,\n): number => {\n const res = getFontSizeVariable(inSize, opts)\n if (isVariable(res)) {\n return +res.val\n }\n return res ? +res : 16\n}\n\nexport const getFontSizeVariable = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts,\n) => {\n const token = getFontSizeToken(inSize, opts)\n if (!token) {\n return inSize\n }\n const conf = getConfig()\n return conf.fontsParsed[opts?.font || '$body'].size[token]\n}\n\nexport const getFontSizeToken = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts,\n): FontSizeTokens | null => {\n if (typeof inSize === 'number') {\n return null\n }\n const size = inSize || '$4'\n const relativeSize = opts?.relativeSize || 0\n const conf = getConfig()\n const fontSize = conf.fontsParsed[opts?.font || '$body'].size\n const sizeTokens = Object.keys(fontSize)\n let foundIndex = sizeTokens.indexOf(size)\n if (foundIndex === -1) {\n if (size.endsWith('.5')) {\n foundIndex = sizeTokens.indexOf(size.replace('.5', ''))\n }\n }\n if (process.env.NODE_ENV === 'development') {\n if (foundIndex === -1) {\n // eslint-disable-next-line no-console\n console.warn('No font size found', inSize, opts, 'in size tokens', sizeTokens)\n }\n }\n const tokenIndex = Math.min(\n Math.max(0, foundIndex + relativeSize),\n sizeTokens.length - 1,\n )\n return (sizeTokens[tokenIndex] ?? size) as FontSizeTokens\n}\n"],
5
- "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAMO;AAOA,MAAM,cAAc,CACzB,QACA,SACW;AACX,QAAM,MAAM,oBAAoB,QAAQ,IAAI;AAC5C,UAAI,wBAAW,GAAG,GAAG;AACnB,WAAO,CAAC,IAAI;AAAA,EACd;AACA,SAAO,MAAM,CAAC,MAAM;AACtB;AAEO,MAAM,sBAAsB,CACjC,QACA,SACG;AACH,QAAM,QAAQ,iBAAiB,QAAQ,IAAI;AAC3C,MAAI,CAAC,OAAO;AACV,WAAO;AAAA,EACT;AACA,QAAM,WAAO,uBAAU;AACvB,SAAO,KAAK,aAAY,6BAAM,SAAQ,SAAS,KAAK;AACtD;AAEO,MAAM,mBAAmB,CAC9B,QACA,SAC0B;AAC1B,MAAI,OAAO,WAAW,UAAU;AAC9B,WAAO;AAAA,EACT;AACA,QAAM,OAAO,UAAU;AACvB,QAAM,gBAAe,6BAAM,iBAAgB;AAC3C,QAAM,WAAO,uBAAU;AACvB,QAAM,WAAW,KAAK,aAAY,6BAAM,SAAQ,SAAS;AACzD,QAAM,aAAa,OAAO,KAAK,QAAQ;AACvC,MAAI,aAAa,WAAW,QAAQ,IAAI;AACxC,MAAI,eAAe,IAAI;AACrB,QAAI,KAAK,SAAS,IAAI,GAAG;AACvB,mBAAa,WAAW,QAAQ,KAAK,QAAQ,MAAM,EAAE,CAAC;AAAA,IACxD;AAAA,EACF;AACA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,eAAe,IAAI;AAErB,cAAQ,KAAK,sBAAsB,QAAQ,MAAM,kBAAkB,UAAU;AAAA,IAC/E;AAAA,EACF;AACA,QAAM,aAAa,KAAK;AAAA,IACtB,KAAK,IAAI,GAAG,aAAa,YAAY;AAAA,IACrC,WAAW,SAAS;AAAA,EACtB;AACA,SAAQ,WAAW,eAAe;AACpC;",
4
+ "sourcesContent": ["import { FontSizeTokens, FontTokens, getConfig, isVariable } from '@tamagui/core'\n\ntype GetFontSizeOpts = {\n relativeSize?: number\n font?: FontTokens\n}\n\nexport const getFontSize = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts\n): number => {\n const res = getFontSizeVariable(inSize, opts)\n if (isVariable(res)) {\n return +res.val\n }\n return res ? +res : 16\n}\n\nexport const getFontSizeVariable = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts\n) => {\n const token = getFontSizeToken(inSize, opts)\n if (!token) {\n return inSize\n }\n const conf = getConfig()\n return conf.fontsParsed[opts?.font || '$body'].size[token]\n}\n\nexport const getFontSizeToken = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts\n): FontSizeTokens | null => {\n if (typeof inSize === 'number') {\n return null\n }\n const size = inSize || '$true'\n const relativeSize = opts?.relativeSize || 0\n const conf = getConfig()\n const fontSize = conf.fontsParsed[opts?.font || '$body'].size\n const sizeTokens = Object.keys(fontSize)\n let foundIndex = sizeTokens.indexOf(size)\n if (foundIndex === -1) {\n if (size.endsWith('.5')) {\n foundIndex = sizeTokens.indexOf(size.replace('.5', ''))\n }\n }\n if (process.env.NODE_ENV === 'development') {\n if (foundIndex === -1) {\n // eslint-disable-next-line no-console\n console.warn('No font size found', inSize, opts, 'in size tokens', sizeTokens)\n }\n }\n const tokenIndex = Math.min(\n Math.max(0, foundIndex + relativeSize),\n sizeTokens.length - 1\n )\n return (sizeTokens[tokenIndex] ?? size) as FontSizeTokens\n}\n"],
5
+ "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAkE;AAO3D,MAAM,cAAc,CACzB,QACA,SACW;AACX,QAAM,MAAM,oBAAoB,QAAQ,IAAI;AAC5C,UAAI,wBAAW,GAAG,GAAG;AACnB,WAAO,CAAC,IAAI;AAAA,EACd;AACA,SAAO,MAAM,CAAC,MAAM;AACtB;AAEO,MAAM,sBAAsB,CACjC,QACA,SACG;AACH,QAAM,QAAQ,iBAAiB,QAAQ,IAAI;AAC3C,MAAI,CAAC,OAAO;AACV,WAAO;AAAA,EACT;AACA,QAAM,WAAO,uBAAU;AACvB,SAAO,KAAK,aAAY,6BAAM,SAAQ,SAAS,KAAK;AACtD;AAEO,MAAM,mBAAmB,CAC9B,QACA,SAC0B;AAC1B,MAAI,OAAO,WAAW,UAAU;AAC9B,WAAO;AAAA,EACT;AACA,QAAM,OAAO,UAAU;AACvB,QAAM,gBAAe,6BAAM,iBAAgB;AAC3C,QAAM,WAAO,uBAAU;AACvB,QAAM,WAAW,KAAK,aAAY,6BAAM,SAAQ,SAAS;AACzD,QAAM,aAAa,OAAO,KAAK,QAAQ;AACvC,MAAI,aAAa,WAAW,QAAQ,IAAI;AACxC,MAAI,eAAe,IAAI;AACrB,QAAI,KAAK,SAAS,IAAI,GAAG;AACvB,mBAAa,WAAW,QAAQ,KAAK,QAAQ,MAAM,EAAE,CAAC;AAAA,IACxD;AAAA,EACF;AACA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,eAAe,IAAI;AAErB,cAAQ,KAAK,sBAAsB,QAAQ,MAAM,kBAAkB,UAAU;AAAA,IAC/E;AAAA,EACF;AACA,QAAM,aAAa,KAAK;AAAA,IACtB,KAAK,IAAI,GAAG,aAAa,YAAY;AAAA,IACrC,WAAW,SAAS;AAAA,EACtB;AACA,SAAQ,WAAW,eAAe;AACpC;",
6
6
  "names": []
7
7
  }
@@ -1,7 +1,4 @@
1
- import {
2
- getConfig,
3
- isVariable
4
- } from "@tamagui/core";
1
+ import { getConfig, isVariable } from "@tamagui/core";
5
2
  const getFontSize = (inSize, opts) => {
6
3
  const res = getFontSizeVariable(inSize, opts);
7
4
  if (isVariable(res)) {
@@ -21,7 +18,7 @@ const getFontSizeToken = (inSize, opts) => {
21
18
  if (typeof inSize === "number") {
22
19
  return null;
23
20
  }
24
- const size = inSize || "$4";
21
+ const size = inSize || "$true";
25
22
  const relativeSize = (opts == null ? void 0 : opts.relativeSize) || 0;
26
23
  const conf = getConfig();
27
24
  const fontSize = conf.fontsParsed[(opts == null ? void 0 : opts.font) || "$body"].size;
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/getFontSize.ts"],
4
- "sourcesContent": ["import {\n FontSizeTokens,\n FontTokens,\n getConfig,\n getTokens,\n isVariable,\n} from '@tamagui/core'\n\ntype GetFontSizeOpts = {\n relativeSize?: number\n font?: FontTokens\n}\n\nexport const getFontSize = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts,\n): number => {\n const res = getFontSizeVariable(inSize, opts)\n if (isVariable(res)) {\n return +res.val\n }\n return res ? +res : 16\n}\n\nexport const getFontSizeVariable = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts,\n) => {\n const token = getFontSizeToken(inSize, opts)\n if (!token) {\n return inSize\n }\n const conf = getConfig()\n return conf.fontsParsed[opts?.font || '$body'].size[token]\n}\n\nexport const getFontSizeToken = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts,\n): FontSizeTokens | null => {\n if (typeof inSize === 'number') {\n return null\n }\n const size = inSize || '$4'\n const relativeSize = opts?.relativeSize || 0\n const conf = getConfig()\n const fontSize = conf.fontsParsed[opts?.font || '$body'].size\n const sizeTokens = Object.keys(fontSize)\n let foundIndex = sizeTokens.indexOf(size)\n if (foundIndex === -1) {\n if (size.endsWith('.5')) {\n foundIndex = sizeTokens.indexOf(size.replace('.5', ''))\n }\n }\n if (process.env.NODE_ENV === 'development') {\n if (foundIndex === -1) {\n // eslint-disable-next-line no-console\n console.warn('No font size found', inSize, opts, 'in size tokens', sizeTokens)\n }\n }\n const tokenIndex = Math.min(\n Math.max(0, foundIndex + relativeSize),\n sizeTokens.length - 1,\n )\n return (sizeTokens[tokenIndex] ?? size) as FontSizeTokens\n}\n"],
5
- "mappings": "AAAA;AAAA,EAGE;AAAA,EAEA;AAAA,OACK;AAOA,MAAM,cAAc,CACzB,QACA,SACW;AACX,QAAM,MAAM,oBAAoB,QAAQ,IAAI;AAC5C,MAAI,WAAW,GAAG,GAAG;AACnB,WAAO,CAAC,IAAI;AAAA,EACd;AACA,SAAO,MAAM,CAAC,MAAM;AACtB;AAEO,MAAM,sBAAsB,CACjC,QACA,SACG;AACH,QAAM,QAAQ,iBAAiB,QAAQ,IAAI;AAC3C,MAAI,CAAC,OAAO;AACV,WAAO;AAAA,EACT;AACA,QAAM,OAAO,UAAU;AACvB,SAAO,KAAK,aAAY,6BAAM,SAAQ,SAAS,KAAK;AACtD;AAEO,MAAM,mBAAmB,CAC9B,QACA,SAC0B;AAC1B,MAAI,OAAO,WAAW,UAAU;AAC9B,WAAO;AAAA,EACT;AACA,QAAM,OAAO,UAAU;AACvB,QAAM,gBAAe,6BAAM,iBAAgB;AAC3C,QAAM,OAAO,UAAU;AACvB,QAAM,WAAW,KAAK,aAAY,6BAAM,SAAQ,SAAS;AACzD,QAAM,aAAa,OAAO,KAAK,QAAQ;AACvC,MAAI,aAAa,WAAW,QAAQ,IAAI;AACxC,MAAI,eAAe,IAAI;AACrB,QAAI,KAAK,SAAS,IAAI,GAAG;AACvB,mBAAa,WAAW,QAAQ,KAAK,QAAQ,MAAM,EAAE,CAAC;AAAA,IACxD;AAAA,EACF;AACA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,eAAe,IAAI;AAErB,cAAQ,KAAK,sBAAsB,QAAQ,MAAM,kBAAkB,UAAU;AAAA,IAC/E;AAAA,EACF;AACA,QAAM,aAAa,KAAK;AAAA,IACtB,KAAK,IAAI,GAAG,aAAa,YAAY;AAAA,IACrC,WAAW,SAAS;AAAA,EACtB;AACA,SAAQ,WAAW,eAAe;AACpC;",
4
+ "sourcesContent": ["import { FontSizeTokens, FontTokens, getConfig, isVariable } from '@tamagui/core'\n\ntype GetFontSizeOpts = {\n relativeSize?: number\n font?: FontTokens\n}\n\nexport const getFontSize = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts\n): number => {\n const res = getFontSizeVariable(inSize, opts)\n if (isVariable(res)) {\n return +res.val\n }\n return res ? +res : 16\n}\n\nexport const getFontSizeVariable = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts\n) => {\n const token = getFontSizeToken(inSize, opts)\n if (!token) {\n return inSize\n }\n const conf = getConfig()\n return conf.fontsParsed[opts?.font || '$body'].size[token]\n}\n\nexport const getFontSizeToken = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts\n): FontSizeTokens | null => {\n if (typeof inSize === 'number') {\n return null\n }\n const size = inSize || '$true'\n const relativeSize = opts?.relativeSize || 0\n const conf = getConfig()\n const fontSize = conf.fontsParsed[opts?.font || '$body'].size\n const sizeTokens = Object.keys(fontSize)\n let foundIndex = sizeTokens.indexOf(size)\n if (foundIndex === -1) {\n if (size.endsWith('.5')) {\n foundIndex = sizeTokens.indexOf(size.replace('.5', ''))\n }\n }\n if (process.env.NODE_ENV === 'development') {\n if (foundIndex === -1) {\n // eslint-disable-next-line no-console\n console.warn('No font size found', inSize, opts, 'in size tokens', sizeTokens)\n }\n }\n const tokenIndex = Math.min(\n Math.max(0, foundIndex + relativeSize),\n sizeTokens.length - 1\n )\n return (sizeTokens[tokenIndex] ?? size) as FontSizeTokens\n}\n"],
5
+ "mappings": "AAAA,SAAqC,WAAW,kBAAkB;AAO3D,MAAM,cAAc,CACzB,QACA,SACW;AACX,QAAM,MAAM,oBAAoB,QAAQ,IAAI;AAC5C,MAAI,WAAW,GAAG,GAAG;AACnB,WAAO,CAAC,IAAI;AAAA,EACd;AACA,SAAO,MAAM,CAAC,MAAM;AACtB;AAEO,MAAM,sBAAsB,CACjC,QACA,SACG;AACH,QAAM,QAAQ,iBAAiB,QAAQ,IAAI;AAC3C,MAAI,CAAC,OAAO;AACV,WAAO;AAAA,EACT;AACA,QAAM,OAAO,UAAU;AACvB,SAAO,KAAK,aAAY,6BAAM,SAAQ,SAAS,KAAK;AACtD;AAEO,MAAM,mBAAmB,CAC9B,QACA,SAC0B;AAC1B,MAAI,OAAO,WAAW,UAAU;AAC9B,WAAO;AAAA,EACT;AACA,QAAM,OAAO,UAAU;AACvB,QAAM,gBAAe,6BAAM,iBAAgB;AAC3C,QAAM,OAAO,UAAU;AACvB,QAAM,WAAW,KAAK,aAAY,6BAAM,SAAQ,SAAS;AACzD,QAAM,aAAa,OAAO,KAAK,QAAQ;AACvC,MAAI,aAAa,WAAW,QAAQ,IAAI;AACxC,MAAI,eAAe,IAAI;AACrB,QAAI,KAAK,SAAS,IAAI,GAAG;AACvB,mBAAa,WAAW,QAAQ,KAAK,QAAQ,MAAM,EAAE,CAAC;AAAA,IACxD;AAAA,EACF;AACA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,eAAe,IAAI;AAErB,cAAQ,KAAK,sBAAsB,QAAQ,MAAM,kBAAkB,UAAU;AAAA,IAC/E;AAAA,EACF;AACA,QAAM,aAAa,KAAK;AAAA,IACtB,KAAK,IAAI,GAAG,aAAa,YAAY;AAAA,IACrC,WAAW,SAAS;AAAA,EACtB;AACA,SAAQ,WAAW,eAAe;AACpC;",
6
6
  "names": []
7
7
  }
@@ -1,7 +1,4 @@
1
- import {
2
- getConfig,
3
- isVariable
4
- } from "@tamagui/core";
1
+ import { getConfig, isVariable } from "@tamagui/core";
5
2
  const getFontSize = (inSize, opts) => {
6
3
  const res = getFontSizeVariable(inSize, opts);
7
4
  if (isVariable(res)) {
@@ -21,7 +18,7 @@ const getFontSizeToken = (inSize, opts) => {
21
18
  if (typeof inSize === "number") {
22
19
  return null;
23
20
  }
24
- const size = inSize || "$4";
21
+ const size = inSize || "$true";
25
22
  const relativeSize = opts?.relativeSize || 0;
26
23
  const conf = getConfig();
27
24
  const fontSize = conf.fontsParsed[opts?.font || "$body"].size;
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/getFontSize.ts"],
4
- "sourcesContent": ["import {\n FontSizeTokens,\n FontTokens,\n getConfig,\n getTokens,\n isVariable,\n} from '@tamagui/core'\n\ntype GetFontSizeOpts = {\n relativeSize?: number\n font?: FontTokens\n}\n\nexport const getFontSize = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts,\n): number => {\n const res = getFontSizeVariable(inSize, opts)\n if (isVariable(res)) {\n return +res.val\n }\n return res ? +res : 16\n}\n\nexport const getFontSizeVariable = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts,\n) => {\n const token = getFontSizeToken(inSize, opts)\n if (!token) {\n return inSize\n }\n const conf = getConfig()\n return conf.fontsParsed[opts?.font || '$body'].size[token]\n}\n\nexport const getFontSizeToken = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts,\n): FontSizeTokens | null => {\n if (typeof inSize === 'number') {\n return null\n }\n const size = inSize || '$4'\n const relativeSize = opts?.relativeSize || 0\n const conf = getConfig()\n const fontSize = conf.fontsParsed[opts?.font || '$body'].size\n const sizeTokens = Object.keys(fontSize)\n let foundIndex = sizeTokens.indexOf(size)\n if (foundIndex === -1) {\n if (size.endsWith('.5')) {\n foundIndex = sizeTokens.indexOf(size.replace('.5', ''))\n }\n }\n if (process.env.NODE_ENV === 'development') {\n if (foundIndex === -1) {\n // eslint-disable-next-line no-console\n console.warn('No font size found', inSize, opts, 'in size tokens', sizeTokens)\n }\n }\n const tokenIndex = Math.min(\n Math.max(0, foundIndex + relativeSize),\n sizeTokens.length - 1,\n )\n return (sizeTokens[tokenIndex] ?? size) as FontSizeTokens\n}\n"],
5
- "mappings": "AAAA;AAAA,EAGE;AAAA,EAEA;AAAA,OACK;AAOA,MAAM,cAAc,CACzB,QACA,SACW;AACX,QAAM,MAAM,oBAAoB,QAAQ,IAAI;AAC5C,MAAI,WAAW,GAAG,GAAG;AACnB,WAAO,CAAC,IAAI;AAAA,EACd;AACA,SAAO,MAAM,CAAC,MAAM;AACtB;AAEO,MAAM,sBAAsB,CACjC,QACA,SACG;AACH,QAAM,QAAQ,iBAAiB,QAAQ,IAAI;AAC3C,MAAI,CAAC,OAAO;AACV,WAAO;AAAA,EACT;AACA,QAAM,OAAO,UAAU;AACvB,SAAO,KAAK,YAAY,MAAM,QAAQ,SAAS,KAAK;AACtD;AAEO,MAAM,mBAAmB,CAC9B,QACA,SAC0B;AAC1B,MAAI,OAAO,WAAW,UAAU;AAC9B,WAAO;AAAA,EACT;AACA,QAAM,OAAO,UAAU;AACvB,QAAM,eAAe,MAAM,gBAAgB;AAC3C,QAAM,OAAO,UAAU;AACvB,QAAM,WAAW,KAAK,YAAY,MAAM,QAAQ,SAAS;AACzD,QAAM,aAAa,OAAO,KAAK,QAAQ;AACvC,MAAI,aAAa,WAAW,QAAQ,IAAI;AACxC,MAAI,eAAe,IAAI;AACrB,QAAI,KAAK,SAAS,IAAI,GAAG;AACvB,mBAAa,WAAW,QAAQ,KAAK,QAAQ,MAAM,EAAE,CAAC;AAAA,IACxD;AAAA,EACF;AACA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,eAAe,IAAI;AAErB,cAAQ,KAAK,sBAAsB,QAAQ,MAAM,kBAAkB,UAAU;AAAA,IAC/E;AAAA,EACF;AACA,QAAM,aAAa,KAAK;AAAA,IACtB,KAAK,IAAI,GAAG,aAAa,YAAY;AAAA,IACrC,WAAW,SAAS;AAAA,EACtB;AACA,SAAQ,WAAW,eAAe;AACpC;",
4
+ "sourcesContent": ["import { FontSizeTokens, FontTokens, getConfig, isVariable } from '@tamagui/core'\n\ntype GetFontSizeOpts = {\n relativeSize?: number\n font?: FontTokens\n}\n\nexport const getFontSize = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts\n): number => {\n const res = getFontSizeVariable(inSize, opts)\n if (isVariable(res)) {\n return +res.val\n }\n return res ? +res : 16\n}\n\nexport const getFontSizeVariable = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts\n) => {\n const token = getFontSizeToken(inSize, opts)\n if (!token) {\n return inSize\n }\n const conf = getConfig()\n return conf.fontsParsed[opts?.font || '$body'].size[token]\n}\n\nexport const getFontSizeToken = (\n inSize: FontSizeTokens | null | undefined,\n opts?: GetFontSizeOpts\n): FontSizeTokens | null => {\n if (typeof inSize === 'number') {\n return null\n }\n const size = inSize || '$true'\n const relativeSize = opts?.relativeSize || 0\n const conf = getConfig()\n const fontSize = conf.fontsParsed[opts?.font || '$body'].size\n const sizeTokens = Object.keys(fontSize)\n let foundIndex = sizeTokens.indexOf(size)\n if (foundIndex === -1) {\n if (size.endsWith('.5')) {\n foundIndex = sizeTokens.indexOf(size.replace('.5', ''))\n }\n }\n if (process.env.NODE_ENV === 'development') {\n if (foundIndex === -1) {\n // eslint-disable-next-line no-console\n console.warn('No font size found', inSize, opts, 'in size tokens', sizeTokens)\n }\n }\n const tokenIndex = Math.min(\n Math.max(0, foundIndex + relativeSize),\n sizeTokens.length - 1\n )\n return (sizeTokens[tokenIndex] ?? size) as FontSizeTokens\n}\n"],
5
+ "mappings": "AAAA,SAAqC,WAAW,kBAAkB;AAO3D,MAAM,cAAc,CACzB,QACA,SACW;AACX,QAAM,MAAM,oBAAoB,QAAQ,IAAI;AAC5C,MAAI,WAAW,GAAG,GAAG;AACnB,WAAO,CAAC,IAAI;AAAA,EACd;AACA,SAAO,MAAM,CAAC,MAAM;AACtB;AAEO,MAAM,sBAAsB,CACjC,QACA,SACG;AACH,QAAM,QAAQ,iBAAiB,QAAQ,IAAI;AAC3C,MAAI,CAAC,OAAO;AACV,WAAO;AAAA,EACT;AACA,QAAM,OAAO,UAAU;AACvB,SAAO,KAAK,YAAY,MAAM,QAAQ,SAAS,KAAK;AACtD;AAEO,MAAM,mBAAmB,CAC9B,QACA,SAC0B;AAC1B,MAAI,OAAO,WAAW,UAAU;AAC9B,WAAO;AAAA,EACT;AACA,QAAM,OAAO,UAAU;AACvB,QAAM,eAAe,MAAM,gBAAgB;AAC3C,QAAM,OAAO,UAAU;AACvB,QAAM,WAAW,KAAK,YAAY,MAAM,QAAQ,SAAS;AACzD,QAAM,aAAa,OAAO,KAAK,QAAQ;AACvC,MAAI,aAAa,WAAW,QAAQ,IAAI;AACxC,MAAI,eAAe,IAAI;AACrB,QAAI,KAAK,SAAS,IAAI,GAAG;AACvB,mBAAa,WAAW,QAAQ,KAAK,QAAQ,MAAM,EAAE,CAAC;AAAA,IACxD;AAAA,EACF;AACA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,eAAe,IAAI;AAErB,cAAQ,KAAK,sBAAsB,QAAQ,MAAM,kBAAkB,UAAU;AAAA,IAC/E;AAAA,EACF;AACA,QAAM,aAAa,KAAK;AAAA,IACtB,KAAK,IAAI,GAAG,aAAa,YAAY;AAAA,IACrC,WAAW,SAAS;AAAA,EACtB;AACA,SAAQ,WAAW,eAAe;AACpC;",
6
6
  "names": []
7
7
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/font-size",
3
- "version": "1.1.7",
3
+ "version": "1.1.8",
4
4
  "sideEffects": false,
5
5
  "source": "src/index.ts",
6
6
  "types": "./types/index.d.ts",
@@ -19,14 +19,14 @@
19
19
  "lint:fix": "../../node_modules/.bin/rome check --apply-suggested src"
20
20
  },
21
21
  "dependencies": {
22
- "@tamagui/core": "^1.1.7"
22
+ "@tamagui/core": "^1.1.8"
23
23
  },
24
24
  "peerDependencies": {
25
25
  "react": "*",
26
26
  "react-dom": "*"
27
27
  },
28
28
  "devDependencies": {
29
- "@tamagui/build": "^1.1.7",
29
+ "@tamagui/build": "^1.1.8",
30
30
  "react": "^18.2.0",
31
31
  "react-dom": "^18.2.0"
32
32
  },
@@ -1,10 +1,4 @@
1
- import {
2
- FontSizeTokens,
3
- FontTokens,
4
- getConfig,
5
- getTokens,
6
- isVariable,
7
- } from '@tamagui/core'
1
+ import { FontSizeTokens, FontTokens, getConfig, isVariable } from '@tamagui/core'
8
2
 
9
3
  type GetFontSizeOpts = {
10
4
  relativeSize?: number
@@ -13,7 +7,7 @@ type GetFontSizeOpts = {
13
7
 
14
8
  export const getFontSize = (
15
9
  inSize: FontSizeTokens | null | undefined,
16
- opts?: GetFontSizeOpts,
10
+ opts?: GetFontSizeOpts
17
11
  ): number => {
18
12
  const res = getFontSizeVariable(inSize, opts)
19
13
  if (isVariable(res)) {
@@ -24,7 +18,7 @@ export const getFontSize = (
24
18
 
25
19
  export const getFontSizeVariable = (
26
20
  inSize: FontSizeTokens | null | undefined,
27
- opts?: GetFontSizeOpts,
21
+ opts?: GetFontSizeOpts
28
22
  ) => {
29
23
  const token = getFontSizeToken(inSize, opts)
30
24
  if (!token) {
@@ -36,12 +30,12 @@ export const getFontSizeVariable = (
36
30
 
37
31
  export const getFontSizeToken = (
38
32
  inSize: FontSizeTokens | null | undefined,
39
- opts?: GetFontSizeOpts,
33
+ opts?: GetFontSizeOpts
40
34
  ): FontSizeTokens | null => {
41
35
  if (typeof inSize === 'number') {
42
36
  return null
43
37
  }
44
- const size = inSize || '$4'
38
+ const size = inSize || '$true'
45
39
  const relativeSize = opts?.relativeSize || 0
46
40
  const conf = getConfig()
47
41
  const fontSize = conf.fontsParsed[opts?.font || '$body'].size
@@ -60,7 +54,7 @@ export const getFontSizeToken = (
60
54
  }
61
55
  const tokenIndex = Math.min(
62
56
  Math.max(0, foundIndex + relativeSize),
63
- sizeTokens.length - 1,
57
+ sizeTokens.length - 1
64
58
  )
65
59
  return (sizeTokens[tokenIndex] ?? size) as FontSizeTokens
66
60
  }