@fluentui-react-native/text 0.21.11 → 0.21.13
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 +85 -1
- package/CHANGELOG.md +27 -2
- package/lib/Text.d.ts.map +1 -1
- package/lib/Text.js +11 -21
- package/lib/Text.js.map +1 -1
- package/lib/Text.types.d.ts +1 -1
- package/lib/Text.types.d.ts.map +1 -1
- package/lib/Variants.ios.d.ts.map +1 -1
- package/lib/Variants.ios.js +0 -1
- package/lib/Variants.ios.js.map +1 -1
- package/lib-commonjs/Text.d.ts.map +1 -1
- package/lib-commonjs/Text.js +11 -21
- package/lib-commonjs/Text.js.map +1 -1
- package/lib-commonjs/Text.types.d.ts +1 -1
- package/lib-commonjs/Text.types.d.ts.map +1 -1
- package/lib-commonjs/Variants.ios.d.ts.map +1 -1
- package/lib-commonjs/Variants.ios.js +0 -1
- package/lib-commonjs/Variants.ios.js.map +1 -1
- package/package.json +6 -7
- package/src/Text.tsx +10 -20
- package/src/Text.types.ts +1 -2
- package/src/Variants.ios.ts +12 -14
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,91 @@
|
|
|
2
2
|
"name": "@fluentui-react-native/text",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "
|
|
5
|
+
"date": "Fri, 03 Nov 2023 18:49:35 GMT",
|
|
6
|
+
"version": "0.21.13",
|
|
7
|
+
"tag": "@fluentui-react-native/text_v0.21.13",
|
|
8
|
+
"comments": {
|
|
9
|
+
"patch": [
|
|
10
|
+
{
|
|
11
|
+
"author": "adgleitm@microsoft.com",
|
|
12
|
+
"package": "@fluentui-react-native/text",
|
|
13
|
+
"commit": "130232522fd2916880ec3decfe594550f069d7a7",
|
|
14
|
+
"comment": "Use RN-based dynamic type"
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
"author": "beachball",
|
|
18
|
+
"package": "@fluentui-react-native/text",
|
|
19
|
+
"comment": "Bump @fluentui-react-native/framework to v0.11.9",
|
|
20
|
+
"commit": "not available"
|
|
21
|
+
},
|
|
22
|
+
{
|
|
23
|
+
"author": "beachball",
|
|
24
|
+
"package": "@fluentui-react-native/text",
|
|
25
|
+
"comment": "Bump @fluentui-react-native/interactive-hooks to v0.24.11",
|
|
26
|
+
"commit": "not available"
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
"author": "beachball",
|
|
30
|
+
"package": "@fluentui-react-native/text",
|
|
31
|
+
"comment": "Bump @fluentui-react-native/theme-tokens to v0.25.3",
|
|
32
|
+
"commit": "not available"
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
"author": "beachball",
|
|
36
|
+
"package": "@fluentui-react-native/text",
|
|
37
|
+
"comment": "Bump @fluentui-react-native/tokens to v0.21.5",
|
|
38
|
+
"commit": "not available"
|
|
39
|
+
},
|
|
40
|
+
{
|
|
41
|
+
"author": "beachball",
|
|
42
|
+
"package": "@fluentui-react-native/text",
|
|
43
|
+
"comment": "Bump @uifabricshared/foundation-compose to v1.14.11",
|
|
44
|
+
"commit": "not available"
|
|
45
|
+
}
|
|
46
|
+
]
|
|
47
|
+
}
|
|
48
|
+
},
|
|
49
|
+
{
|
|
50
|
+
"date": "Mon, 30 Oct 2023 21:26:06 GMT",
|
|
51
|
+
"version": "0.21.12",
|
|
52
|
+
"tag": "@fluentui-react-native/text_v0.21.12",
|
|
53
|
+
"comments": {
|
|
54
|
+
"patch": [
|
|
55
|
+
{
|
|
56
|
+
"author": "beachball",
|
|
57
|
+
"package": "@fluentui-react-native/text",
|
|
58
|
+
"comment": "Bump @fluentui-react-native/framework to v0.11.8",
|
|
59
|
+
"commit": "not available"
|
|
60
|
+
},
|
|
61
|
+
{
|
|
62
|
+
"author": "beachball",
|
|
63
|
+
"package": "@fluentui-react-native/text",
|
|
64
|
+
"comment": "Bump @fluentui-react-native/interactive-hooks to v0.24.10",
|
|
65
|
+
"commit": "not available"
|
|
66
|
+
},
|
|
67
|
+
{
|
|
68
|
+
"author": "beachball",
|
|
69
|
+
"package": "@fluentui-react-native/text",
|
|
70
|
+
"comment": "Bump @fluentui-react-native/theme-tokens to v0.25.2",
|
|
71
|
+
"commit": "not available"
|
|
72
|
+
},
|
|
73
|
+
{
|
|
74
|
+
"author": "beachball",
|
|
75
|
+
"package": "@fluentui-react-native/text",
|
|
76
|
+
"comment": "Bump @fluentui-react-native/tokens to v0.21.4",
|
|
77
|
+
"commit": "not available"
|
|
78
|
+
},
|
|
79
|
+
{
|
|
80
|
+
"author": "beachball",
|
|
81
|
+
"package": "@fluentui-react-native/text",
|
|
82
|
+
"comment": "Bump @uifabricshared/foundation-compose to v1.14.10",
|
|
83
|
+
"commit": "not available"
|
|
84
|
+
}
|
|
85
|
+
]
|
|
86
|
+
}
|
|
87
|
+
},
|
|
88
|
+
{
|
|
89
|
+
"date": "Wed, 25 Oct 2023 20:50:34 GMT",
|
|
6
90
|
"version": "0.21.11",
|
|
7
91
|
"tag": "@fluentui-react-native/text_v0.21.11",
|
|
8
92
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,37 @@
|
|
|
1
1
|
# Change Log - @fluentui-react-native/text
|
|
2
2
|
|
|
3
|
-
This log was last generated on
|
|
3
|
+
This log was last generated on Fri, 03 Nov 2023 18:49:35 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 0.21.13
|
|
8
|
+
|
|
9
|
+
Fri, 03 Nov 2023 18:49:35 GMT
|
|
10
|
+
|
|
11
|
+
### Patches
|
|
12
|
+
|
|
13
|
+
- Use RN-based dynamic type (adgleitm@microsoft.com)
|
|
14
|
+
- Bump @fluentui-react-native/framework to v0.11.9
|
|
15
|
+
- Bump @fluentui-react-native/interactive-hooks to v0.24.11
|
|
16
|
+
- Bump @fluentui-react-native/theme-tokens to v0.25.3
|
|
17
|
+
- Bump @fluentui-react-native/tokens to v0.21.5
|
|
18
|
+
- Bump @uifabricshared/foundation-compose to v1.14.11
|
|
19
|
+
|
|
20
|
+
## 0.21.12
|
|
21
|
+
|
|
22
|
+
Mon, 30 Oct 2023 21:26:06 GMT
|
|
23
|
+
|
|
24
|
+
### Patches
|
|
25
|
+
|
|
26
|
+
- Bump @fluentui-react-native/framework to v0.11.8
|
|
27
|
+
- Bump @fluentui-react-native/interactive-hooks to v0.24.10
|
|
28
|
+
- Bump @fluentui-react-native/theme-tokens to v0.25.2
|
|
29
|
+
- Bump @fluentui-react-native/tokens to v0.21.4
|
|
30
|
+
- Bump @uifabricshared/foundation-compose to v1.14.10
|
|
31
|
+
|
|
7
32
|
## 0.21.11
|
|
8
33
|
|
|
9
|
-
Wed, 25 Oct 2023 20:
|
|
34
|
+
Wed, 25 Oct 2023 20:50:34 GMT
|
|
10
35
|
|
|
11
36
|
### Patches
|
|
12
37
|
|
package/lib/Text.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Text.d.ts","sourceRoot":"","sources":["../src/Text.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Text.d.ts","sourceRoot":"","sources":["../src/Text.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAK1D,eAAO,MAAM,IAAI,kMA0IA,CAAC;AAGlB,eAAe,IAAI,CAAC"}
|
package/lib/Text.js
CHANGED
|
@@ -33,7 +33,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
33
33
|
/** @jsx withSlots */
|
|
34
34
|
import React from 'react';
|
|
35
35
|
import { I18nManager, Platform, Text as RNText } from 'react-native';
|
|
36
|
-
import { useFontMetricsScaleFactors } from '@fluentui-react-native/experimental-native-font-metrics';
|
|
37
36
|
import { fontStyles, withSlots, useFluentTheme, mergeStyles, compressible, patchTokens } from '@fluentui-react-native/framework';
|
|
38
37
|
import { useKeyProps } from '@fluentui-react-native/interactive-hooks';
|
|
39
38
|
import { globalTokens } from '@fluentui-react-native/theme-tokens';
|
|
@@ -42,17 +41,14 @@ import { useTextTokens } from './TextTokens';
|
|
|
42
41
|
var emptyProps = {};
|
|
43
42
|
export var Text = compressible(function (props, useTokens) {
|
|
44
43
|
var _a;
|
|
45
|
-
var _b, _c;
|
|
46
44
|
if (props === undefined) {
|
|
47
45
|
props = emptyProps;
|
|
48
46
|
}
|
|
49
47
|
// split out color and variant from props
|
|
50
|
-
var
|
|
48
|
+
var _b = props.align, align = _b === void 0 ? undefined : _b, block = props.block, color = props.color, font = props.font, italic = props.italic, numberOfLines = props.numberOfLines, onAccessibilityTap = props.onAccessibilityTap, onKeyUp = props.onKeyUp, onKeyDown = props.onKeyDown, keyUpEvents = props.keyUpEvents, keyDownEvents = props.keyDownEvents, onPress = props.onPress, size = props.size, strikethrough = props.strikethrough, style = props.style, _c = props.truncate, truncate = _c === void 0 ? false : _c, underline = props.underline, variant = props.variant, weight = props.weight, _d = props.wrap, wrap = _d === void 0 ? true : _d, rest = __rest(props, ["align", "block", "color", "font", "italic", "numberOfLines", "onAccessibilityTap", "onKeyUp", "onKeyDown", "keyUpEvents", "keyDownEvents", "onPress", "size", "strikethrough", "style", "truncate", "underline", "variant", "weight", "wrap"]);
|
|
51
49
|
var theme = useFluentTheme();
|
|
52
50
|
// get the tokens from the theme
|
|
53
|
-
var
|
|
54
|
-
// GH #2268: Remove once RN Core properly supports Dynamic Type scaling
|
|
55
|
-
var fontMetricsScaleFactors = useFontMetricsScaleFactors();
|
|
51
|
+
var _e = useTokens(theme), tokens = _e[0], cache = _e[1];
|
|
56
52
|
var textAlign = I18nManager.isRTL
|
|
57
53
|
? align === 'start'
|
|
58
54
|
? 'right'
|
|
@@ -89,22 +85,16 @@ export var Text = compressible(function (props, useTokens) {
|
|
|
89
85
|
}), tokens = _a[0], cache = _a[1];
|
|
90
86
|
// now build the text style from tokens that can be shared between different Text instances
|
|
91
87
|
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];
|
|
92
|
-
//
|
|
88
|
+
// Safety measure: Dynamic Type is an iOS-specific thing
|
|
93
89
|
var dynamicTypeVariant = Platform.OS === 'ios' ? tokenStyle.dynamicTypeRamp : undefined;
|
|
94
|
-
var
|
|
95
|
-
|
|
96
|
-
// tokenStyle.fontSize and tokenStyle.lineHeight can also be strings (e.g., "14px").
|
|
90
|
+
var maxFontSizeScaleAdjustment = emptyProps;
|
|
91
|
+
// tokenStyle.fontSize can also be a string (e.g., "14px").
|
|
97
92
|
// Therefore, we only support scaling for number-based size values in order to avoid any messy calculations.
|
|
98
|
-
if (dynamicTypeVariant !== undefined && typeof tokenStyle.fontSize === 'number' &&
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
var scaleFactor = Math.min(requestedScaleFactor, maximumScaleFactor);
|
|
102
|
-
scaleStyleAdjustments = {
|
|
103
|
-
fontSize: tokenStyle.fontSize * scaleFactor,
|
|
104
|
-
lineHeight: tokenStyle.lineHeight * scaleFactor, // scale accordingly with fontSize
|
|
93
|
+
if (dynamicTypeVariant !== undefined && typeof tokenStyle.fontSize === 'number' && tokenStyle.maximumFontSize !== undefined) {
|
|
94
|
+
maxFontSizeScaleAdjustment = {
|
|
95
|
+
maxFontSizeMultiplier: tokenStyle.maximumFontSize / tokenStyle.fontSize,
|
|
105
96
|
};
|
|
106
97
|
}
|
|
107
|
-
// ]GH #2268
|
|
108
98
|
var isWinPlatform = Platform.OS === ('win32' || 'windows');
|
|
109
99
|
var filteredProps = {
|
|
110
100
|
onKeyUp: isWinPlatform ? onKeyUp : undefined,
|
|
@@ -117,9 +107,9 @@ export var Text = compressible(function (props, useTokens) {
|
|
|
117
107
|
};
|
|
118
108
|
// return a continuation function that allows this text to be compressed
|
|
119
109
|
return function (extra, children) {
|
|
120
|
-
var mergedProps = __assign(__assign(__assign(__assign(__assign(__assign({}, rest), keyProps), filteredProps), extra), (
|
|
121
|
-
|
|
122
|
-
//
|
|
110
|
+
var mergedProps = __assign(__assign(__assign(__assign(__assign(__assign({}, rest), keyProps), filteredProps), extra), maxFontSizeScaleAdjustment), { onPress: onPress, numberOfLines: (numberOfLines !== null && numberOfLines !== void 0 ? numberOfLines : (truncate || !wrap)) ? 1 : 0, style: mergeStyles(tokenStyle, props.style, extra === null || extra === void 0 ? void 0 : extra.style) });
|
|
111
|
+
// RN TextStyle doesn't recognize these properties.
|
|
112
|
+
// Don't let them leak through or RN will complain about invalid props.
|
|
123
113
|
delete mergedProps.style.dynamicTypeRamp;
|
|
124
114
|
delete mergedProps.style.maximumFontSize;
|
|
125
115
|
return (withSlots(RNText, __assign({ ellipsizeMode: !wrap && !truncate ? 'clip' : 'tail' }, mergedProps), children));
|
package/lib/Text.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Text.js","sourceRoot":"","sources":["../src/Text.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0BAA0B;AAC1B,qBAAqB;AACrB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,IAAI,MAAM,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"Text.js","sourceRoot":"","sources":["../src/Text.tsx"],"names":[],"mappings":"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"}
|
package/lib/Text.types.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ export type TextTokens = Omit<FontTokens, 'fontFamily'> & IForegroundColorTokens
|
|
|
11
11
|
* (iOS only) The Dynamic Type ramp that a Text element should follow as the user changes their
|
|
12
12
|
* preferred content size.
|
|
13
13
|
*/
|
|
14
|
-
dynamicTypeRamp?:
|
|
14
|
+
dynamicTypeRamp?: TextProps['dynamicTypeRamp'];
|
|
15
15
|
/**
|
|
16
16
|
* (iOS only) The maximum font size that a Text element will grow to as the user changes their
|
|
17
17
|
* preferred content size.
|
package/lib/Text.types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Text.types.d.ts","sourceRoot":"","sources":["../src/Text.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAE9G,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,GACrD,sBAAsB,GACtB,IAAI,CAAC,SAAS,EAAE,UAAU,GAAG,YAAY,GAAG,OAAO,CAAC,GAAG;
|
|
1
|
+
{"version":3,"file":"Text.types.d.ts","sourceRoot":"","sources":["../src/Text.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAE9G,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,GACrD,sBAAsB,GACtB,IAAI,CAAC,SAAS,EAAE,UAAU,GAAG,YAAY,GAAG,OAAO,CAAC,GAAG;IACrD;;;OAGG;IACH,eAAe,CAAC,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAE/C;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEJ,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,SAAS,CAAC;AAC/D,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,SAAS,CAAC;AACxD,MAAM,MAAM,QAAQ,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC;AAClF,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,QAAQ,GAAG,UAAU,GAAG,MAAM,CAAC;AAEpE;;GAEG;AACH,MAAM,MAAM,SAAS,CAAC,KAAK,GAAG,UAAU,IAAI,KAAK,GAC/C,iBAAiB,GAAG;IAClB;;OAEG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC;IAEnB;;;;OAIG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC;IAElB;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;OAIG;IACH,IAAI,CAAC,EAAE,QAAQ,CAAC;IAEhB;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;OAIG;IACH,IAAI,CAAC,EAAE,QAAQ,CAAC;IAEhB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;OAIG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IAEpB;;;;OAIG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Variants.ios.d.ts","sourceRoot":"","sources":["../src/Variants.ios.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Variants.ios.d.ts","sourceRoot":"","sources":["../src/Variants.ios.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,QAAQ,kPAEnB,CAAC;AACH,eAAO,MAAM,cAAc,kPAEzB,CAAC;AACH,eAAO,MAAM,QAAQ,kPAEnB,CAAC;AACH,eAAO,MAAM,KAAK,kPAEhB,CAAC;AACH,eAAO,MAAM,WAAW,kPAEtB,CAAC;AACH,eAAO,MAAM,KAAK,kPAEhB,CAAC;AACH,eAAO,MAAM,WAAW,kPAEtB,CAAC;AACH,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,kPAEjB,CAAC;AACH,eAAO,MAAM,YAAY,KAAO,CAAC;AACjC,eAAO,MAAM,MAAM,kPAEjB,CAAC;AACH,eAAO,MAAM,MAAM,kPAEjB,CAAC;AACH,eAAO,MAAM,UAAU,kPAErB,CAAC;AACH,eAAO,MAAM,OAAO,kPAElB,CAAC"}
|
package/lib/Variants.ios.js
CHANGED
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,
|
|
1
|
+
{"version":3,"file":"Variants.ios.js","sourceRoot":"","sources":["../src/Variants.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,MAAM,CAAC,IAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;IACrC,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC;AACH,MAAM,CAAC,IAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC;IAC3C,OAAO,EAAE,gBAAgB;CAC1B,CAAC,CAAC;AACH,MAAM,CAAC,IAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;IACrC,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC;AACH,MAAM,CAAC,IAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC;IAClC,OAAO,EAAE,OAAO;CACjB,CAAC,CAAC;AACH,MAAM,CAAC,IAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC;IACxC,OAAO,EAAE,aAAa;CACvB,CAAC,CAAC;AACH,MAAM,CAAC,IAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC;IAClC,OAAO,EAAE,OAAO;CACjB,CAAC,CAAC;AACH,MAAM,CAAC,IAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC;IACxC,OAAO,EAAE,aAAa;CACvB,CAAC,CAAC;AACH,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;CAClB,CAAC,CAAC;AACH,MAAM,CAAC,IAAM,YAAY,GAAG,IAAI,CAAC,CAAC,uBAAuB;AACzD,MAAM,CAAC,IAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC;IACnC,OAAO,EAAE,QAAQ;CAClB,CAAC,CAAC;AACH,MAAM,CAAC,IAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC;IACnC,OAAO,EAAE,QAAQ;CAClB,CAAC,CAAC;AACH,MAAM,CAAC,IAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;IACvC,OAAO,EAAE,YAAY;CACtB,CAAC,CAAC;AACH,MAAM,CAAC,IAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;IACpC,OAAO,EAAE,SAAS;CACnB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Text.d.ts","sourceRoot":"","sources":["../src/Text.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Text.d.ts","sourceRoot":"","sources":["../src/Text.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAK1D,eAAO,MAAM,IAAI,kMA0IA,CAAC;AAGlB,eAAe,IAAI,CAAC"}
|
package/lib-commonjs/Text.js
CHANGED
|
@@ -39,7 +39,6 @@ exports.Text = void 0;
|
|
|
39
39
|
/** @jsx withSlots */
|
|
40
40
|
var react_1 = __importDefault(require("react"));
|
|
41
41
|
var react_native_1 = require("react-native");
|
|
42
|
-
var experimental_native_font_metrics_1 = require("@fluentui-react-native/experimental-native-font-metrics");
|
|
43
42
|
var framework_1 = require("@fluentui-react-native/framework");
|
|
44
43
|
var interactive_hooks_1 = require("@fluentui-react-native/interactive-hooks");
|
|
45
44
|
var theme_tokens_1 = require("@fluentui-react-native/theme-tokens");
|
|
@@ -48,17 +47,14 @@ var TextTokens_1 = require("./TextTokens");
|
|
|
48
47
|
var emptyProps = {};
|
|
49
48
|
exports.Text = (0, framework_1.compressible)(function (props, useTokens) {
|
|
50
49
|
var _a;
|
|
51
|
-
var _b, _c;
|
|
52
50
|
if (props === undefined) {
|
|
53
51
|
props = emptyProps;
|
|
54
52
|
}
|
|
55
53
|
// split out color and variant from props
|
|
56
|
-
var
|
|
54
|
+
var _b = props.align, align = _b === void 0 ? undefined : _b, block = props.block, color = props.color, font = props.font, italic = props.italic, numberOfLines = props.numberOfLines, onAccessibilityTap = props.onAccessibilityTap, onKeyUp = props.onKeyUp, onKeyDown = props.onKeyDown, keyUpEvents = props.keyUpEvents, keyDownEvents = props.keyDownEvents, onPress = props.onPress, size = props.size, strikethrough = props.strikethrough, style = props.style, _c = props.truncate, truncate = _c === void 0 ? false : _c, underline = props.underline, variant = props.variant, weight = props.weight, _d = props.wrap, wrap = _d === void 0 ? true : _d, rest = __rest(props, ["align", "block", "color", "font", "italic", "numberOfLines", "onAccessibilityTap", "onKeyUp", "onKeyDown", "keyUpEvents", "keyDownEvents", "onPress", "size", "strikethrough", "style", "truncate", "underline", "variant", "weight", "wrap"]);
|
|
57
55
|
var theme = (0, framework_1.useFluentTheme)();
|
|
58
56
|
// get the tokens from the theme
|
|
59
|
-
var
|
|
60
|
-
// GH #2268: Remove once RN Core properly supports Dynamic Type scaling
|
|
61
|
-
var fontMetricsScaleFactors = (0, experimental_native_font_metrics_1.useFontMetricsScaleFactors)();
|
|
57
|
+
var _e = useTokens(theme), tokens = _e[0], cache = _e[1];
|
|
62
58
|
var textAlign = react_native_1.I18nManager.isRTL
|
|
63
59
|
? align === 'start'
|
|
64
60
|
? 'right'
|
|
@@ -95,22 +91,16 @@ exports.Text = (0, framework_1.compressible)(function (props, useTokens) {
|
|
|
95
91
|
}), tokens = _a[0], cache = _a[1];
|
|
96
92
|
// now build the text style from tokens that can be shared between different Text instances
|
|
97
93
|
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];
|
|
98
|
-
//
|
|
94
|
+
// Safety measure: Dynamic Type is an iOS-specific thing
|
|
99
95
|
var dynamicTypeVariant = react_native_1.Platform.OS === 'ios' ? tokenStyle.dynamicTypeRamp : undefined;
|
|
100
|
-
var
|
|
101
|
-
|
|
102
|
-
// tokenStyle.fontSize and tokenStyle.lineHeight can also be strings (e.g., "14px").
|
|
96
|
+
var maxFontSizeScaleAdjustment = emptyProps;
|
|
97
|
+
// tokenStyle.fontSize can also be a string (e.g., "14px").
|
|
103
98
|
// Therefore, we only support scaling for number-based size values in order to avoid any messy calculations.
|
|
104
|
-
if (dynamicTypeVariant !== undefined && typeof tokenStyle.fontSize === 'number' &&
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
var scaleFactor = Math.min(requestedScaleFactor, maximumScaleFactor);
|
|
108
|
-
scaleStyleAdjustments = {
|
|
109
|
-
fontSize: tokenStyle.fontSize * scaleFactor,
|
|
110
|
-
lineHeight: tokenStyle.lineHeight * scaleFactor, // scale accordingly with fontSize
|
|
99
|
+
if (dynamicTypeVariant !== undefined && typeof tokenStyle.fontSize === 'number' && tokenStyle.maximumFontSize !== undefined) {
|
|
100
|
+
maxFontSizeScaleAdjustment = {
|
|
101
|
+
maxFontSizeMultiplier: tokenStyle.maximumFontSize / tokenStyle.fontSize,
|
|
111
102
|
};
|
|
112
103
|
}
|
|
113
|
-
// ]GH #2268
|
|
114
104
|
var isWinPlatform = react_native_1.Platform.OS === ('win32' || 'windows');
|
|
115
105
|
var filteredProps = {
|
|
116
106
|
onKeyUp: isWinPlatform ? onKeyUp : undefined,
|
|
@@ -123,9 +113,9 @@ exports.Text = (0, framework_1.compressible)(function (props, useTokens) {
|
|
|
123
113
|
};
|
|
124
114
|
// return a continuation function that allows this text to be compressed
|
|
125
115
|
return function (extra, children) {
|
|
126
|
-
var mergedProps = __assign(__assign(__assign(__assign(__assign(__assign({}, rest), keyProps), filteredProps), extra), (
|
|
127
|
-
|
|
128
|
-
//
|
|
116
|
+
var mergedProps = __assign(__assign(__assign(__assign(__assign(__assign({}, rest), keyProps), filteredProps), extra), maxFontSizeScaleAdjustment), { onPress: onPress, numberOfLines: (numberOfLines !== null && numberOfLines !== void 0 ? numberOfLines : (truncate || !wrap)) ? 1 : 0, style: (0, framework_1.mergeStyles)(tokenStyle, props.style, extra === null || extra === void 0 ? void 0 : extra.style) });
|
|
117
|
+
// RN TextStyle doesn't recognize these properties.
|
|
118
|
+
// Don't let them leak through or RN will complain about invalid props.
|
|
129
119
|
delete mergedProps.style.dynamicTypeRamp;
|
|
130
120
|
delete mergedProps.style.maximumFontSize;
|
|
131
121
|
return ((0, framework_1.withSlots)(react_native_1.Text, __assign({ ellipsizeMode: !wrap && !truncate ? 'clip' : 'tail' }, mergedProps), children));
|
package/lib-commonjs/Text.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Text.js","sourceRoot":"","sources":["../src/Text.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0BAA0B;AAC1B,qBAAqB;AACrB,gDAA0B;AAC1B,6CAAqE;
|
|
1
|
+
{"version":3,"file":"Text.js","sourceRoot":"","sources":["../src/Text.tsx"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export type TextTokens = Omit<FontTokens, 'fontFamily'> & IForegroundColorTokens
|
|
|
11
11
|
* (iOS only) The Dynamic Type ramp that a Text element should follow as the user changes their
|
|
12
12
|
* preferred content size.
|
|
13
13
|
*/
|
|
14
|
-
dynamicTypeRamp?:
|
|
14
|
+
dynamicTypeRamp?: TextProps['dynamicTypeRamp'];
|
|
15
15
|
/**
|
|
16
16
|
* (iOS only) The maximum font size that a Text element will grow to as the user changes their
|
|
17
17
|
* preferred content size.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Text.types.d.ts","sourceRoot":"","sources":["../src/Text.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAE9G,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,GACrD,sBAAsB,GACtB,IAAI,CAAC,SAAS,EAAE,UAAU,GAAG,YAAY,GAAG,OAAO,CAAC,GAAG;
|
|
1
|
+
{"version":3,"file":"Text.types.d.ts","sourceRoot":"","sources":["../src/Text.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAE9G,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,GACrD,sBAAsB,GACtB,IAAI,CAAC,SAAS,EAAE,UAAU,GAAG,YAAY,GAAG,OAAO,CAAC,GAAG;IACrD;;;OAGG;IACH,eAAe,CAAC,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAE/C;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEJ,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,SAAS,CAAC;AAC/D,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,SAAS,CAAC;AACxD,MAAM,MAAM,QAAQ,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC;AAClF,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,QAAQ,GAAG,UAAU,GAAG,MAAM,CAAC;AAEpE;;GAEG;AACH,MAAM,MAAM,SAAS,CAAC,KAAK,GAAG,UAAU,IAAI,KAAK,GAC/C,iBAAiB,GAAG;IAClB;;OAEG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC;IAEnB;;;;OAIG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC;IAElB;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;OAIG;IACH,IAAI,CAAC,EAAE,QAAQ,CAAC;IAEhB;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;OAIG;IACH,IAAI,CAAC,EAAE,QAAQ,CAAC;IAEhB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;OAIG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IAEpB;;;;OAIG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Variants.ios.d.ts","sourceRoot":"","sources":["../src/Variants.ios.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Variants.ios.d.ts","sourceRoot":"","sources":["../src/Variants.ios.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,QAAQ,kPAEnB,CAAC;AACH,eAAO,MAAM,cAAc,kPAEzB,CAAC;AACH,eAAO,MAAM,QAAQ,kPAEnB,CAAC;AACH,eAAO,MAAM,KAAK,kPAEhB,CAAC;AACH,eAAO,MAAM,WAAW,kPAEtB,CAAC;AACH,eAAO,MAAM,KAAK,kPAEhB,CAAC;AACH,eAAO,MAAM,WAAW,kPAEtB,CAAC;AACH,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,kPAEjB,CAAC;AACH,eAAO,MAAM,YAAY,KAAO,CAAC;AACjC,eAAO,MAAM,MAAM,kPAEjB,CAAC;AACH,eAAO,MAAM,MAAM,kPAEjB,CAAC;AACH,eAAO,MAAM,UAAU,kPAErB,CAAC;AACH,eAAO,MAAM,OAAO,kPAElB,CAAC"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Display = exports.LargeTitle = exports.Title3 = exports.Title2 = exports.Title1Strong = exports.Title1 = exports.Subtitle2Strong = exports.Subtitle2 = exports.Subtitle1Strong = exports.Subtitle1 = exports.Body2Strong = exports.Body2 = exports.Body1Strong = exports.Body1 = exports.Caption2 = exports.Caption1Strong = exports.Caption1 = void 0;
|
|
4
4
|
var Text_1 = require("./Text");
|
|
5
|
-
// GH #2268: Remove "as any" designations once RN Core properly supports Dynamic Type scaling
|
|
6
5
|
exports.Caption1 = Text_1.Text.customize({
|
|
7
6
|
variant: 'caption1',
|
|
8
7
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Variants.ios.js","sourceRoot":"","sources":["../src/Variants.ios.ts"],"names":[],"mappings":";;;AAAA,+BAA8B;
|
|
1
|
+
{"version":3,"file":"Variants.ios.js","sourceRoot":"","sources":["../src/Variants.ios.ts"],"names":[],"mappings":";;;AAAA,+BAA8B;AAEjB,QAAA,QAAQ,GAAG,WAAI,CAAC,SAAS,CAAC;IACrC,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC;AACU,QAAA,cAAc,GAAG,WAAI,CAAC,SAAS,CAAC;IAC3C,OAAO,EAAE,gBAAgB;CAC1B,CAAC,CAAC;AACU,QAAA,QAAQ,GAAG,WAAI,CAAC,SAAS,CAAC;IACrC,OAAO,EAAE,UAAU;CACpB,CAAC,CAAC;AACU,QAAA,KAAK,GAAG,WAAI,CAAC,SAAS,CAAC;IAClC,OAAO,EAAE,OAAO;CACjB,CAAC,CAAC;AACU,QAAA,WAAW,GAAG,WAAI,CAAC,SAAS,CAAC;IACxC,OAAO,EAAE,aAAa;CACvB,CAAC,CAAC;AACU,QAAA,KAAK,GAAG,WAAI,CAAC,SAAS,CAAC;IAClC,OAAO,EAAE,OAAO;CACjB,CAAC,CAAC;AACU,QAAA,WAAW,GAAG,WAAI,CAAC,SAAS,CAAC;IACxC,OAAO,EAAE,aAAa;CACvB,CAAC,CAAC;AACU,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;CAClB,CAAC,CAAC;AACU,QAAA,YAAY,GAAG,IAAI,CAAC,CAAC,uBAAuB;AAC5C,QAAA,MAAM,GAAG,WAAI,CAAC,SAAS,CAAC;IACnC,OAAO,EAAE,QAAQ;CAClB,CAAC,CAAC;AACU,QAAA,MAAM,GAAG,WAAI,CAAC,SAAS,CAAC;IACnC,OAAO,EAAE,QAAQ;CAClB,CAAC,CAAC;AACU,QAAA,UAAU,GAAG,WAAI,CAAC,SAAS,CAAC;IACvC,OAAO,EAAE,YAAY;CACtB,CAAC,CAAC;AACU,QAAA,OAAO,GAAG,WAAI,CAAC,SAAS,CAAC;IACpC,OAAO,EAAE,SAAS;CACnB,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fluentui-react-native/text",
|
|
3
|
-
"version": "0.21.
|
|
3
|
+
"version": "0.21.13",
|
|
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",
|
|
@@ -23,12 +23,11 @@
|
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@fluentui-react-native/adapters": ">=0.11.3 <1.0.0",
|
|
26
|
-
"@fluentui-react-native/
|
|
27
|
-
"@fluentui-react-native/
|
|
28
|
-
"@fluentui-react-native/
|
|
29
|
-
"@fluentui-react-native/
|
|
30
|
-
"@
|
|
31
|
-
"@uifabricshared/foundation-compose": "^1.14.9",
|
|
26
|
+
"@fluentui-react-native/framework": "0.11.9",
|
|
27
|
+
"@fluentui-react-native/interactive-hooks": ">=0.24.11 <1.0.0",
|
|
28
|
+
"@fluentui-react-native/theme-tokens": ">=0.25.3 <1.0.0",
|
|
29
|
+
"@fluentui-react-native/tokens": ">=0.21.5 <1.0.0",
|
|
30
|
+
"@uifabricshared/foundation-compose": "^1.14.11",
|
|
32
31
|
"tslib": "^2.3.1"
|
|
33
32
|
},
|
|
34
33
|
"devDependencies": {
|
package/src/Text.tsx
CHANGED
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
import React from 'react';
|
|
4
4
|
import { I18nManager, Platform, Text as RNText } from 'react-native';
|
|
5
5
|
|
|
6
|
-
import { useFontMetricsScaleFactors } from '@fluentui-react-native/experimental-native-font-metrics';
|
|
7
6
|
import type { UseTokens, FontWeightValue } from '@fluentui-react-native/framework';
|
|
8
7
|
import { fontStyles, withSlots, useFluentTheme, mergeStyles, compressible, patchTokens } from '@fluentui-react-native/framework';
|
|
9
8
|
import { useKeyProps } from '@fluentui-react-native/interactive-hooks';
|
|
@@ -47,9 +46,6 @@ export const Text = compressible<TextProps, TextTokens>((props: TextProps, useTo
|
|
|
47
46
|
// get the tokens from the theme
|
|
48
47
|
let [tokens, cache] = useTokens(theme);
|
|
49
48
|
|
|
50
|
-
// GH #2268: Remove once RN Core properly supports Dynamic Type scaling
|
|
51
|
-
const fontMetricsScaleFactors = useFontMetricsScaleFactors();
|
|
52
|
-
|
|
53
49
|
const textAlign = I18nManager.isRTL
|
|
54
50
|
? align === 'start'
|
|
55
51
|
? 'right'
|
|
@@ -108,24 +104,17 @@ export const Text = compressible<TextProps, TextTokens>((props: TextProps, useTo
|
|
|
108
104
|
['color', 'fontStyle', 'textAlign', 'textDecorationLine', ...fontStyles.keys],
|
|
109
105
|
);
|
|
110
106
|
|
|
111
|
-
//
|
|
107
|
+
// Safety measure: Dynamic Type is an iOS-specific thing
|
|
112
108
|
const dynamicTypeVariant = Platform.OS === 'ios' ? tokenStyle.dynamicTypeRamp : undefined;
|
|
113
|
-
const maximumFontSize = tokenStyle.maximumFontSize ?? Number.POSITIVE_INFINITY;
|
|
114
109
|
|
|
115
|
-
let
|
|
116
|
-
// tokenStyle.fontSize
|
|
110
|
+
let maxFontSizeScaleAdjustment: TextProps = emptyProps;
|
|
111
|
+
// tokenStyle.fontSize can also be a string (e.g., "14px").
|
|
117
112
|
// Therefore, we only support scaling for number-based size values in order to avoid any messy calculations.
|
|
118
|
-
if (dynamicTypeVariant !== undefined && typeof tokenStyle.fontSize === 'number' &&
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
const scaleFactor = Math.min(requestedScaleFactor, maximumScaleFactor);
|
|
122
|
-
|
|
123
|
-
scaleStyleAdjustments = {
|
|
124
|
-
fontSize: tokenStyle.fontSize * scaleFactor,
|
|
125
|
-
lineHeight: tokenStyle.lineHeight * scaleFactor, // scale accordingly with fontSize
|
|
113
|
+
if (dynamicTypeVariant !== undefined && typeof tokenStyle.fontSize === 'number' && tokenStyle.maximumFontSize !== undefined) {
|
|
114
|
+
maxFontSizeScaleAdjustment = {
|
|
115
|
+
maxFontSizeMultiplier: tokenStyle.maximumFontSize / tokenStyle.fontSize,
|
|
126
116
|
};
|
|
127
117
|
}
|
|
128
|
-
// ]GH #2268
|
|
129
118
|
|
|
130
119
|
const isWinPlatform = Platform.OS === (('win32' as any) || 'windows');
|
|
131
120
|
const filteredProps = {
|
|
@@ -145,13 +134,14 @@ export const Text = compressible<TextProps, TextTokens>((props: TextProps, useTo
|
|
|
145
134
|
...keyProps,
|
|
146
135
|
...filteredProps,
|
|
147
136
|
...extra,
|
|
148
|
-
...
|
|
137
|
+
...maxFontSizeScaleAdjustment,
|
|
149
138
|
onPress,
|
|
150
139
|
numberOfLines: numberOfLines ?? (truncate || !wrap) ? 1 : 0,
|
|
151
|
-
style: mergeStyles(tokenStyle, props.style, extra?.style
|
|
140
|
+
style: mergeStyles(tokenStyle, props.style, extra?.style),
|
|
152
141
|
};
|
|
153
142
|
|
|
154
|
-
//
|
|
143
|
+
// RN TextStyle doesn't recognize these properties.
|
|
144
|
+
// Don't let them leak through or RN will complain about invalid props.
|
|
155
145
|
delete (mergedProps.style as TextTokens).dynamicTypeRamp;
|
|
156
146
|
delete (mergedProps.style as TextTokens).maximumFontSize;
|
|
157
147
|
|
package/src/Text.types.ts
CHANGED
|
@@ -12,12 +12,11 @@ export const textName = 'Text';
|
|
|
12
12
|
export type TextTokens = Omit<FontTokens, 'fontFamily'> &
|
|
13
13
|
IForegroundColorTokens &
|
|
14
14
|
Omit<TextStyle, 'fontSize' | 'fontWeight' | 'color'> & {
|
|
15
|
-
// GH #2268: Remove these once RN Core properly supports Dynamic Type scaling
|
|
16
15
|
/**
|
|
17
16
|
* (iOS only) The Dynamic Type ramp that a Text element should follow as the user changes their
|
|
18
17
|
* preferred content size.
|
|
19
18
|
*/
|
|
20
|
-
dynamicTypeRamp?:
|
|
19
|
+
dynamicTypeRamp?: TextProps['dynamicTypeRamp'];
|
|
21
20
|
|
|
22
21
|
/**
|
|
23
22
|
* (iOS only) The maximum font size that a Text element will grow to as the user changes their
|
package/src/Variants.ios.ts
CHANGED
|
@@ -1,45 +1,43 @@
|
|
|
1
1
|
import { Text } from './Text';
|
|
2
2
|
|
|
3
|
-
// GH #2268: Remove "as any" designations once RN Core properly supports Dynamic Type scaling
|
|
4
|
-
|
|
5
3
|
export const Caption1 = Text.customize({
|
|
6
4
|
variant: 'caption1',
|
|
7
|
-
}
|
|
5
|
+
});
|
|
8
6
|
export const Caption1Strong = Text.customize({
|
|
9
7
|
variant: 'caption1Strong',
|
|
10
|
-
}
|
|
8
|
+
});
|
|
11
9
|
export const Caption2 = Text.customize({
|
|
12
10
|
variant: 'caption2',
|
|
13
|
-
}
|
|
11
|
+
});
|
|
14
12
|
export const Body1 = Text.customize({
|
|
15
13
|
variant: 'body1',
|
|
16
|
-
}
|
|
14
|
+
});
|
|
17
15
|
export const Body1Strong = Text.customize({
|
|
18
16
|
variant: 'body1Strong',
|
|
19
|
-
}
|
|
17
|
+
});
|
|
20
18
|
export const Body2 = Text.customize({
|
|
21
19
|
variant: 'body2',
|
|
22
|
-
}
|
|
20
|
+
});
|
|
23
21
|
export const Body2Strong = Text.customize({
|
|
24
22
|
variant: 'body2Strong',
|
|
25
|
-
}
|
|
23
|
+
});
|
|
26
24
|
export const Subtitle1 = null; // Not supported on iOS
|
|
27
25
|
export const Subtitle1Strong = null; // Not supported on iOS
|
|
28
26
|
export const Subtitle2 = null; // Not supported on iOS
|
|
29
27
|
export const Subtitle2Strong = null; // Not supported on iOS
|
|
30
28
|
export const Title1 = Text.customize({
|
|
31
29
|
variant: 'title1',
|
|
32
|
-
}
|
|
30
|
+
});
|
|
33
31
|
export const Title1Strong = null; // Not supported on iOS
|
|
34
32
|
export const Title2 = Text.customize({
|
|
35
33
|
variant: 'title2',
|
|
36
|
-
}
|
|
34
|
+
});
|
|
37
35
|
export const Title3 = Text.customize({
|
|
38
36
|
variant: 'title3',
|
|
39
|
-
}
|
|
37
|
+
});
|
|
40
38
|
export const LargeTitle = Text.customize({
|
|
41
39
|
variant: 'largeTitle',
|
|
42
|
-
}
|
|
40
|
+
});
|
|
43
41
|
export const Display = Text.customize({
|
|
44
42
|
variant: 'display',
|
|
45
|
-
}
|
|
43
|
+
});
|