@evlop/native-components 1.0.276 → 1.0.278
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/src/RenderPage/_IconWithBadge.js +7 -6
- package/dist/cjs/src/RenderPage/_IconWithBadge.js.map +1 -1
- package/dist/cjs/src/Text/customFontManager.d.ts +1 -2
- package/dist/cjs/src/Text/customFontManager.d.ts.map +1 -1
- package/dist/cjs/src/Text/customFontManager.js +10 -10
- package/dist/cjs/src/Text/customFontManager.js.map +1 -1
- package/dist/cjs/src/Text/index.d.ts.map +1 -1
- package/dist/cjs/src/Text/index.js +14 -10
- package/dist/cjs/src/Text/index.js.map +1 -1
- package/dist/types/src/Text/customFontManager.d.ts +1 -2
- package/dist/types/src/Text/customFontManager.d.ts.map +1 -1
- package/dist/types/src/Text/index.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -24,29 +24,30 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
// import { Icon, Text } from '@evlop/native-components';
|
|
27
|
+
const commons_1 = require("@evlop/commons");
|
|
27
28
|
const lodash_1 = require("lodash");
|
|
28
29
|
const react_1 = __importStar(require("react"));
|
|
29
30
|
const react_native_1 = require("react-native");
|
|
30
|
-
const react_redux_1 = require("react-redux");
|
|
31
31
|
const Icon_1 = require("../Icon");
|
|
32
32
|
const AnimatedView = react_native_1.Animated.createAnimatedComponent(react_native_1.View);
|
|
33
33
|
function IconWithBadge({ icon, size: iconSize, color, badge }) {
|
|
34
|
-
const wishlist = (0,
|
|
35
|
-
const
|
|
34
|
+
const wishlist = (0, commons_1.useScope)((s) => s.wishlist);
|
|
35
|
+
const cart = (0, commons_1.useScope)((s) => s.cart);
|
|
36
36
|
const bubbleAnimation = (0, react_1.useMemo)(() => new react_native_1.Animated.Value(0), []);
|
|
37
37
|
const isFirstRender = (0, react_1.useRef)(true);
|
|
38
38
|
const badgeText = (0, react_1.useMemo)(() => {
|
|
39
|
+
var _a, _b, _c;
|
|
39
40
|
switch (badge) {
|
|
40
41
|
case 'WISHLIST_ITEMS_COUNT':
|
|
41
|
-
return (0
|
|
42
|
+
return (_b = (_a = wishlist === null || wishlist === void 0 ? void 0 : wishlist.items) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
|
|
42
43
|
case 'CART_ITEMS_COUNT': {
|
|
43
|
-
const lineItems = (0
|
|
44
|
+
const lineItems = (_c = cart === null || cart === void 0 ? void 0 : cart.lineItems) !== null && _c !== void 0 ? _c : [];
|
|
44
45
|
return (0, lodash_1.sum)((0, lodash_1.map)(lineItems, 'quantity'));
|
|
45
46
|
}
|
|
46
47
|
default:
|
|
47
48
|
return badge;
|
|
48
49
|
}
|
|
49
|
-
}, [badge,
|
|
50
|
+
}, [badge, cart, wishlist]);
|
|
50
51
|
(0, react_1.useEffect)(() => {
|
|
51
52
|
if (isFirstRender.current) {
|
|
52
53
|
isFirstRender.current = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_IconWithBadge.js","sourceRoot":"","sources":["../../../../src/RenderPage/_IconWithBadge.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"_IconWithBadge.js","sourceRoot":"","sources":["../../../../src/RenderPage/_IconWithBadge.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
declare type FontWeight = keyof Theme["fontWeights"];
|
|
1
|
+
declare type FontWeight = 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900;
|
|
3
2
|
interface FontRegistration {
|
|
4
3
|
/** Base family name as embedded in the font file, e.g. "Inter" */
|
|
5
4
|
familyName: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customFontManager.d.ts","sourceRoot":"","sources":["../../../../src/Text/customFontManager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"customFontManager.d.ts","sourceRoot":"","sources":["../../../../src/Text/customFontManager.ts"],"names":[],"mappings":"AAEA,aAAK,UAAU,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAEtE,UAAU,gBAAgB;IACxB,kEAAkE;IAClE,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAC;CAC3E;AAcD,cAAM,iBAAiB;IACrB,OAAO,CAAC,QAAQ,CAAuC;IAEvD;;;;;OAKG;IACH,YAAY,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI;IAI5C;;OAEG;IACH,wBAAwB,IAAI,MAAM,EAAE;IAIpC;;OAEG;IACH,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAIzC;;;;;;OAMG;IACH,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,UAAQ,GAAG,MAAM,GAAG,SAAS;CAiBlG;AAED,eAAO,MAAM,iBAAiB,mBAA0B,CAAC"}
|
|
@@ -2,15 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.customFontManager = void 0;
|
|
4
4
|
const DEFAULT_WEIGHT_SUFFIXES = {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
5
|
+
100: { normal: 'Thin', italic: 'ThinItalic' },
|
|
6
|
+
200: { normal: 'UltraLight', italic: 'UltraLightItalic' },
|
|
7
|
+
300: { normal: 'Light', italic: 'LightItalic' },
|
|
8
|
+
400: { normal: 'Regular', italic: 'Italic' },
|
|
9
|
+
500: { normal: 'Medium', italic: 'MediumItalic' },
|
|
10
|
+
600: { normal: 'Semibold', italic: 'SemiboldItalic' },
|
|
11
|
+
700: { normal: 'Bold', italic: 'BoldItalic' },
|
|
12
|
+
800: { normal: 'Heavy', italic: 'HeavyItalic' },
|
|
13
|
+
900: { normal: 'Black', italic: 'BlackItalic' },
|
|
14
14
|
};
|
|
15
15
|
class CustomFontManager {
|
|
16
16
|
constructor() {
|
|
@@ -54,7 +54,7 @@ class CustomFontManager {
|
|
|
54
54
|
if (override) {
|
|
55
55
|
return italic ? override.italic : override.normal;
|
|
56
56
|
}
|
|
57
|
-
const suffix = DEFAULT_WEIGHT_SUFFIXES[fontWeight] || DEFAULT_WEIGHT_SUFFIXES
|
|
57
|
+
const suffix = DEFAULT_WEIGHT_SUFFIXES[fontWeight] || DEFAULT_WEIGHT_SUFFIXES[400];
|
|
58
58
|
const variant = italic ? suffix.italic : suffix.normal;
|
|
59
59
|
return `${familyName}-${variant}`;
|
|
60
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customFontManager.js","sourceRoot":"","sources":["../../../../src/Text/customFontManager.ts"],"names":[],"mappings":";;;AAiBA,MAAM,uBAAuB,GAA2D;IACtF,
|
|
1
|
+
{"version":3,"file":"customFontManager.js","sourceRoot":"","sources":["../../../../src/Text/customFontManager.ts"],"names":[],"mappings":";;;AAiBA,MAAM,uBAAuB,GAA2D;IACtF,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAQ,MAAM,EAAE,YAAY,EAAQ;IACzD,GAAG,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,kBAAkB,EAAE;IACzD,GAAG,EAAE,EAAE,MAAM,EAAE,OAAO,EAAO,MAAM,EAAE,aAAa,EAAO;IACzD,GAAG,EAAE,EAAE,MAAM,EAAE,SAAS,EAAK,MAAM,EAAE,QAAQ,EAAY;IACzD,GAAG,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAM,MAAM,EAAE,cAAc,EAAM;IACzD,GAAG,EAAE,EAAE,MAAM,EAAE,UAAU,EAAI,MAAM,EAAE,gBAAgB,EAAI;IACzD,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAQ,MAAM,EAAE,YAAY,EAAQ;IACzD,GAAG,EAAE,EAAE,MAAM,EAAE,OAAO,EAAO,MAAM,EAAE,aAAa,EAAO;IACzD,GAAG,EAAE,EAAE,MAAM,EAAE,OAAO,EAAO,MAAM,EAAE,aAAa,EAAO;CAC1D,CAAC;AAEF,MAAM,iBAAiB;IAAvB;QACU,aAAQ,GAAG,IAAI,GAAG,EAA4B,CAAC;IAkDzD,CAAC;IAhDC;;;;;OAKG;IACH,YAAY,CAAC,MAAwB;QACnC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;IAED;;OAEG;IACH,wBAAwB;QACtB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,YAAY,CAAC,UAAkB;QAC7B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC;IAED;;;;;;OAMG;IACH,iBAAiB,CAAC,UAAkB,EAAE,UAAsB,EAAE,MAAM,GAAG,KAAK;QAC1E,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACnD,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;QACjC,MAAM,QAAQ,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,UAAU,CAAC,CAAC;QAEvC,IAAI,QAAQ,EAAE;YACZ,OAAO,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;SACnD;QAED,MAAM,MAAM,GAAG,uBAAuB,CAAC,UAAU,CAAC,IAAI,uBAAuB,CAAC,GAAG,CAAC,CAAC;QACnF,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;QACvD,OAAO,GAAG,UAAU,IAAI,OAAO,EAAE,CAAC;IACpC,CAAC;CACF;AAEY,QAAA,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/Text/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EAErB,KAAK,EAEN,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAkB,SAAS,IAAI,WAAW,EAAE,MAAM,cAAc,CAAC;AAExE,OAAO,EAAc,eAAe,EAAU,WAAW,EAAS,UAAU,EAAiC,WAAW,EAAoC,UAAU,EAAa,eAAe,EAAW,MAAM,eAAe,CAAC;AACnO,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAMxD,aAAK,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5C,aAAK,eAAe,GAAG,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,eAAe,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/Text/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EAErB,KAAK,EAEN,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAkB,SAAS,IAAI,WAAW,EAAE,MAAM,cAAc,CAAC;AAExE,OAAO,EAAc,eAAe,EAAU,WAAW,EAAS,UAAU,EAAiC,WAAW,EAAoC,UAAU,EAAa,eAAe,EAAW,MAAM,eAAe,CAAC;AACnO,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAMxD,aAAK,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5C,aAAK,eAAe,GAAG,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,eAAe,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA+DlN,oBAAY,aAAa,GAAG,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAMnE,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC,aAAa,CAcvD,CAAC;AAEF,eAAO,MAAM,IAAI,EAAE,qBAAqB,CAAC,aAAa,CAgC1C,CAAC;AAEb,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAE7B,eAAe,IAAI,CAAC"}
|
|
@@ -47,15 +47,19 @@ const resolveFontFamily = ({ fontFamily: fontFamilyProp, fontWeight: fontWeightP
|
|
|
47
47
|
const fontFamilyValue = fontFamilyProp !== null && fontFamilyProp !== void 0 ? fontFamilyProp : variantStyles.fontFamily;
|
|
48
48
|
const fontWeightValue = fontWeightProp !== null && fontWeightProp !== void 0 ? fontWeightProp : variantStyles.fontWeight;
|
|
49
49
|
const fontStyleValue = fontStyleProp !== null && fontStyleProp !== void 0 ? fontStyleProp : variantStyles.fontStyle;
|
|
50
|
-
const
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
50
|
+
const themeFonts = theme === null || theme === void 0 ? void 0 : theme.fonts;
|
|
51
|
+
const stylesToApply = {
|
|
52
|
+
fontFamily: themeFonts[fontFamilyValue] || fontFamilyValue,
|
|
53
|
+
fontWeight: theme.fontWeights[fontWeightValue] || fontWeightValue,
|
|
54
|
+
fontStyle: fontStyleValue,
|
|
55
|
+
};
|
|
56
|
+
if (stylesToApply.fontFamily === 'system')
|
|
57
|
+
return { fontWeight: stylesToApply.fontWeight, fontStyle: stylesToApply.fontStyle };
|
|
58
|
+
if (customFontManager_1.customFontManager.isCustomFont(stylesToApply.fontFamily)) {
|
|
59
|
+
const customFontFamily = customFontManager_1.customFontManager.resolveFontFamily(stylesToApply.fontFamily, stylesToApply.fontWeight, fontStyleValue === 'italic');
|
|
56
60
|
return customFontFamily ? { fontFamily: customFontFamily } : undefined;
|
|
57
61
|
}
|
|
58
|
-
return
|
|
62
|
+
return stylesToApply;
|
|
59
63
|
};
|
|
60
64
|
const StyledText = (0, native_1.default)(react_native_1.Text)(({ theme }) => {
|
|
61
65
|
var _a;
|
|
@@ -63,18 +67,18 @@ const StyledText = (0, native_1.default)(react_native_1.Text)(({ theme }) => {
|
|
|
63
67
|
// has to be like this for defaulting the color, we cannot override prop as text variant might apply color to it aswell.
|
|
64
68
|
color: (_a = theme === null || theme === void 0 ? void 0 : theme.colors) === null || _a === void 0 ? void 0 : _a['gray-900'],
|
|
65
69
|
});
|
|
66
|
-
}, textVariant, resolveFontFamily, styled_system_1.border, styled_system_1.layout, styled_system_1.background, styled_system_1.color, fontSize, styled_system_1.
|
|
70
|
+
}, textVariant, resolveFontFamily, styled_system_1.border, styled_system_1.layout, styled_system_1.background, styled_system_1.color, fontSize, styled_system_1.letterSpacing, styled_system_1.textAlign, // these are typography from styled-system except fontWeight, fontFamily, lineHeight is handled by fontSize
|
|
67
71
|
styled_system_1.space);
|
|
68
72
|
const handlebarTemplateRegex = /{{[^{}]+}}/;
|
|
69
73
|
const testHandlebarTemplate = (0, lodash_1.memoize)((content) => typeof content === 'string' && handlebarTemplateRegex.test(content));
|
|
70
74
|
const BaseText = (_a) => {
|
|
71
|
-
var { children, content, fontFamily = 'primary' } = _a, props = __rest(_a, ["children", "content", "fontFamily"]);
|
|
75
|
+
var { children, content, fontFamily = 'primary', fontWeight = "Regular", fontStyle = "normal" } = _a, props = __rest(_a, ["children", "content", "fontFamily", "fontWeight", "fontStyle"]);
|
|
72
76
|
let displayValue = content || children;
|
|
73
77
|
const isTemplate = testHandlebarTemplate(displayValue);
|
|
74
78
|
if (isTemplate) {
|
|
75
79
|
displayValue = react_1.default.createElement(commons_1.RenderTemplate, { template: displayValue });
|
|
76
80
|
}
|
|
77
|
-
return (react_1.default.createElement(StyledText, Object.assign({ fontFamily: fontFamily }, props), displayValue));
|
|
81
|
+
return (react_1.default.createElement(StyledText, Object.assign({ fontFamily: fontFamily, fontWeight: fontWeight, fontStyle: fontStyle }, props), displayValue));
|
|
78
82
|
};
|
|
79
83
|
exports.BaseText = BaseText;
|
|
80
84
|
exports.Text = (0, commons_1.withSettings)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/Text/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4CAKwB;AACxB,mCAAiC;AACjC,kDAA0B;AAC1B,+CAAwE;AACxE,sEAA8C;AAC9C,iDAAmO;AACnO,2DAAwD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/Text/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
declare type FontWeight = keyof Theme["fontWeights"];
|
|
1
|
+
declare type FontWeight = 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900;
|
|
3
2
|
interface FontRegistration {
|
|
4
3
|
/** Base family name as embedded in the font file, e.g. "Inter" */
|
|
5
4
|
familyName: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customFontManager.d.ts","sourceRoot":"","sources":["../../../../src/Text/customFontManager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"customFontManager.d.ts","sourceRoot":"","sources":["../../../../src/Text/customFontManager.ts"],"names":[],"mappings":"AAEA,aAAK,UAAU,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAEtE,UAAU,gBAAgB;IACxB,kEAAkE;IAClE,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAC;CAC3E;AAcD,cAAM,iBAAiB;IACrB,OAAO,CAAC,QAAQ,CAAuC;IAEvD;;;;;OAKG;IACH,YAAY,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI;IAI5C;;OAEG;IACH,wBAAwB,IAAI,MAAM,EAAE;IAIpC;;OAEG;IACH,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAIzC;;;;;;OAMG;IACH,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,UAAQ,GAAG,MAAM,GAAG,SAAS;CAiBlG;AAED,eAAO,MAAM,iBAAiB,mBAA0B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/Text/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EAErB,KAAK,EAEN,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAkB,SAAS,IAAI,WAAW,EAAE,MAAM,cAAc,CAAC;AAExE,OAAO,EAAc,eAAe,EAAU,WAAW,EAAS,UAAU,EAAiC,WAAW,EAAoC,UAAU,EAAa,eAAe,EAAW,MAAM,eAAe,CAAC;AACnO,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAMxD,aAAK,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5C,aAAK,eAAe,GAAG,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,eAAe,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/Text/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EAErB,KAAK,EAEN,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAkB,SAAS,IAAI,WAAW,EAAE,MAAM,cAAc,CAAC;AAExE,OAAO,EAAc,eAAe,EAAU,WAAW,EAAS,UAAU,EAAiC,WAAW,EAAoC,UAAU,EAAa,eAAe,EAAW,MAAM,eAAe,CAAC;AACnO,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAMxD,aAAK,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5C,aAAK,eAAe,GAAG,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,eAAe,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA+DlN,oBAAY,aAAa,GAAG,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAMnE,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC,aAAa,CAcvD,CAAC;AAEF,eAAO,MAAM,IAAI,EAAE,qBAAqB,CAAC,aAAa,CAgC1C,CAAC;AAEb,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAE7B,eAAe,IAAI,CAAC"}
|