@tamagui/get-font-sized 1.30.13 → 1.30.15
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 +1 -2
- package/dist/cjs/index.js.map +1 -1
- package/dist/esm/index.js +1 -2
- package/dist/esm/index.js.map +1 -1
- 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", { font, props }) => {
|
|
25
|
+
const getFontSized = (sizeTokenIn = "$true", { font, fontFamily, props }) => {
|
|
26
26
|
var _a, _b, _c, _d, _e, _f;
|
|
27
27
|
if (!font) {
|
|
28
28
|
if (process.env.NODE_ENV === "development") {
|
|
@@ -32,7 +32,6 @@ const getFontSized = (sizeTokenIn = "$true", { font, props }) => {
|
|
|
32
32
|
}
|
|
33
33
|
return;
|
|
34
34
|
}
|
|
35
|
-
const fontFamily = font.family;
|
|
36
35
|
const sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn;
|
|
37
36
|
const fontSize = props.fontSize || font.size[sizeToken];
|
|
38
37
|
const lineHeight = props.lineHeight || ((_a = font.lineHeight) == null ? void 0 : _a[sizeToken]);
|
package/dist/cjs/index.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/index.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA4C;AAQrC,MAAM,eAAiE,CAC5E,cAAc,SACd,EAAE,MAAM,MAAM,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA4C;AAQrC,MAAM,eAAiE,CAC5E,cAAc,SACd,EAAE,MAAM,YAAY,MAAM,MACvB;AAXL;AAYE,MAAI,CAAC,MAAM;AACT,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AACA;AAAA,EACF;AAEA,QAAM,YAAY,gBAAgB,UAAU,oBAAoB,IAAI,IAAI;AACxE,QAAM,WAAW,MAAM,YAAY,KAAK,KAAK,SAAS;AACtD,QAAM,aAAa,MAAM,gBAAc,UAAK,eAAL,mBAAkB;AACzD,QAAM,aAAa,MAAM,gBAAc,UAAK,WAAL,mBAAc;AACrD,QAAM,gBAAgB,MAAM,mBAAiB,UAAK,kBAAL,mBAAqB;AAClE,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;AAClB,cAAQ,eAAe,4BAAqB,aAAa,SAAS;AAElE,cAAQ,IAAI,EAAE,OAAO,OAAO,KAAK,CAAC;AAClC,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;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/esm/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getTokens } from "@tamagui/core";
|
|
2
|
-
const getFontSized = (sizeTokenIn = "$true", { font, props }) => {
|
|
2
|
+
const getFontSized = (sizeTokenIn = "$true", { font, fontFamily, props }) => {
|
|
3
3
|
var _a, _b, _c, _d, _e, _f;
|
|
4
4
|
if (!font) {
|
|
5
5
|
if (process.env.NODE_ENV === "development") {
|
|
@@ -9,7 +9,6 @@ const getFontSized = (sizeTokenIn = "$true", { font, props }) => {
|
|
|
9
9
|
}
|
|
10
10
|
return;
|
|
11
11
|
}
|
|
12
|
-
const fontFamily = font.family;
|
|
13
12
|
const sizeToken = sizeTokenIn === "$true" ? getDefaultSizeToken(font) : sizeTokenIn;
|
|
14
13
|
const fontSize = props.fontSize || font.size[sizeToken];
|
|
15
14
|
const lineHeight = props.lineHeight || ((_a = font.lineHeight) == null ? void 0 : _a[sizeToken]);
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/index.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,iBAAmC;AAQrC,MAAM,eAAiE,CAC5E,cAAc,SACd,EAAE,MAAM,MAAM,
|
|
4
|
+
"mappings": "AAAA,SAAS,iBAAmC;AAQrC,MAAM,eAAiE,CAC5E,cAAc,SACd,EAAE,MAAM,YAAY,MAAM,MACvB;AAXL;AAYE,MAAI,CAAC,MAAM;AACT,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AACA;AAAA,EACF;AAEA,QAAM,YAAY,gBAAgB,UAAU,oBAAoB,IAAI,IAAI;AACxE,QAAM,WAAW,MAAM,YAAY,KAAK,KAAK,SAAS;AACtD,QAAM,aAAa,MAAM,gBAAc,UAAK,eAAL,mBAAkB;AACzD,QAAM,aAAa,MAAM,gBAAc,UAAK,WAAL,mBAAc;AACrD,QAAM,gBAAgB,MAAM,mBAAiB,UAAK,kBAAL,mBAAqB;AAClE,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;AAClB,cAAQ,eAAe,4BAAqB,aAAa,SAAS;AAElE,cAAQ,IAAI,EAAE,OAAO,OAAO,KAAK,CAAC;AAClC,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;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/get-font-sized",
|
|
3
|
-
"version": "1.30.
|
|
3
|
+
"version": "1.30.15",
|
|
4
4
|
"types": "./types/index.d.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -18,10 +18,10 @@
|
|
|
18
18
|
"clean:build": "tamagui-build clean:build"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@tamagui/core": "1.30.
|
|
21
|
+
"@tamagui/core": "1.30.15"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
|
-
"@tamagui/build": "1.30.
|
|
24
|
+
"@tamagui/build": "1.30.15",
|
|
25
25
|
"@types/react": "^18.0.15",
|
|
26
26
|
"react": "^18.2.0"
|
|
27
27
|
},
|
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
|
-
{ font, props }
|
|
11
|
+
{ font, fontFamily, props }
|
|
12
12
|
) => {
|
|
13
13
|
if (!font) {
|
|
14
14
|
if (process.env.NODE_ENV === 'development') {
|
|
@@ -18,7 +18,7 @@ export const getFontSized: VariantSpreadFunction<TextProps, FontSizeTokens> = (
|
|
|
18
18
|
}
|
|
19
19
|
return
|
|
20
20
|
}
|
|
21
|
-
|
|
21
|
+
|
|
22
22
|
const sizeToken = sizeTokenIn === '$true' ? getDefaultSizeToken(font) : sizeTokenIn
|
|
23
23
|
const fontSize = props.fontSize || font.size[sizeToken]
|
|
24
24
|
const lineHeight = props.lineHeight || font.lineHeight?.[sizeToken]
|