@tamagui/get-font-sized 1.2.3 → 1.2.5
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.
- package/dist/cjs/index.js +2 -2
- package/dist/cjs/index.js.map +2 -2
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +2 -2
- package/package.json +3 -3
- package/src/index.ts +2 -2
package/dist/cjs/index.js
CHANGED
|
@@ -22,7 +22,7 @@ __export(src_exports, {
|
|
|
22
22
|
});
|
|
23
23
|
module.exports = __toCommonJS(src_exports);
|
|
24
24
|
var import_core = require("@tamagui/core");
|
|
25
|
-
const getFontSized = (sizeTokenIn = "$true", { fonts,
|
|
25
|
+
const getFontSized = (sizeTokenIn = "$true", { fonts, props }) => {
|
|
26
26
|
var _a, _b, _c;
|
|
27
27
|
const family = (0, import_core.getVariableValue)(props.fontFamily) || "$body";
|
|
28
28
|
const font = fonts[family] || fonts["$body"];
|
|
@@ -44,7 +44,7 @@ const getFontSized = (sizeTokenIn = "$true", { fonts, theme, props }) => {
|
|
|
44
44
|
const letterSpacing = props.letterSpacing || font.letterSpacing[sizeToken];
|
|
45
45
|
const fontStyle = props.fontStyle || ((_a = font.style) == null ? void 0 : _a[sizeToken]);
|
|
46
46
|
const textTransform = props.textTransform || ((_b = font.transform) == null ? void 0 : _b[sizeToken]);
|
|
47
|
-
const color = props.color || ((_c = font.color) == null ? void 0 : _c[sizeToken])
|
|
47
|
+
const color = props.color || ((_c = font.color) == null ? void 0 : _c[sizeToken]);
|
|
48
48
|
const style = {
|
|
49
49
|
color,
|
|
50
50
|
fontStyle,
|
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 { getTokens, getVariableValue } from '@tamagui/core'\nimport type {\n FontSizeTokens,\n GenericFont,\n TextProps,\n VariantSpreadFunction,\n} from '@tamagui/core'\n\nexport const getFontSized: VariantSpreadFunction<TextProps, FontSizeTokens> = (\n sizeTokenIn = '$true',\n { fonts,
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA4C;AAQrC,MAAM,eAAiE,CAC5E,cAAc,SACd,EAAE,OAAO,
|
|
4
|
+
"sourcesContent": ["import { getTokens, getVariableValue } from '@tamagui/core'\nimport type {\n FontSizeTokens,\n GenericFont,\n TextProps,\n VariantSpreadFunction,\n} from '@tamagui/core'\n\nexport const getFontSized: VariantSpreadFunction<TextProps, FontSizeTokens> = (\n sizeTokenIn = '$true',\n { fonts, props }\n) => {\n const family = getVariableValue(props.fontFamily) || '$body'\n const font = fonts[family] || fonts['$body']\n if (!font) {\n if (process.env.NODE_ENV === 'development') {\n // eslint-disable-next-line no-console\n console.warn('\u26A0\uFE0F no font found', {\n family,\n fontTokens: Object.keys(fonts),\n sizeTokenIn,\n })\n }\n return {} as any\n }\n const fontFamily = font.family\n const sizeToken = sizeTokenIn === '$true' ? getDefaultSizeToken(font) : sizeTokenIn\n const fontSize = props.fontSize || font.size[sizeToken]\n const lineHeight = props.lineHeight || font.lineHeight[sizeToken]\n const fontWeight = props.fontWeight || font.weight[sizeToken]\n const letterSpacing = props.letterSpacing || font.letterSpacing[sizeToken]\n const fontStyle = props.fontStyle || font.style?.[sizeToken]\n const textTransform = props.textTransform || font.transform?.[sizeToken]\n const color = props.color || font.color?.[sizeToken]\n\n const style = {\n color,\n fontStyle,\n textTransform,\n fontFamily,\n fontWeight,\n letterSpacing,\n fontSize,\n lineHeight,\n }\n if (process.env.NODE_ENV === 'development') {\n if (props['debug']) {\n // eslint-disable-next-line no-console\n console.groupCollapsed(' \uD83D\uDD39 getFontSized', sizeTokenIn, sizeToken)\n // eslint-disable-next-line no-console\n console.log({ style, props, font })\n // eslint-disable-next-line no-console\n console.groupEnd()\n }\n }\n return style\n}\n\nconst cache = new WeakMap<any, FontSizeTokens>()\n\nfunction getDefaultSizeToken(font: GenericFont) {\n if (typeof font === 'object' && cache.has(font)) {\n return cache.get(font)!\n }\n\n // use either font.size if it has true set, or fallback to tokens.size mapping to the same\n const sizeTokens = '$true' in font.size ? font.size : getTokens().size\n const sizeDefault = sizeTokens['$true']\n const sizeDefaultSpecific = sizeDefault\n ? Object.keys(sizeTokens).find(\n (x) => x !== '$true' && sizeTokens[x]['val'] === sizeDefault['val']\n )\n : null\n\n if (!sizeDefault || !sizeDefaultSpecific) {\n if (process.env.NODE_ENV === 'development') {\n console.warn(`No default size is set in your tokens for the \"true\" key, fonts will be inconsistent.\n\n Fix this by having consistent tokens across fonts and sizes and setting a true key for your size tokens, or\n set true keys for all your font tokens: \"size\", \"lineHeight\", \"fontStyle\", etc.`)\n }\n return Object.keys(font.size)[3]\n }\n\n cache.set(font, sizeDefaultSpecific as FontSizeTokens)\n return sizeDefaultSpecific\n}\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA4C;AAQrC,MAAM,eAAiE,CAC5E,cAAc,SACd,EAAE,OAAO,MAAM,MACZ;AAXL;AAYE,QAAM,aAAS,8BAAiB,MAAM,UAAU,KAAK;AACrD,QAAM,OAAO,MAAM,MAAM,KAAK,MAAM,OAAO;AAC3C,MAAI,CAAC,MAAM;AACT,QAAI,QAAQ,IAAI,aAAa,eAAe;AAE1C,cAAQ,KAAK,8BAAoB;AAAA,QAC/B;AAAA,QACA,YAAY,OAAO,KAAK,KAAK;AAAA,QAC7B;AAAA,MACF,CAAC;AAAA,IACH;AACA,WAAO,CAAC;AAAA,EACV;AACA,QAAM,aAAa,KAAK;AACxB,QAAM,YAAY,gBAAgB,UAAU,oBAAoB,IAAI,IAAI;AACxE,QAAM,WAAW,MAAM,YAAY,KAAK,KAAK,SAAS;AACtD,QAAM,aAAa,MAAM,cAAc,KAAK,WAAW,SAAS;AAChE,QAAM,aAAa,MAAM,cAAc,KAAK,OAAO,SAAS;AAC5D,QAAM,gBAAgB,MAAM,iBAAiB,KAAK,cAAc,SAAS;AACzE,QAAM,YAAY,MAAM,eAAa,UAAK,UAAL,mBAAa;AAClD,QAAM,gBAAgB,MAAM,mBAAiB,UAAK,cAAL,mBAAiB;AAC9D,QAAM,QAAQ,MAAM,WAAS,UAAK,UAAL,mBAAa;AAE1C,QAAM,QAAQ;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,MAAM,OAAO,GAAG;AAElB,cAAQ,eAAe,4BAAqB,aAAa,SAAS;AAElE,cAAQ,IAAI,EAAE,OAAO,OAAO,KAAK,CAAC;AAElC,cAAQ,SAAS;AAAA,IACnB;AAAA,EACF;AACA,SAAO;AACT;AAEA,MAAM,QAAQ,oBAAI,QAA6B;AAE/C,SAAS,oBAAoB,MAAmB;AAC9C,MAAI,OAAO,SAAS,YAAY,MAAM,IAAI,IAAI,GAAG;AAC/C,WAAO,MAAM,IAAI,IAAI;AAAA,EACvB;AAGA,QAAM,aAAa,WAAW,KAAK,OAAO,KAAK,WAAO,uBAAU,EAAE;AAClE,QAAM,cAAc,WAAW,OAAO;AACtC,QAAM,sBAAsB,cACxB,OAAO,KAAK,UAAU,EAAE;AAAA,IACtB,CAAC,MAAM,MAAM,WAAW,WAAW,CAAC,EAAE,KAAK,MAAM,YAAY,KAAK;AAAA,EACpE,IACA;AAEJ,MAAI,CAAC,eAAe,CAAC,qBAAqB;AACxC,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK;AAAA;AAAA;AAAA,sFAGmE;AAAA,IAClF;AACA,WAAO,OAAO,KAAK,KAAK,IAAI,EAAE,CAAC;AAAA,EACjC;AAEA,QAAM,IAAI,MAAM,mBAAqC;AACrD,SAAO;AACT;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/esm/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getTokens, getVariableValue } from "@tamagui/core";
|
|
2
|
-
const getFontSized = (sizeTokenIn = "$true", { fonts,
|
|
2
|
+
const getFontSized = (sizeTokenIn = "$true", { fonts, props }) => {
|
|
3
3
|
var _a, _b, _c;
|
|
4
4
|
const family = getVariableValue(props.fontFamily) || "$body";
|
|
5
5
|
const font = fonts[family] || fonts["$body"];
|
|
@@ -21,7 +21,7 @@ const getFontSized = (sizeTokenIn = "$true", { fonts, theme, props }) => {
|
|
|
21
21
|
const letterSpacing = props.letterSpacing || font.letterSpacing[sizeToken];
|
|
22
22
|
const fontStyle = props.fontStyle || ((_a = font.style) == null ? void 0 : _a[sizeToken]);
|
|
23
23
|
const textTransform = props.textTransform || ((_b = font.transform) == null ? void 0 : _b[sizeToken]);
|
|
24
|
-
const color = props.color || ((_c = font.color) == null ? void 0 : _c[sizeToken])
|
|
24
|
+
const color = props.color || ((_c = font.color) == null ? void 0 : _c[sizeToken]);
|
|
25
25
|
const style = {
|
|
26
26
|
color,
|
|
27
27
|
fontStyle,
|
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 { getTokens, getVariableValue } from '@tamagui/core'\nimport type {\n FontSizeTokens,\n GenericFont,\n TextProps,\n VariantSpreadFunction,\n} from '@tamagui/core'\n\nexport const getFontSized: VariantSpreadFunction<TextProps, FontSizeTokens> = (\n sizeTokenIn = '$true',\n { fonts,
|
|
5
|
-
"mappings": "AAAA,SAAS,WAAW,wBAAwB;AAQrC,MAAM,eAAiE,CAC5E,cAAc,SACd,EAAE,OAAO,
|
|
4
|
+
"sourcesContent": ["import { getTokens, getVariableValue } from '@tamagui/core'\nimport type {\n FontSizeTokens,\n GenericFont,\n TextProps,\n VariantSpreadFunction,\n} from '@tamagui/core'\n\nexport const getFontSized: VariantSpreadFunction<TextProps, FontSizeTokens> = (\n sizeTokenIn = '$true',\n { fonts, props }\n) => {\n const family = getVariableValue(props.fontFamily) || '$body'\n const font = fonts[family] || fonts['$body']\n if (!font) {\n if (process.env.NODE_ENV === 'development') {\n // eslint-disable-next-line no-console\n console.warn('\u26A0\uFE0F no font found', {\n family,\n fontTokens: Object.keys(fonts),\n sizeTokenIn,\n })\n }\n return {} as any\n }\n const fontFamily = font.family\n const sizeToken = sizeTokenIn === '$true' ? getDefaultSizeToken(font) : sizeTokenIn\n const fontSize = props.fontSize || font.size[sizeToken]\n const lineHeight = props.lineHeight || font.lineHeight[sizeToken]\n const fontWeight = props.fontWeight || font.weight[sizeToken]\n const letterSpacing = props.letterSpacing || font.letterSpacing[sizeToken]\n const fontStyle = props.fontStyle || font.style?.[sizeToken]\n const textTransform = props.textTransform || font.transform?.[sizeToken]\n const color = props.color || font.color?.[sizeToken]\n\n const style = {\n color,\n fontStyle,\n textTransform,\n fontFamily,\n fontWeight,\n letterSpacing,\n fontSize,\n lineHeight,\n }\n if (process.env.NODE_ENV === 'development') {\n if (props['debug']) {\n // eslint-disable-next-line no-console\n console.groupCollapsed(' \uD83D\uDD39 getFontSized', sizeTokenIn, sizeToken)\n // eslint-disable-next-line no-console\n console.log({ style, props, font })\n // eslint-disable-next-line no-console\n console.groupEnd()\n }\n }\n return style\n}\n\nconst cache = new WeakMap<any, FontSizeTokens>()\n\nfunction getDefaultSizeToken(font: GenericFont) {\n if (typeof font === 'object' && cache.has(font)) {\n return cache.get(font)!\n }\n\n // use either font.size if it has true set, or fallback to tokens.size mapping to the same\n const sizeTokens = '$true' in font.size ? font.size : getTokens().size\n const sizeDefault = sizeTokens['$true']\n const sizeDefaultSpecific = sizeDefault\n ? Object.keys(sizeTokens).find(\n (x) => x !== '$true' && sizeTokens[x]['val'] === sizeDefault['val']\n )\n : null\n\n if (!sizeDefault || !sizeDefaultSpecific) {\n if (process.env.NODE_ENV === 'development') {\n console.warn(`No default size is set in your tokens for the \"true\" key, fonts will be inconsistent.\n\n Fix this by having consistent tokens across fonts and sizes and setting a true key for your size tokens, or\n set true keys for all your font tokens: \"size\", \"lineHeight\", \"fontStyle\", etc.`)\n }\n return Object.keys(font.size)[3]\n }\n\n cache.set(font, sizeDefaultSpecific as FontSizeTokens)\n return sizeDefaultSpecific\n}\n"],
|
|
5
|
+
"mappings": "AAAA,SAAS,WAAW,wBAAwB;AAQrC,MAAM,eAAiE,CAC5E,cAAc,SACd,EAAE,OAAO,MAAM,MACZ;AAXL;AAYE,QAAM,SAAS,iBAAiB,MAAM,UAAU,KAAK;AACrD,QAAM,OAAO,MAAM,MAAM,KAAK,MAAM,OAAO;AAC3C,MAAI,CAAC,MAAM;AACT,QAAI,QAAQ,IAAI,aAAa,eAAe;AAE1C,cAAQ,KAAK,8BAAoB;AAAA,QAC/B;AAAA,QACA,YAAY,OAAO,KAAK,KAAK;AAAA,QAC7B;AAAA,MACF,CAAC;AAAA,IACH;AACA,WAAO,CAAC;AAAA,EACV;AACA,QAAM,aAAa,KAAK;AACxB,QAAM,YAAY,gBAAgB,UAAU,oBAAoB,IAAI,IAAI;AACxE,QAAM,WAAW,MAAM,YAAY,KAAK,KAAK,SAAS;AACtD,QAAM,aAAa,MAAM,cAAc,KAAK,WAAW,SAAS;AAChE,QAAM,aAAa,MAAM,cAAc,KAAK,OAAO,SAAS;AAC5D,QAAM,gBAAgB,MAAM,iBAAiB,KAAK,cAAc,SAAS;AACzE,QAAM,YAAY,MAAM,eAAa,UAAK,UAAL,mBAAa;AAClD,QAAM,gBAAgB,MAAM,mBAAiB,UAAK,cAAL,mBAAiB;AAC9D,QAAM,QAAQ,MAAM,WAAS,UAAK,UAAL,mBAAa;AAE1C,QAAM,QAAQ;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,QAAI,MAAM,OAAO,GAAG;AAElB,cAAQ,eAAe,4BAAqB,aAAa,SAAS;AAElE,cAAQ,IAAI,EAAE,OAAO,OAAO,KAAK,CAAC;AAElC,cAAQ,SAAS;AAAA,IACnB;AAAA,EACF;AACA,SAAO;AACT;AAEA,MAAM,QAAQ,oBAAI,QAA6B;AAE/C,SAAS,oBAAoB,MAAmB;AAC9C,MAAI,OAAO,SAAS,YAAY,MAAM,IAAI,IAAI,GAAG;AAC/C,WAAO,MAAM,IAAI,IAAI;AAAA,EACvB;AAGA,QAAM,aAAa,WAAW,KAAK,OAAO,KAAK,OAAO,UAAU,EAAE;AAClE,QAAM,cAAc,WAAW,OAAO;AACtC,QAAM,sBAAsB,cACxB,OAAO,KAAK,UAAU,EAAE;AAAA,IACtB,CAAC,MAAM,MAAM,WAAW,WAAW,CAAC,EAAE,KAAK,MAAM,YAAY,KAAK;AAAA,EACpE,IACA;AAEJ,MAAI,CAAC,eAAe,CAAC,qBAAqB;AACxC,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK;AAAA;AAAA;AAAA,sFAGmE;AAAA,IAClF;AACA,WAAO,OAAO,KAAK,KAAK,IAAI,EAAE,CAAC;AAAA,EACjC;AAEA,QAAM,IAAI,MAAM,mBAAqC;AACrD,SAAO;AACT;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/get-font-sized",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.5",
|
|
4
4
|
"types": "./types/index.d.ts",
|
|
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
|
"dependencies": {
|
|
21
|
-
"@tamagui/core": "^1.2.
|
|
21
|
+
"@tamagui/core": "^1.2.5",
|
|
22
22
|
"react": "^18.2.0"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
|
-
"@tamagui/build": "^1.2.
|
|
25
|
+
"@tamagui/build": "^1.2.5",
|
|
26
26
|
"@types/react": "^18.0.15"
|
|
27
27
|
},
|
|
28
28
|
"publishConfig": {
|
package/src/index.ts
CHANGED
|
@@ -8,7 +8,7 @@ import type {
|
|
|
8
8
|
|
|
9
9
|
export const getFontSized: VariantSpreadFunction<TextProps, FontSizeTokens> = (
|
|
10
10
|
sizeTokenIn = '$true',
|
|
11
|
-
{ fonts,
|
|
11
|
+
{ fonts, props }
|
|
12
12
|
) => {
|
|
13
13
|
const family = getVariableValue(props.fontFamily) || '$body'
|
|
14
14
|
const font = fonts[family] || fonts['$body']
|
|
@@ -31,7 +31,7 @@ export const getFontSized: VariantSpreadFunction<TextProps, FontSizeTokens> = (
|
|
|
31
31
|
const letterSpacing = props.letterSpacing || font.letterSpacing[sizeToken]
|
|
32
32
|
const fontStyle = props.fontStyle || font.style?.[sizeToken]
|
|
33
33
|
const textTransform = props.textTransform || font.transform?.[sizeToken]
|
|
34
|
-
const color = props.color || font.color?.[sizeToken]
|
|
34
|
+
const color = props.color || font.color?.[sizeToken]
|
|
35
35
|
|
|
36
36
|
const style = {
|
|
37
37
|
color,
|