@fluentui-react-native/text 0.17.1 → 0.18.1
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/CHANGELOG.json +79 -1
- package/CHANGELOG.md +26 -2
- package/lib/Text.d.ts.map +1 -1
- package/lib/Text.js +3 -2
- package/lib/Text.js.map +1 -1
- package/lib/Variants.ios.d.ts.map +1 -1
- package/lib/Variants.ios.js +0 -12
- package/lib/Variants.ios.js.map +1 -1
- package/lib-commonjs/Text.d.ts.map +1 -1
- package/lib-commonjs/Text.js +3 -2
- package/lib-commonjs/Text.js.map +1 -1
- package/lib-commonjs/Variants.ios.d.ts.map +1 -1
- package/lib-commonjs/Variants.ios.js +0 -12
- package/lib-commonjs/Variants.ios.js.map +1 -1
- package/package.json +6 -6
- package/src/Text.tsx +4 -3
- package/src/Variants.ios.ts +0 -12
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,85 @@
|
|
|
2
2
|
"name": "@fluentui-react-native/text",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "
|
|
5
|
+
"date": "Tue, 06 Dec 2022 16:57:13 GMT",
|
|
6
|
+
"tag": "@fluentui-react-native/text_v0.18.1",
|
|
7
|
+
"version": "0.18.1",
|
|
8
|
+
"comments": {
|
|
9
|
+
"patch": [
|
|
10
|
+
{
|
|
11
|
+
"author": "beachball",
|
|
12
|
+
"package": "@fluentui-react-native/text",
|
|
13
|
+
"comment": "Bump @uifabricshared/foundation-compose to v1.12.25",
|
|
14
|
+
"commit": "fd3173a08209d19f2ba01d34348767dbf49624bd"
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
"author": "beachball",
|
|
18
|
+
"package": "@fluentui-react-native/text",
|
|
19
|
+
"comment": "Bump @fluentui-react-native/framework to v0.8.24",
|
|
20
|
+
"commit": "fd3173a08209d19f2ba01d34348767dbf49624bd"
|
|
21
|
+
},
|
|
22
|
+
{
|
|
23
|
+
"author": "beachball",
|
|
24
|
+
"package": "@fluentui-react-native/text",
|
|
25
|
+
"comment": "Bump @fluentui-react-native/interactive-hooks to v0.21.5",
|
|
26
|
+
"commit": "fd3173a08209d19f2ba01d34348767dbf49624bd"
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
"author": "beachball",
|
|
30
|
+
"package": "@fluentui-react-native/text",
|
|
31
|
+
"comment": "Bump @fluentui-react-native/theme-tokens to v0.22.0",
|
|
32
|
+
"commit": "fd3173a08209d19f2ba01d34348767dbf49624bd"
|
|
33
|
+
}
|
|
34
|
+
]
|
|
35
|
+
}
|
|
36
|
+
},
|
|
37
|
+
{
|
|
38
|
+
"date": "Tue, 06 Dec 2022 00:46:41 GMT",
|
|
39
|
+
"tag": "@fluentui-react-native/text_v0.18.0",
|
|
40
|
+
"version": "0.18.0",
|
|
41
|
+
"comments": {
|
|
42
|
+
"minor": [
|
|
43
|
+
{
|
|
44
|
+
"author": "adgleitm@microsoft.com",
|
|
45
|
+
"package": "@fluentui-react-native/text",
|
|
46
|
+
"commit": "bb56215afebd2cadbe34da92ab4768c2d2a6b355",
|
|
47
|
+
"comment": "Allow V1 usage of V2 variants"
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
"author": "beachball",
|
|
51
|
+
"package": "@fluentui-react-native/text",
|
|
52
|
+
"comment": "Bump @uifabricshared/foundation-compose to v1.12.24",
|
|
53
|
+
"commit": "8e94deaeff8869396c506ca186a614eb0acd9f93"
|
|
54
|
+
},
|
|
55
|
+
{
|
|
56
|
+
"author": "beachball",
|
|
57
|
+
"package": "@fluentui-react-native/text",
|
|
58
|
+
"comment": "Bump @fluentui-react-native/framework to v0.8.23",
|
|
59
|
+
"commit": "8e94deaeff8869396c506ca186a614eb0acd9f93"
|
|
60
|
+
},
|
|
61
|
+
{
|
|
62
|
+
"author": "beachball",
|
|
63
|
+
"package": "@fluentui-react-native/text",
|
|
64
|
+
"comment": "Bump @fluentui-react-native/interactive-hooks to v0.21.4",
|
|
65
|
+
"commit": "8e94deaeff8869396c506ca186a614eb0acd9f93"
|
|
66
|
+
},
|
|
67
|
+
{
|
|
68
|
+
"author": "beachball",
|
|
69
|
+
"package": "@fluentui-react-native/text",
|
|
70
|
+
"comment": "Bump @fluentui-react-native/theme-tokens to v0.21.5",
|
|
71
|
+
"commit": "8e94deaeff8869396c506ca186a614eb0acd9f93"
|
|
72
|
+
},
|
|
73
|
+
{
|
|
74
|
+
"author": "beachball",
|
|
75
|
+
"package": "@fluentui-react-native/text",
|
|
76
|
+
"comment": "Bump @fluentui-react-native/tokens to v0.19.0",
|
|
77
|
+
"commit": "8e94deaeff8869396c506ca186a614eb0acd9f93"
|
|
78
|
+
}
|
|
79
|
+
]
|
|
80
|
+
}
|
|
81
|
+
},
|
|
82
|
+
{
|
|
83
|
+
"date": "Thu, 01 Dec 2022 03:12:20 GMT",
|
|
6
84
|
"tag": "@fluentui-react-native/text_v0.17.1",
|
|
7
85
|
"version": "0.17.1",
|
|
8
86
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,36 @@
|
|
|
1
1
|
# Change Log - @fluentui-react-native/text
|
|
2
2
|
|
|
3
|
-
This log was last generated on
|
|
3
|
+
This log was last generated on Tue, 06 Dec 2022 16:57:13 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 0.18.1
|
|
8
|
+
|
|
9
|
+
Tue, 06 Dec 2022 16:57:13 GMT
|
|
10
|
+
|
|
11
|
+
### Patches
|
|
12
|
+
|
|
13
|
+
- Bump @uifabricshared/foundation-compose to v1.12.25
|
|
14
|
+
- Bump @fluentui-react-native/framework to v0.8.24
|
|
15
|
+
- Bump @fluentui-react-native/interactive-hooks to v0.21.5
|
|
16
|
+
- Bump @fluentui-react-native/theme-tokens to v0.22.0
|
|
17
|
+
|
|
18
|
+
## 0.18.0
|
|
19
|
+
|
|
20
|
+
Tue, 06 Dec 2022 00:46:41 GMT
|
|
21
|
+
|
|
22
|
+
### Minor changes
|
|
23
|
+
|
|
24
|
+
- Allow V1 usage of V2 variants (adgleitm@microsoft.com)
|
|
25
|
+
- Bump @uifabricshared/foundation-compose to v1.12.24
|
|
26
|
+
- Bump @fluentui-react-native/framework to v0.8.23
|
|
27
|
+
- Bump @fluentui-react-native/interactive-hooks to v0.21.4
|
|
28
|
+
- Bump @fluentui-react-native/theme-tokens to v0.21.5
|
|
29
|
+
- Bump @fluentui-react-native/tokens to v0.19.0
|
|
30
|
+
|
|
7
31
|
## 0.17.1
|
|
8
32
|
|
|
9
|
-
Thu, 01 Dec 2022 03:
|
|
33
|
+
Thu, 01 Dec 2022 03:12:20 GMT
|
|
10
34
|
|
|
11
35
|
### Patches
|
|
12
36
|
|
package/lib/Text.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Text.d.ts","sourceRoot":"","sources":["../src/Text.tsx"],"names":[],"mappings":"AAcA,OAAO,EAAY,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAM/D,eAAO,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"Text.d.ts","sourceRoot":"","sources":["../src/Text.tsx"],"names":[],"mappings":"AAcA,OAAO,EAAY,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAM/D,eAAO,MAAM,IAAI,kMA0IA,CAAC;AAGlB,eAAe,IAAI,CAAC"}
|
package/lib/Text.js
CHANGED
|
@@ -73,8 +73,6 @@ export var Text = compressible(function (props, useTokens) {
|
|
|
73
73
|
var onAccTap = React.useCallback(function (event) {
|
|
74
74
|
onAccessibilityTap ? onAccessibilityTap() : onPress(event);
|
|
75
75
|
}, [onPress, onAccessibilityTap]);
|
|
76
|
-
// TODO(#2268): Remove once RN Core properly supports Dynamic Type scaling
|
|
77
|
-
var dynamicTypeVariant = Platform.OS === 'ios' ? tokens.dynamicTypeRamp : undefined;
|
|
78
76
|
// override tokens from props
|
|
79
77
|
_a = patchTokens(tokens, cache, {
|
|
80
78
|
color: color,
|
|
@@ -89,6 +87,8 @@ export var Text = compressible(function (props, useTokens) {
|
|
|
89
87
|
}), tokens = _a[0], cache = _a[1];
|
|
90
88
|
// now build the text style from tokens that can be shared between different Text instances
|
|
91
89
|
var tokenStyle = cache(function () { return (__assign({ margin: 0, color: tokens.color, fontStyle: tokens.fontStyle, textAlign: tokens.textAlign, textDecorationLine: tokens.textDecorationLine }, fontStyles.from(tokens, theme))); }, __spreadArray(['color', 'fontStyle', 'textAlign', 'textDecorationLine'], fontStyles.keys, true))[0];
|
|
90
|
+
// TODO(#2268): Remove once RN Core properly supports Dynamic Type scaling
|
|
91
|
+
var dynamicTypeVariant = Platform.OS === 'ios' ? tokenStyle.dynamicTypeRamp : undefined;
|
|
92
92
|
// [TODO(#2268): Remove once RN Core properly supports Dynamic Type scaling
|
|
93
93
|
var scaleStyleAdjustments = emptyProps;
|
|
94
94
|
// tokenStyle.fontSize and tokenStyle.lineHeight can also be strings (e.g., "14px").
|
|
@@ -115,6 +115,7 @@ export var Text = compressible(function (props, useTokens) {
|
|
|
115
115
|
return function (extra, children) {
|
|
116
116
|
var mergedProps = __assign(__assign(__assign(__assign(__assign(__assign({}, rest), keyProps), filteredProps), extra), (dynamicTypeVariant !== undefined && { allowFontScaling: false })), { // TODO(#2268): Remove once RN Core properly supports Dynamic Type scaling
|
|
117
117
|
onPress: onPress, numberOfLines: truncate || !wrap ? 1 : 0, style: mergeStyles(tokenStyle, props.style, extra === null || extra === void 0 ? void 0 : extra.style, scaleStyleAdjustments) });
|
|
118
|
+
delete mergedProps.style.dynamicTypeRamp; // TODO(#2268): RN Text doesn't recognize dynamicTypeRamp yet, so don't let it leak through or RN will complain about it being an invalid prop
|
|
118
119
|
return (withSlots(RNText, __assign({ ellipsizeMode: !wrap && !truncate ? 'clip' : 'tail' }, mergedProps), children));
|
|
119
120
|
};
|
|
120
121
|
}, useTextTokens);
|
package/lib/Text.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Text.js","sourceRoot":"","sources":["../src/Text.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Text.js","sourceRoot":"","sources":["../src/Text.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Variants.ios.d.ts","sourceRoot":"","sources":["../src/Variants.ios.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"Variants.ios.d.ts","sourceRoot":"","sources":["../src/Variants.ios.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,QAAQ,kPAEZ,CAAC;AACV,eAAO,MAAM,cAAc,kPAElB,CAAC;AACV,eAAO,MAAM,QAAQ,kPAEZ,CAAC;AACV,eAAO,MAAM,KAAK,kPAET,CAAC;AACV,eAAO,MAAM,WAAW,kPAEf,CAAC;AACV,eAAO,MAAM,KAAK,kPAET,CAAC;AACV,eAAO,MAAM,WAAW,kPAEf,CAAC;AACV,eAAO,MAAM,SAAS,KAAO,CAAC;AAC9B,eAAO,MAAM,eAAe,KAAO,CAAC;AACpC,eAAO,MAAM,SAAS,KAAO,CAAC;AAC9B,eAAO,MAAM,eAAe,KAAO,CAAC;AACpC,eAAO,MAAM,MAAM,kPAEV,CAAC;AACV,eAAO,MAAM,YAAY,KAAO,CAAC;AACjC,eAAO,MAAM,MAAM,kPAEV,CAAC;AACV,eAAO,MAAM,MAAM,kPAEV,CAAC;AACV,eAAO,MAAM,UAAU,kPAEd,CAAC;AACV,eAAO,MAAM,OAAO,kPAEX,CAAC"}
|
package/lib/Variants.ios.js
CHANGED
|
@@ -2,31 +2,24 @@ import { Text } from './Text';
|
|
|
2
2
|
// TODO(#2268): Remove "as any" designations once RN Core properly supports Dynamic Type scaling
|
|
3
3
|
export var Caption1 = Text.customize({
|
|
4
4
|
variant: 'caption1',
|
|
5
|
-
dynamicTypeRamp: 'footnote',
|
|
6
5
|
});
|
|
7
6
|
export var Caption1Strong = Text.customize({
|
|
8
7
|
variant: 'caption1Strong',
|
|
9
|
-
dynamicTypeRamp: 'footnote',
|
|
10
8
|
});
|
|
11
9
|
export var Caption2 = Text.customize({
|
|
12
10
|
variant: 'caption2',
|
|
13
|
-
dynamicTypeRamp: 'caption1',
|
|
14
11
|
});
|
|
15
12
|
export var Body1 = Text.customize({
|
|
16
13
|
variant: 'body1',
|
|
17
|
-
dynamicTypeRamp: 'body',
|
|
18
14
|
});
|
|
19
15
|
export var Body1Strong = Text.customize({
|
|
20
16
|
variant: 'body1Strong',
|
|
21
|
-
dynamicTypeRamp: 'body',
|
|
22
17
|
});
|
|
23
18
|
export var Body2 = Text.customize({
|
|
24
19
|
variant: 'body2',
|
|
25
|
-
dynamicTypeRamp: 'subheadline',
|
|
26
20
|
});
|
|
27
21
|
export var Body2Strong = Text.customize({
|
|
28
22
|
variant: 'body2Strong',
|
|
29
|
-
dynamicTypeRamp: 'subheadline',
|
|
30
23
|
});
|
|
31
24
|
export var Subtitle1 = null; // Not supported on iOS
|
|
32
25
|
export var Subtitle1Strong = null; // Not supported on iOS
|
|
@@ -34,23 +27,18 @@ export var Subtitle2 = null; // Not supported on iOS
|
|
|
34
27
|
export var Subtitle2Strong = null; // Not supported on iOS
|
|
35
28
|
export var Title1 = Text.customize({
|
|
36
29
|
variant: 'title1',
|
|
37
|
-
dynamicTypeRamp: 'title1',
|
|
38
30
|
});
|
|
39
31
|
export var Title1Strong = null; // Not supported on iOS
|
|
40
32
|
export var Title2 = Text.customize({
|
|
41
33
|
variant: 'title2',
|
|
42
|
-
dynamicTypeRamp: 'title2',
|
|
43
34
|
});
|
|
44
35
|
export var Title3 = Text.customize({
|
|
45
36
|
variant: 'title3',
|
|
46
|
-
dynamicTypeRamp: 'title3',
|
|
47
37
|
});
|
|
48
38
|
export var LargeTitle = Text.customize({
|
|
49
39
|
variant: 'largeTitle',
|
|
50
|
-
dynamicTypeRamp: 'largeTitle',
|
|
51
40
|
});
|
|
52
41
|
export var Display = Text.customize({
|
|
53
42
|
variant: 'display',
|
|
54
|
-
dynamicTypeRamp: 'largeTitle',
|
|
55
43
|
});
|
|
56
44
|
//# sourceMappingURL=Variants.ios.js.map
|
package/lib/Variants.ios.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Variants.ios.js","sourceRoot":"","sources":["../src/Variants.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,gGAAgG;AAEhG,MAAM,CAAC,IAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;IACrC,OAAO,EAAE,UAAU;
|
|
1
|
+
{"version":3,"file":"Variants.ios.js","sourceRoot":"","sources":["../src/Variants.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,gGAAgG;AAEhG,MAAM,CAAC,IAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;IACrC,OAAO,EAAE,UAAU;CACb,CAAC,CAAC;AACV,MAAM,CAAC,IAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC;IAC3C,OAAO,EAAE,gBAAgB;CACnB,CAAC,CAAC;AACV,MAAM,CAAC,IAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;IACrC,OAAO,EAAE,UAAU;CACb,CAAC,CAAC;AACV,MAAM,CAAC,IAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC;IAClC,OAAO,EAAE,OAAO;CACV,CAAC,CAAC;AACV,MAAM,CAAC,IAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC;IACxC,OAAO,EAAE,aAAa;CAChB,CAAC,CAAC;AACV,MAAM,CAAC,IAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC;IAClC,OAAO,EAAE,OAAO;CACV,CAAC,CAAC;AACV,MAAM,CAAC,IAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC;IACxC,OAAO,EAAE,aAAa;CAChB,CAAC,CAAC;AACV,MAAM,CAAC,IAAM,SAAS,GAAG,IAAI,CAAC,CAAC,uBAAuB;AACtD,MAAM,CAAC,IAAM,eAAe,GAAG,IAAI,CAAC,CAAC,uBAAuB;AAC5D,MAAM,CAAC,IAAM,SAAS,GAAG,IAAI,CAAC,CAAC,uBAAuB;AACtD,MAAM,CAAC,IAAM,eAAe,GAAG,IAAI,CAAC,CAAC,uBAAuB;AAC5D,MAAM,CAAC,IAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC;IACnC,OAAO,EAAE,QAAQ;CACX,CAAC,CAAC;AACV,MAAM,CAAC,IAAM,YAAY,GAAG,IAAI,CAAC,CAAC,uBAAuB;AACzD,MAAM,CAAC,IAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC;IACnC,OAAO,EAAE,QAAQ;CACX,CAAC,CAAC;AACV,MAAM,CAAC,IAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC;IACnC,OAAO,EAAE,QAAQ;CACX,CAAC,CAAC;AACV,MAAM,CAAC,IAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;IACvC,OAAO,EAAE,YAAY;CACf,CAAC,CAAC;AACV,MAAM,CAAC,IAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;IACpC,OAAO,EAAE,SAAS;CACZ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Text.d.ts","sourceRoot":"","sources":["../src/Text.tsx"],"names":[],"mappings":"AAcA,OAAO,EAAY,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAM/D,eAAO,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"Text.d.ts","sourceRoot":"","sources":["../src/Text.tsx"],"names":[],"mappings":"AAcA,OAAO,EAAY,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAM/D,eAAO,MAAM,IAAI,kMA0IA,CAAC;AAGlB,eAAe,IAAI,CAAC"}
|
package/lib-commonjs/Text.js
CHANGED
|
@@ -79,8 +79,6 @@ exports.Text = (0, framework_1.compressible)(function (props, useTokens) {
|
|
|
79
79
|
var onAccTap = react_1.default.useCallback(function (event) {
|
|
80
80
|
onAccessibilityTap ? onAccessibilityTap() : onPress(event);
|
|
81
81
|
}, [onPress, onAccessibilityTap]);
|
|
82
|
-
// TODO(#2268): Remove once RN Core properly supports Dynamic Type scaling
|
|
83
|
-
var dynamicTypeVariant = react_native_1.Platform.OS === 'ios' ? tokens.dynamicTypeRamp : undefined;
|
|
84
82
|
// override tokens from props
|
|
85
83
|
_a = (0, framework_1.patchTokens)(tokens, cache, {
|
|
86
84
|
color: color,
|
|
@@ -95,6 +93,8 @@ exports.Text = (0, framework_1.compressible)(function (props, useTokens) {
|
|
|
95
93
|
}), tokens = _a[0], cache = _a[1];
|
|
96
94
|
// now build the text style from tokens that can be shared between different Text instances
|
|
97
95
|
var tokenStyle = cache(function () { return (__assign({ margin: 0, color: tokens.color, fontStyle: tokens.fontStyle, textAlign: tokens.textAlign, textDecorationLine: tokens.textDecorationLine }, framework_1.fontStyles.from(tokens, theme))); }, __spreadArray(['color', 'fontStyle', 'textAlign', 'textDecorationLine'], framework_1.fontStyles.keys, true))[0];
|
|
96
|
+
// TODO(#2268): Remove once RN Core properly supports Dynamic Type scaling
|
|
97
|
+
var dynamicTypeVariant = react_native_1.Platform.OS === 'ios' ? tokenStyle.dynamicTypeRamp : undefined;
|
|
98
98
|
// [TODO(#2268): Remove once RN Core properly supports Dynamic Type scaling
|
|
99
99
|
var scaleStyleAdjustments = emptyProps;
|
|
100
100
|
// tokenStyle.fontSize and tokenStyle.lineHeight can also be strings (e.g., "14px").
|
|
@@ -121,6 +121,7 @@ exports.Text = (0, framework_1.compressible)(function (props, useTokens) {
|
|
|
121
121
|
return function (extra, children) {
|
|
122
122
|
var mergedProps = __assign(__assign(__assign(__assign(__assign(__assign({}, rest), keyProps), filteredProps), extra), (dynamicTypeVariant !== undefined && { allowFontScaling: false })), { // TODO(#2268): Remove once RN Core properly supports Dynamic Type scaling
|
|
123
123
|
onPress: onPress, numberOfLines: truncate || !wrap ? 1 : 0, style: (0, framework_1.mergeStyles)(tokenStyle, props.style, extra === null || extra === void 0 ? void 0 : extra.style, scaleStyleAdjustments) });
|
|
124
|
+
delete mergedProps.style.dynamicTypeRamp; // TODO(#2268): RN Text doesn't recognize dynamicTypeRamp yet, so don't let it leak through or RN will complain about it being an invalid prop
|
|
124
125
|
return ((0, framework_1.withSlots)(react_native_1.Text, __assign({ ellipsizeMode: !wrap && !truncate ? 'clip' : 'tail' }, mergedProps), children));
|
|
125
126
|
};
|
|
126
127
|
}, TextTokens_1.useTextTokens);
|
package/lib-commonjs/Text.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Text.js","sourceRoot":"","sources":["../src/Text.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qBAAqB;AACrB,8DAS0C;AAC1C,8EAAuE;AACvE,oEAAmE;AACnE,6CAAqE;AACrE,2CAA+D;AAC/D,2CAA6C;AAC7C,gDAA0B;AAC1B,4GAAqG;AAErG,IAAM,UAAU,GAAG,EAAE,CAAC;AACT,QAAA,IAAI,GAAG,IAAA,wBAAY,EAAwB,UAAC,KAAgB,EAAE,SAAgC;;;IACzG,IAAI,KAAK,KAAK,SAAS,EAAE;QACvB,KAAK,GAAG,UAAU,CAAC;KACpB;IAED,yCAAyC;IAEvC,IAAA,KAoBE,KAAK,MApBU,EAAjB,KAAK,mBAAG,SAAS,KAAA,EACjB,KAAK,GAmBH,KAAK,MAnBF,EACL,KAAK,GAkBH,KAAK,MAlBF,EACL,IAAI,GAiBF,KAAK,KAjBH,EACJ,MAAM,GAgBJ,KAAK,OAhBD,EACN,kBAAkB,GAehB,KAAK,mBAfW,EAClB,OAAO,GAcL,KAAK,QAdA,EACP,SAAS,GAaP,KAAK,UAbE,EACT,WAAW,GAYT,KAAK,YAZI,EACX,aAAa,GAWX,KAAK,cAXM,EACb,OAAO,GAUL,KAAK,QAVA,EACP,IAAI,GASF,KAAK,KATH,EACJ,aAAa,GAQX,KAAK,cARM,EACb,KAAK,GAOH,KAAK,MAPF,EACL,KAME,KAAK,SANS,EAAhB,QAAQ,mBAAG,KAAK,KAAA,EAChB,SAAS,GAKP,KAAK,UALE,EACT,OAAO,GAIL,KAAK,QAJA,EACP,MAAM,GAGJ,KAAK,OAHD,EACN,KAEE,KAAK,KAFI,EAAX,IAAI,mBAAG,IAAI,KAAA,EACR,IAAI,UACL,KAAK,EArBH,8NAqBL,CADQ,CACC;IACV,IAAM,KAAK,GAAG,IAAA,0BAAc,GAAE,CAAC;IAC/B,gCAAgC;IAC5B,IAAA,KAAkB,SAAS,CAAC,KAAK,CAAC,EAAjC,MAAM,QAAA,EAAE,KAAK,QAAoB,CAAC;IAEvC,0EAA0E;IAC1E,IAAM,uBAAuB,GAAG,IAAA,6DAA0B,GAAE,CAAC;IAE7D,IAAM,SAAS,GAAG,0BAAW,CAAC,KAAK;QACjC,CAAC,CAAC,KAAK,KAAK,OAAO;YACjB,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,KAAK,KAAK,KAAK;gBACjB,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,KAAK;QACT,CAAC,CAAC,KAAK,KAAK,OAAO;YACnB,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,KAAK,KAAK,KAAK;gBACjB,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,KAAK,CAAC;IAEV,IAAM,WAAW,GAAG,eAAK,CAAC,WAAW,CACnC,UAAC,CAAC;QACA,IAAI,OAAO,EAAE;YACX,OAAO,CAAC,CAAC,CAAC,CAAC;SACZ;QACD,CAAC,CAAC,eAAe,EAAE,CAAC;IACtB,CAAC,EACD,CAAC,OAAO,CAAC,CACV,CAAC;IACF,IAAM,QAAQ,GAAG,IAAA,+BAAW,EAAC,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAExD,IAAM,QAAQ,GAAG,eAAK,CAAC,WAAW,CAChC,UAAC,KAAM;QACL,kBAAkB,CAAC,CAAC,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7D,CAAC,EACD,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAC9B,CAAC;IAEF,
|
|
1
|
+
{"version":3,"file":"Text.js","sourceRoot":"","sources":["../src/Text.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Variants.ios.d.ts","sourceRoot":"","sources":["../src/Variants.ios.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"Variants.ios.d.ts","sourceRoot":"","sources":["../src/Variants.ios.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,QAAQ,kPAEZ,CAAC;AACV,eAAO,MAAM,cAAc,kPAElB,CAAC;AACV,eAAO,MAAM,QAAQ,kPAEZ,CAAC;AACV,eAAO,MAAM,KAAK,kPAET,CAAC;AACV,eAAO,MAAM,WAAW,kPAEf,CAAC;AACV,eAAO,MAAM,KAAK,kPAET,CAAC;AACV,eAAO,MAAM,WAAW,kPAEf,CAAC;AACV,eAAO,MAAM,SAAS,KAAO,CAAC;AAC9B,eAAO,MAAM,eAAe,KAAO,CAAC;AACpC,eAAO,MAAM,SAAS,KAAO,CAAC;AAC9B,eAAO,MAAM,eAAe,KAAO,CAAC;AACpC,eAAO,MAAM,MAAM,kPAEV,CAAC;AACV,eAAO,MAAM,YAAY,KAAO,CAAC;AACjC,eAAO,MAAM,MAAM,kPAEV,CAAC;AACV,eAAO,MAAM,MAAM,kPAEV,CAAC;AACV,eAAO,MAAM,UAAU,kPAEd,CAAC;AACV,eAAO,MAAM,OAAO,kPAEX,CAAC"}
|
|
@@ -5,31 +5,24 @@ var Text_1 = require("./Text");
|
|
|
5
5
|
// TODO(#2268): Remove "as any" designations once RN Core properly supports Dynamic Type scaling
|
|
6
6
|
exports.Caption1 = Text_1.Text.customize({
|
|
7
7
|
variant: 'caption1',
|
|
8
|
-
dynamicTypeRamp: 'footnote',
|
|
9
8
|
});
|
|
10
9
|
exports.Caption1Strong = Text_1.Text.customize({
|
|
11
10
|
variant: 'caption1Strong',
|
|
12
|
-
dynamicTypeRamp: 'footnote',
|
|
13
11
|
});
|
|
14
12
|
exports.Caption2 = Text_1.Text.customize({
|
|
15
13
|
variant: 'caption2',
|
|
16
|
-
dynamicTypeRamp: 'caption1',
|
|
17
14
|
});
|
|
18
15
|
exports.Body1 = Text_1.Text.customize({
|
|
19
16
|
variant: 'body1',
|
|
20
|
-
dynamicTypeRamp: 'body',
|
|
21
17
|
});
|
|
22
18
|
exports.Body1Strong = Text_1.Text.customize({
|
|
23
19
|
variant: 'body1Strong',
|
|
24
|
-
dynamicTypeRamp: 'body',
|
|
25
20
|
});
|
|
26
21
|
exports.Body2 = Text_1.Text.customize({
|
|
27
22
|
variant: 'body2',
|
|
28
|
-
dynamicTypeRamp: 'subheadline',
|
|
29
23
|
});
|
|
30
24
|
exports.Body2Strong = Text_1.Text.customize({
|
|
31
25
|
variant: 'body2Strong',
|
|
32
|
-
dynamicTypeRamp: 'subheadline',
|
|
33
26
|
});
|
|
34
27
|
exports.Subtitle1 = null; // Not supported on iOS
|
|
35
28
|
exports.Subtitle1Strong = null; // Not supported on iOS
|
|
@@ -37,23 +30,18 @@ exports.Subtitle2 = null; // Not supported on iOS
|
|
|
37
30
|
exports.Subtitle2Strong = null; // Not supported on iOS
|
|
38
31
|
exports.Title1 = Text_1.Text.customize({
|
|
39
32
|
variant: 'title1',
|
|
40
|
-
dynamicTypeRamp: 'title1',
|
|
41
33
|
});
|
|
42
34
|
exports.Title1Strong = null; // Not supported on iOS
|
|
43
35
|
exports.Title2 = Text_1.Text.customize({
|
|
44
36
|
variant: 'title2',
|
|
45
|
-
dynamicTypeRamp: 'title2',
|
|
46
37
|
});
|
|
47
38
|
exports.Title3 = Text_1.Text.customize({
|
|
48
39
|
variant: 'title3',
|
|
49
|
-
dynamicTypeRamp: 'title3',
|
|
50
40
|
});
|
|
51
41
|
exports.LargeTitle = Text_1.Text.customize({
|
|
52
42
|
variant: 'largeTitle',
|
|
53
|
-
dynamicTypeRamp: 'largeTitle',
|
|
54
43
|
});
|
|
55
44
|
exports.Display = Text_1.Text.customize({
|
|
56
45
|
variant: 'display',
|
|
57
|
-
dynamicTypeRamp: 'largeTitle',
|
|
58
46
|
});
|
|
59
47
|
//# sourceMappingURL=Variants.ios.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Variants.ios.js","sourceRoot":"","sources":["../src/Variants.ios.ts"],"names":[],"mappings":";;;AAAA,+BAA8B;AAE9B,gGAAgG;AAEnF,QAAA,QAAQ,GAAG,WAAI,CAAC,SAAS,CAAC;IACrC,OAAO,EAAE,UAAU;
|
|
1
|
+
{"version":3,"file":"Variants.ios.js","sourceRoot":"","sources":["../src/Variants.ios.ts"],"names":[],"mappings":";;;AAAA,+BAA8B;AAE9B,gGAAgG;AAEnF,QAAA,QAAQ,GAAG,WAAI,CAAC,SAAS,CAAC;IACrC,OAAO,EAAE,UAAU;CACb,CAAC,CAAC;AACG,QAAA,cAAc,GAAG,WAAI,CAAC,SAAS,CAAC;IAC3C,OAAO,EAAE,gBAAgB;CACnB,CAAC,CAAC;AACG,QAAA,QAAQ,GAAG,WAAI,CAAC,SAAS,CAAC;IACrC,OAAO,EAAE,UAAU;CACb,CAAC,CAAC;AACG,QAAA,KAAK,GAAG,WAAI,CAAC,SAAS,CAAC;IAClC,OAAO,EAAE,OAAO;CACV,CAAC,CAAC;AACG,QAAA,WAAW,GAAG,WAAI,CAAC,SAAS,CAAC;IACxC,OAAO,EAAE,aAAa;CAChB,CAAC,CAAC;AACG,QAAA,KAAK,GAAG,WAAI,CAAC,SAAS,CAAC;IAClC,OAAO,EAAE,OAAO;CACV,CAAC,CAAC;AACG,QAAA,WAAW,GAAG,WAAI,CAAC,SAAS,CAAC;IACxC,OAAO,EAAE,aAAa;CAChB,CAAC,CAAC;AACG,QAAA,SAAS,GAAG,IAAI,CAAC,CAAC,uBAAuB;AACzC,QAAA,eAAe,GAAG,IAAI,CAAC,CAAC,uBAAuB;AAC/C,QAAA,SAAS,GAAG,IAAI,CAAC,CAAC,uBAAuB;AACzC,QAAA,eAAe,GAAG,IAAI,CAAC,CAAC,uBAAuB;AAC/C,QAAA,MAAM,GAAG,WAAI,CAAC,SAAS,CAAC;IACnC,OAAO,EAAE,QAAQ;CACX,CAAC,CAAC;AACG,QAAA,YAAY,GAAG,IAAI,CAAC,CAAC,uBAAuB;AAC5C,QAAA,MAAM,GAAG,WAAI,CAAC,SAAS,CAAC;IACnC,OAAO,EAAE,QAAQ;CACX,CAAC,CAAC;AACG,QAAA,MAAM,GAAG,WAAI,CAAC,SAAS,CAAC;IACnC,OAAO,EAAE,QAAQ;CACX,CAAC,CAAC;AACG,QAAA,UAAU,GAAG,WAAI,CAAC,SAAS,CAAC;IACvC,OAAO,EAAE,YAAY;CACf,CAAC,CAAC;AACG,QAAA,OAAO,GAAG,WAAI,CAAC,SAAS,CAAC;IACpC,OAAO,EAAE,SAAS;CACZ,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fluentui-react-native/text",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.18.1",
|
|
4
4
|
"description": "A cross-platform Text component using the Fluent Design System",
|
|
5
5
|
"main": "lib-commonjs/index.js",
|
|
6
6
|
"module": "lib/index.js",
|
|
@@ -22,13 +22,13 @@
|
|
|
22
22
|
"directory": "packages/components/text"
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@uifabricshared/foundation-compose": "^1.12.
|
|
25
|
+
"@uifabricshared/foundation-compose": "^1.12.25",
|
|
26
26
|
"@fluentui-react-native/adapters": ">=0.10.0 <1.0.0",
|
|
27
27
|
"@fluentui-react-native/experimental-native-font-metrics": "^0.3.0",
|
|
28
|
-
"@fluentui-react-native/framework": "0.8.
|
|
29
|
-
"@fluentui-react-native/interactive-hooks": ">=0.21.
|
|
30
|
-
"@fluentui-react-native/theme-tokens": ">=0.
|
|
31
|
-
"@fluentui-react-native/tokens": ">=0.
|
|
28
|
+
"@fluentui-react-native/framework": "0.8.24",
|
|
29
|
+
"@fluentui-react-native/interactive-hooks": ">=0.21.5 <1.0.0",
|
|
30
|
+
"@fluentui-react-native/theme-tokens": ">=0.22.0 <1.0.0",
|
|
31
|
+
"@fluentui-react-native/tokens": ">=0.19.0 <1.0.0",
|
|
32
32
|
"tslib": "^2.3.1"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
package/src/Text.tsx
CHANGED
|
@@ -83,9 +83,6 @@ export const Text = compressible<TextProps, TextTokens>((props: TextProps, useTo
|
|
|
83
83
|
[onPress, onAccessibilityTap],
|
|
84
84
|
);
|
|
85
85
|
|
|
86
|
-
// TODO(#2268): Remove once RN Core properly supports Dynamic Type scaling
|
|
87
|
-
const dynamicTypeVariant = Platform.OS === 'ios' ? tokens.dynamicTypeRamp : undefined;
|
|
88
|
-
|
|
89
86
|
// override tokens from props
|
|
90
87
|
[tokens, cache] = patchTokens(tokens, cache, {
|
|
91
88
|
color,
|
|
@@ -113,6 +110,9 @@ export const Text = compressible<TextProps, TextTokens>((props: TextProps, useTo
|
|
|
113
110
|
['color', 'fontStyle', 'textAlign', 'textDecorationLine', ...fontStyles.keys],
|
|
114
111
|
);
|
|
115
112
|
|
|
113
|
+
// TODO(#2268): Remove once RN Core properly supports Dynamic Type scaling
|
|
114
|
+
const dynamicTypeVariant = Platform.OS === 'ios' ? tokenStyle.dynamicTypeRamp : undefined;
|
|
115
|
+
|
|
116
116
|
// [TODO(#2268): Remove once RN Core properly supports Dynamic Type scaling
|
|
117
117
|
let scaleStyleAdjustments: TextTokens = emptyProps;
|
|
118
118
|
// tokenStyle.fontSize and tokenStyle.lineHeight can also be strings (e.g., "14px").
|
|
@@ -149,6 +149,7 @@ export const Text = compressible<TextProps, TextTokens>((props: TextProps, useTo
|
|
|
149
149
|
numberOfLines: truncate || !wrap ? 1 : 0,
|
|
150
150
|
style: mergeStyles(tokenStyle, props.style, extra?.style, scaleStyleAdjustments),
|
|
151
151
|
};
|
|
152
|
+
delete (mergedProps.style as TextTokens).dynamicTypeRamp; // TODO(#2268): RN Text doesn't recognize dynamicTypeRamp yet, so don't let it leak through or RN will complain about it being an invalid prop
|
|
152
153
|
return (
|
|
153
154
|
<RNText ellipsizeMode={!wrap && !truncate ? 'clip' : 'tail'} {...mergedProps}>
|
|
154
155
|
{children}
|
package/src/Variants.ios.ts
CHANGED
|
@@ -4,31 +4,24 @@ import { Text } from './Text';
|
|
|
4
4
|
|
|
5
5
|
export const Caption1 = Text.customize({
|
|
6
6
|
variant: 'caption1',
|
|
7
|
-
dynamicTypeRamp: 'footnote',
|
|
8
7
|
} as any);
|
|
9
8
|
export const Caption1Strong = Text.customize({
|
|
10
9
|
variant: 'caption1Strong',
|
|
11
|
-
dynamicTypeRamp: 'footnote',
|
|
12
10
|
} as any);
|
|
13
11
|
export const Caption2 = Text.customize({
|
|
14
12
|
variant: 'caption2',
|
|
15
|
-
dynamicTypeRamp: 'caption1',
|
|
16
13
|
} as any);
|
|
17
14
|
export const Body1 = Text.customize({
|
|
18
15
|
variant: 'body1',
|
|
19
|
-
dynamicTypeRamp: 'body',
|
|
20
16
|
} as any);
|
|
21
17
|
export const Body1Strong = Text.customize({
|
|
22
18
|
variant: 'body1Strong',
|
|
23
|
-
dynamicTypeRamp: 'body',
|
|
24
19
|
} as any);
|
|
25
20
|
export const Body2 = Text.customize({
|
|
26
21
|
variant: 'body2',
|
|
27
|
-
dynamicTypeRamp: 'subheadline',
|
|
28
22
|
} as any);
|
|
29
23
|
export const Body2Strong = Text.customize({
|
|
30
24
|
variant: 'body2Strong',
|
|
31
|
-
dynamicTypeRamp: 'subheadline',
|
|
32
25
|
} as any);
|
|
33
26
|
export const Subtitle1 = null; // Not supported on iOS
|
|
34
27
|
export const Subtitle1Strong = null; // Not supported on iOS
|
|
@@ -36,22 +29,17 @@ export const Subtitle2 = null; // Not supported on iOS
|
|
|
36
29
|
export const Subtitle2Strong = null; // Not supported on iOS
|
|
37
30
|
export const Title1 = Text.customize({
|
|
38
31
|
variant: 'title1',
|
|
39
|
-
dynamicTypeRamp: 'title1',
|
|
40
32
|
} as any);
|
|
41
33
|
export const Title1Strong = null; // Not supported on iOS
|
|
42
34
|
export const Title2 = Text.customize({
|
|
43
35
|
variant: 'title2',
|
|
44
|
-
dynamicTypeRamp: 'title2',
|
|
45
36
|
} as any);
|
|
46
37
|
export const Title3 = Text.customize({
|
|
47
38
|
variant: 'title3',
|
|
48
|
-
dynamicTypeRamp: 'title3',
|
|
49
39
|
} as any);
|
|
50
40
|
export const LargeTitle = Text.customize({
|
|
51
41
|
variant: 'largeTitle',
|
|
52
|
-
dynamicTypeRamp: 'largeTitle',
|
|
53
42
|
} as any);
|
|
54
43
|
export const Display = Text.customize({
|
|
55
44
|
variant: 'display',
|
|
56
|
-
dynamicTypeRamp: 'largeTitle',
|
|
57
45
|
} as any);
|