@tamagui/font-inter 1.0.0-beta.222 → 1.0.0-canary.204

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.
Files changed (8) hide show
  1. package/dist/cjs/index.js +32 -48
  2. package/dist/cjs/index.js.map +2 -2
  3. package/dist/esm/index.js +27 -48
  4. package/dist/esm/index.js.map +2 -2
  5. package/dist/jsx/index.js +27 -48
  6. package/package.json +4 -4
  7. package/types/index.d.ts +23 -1
  8. package/types/index.d.ts.map +1 -1
package/dist/cjs/index.js CHANGED
@@ -1,5 +1,7 @@
1
1
  var __defProp = Object.defineProperty;
2
+ var __defProps = Object.defineProperties;
2
3
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
3
5
  var __getOwnPropNames = Object.getOwnPropertyNames;
4
6
  var __getOwnPropSymbols = Object.getOwnPropertySymbols;
5
7
  var __hasOwnProp = Object.prototype.hasOwnProperty;
@@ -16,6 +18,7 @@ var __spreadValues = (a, b) => {
16
18
  }
17
19
  return a;
18
20
  };
21
+ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
19
22
  var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
20
23
  var __export = (target, all) => {
21
24
  for (var name in all)
@@ -37,63 +40,44 @@ __export(src_exports, {
37
40
  module.exports = __toCommonJS(src_exports);
38
41
  var import_core = require("@tamagui/core");
39
42
  var import_react_native = require("react-native");
40
- const createInterFont = /* @__PURE__ */ __name((font = {}) => {
41
- return (0, import_core.createFont)(__spreadValues({
43
+ const createInterFont = /* @__PURE__ */ __name((font = {}, {
44
+ sizeLineHeight = /* @__PURE__ */ __name((size) => size + 10, "sizeLineHeight"),
45
+ sizeSize = /* @__PURE__ */ __name((size) => size * 1, "sizeSize")
46
+ } = {}) => {
47
+ const size = Object.fromEntries(Object.entries(__spreadValues(__spreadValues({}, defaultSizes), font.size)).map(([k, v]) => [k, sizeSize(v)]));
48
+ return (0, import_core.createFont)(__spreadProps(__spreadValues({
42
49
  family: import_react_native.Platform.OS == "web" ? 'Inter, -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif' : "Inter",
43
- size,
44
- lineHeight: {
45
- 1: 15,
46
- 2: 20,
47
- 3: 25,
48
- 4: 27,
49
- 5: 29,
50
- 6: 31,
51
- 7: 34,
52
- 8: 38,
53
- 9: 42,
54
- 10: 54,
55
- 11: 72,
56
- 12: 80,
57
- 13: 100,
58
- 14: 120,
59
- 15: 150,
60
- 16: 170
61
- },
50
+ lineHeight: Object.fromEntries(Object.entries(size).map(([k, v]) => [k, sizeLineHeight((0, import_core.getVariableValue)(v))])),
62
51
  weight: {
63
- 4: "300",
64
- 7: "600",
65
- 8: "700"
52
+ 4: "300"
66
53
  },
67
54
  letterSpacing: {
68
- 4: 0,
69
- 7: 0,
70
- 8: -1,
71
- 9: -2,
72
- 10: -2,
73
- 11: -3,
74
- 12: -4,
75
- 13: -5,
76
- 14: -6,
77
- 15: -7
55
+ 4: 0
78
56
  }
79
- }, font));
57
+ }, font), {
58
+ size
59
+ }));
80
60
  }, "createInterFont");
81
- const size = {
82
- 1: 10,
61
+ const defaultSizes = {
62
+ 1: 11,
83
63
  2: 12,
84
- 3: 14,
85
- 4: 15,
86
- 5: 16,
87
- 6: 17,
88
- 7: 21,
89
- 8: 25,
64
+ 3: 13,
65
+ 4: 14,
66
+ 5: 17,
67
+ 6: 18,
68
+ 7: 20,
69
+ 8: 23,
90
70
  9: 30,
91
71
  10: 45,
92
72
  11: 58,
93
- 12: 68,
94
- 13: 82,
95
- 14: 102,
96
- 15: 124,
97
- 16: 144
73
+ 12: 64,
74
+ 13: 72,
75
+ 14: 92,
76
+ 15: 114,
77
+ 16: 134
98
78
  };
79
+ // Annotate the CommonJS export names for ESM import in node:
80
+ 0 && (module.exports = {
81
+ createInterFont
82
+ });
99
83
  //# sourceMappingURL=index.js.map
package/dist/cjs/index.js.map CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/index.ts"],
4
- "sourcesContent": ["import { GenericFont, createFont } from '@tamagui/core'\nimport { Platform } from 'react-native'\n\nexport const createInterFont = <A extends GenericFont<keyof typeof size>>(\n font: Partial<A> = {}\n): A => {\n return createFont({\n family:\n Platform.OS == 'web'\n ? 'Inter, -apple-system, system-ui, BlinkMacSystemFont, \"Segoe UI\", Roboto, Helvetica, Arial, sans-serif'\n : 'Inter',\n size,\n lineHeight: {\n 1: 15,\n 2: 20,\n 3: 25,\n 4: 27,\n 5: 29,\n 6: 31,\n 7: 34,\n 8: 38,\n 9: 42,\n 10: 54,\n 11: 72,\n 12: 80,\n 13: 100,\n 14: 120,\n 15: 150,\n 16: 170,\n },\n weight: {\n 4: '300',\n 7: '600',\n 8: '700',\n },\n letterSpacing: {\n 4: 0,\n 7: 0,\n 8: -1,\n 9: -2,\n 10: -2,\n 11: -3,\n 12: -4,\n 13: -5,\n 14: -6,\n 15: -7,\n },\n ...(font as any),\n })\n}\n\nconst size = {\n 1: 10,\n 2: 12,\n 3: 14,\n 4: 15,\n 5: 16,\n 6: 17,\n 7: 21,\n 8: 25,\n 9: 30,\n 10: 45,\n 11: 58,\n 12: 68,\n 13: 82,\n 14: 102,\n 15: 124,\n 16: 144,\n} as const\n"],
5
- "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwC;AACxC,0BAAyB;AAElB,MAAM,kBAAkB,wBAC7B,OAAmB,CAAC,MACd;AACN,SAAO,4BAAW;AAAA,IAChB,QACE,6BAAS,MAAM,QACX,0GACA;AAAA,IACN;AAAA,IACA,YAAY;AAAA,MACV,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,IACN;AAAA,IACA,QAAQ;AAAA,MACN,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,IACL;AAAA,IACA,eAAe;AAAA,MACb,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,IACN;AAAA,KACI,KACL;AACH,GA9C+B;AAgD/B,MAAM,OAAO;AAAA,EACX,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AACN;",
4
+ "sourcesContent": ["import { GenericFont, createFont, getVariableValue } from '@tamagui/core'\nimport { Platform } from 'react-native'\n\nexport const createInterFont = <A extends GenericFont<keyof typeof defaultSizes>>(\n font: {\n [Key in keyof Partial<A>]?: Partial<A[Key]>\n } = {},\n {\n sizeLineHeight = (size) => size + 10,\n sizeSize = (size) => size * 1,\n }: {\n sizeLineHeight?: (fontSize: number) => number\n sizeSize?: (size: number) => number\n } = {}\n): GenericFont<keyof typeof defaultSizes> => {\n // merge to allow individual overrides\n const size = Object.fromEntries(\n Object.entries({\n ...defaultSizes,\n ...font.size,\n }).map(([k, v]) => [k, sizeSize(v)])\n )\n return createFont({\n family:\n Platform.OS == 'web'\n ? 'Inter, -apple-system, system-ui, BlinkMacSystemFont, \"Segoe UI\", Roboto, Helvetica, Arial, sans-serif'\n : 'Inter',\n lineHeight: Object.fromEntries(\n Object.entries(size).map(([k, v]) => [k, sizeLineHeight(getVariableValue(v))])\n ),\n weight: {\n 4: '300',\n },\n letterSpacing: {\n 4: 0,\n },\n ...(font as any),\n size,\n })\n}\n\nconst defaultSizes = {\n 1: 11,\n 2: 12,\n 3: 13,\n 4: 14,\n 5: 17,\n 6: 18,\n 7: 20,\n 8: 23,\n 9: 30,\n 10: 45,\n 11: 58,\n 12: 64,\n 13: 72,\n 14: 92,\n 15: 114,\n 16: 134,\n} as const\n"],
5
+ "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA0D;AAC1D,0BAAyB;AAElB,MAAM,kBAAkB,wBAC7B,OAEI,CAAC,GACL;AAAA,EACE,iBAAiB,wBAAC,SAAS,OAAO,IAAjB;AAAA,EACjB,WAAW,wBAAC,SAAS,OAAO,GAAjB;AAAA,IAIT,CAAC,MACsC;AAE3C,QAAM,OAAO,OAAO,YAClB,OAAO,QAAQ,kCACV,eACA,KAAK,KACT,EAAE,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CACrC;AACA,SAAO,4BAAW;AAAA,IAChB,QACE,6BAAS,MAAM,QACX,0GACA;AAAA,IACN,YAAY,OAAO,YACjB,OAAO,QAAQ,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,eAAe,kCAAiB,CAAC,CAAC,CAAC,CAAC,CAC/E;AAAA,IACA,QAAQ;AAAA,MACN,GAAG;AAAA,IACL;AAAA,IACA,eAAe;AAAA,MACb,GAAG;AAAA,IACL;AAAA,KACI,OAdY;AAAA,IAehB;AAAA,EACF,EAAC;AACH,GApC+B;AAsC/B,MAAM,eAAe;AAAA,EACnB,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AACN;",
6
6
  "names": []
7
7
  }
package/dist/esm/index.js CHANGED
@@ -1,66 +1,45 @@
1
1
  var __defProp = Object.defineProperty;
2
2
  var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
3
- import { createFont } from "@tamagui/core";
3
+ import { createFont, getVariableValue } from "@tamagui/core";
4
4
  import { Platform } from "react-native";
5
- const createInterFont = /* @__PURE__ */ __name((font = {}) => {
5
+ const createInterFont = /* @__PURE__ */ __name((font = {}, {
6
+ sizeLineHeight = /* @__PURE__ */ __name((size) => size + 10, "sizeLineHeight"),
7
+ sizeSize = /* @__PURE__ */ __name((size) => size * 1, "sizeSize")
8
+ } = {}) => {
9
+ const size = Object.fromEntries(Object.entries({
10
+ ...defaultSizes,
11
+ ...font.size
12
+ }).map(([k, v]) => [k, sizeSize(v)]));
6
13
  return createFont({
7
14
  family: Platform.OS == "web" ? 'Inter, -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif' : "Inter",
8
- size,
9
- lineHeight: {
10
- 1: 15,
11
- 2: 20,
12
- 3: 25,
13
- 4: 27,
14
- 5: 29,
15
- 6: 31,
16
- 7: 34,
17
- 8: 38,
18
- 9: 42,
19
- 10: 54,
20
- 11: 72,
21
- 12: 80,
22
- 13: 100,
23
- 14: 120,
24
- 15: 150,
25
- 16: 170
26
- },
15
+ lineHeight: Object.fromEntries(Object.entries(size).map(([k, v]) => [k, sizeLineHeight(getVariableValue(v))])),
27
16
  weight: {
28
- 4: "300",
29
- 7: "600",
30
- 8: "700"
17
+ 4: "300"
31
18
  },
32
19
  letterSpacing: {
33
- 4: 0,
34
- 7: 0,
35
- 8: -1,
36
- 9: -2,
37
- 10: -2,
38
- 11: -3,
39
- 12: -4,
40
- 13: -5,
41
- 14: -6,
42
- 15: -7
20
+ 4: 0
43
21
  },
44
- ...font
22
+ ...font,
23
+ size
45
24
  });
46
25
  }, "createInterFont");
47
- const size = {
48
- 1: 10,
26
+ const defaultSizes = {
27
+ 1: 11,
49
28
  2: 12,
50
- 3: 14,
51
- 4: 15,
52
- 5: 16,
53
- 6: 17,
54
- 7: 21,
55
- 8: 25,
29
+ 3: 13,
30
+ 4: 14,
31
+ 5: 17,
32
+ 6: 18,
33
+ 7: 20,
34
+ 8: 23,
56
35
  9: 30,
57
36
  10: 45,
58
37
  11: 58,
59
- 12: 68,
60
- 13: 82,
61
- 14: 102,
62
- 15: 124,
63
- 16: 144
38
+ 12: 64,
39
+ 13: 72,
40
+ 14: 92,
41
+ 15: 114,
42
+ 16: 134
64
43
  };
65
44
  export {
66
45
  createInterFont
package/dist/esm/index.js.map CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/index.ts"],
4
- "sourcesContent": ["import { GenericFont, createFont } from '@tamagui/core'\nimport { Platform } from 'react-native'\n\nexport const createInterFont = <A extends GenericFont<keyof typeof size>>(\n font: Partial<A> = {}\n): A => {\n return createFont({\n family:\n Platform.OS == 'web'\n ? 'Inter, -apple-system, system-ui, BlinkMacSystemFont, \"Segoe UI\", Roboto, Helvetica, Arial, sans-serif'\n : 'Inter',\n size,\n lineHeight: {\n 1: 15,\n 2: 20,\n 3: 25,\n 4: 27,\n 5: 29,\n 6: 31,\n 7: 34,\n 8: 38,\n 9: 42,\n 10: 54,\n 11: 72,\n 12: 80,\n 13: 100,\n 14: 120,\n 15: 150,\n 16: 170,\n },\n weight: {\n 4: '300',\n 7: '600',\n 8: '700',\n },\n letterSpacing: {\n 4: 0,\n 7: 0,\n 8: -1,\n 9: -2,\n 10: -2,\n 11: -3,\n 12: -4,\n 13: -5,\n 14: -6,\n 15: -7,\n },\n ...(font as any),\n })\n}\n\nconst size = {\n 1: 10,\n 2: 12,\n 3: 14,\n 4: 15,\n 5: 16,\n 6: 17,\n 7: 21,\n 8: 25,\n 9: 30,\n 10: 45,\n 11: 58,\n 12: 68,\n 13: 82,\n 14: 102,\n 15: 124,\n 16: 144,\n} as const\n"],
5
- "mappings": ";;AAAA;AACA;AAEO,MAAM,kBAAkB,wBAC7B,OAAmB,CAAC,MACd;AACN,SAAO,WAAW;AAAA,IAChB,QACE,SAAS,MAAM,QACX,0GACA;AAAA,IACN;AAAA,IACA,YAAY;AAAA,MACV,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,IACN;AAAA,IACA,QAAQ;AAAA,MACN,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,IACL;AAAA,IACA,eAAe;AAAA,MACb,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,GAAG;AAAA,MACH,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,MACJ,IAAI;AAAA,IACN;AAAA,OACI;AAAA,EACN,CAAC;AACH,GA9C+B;AAgD/B,MAAM,OAAO;AAAA,EACX,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AACN;",
4
+ "sourcesContent": ["import { GenericFont, createFont, getVariableValue } from '@tamagui/core'\nimport { Platform } from 'react-native'\n\nexport const createInterFont = <A extends GenericFont<keyof typeof defaultSizes>>(\n font: {\n [Key in keyof Partial<A>]?: Partial<A[Key]>\n } = {},\n {\n sizeLineHeight = (size) => size + 10,\n sizeSize = (size) => size * 1,\n }: {\n sizeLineHeight?: (fontSize: number) => number\n sizeSize?: (size: number) => number\n } = {}\n): GenericFont<keyof typeof defaultSizes> => {\n // merge to allow individual overrides\n const size = Object.fromEntries(\n Object.entries({\n ...defaultSizes,\n ...font.size,\n }).map(([k, v]) => [k, sizeSize(v)])\n )\n return createFont({\n family:\n Platform.OS == 'web'\n ? 'Inter, -apple-system, system-ui, BlinkMacSystemFont, \"Segoe UI\", Roboto, Helvetica, Arial, sans-serif'\n : 'Inter',\n lineHeight: Object.fromEntries(\n Object.entries(size).map(([k, v]) => [k, sizeLineHeight(getVariableValue(v))])\n ),\n weight: {\n 4: '300',\n },\n letterSpacing: {\n 4: 0,\n },\n ...(font as any),\n size,\n })\n}\n\nconst defaultSizes = {\n 1: 11,\n 2: 12,\n 3: 13,\n 4: 14,\n 5: 17,\n 6: 18,\n 7: 20,\n 8: 23,\n 9: 30,\n 10: 45,\n 11: 58,\n 12: 64,\n 13: 72,\n 14: 92,\n 15: 114,\n 16: 134,\n} as const\n"],
5
+ "mappings": ";;AAAA;AACA;AAEO,MAAM,kBAAkB,wBAC7B,OAEI,CAAC,GACL;AAAA,EACE,iBAAiB,wBAAC,SAAS,OAAO,IAAjB;AAAA,EACjB,WAAW,wBAAC,SAAS,OAAO,GAAjB;AAAA,IAIT,CAAC,MACsC;AAE3C,QAAM,OAAO,OAAO,YAClB,OAAO,QAAQ;AAAA,OACV;AAAA,OACA,KAAK;AAAA,EACV,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CACrC;AACA,SAAO,WAAW;AAAA,IAChB,QACE,SAAS,MAAM,QACX,0GACA;AAAA,IACN,YAAY,OAAO,YACjB,OAAO,QAAQ,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,eAAe,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAC/E;AAAA,IACA,QAAQ;AAAA,MACN,GAAG;AAAA,IACL;AAAA,IACA,eAAe;AAAA,MACb,GAAG;AAAA,IACL;AAAA,OACI;AAAA,IACJ;AAAA,EACF,CAAC;AACH,GApC+B;AAsC/B,MAAM,eAAe;AAAA,EACnB,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,GAAG;AAAA,EACH,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AAAA,EACJ,IAAI;AACN;",
6
6
  "names": []
7
7
  }
package/dist/jsx/index.js CHANGED
@@ -1,66 +1,45 @@
1
1
  var __defProp = Object.defineProperty;
2
2
  var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
3
- import { createFont } from "@tamagui/core";
3
+ import { createFont, getVariableValue } from "@tamagui/core";
4
4
  import { Platform } from "react-native";
5
- const createInterFont = /* @__PURE__ */ __name((font = {}) => {
5
+ const createInterFont = /* @__PURE__ */ __name((font = {}, {
6
+ sizeLineHeight = /* @__PURE__ */ __name((size) => size + 10, "sizeLineHeight"),
7
+ sizeSize = /* @__PURE__ */ __name((size) => size * 1, "sizeSize")
8
+ } = {}) => {
9
+ const size = Object.fromEntries(Object.entries({
10
+ ...defaultSizes,
11
+ ...font.size
12
+ }).map(([k, v]) => [k, sizeSize(v)]));
6
13
  return createFont({
7
14
  family: Platform.OS == "web" ? 'Inter, -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif' : "Inter",
8
- size,
9
- lineHeight: {
10
- 1: 15,
11
- 2: 20,
12
- 3: 25,
13
- 4: 27,
14
- 5: 29,
15
- 6: 31,
16
- 7: 34,
17
- 8: 38,
18
- 9: 42,
19
- 10: 54,
20
- 11: 72,
21
- 12: 80,
22
- 13: 100,
23
- 14: 120,
24
- 15: 150,
25
- 16: 170
26
- },
15
+ lineHeight: Object.fromEntries(Object.entries(size).map(([k, v]) => [k, sizeLineHeight(getVariableValue(v))])),
27
16
  weight: {
28
- 4: "300",
29
- 7: "600",
30
- 8: "700"
17
+ 4: "300"
31
18
  },
32
19
  letterSpacing: {
33
- 4: 0,
34
- 7: 0,
35
- 8: -1,
36
- 9: -2,
37
- 10: -2,
38
- 11: -3,
39
- 12: -4,
40
- 13: -5,
41
- 14: -6,
42
- 15: -7
20
+ 4: 0
43
21
  },
44
- ...font
22
+ ...font,
23
+ size
45
24
  });
46
25
  }, "createInterFont");
47
- const size = {
48
- 1: 10,
26
+ const defaultSizes = {
27
+ 1: 11,
49
28
  2: 12,
50
- 3: 14,
51
- 4: 15,
52
- 5: 16,
53
- 6: 17,
54
- 7: 21,
55
- 8: 25,
29
+ 3: 13,
30
+ 4: 14,
31
+ 5: 17,
32
+ 6: 18,
33
+ 7: 20,
34
+ 8: 23,
56
35
  9: 30,
57
36
  10: 45,
58
37
  11: 58,
59
- 12: 68,
60
- 13: 82,
61
- 14: 102,
62
- 15: 124,
63
- 16: 144
38
+ 12: 64,
39
+ 13: 72,
40
+ 14: 92,
41
+ 15: 114,
42
+ 16: 134
64
43
  };
65
44
  export {
66
45
  createInterFont
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/font-inter",
3
- "version": "1.0.0-beta.222+464bca9b",
3
+ "version": "1.0.0-canary.204+d95a5880",
4
4
  "typings": "types",
5
5
  "main": "dist/cjs",
6
6
  "module": "dist/esm",
@@ -18,11 +18,11 @@
18
18
  "clean:build": "tamagui-build clean:build"
19
19
  },
20
20
  "devDependencies": {
21
- "@tamagui/build": "^1.0.0-beta.222+464bca9b",
22
- "@tamagui/colors": "^1.0.0-beta.222+464bca9b"
21
+ "@tamagui/build": "^1.0.0-canary.204+d95a5880",
22
+ "@tamagui/colors": "^1.0.0-canary.204+d95a5880"
23
23
  },
24
24
  "publishConfig": {
25
25
  "access": "public"
26
26
  },
27
- "gitHead": "464bca9bb632fcd9557a632d8e8dc49db243753c"
27
+ "gitHead": "d95a58804c0fc2d3530cba0a357b735a2ca02188"
28
28
  }
package/types/index.d.ts CHANGED
@@ -1,3 +1,25 @@
1
1
  import { GenericFont } from '@tamagui/core';
2
- export declare const createInterFont: <A extends GenericFont<10 | 12 | 14 | 15 | 16 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 11 | 13>>(font?: Partial<A>) => A;
2
+ export declare const createInterFont: <A extends GenericFont<11 | 12 | 13 | 14 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 15 | 16>>(font?: { [Key in keyof Partial<A>]?: Partial<A[Key]> | undefined; }, { sizeLineHeight, sizeSize, }?: {
3
+ sizeLineHeight?: ((fontSize: number) => number) | undefined;
4
+ sizeSize?: ((size: number) => number) | undefined;
5
+ }) => GenericFont<keyof typeof defaultSizes>;
6
+ declare const defaultSizes: {
7
+ readonly 1: 11;
8
+ readonly 2: 12;
9
+ readonly 3: 13;
10
+ readonly 4: 14;
11
+ readonly 5: 17;
12
+ readonly 6: 18;
13
+ readonly 7: 20;
14
+ readonly 8: 23;
15
+ readonly 9: 30;
16
+ readonly 10: 45;
17
+ readonly 11: 58;
18
+ readonly 12: 64;
19
+ readonly 13: 72;
20
+ readonly 14: 92;
21
+ readonly 15: 114;
22
+ readonly 16: 134;
23
+ };
24
+ export {};
3
25
  //# sourceMappingURL=index.d.ts.map
package/types/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAc,MAAM,eAAe,CAAA;AAGvD,eAAO,MAAM,eAAe,uHA8C3B,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAgC,MAAM,eAAe,CAAA;AAGzE,eAAO,MAAM,eAAe;iCAQI,MAAM,KAAK,MAAM;uBAC3B,MAAM,KAAK,MAAM;MAEpC,YAAY,MAAM,mBAAmB,CAyBvC,CAAA;AAED,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;CAiBR,CAAA"}