@nativescript-community/text 1.4.28 → 1.4.29
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.md +11 -0
- package/index.android.js +5 -5
- package/index.android.js.map +1 -1
- package/index.ios.js +19 -10
- package/index.ios.js.map +1 -1
- package/package.json +2 -2
- package/platforms/android/java/com/nativescript/text/Font.java +10 -4
- package/platforms/android/java/com/nativescript/text/LetterSpacingSpan.java +39 -0
- package/platforms/android/text.aar +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [1.4.29](https://github.com/nativescript-community/text/compare/v1.4.28...v1.4.29) (2022-01-02)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **android:** correct letterSpacing on android >= 21 ([5e8b458](https://github.com/nativescript-community/text/commit/5e8b458cdc630d5c0d80e5897d7fca4c2f11a07e))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## [1.4.28](https://github.com/nativescript-community/text/compare/v1.4.27...v1.4.28) (2021-11-02)
|
|
7
18
|
|
|
8
19
|
**Note:** Version bump only for package @nativescript-community/text
|
package/index.android.js
CHANGED
|
@@ -120,10 +120,10 @@ export function init() {
|
|
|
120
120
|
// span.parent.parent is TextBase
|
|
121
121
|
textDecoration = grandParent === null || grandParent === void 0 ? void 0 : grandParent.style.textDecorations;
|
|
122
122
|
}
|
|
123
|
-
|
|
124
|
-
if (!verticalTextAlignment || verticalTextAlignment === 'stretch') {
|
|
125
|
-
|
|
126
|
-
}
|
|
123
|
+
const verticalTextAlignment = this.verticalAlignment || (parent === null || parent === void 0 ? void 0 : parent.verticalAlignment);
|
|
124
|
+
// if (!verticalTextAlignment || verticalTextAlignment === 'stretch') {
|
|
125
|
+
// verticalTextAlignment = grandParent?.verticalTextAlignment;
|
|
126
|
+
// }
|
|
127
127
|
let text = this.text;
|
|
128
128
|
if (text && textTransform != null && textTransform !== 'none') {
|
|
129
129
|
text = getTransformedText(text, textTransform);
|
|
@@ -139,7 +139,7 @@ export function init() {
|
|
|
139
139
|
maxFontSize: maxFontSize ? maxFontSize * density : undefined,
|
|
140
140
|
relativeSize: this.relativeSize,
|
|
141
141
|
verticalTextAlignment,
|
|
142
|
-
lineHeight: this.lineHeight ? this.lineHeight * density : undefined,
|
|
142
|
+
lineHeight: this.lineHeight !== undefined ? this.lineHeight * density : undefined,
|
|
143
143
|
letterSpacing: this.letterSpacing,
|
|
144
144
|
color: this.color ? this.color.android : undefined,
|
|
145
145
|
backgroundColor: this.backgroundColor ? this.backgroundColor.android : undefined,
|
package/index.android.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.android.js","sourceRoot":"../src/","sources":["index.android.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.android.js","sourceRoot":"../src/","sources":["index.android.ts"],"names":[],"mappings":"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"}
|
package/index.ios.js
CHANGED
|
@@ -69,8 +69,12 @@ function _createNativeAttributedString({ text, familyName = '-apple-system', fon
|
|
|
69
69
|
attrText.addAttributeValueRange(NSKernAttributeName, letterSpacing * fontSize, { location: 0, length: attrText.length });
|
|
70
70
|
}
|
|
71
71
|
if (lineHeight !== undefined) {
|
|
72
|
+
if (lineHeight === 0) {
|
|
73
|
+
lineHeight = 0.00001;
|
|
74
|
+
}
|
|
72
75
|
const paragraphStyle = NSMutableParagraphStyle.alloc().init();
|
|
73
|
-
paragraphStyle.
|
|
76
|
+
paragraphStyle.minimumLineHeight = lineHeight;
|
|
77
|
+
paragraphStyle.maximumLineHeight = lineHeight;
|
|
74
78
|
// make sure a possible previously set text alignment setting is not lost when line height is specified
|
|
75
79
|
paragraphStyle.alignment = textAlignment;
|
|
76
80
|
// if (this.nativeTextViewProtected instanceof UILabel) {
|
|
@@ -143,12 +147,12 @@ export function createSpannable(span, parentView, parent, maxFontSize, autoFontS
|
|
|
143
147
|
const backgroundcolor = span.backgroundColor || (parent && parent.backgroundColor);
|
|
144
148
|
const textDecorations = span.textDecoration || (parent && parent.textDecoration);
|
|
145
149
|
const letterSpacing = span.letterSpacing || (parent && parent.letterSpacing);
|
|
146
|
-
|
|
147
|
-
const textAlignment = span.textAlignment || (parent && parent.textAlignment);
|
|
148
|
-
|
|
149
|
-
if (!verticalTextAlignment || verticalTextAlignment === 'stretch') {
|
|
150
|
-
|
|
151
|
-
}
|
|
150
|
+
let lineHeight = span.lineHeight || (parent && parent.lineHeight);
|
|
151
|
+
const textAlignment = span.textAlignment || (parent && parent.textAlignment) || (parentView && parentView.textAlignment);
|
|
152
|
+
const verticalTextAlignment = span.verticalAlignment || (parent === null || parent === void 0 ? void 0 : parent.verticalAlignment);
|
|
153
|
+
// if (!verticalTextAlignment || verticalTextAlignment === 'stretch') {
|
|
154
|
+
// verticalTextAlignment = parentView?.verticalTextAlignment;
|
|
155
|
+
// }
|
|
152
156
|
let iosFont;
|
|
153
157
|
if ((fontWeight && fontWeight !== 'normal') || fontstyle || fontFamily || realFontSize || fontSizeRatio !== 1) {
|
|
154
158
|
const font = new Font(fontFamily || (parent && parent.fontFamily) || (parentView && parentView.fontFamily), realFontSize * fontSizeRatio, fontstyle || (parent && parent.fontStyle) || (parentView && parentView.fontStyle), fontWeight || (parent && parent.fontWeight) || (parentView && parentView.fontWeight));
|
|
@@ -186,7 +190,7 @@ export function createSpannable(span, parentView, parent, maxFontSize, autoFontS
|
|
|
186
190
|
attrDict[NSKernAttributeName] = letterSpacing * iosFont.pointSize;
|
|
187
191
|
}
|
|
188
192
|
let paragraphStyle;
|
|
189
|
-
if (lineHeight !== undefined) {
|
|
193
|
+
if (lineHeight !== undefined || textAlignment) {
|
|
190
194
|
paragraphStyle = NSMutableParagraphStyle.alloc().init();
|
|
191
195
|
switch (textAlignment) {
|
|
192
196
|
case 'middle':
|
|
@@ -200,8 +204,13 @@ export function createSpannable(span, parentView, parent, maxFontSize, autoFontS
|
|
|
200
204
|
paragraphStyle.alignment = 0 /* Left */;
|
|
201
205
|
break;
|
|
202
206
|
}
|
|
203
|
-
|
|
204
|
-
|
|
207
|
+
if (lineHeight !== undefined) {
|
|
208
|
+
if (lineHeight === 0) {
|
|
209
|
+
lineHeight = 0.00001;
|
|
210
|
+
}
|
|
211
|
+
paragraphStyle.minimumLineHeight = lineHeight;
|
|
212
|
+
paragraphStyle.maximumLineHeight = lineHeight;
|
|
213
|
+
}
|
|
205
214
|
}
|
|
206
215
|
if (paragraphStyle) {
|
|
207
216
|
attrDict[NSParagraphStyleAttributeName] = paragraphStyle;
|
package/index.ios.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"../src/","sources":["index.ios.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"../src/","sources":["index.ios.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nativescript-community/text",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.29",
|
|
4
4
|
"description": "Expands the capabilities of NativeScript's text property.",
|
|
5
5
|
"main": "./index",
|
|
6
6
|
"sideEffects": false,
|
|
@@ -30,5 +30,5 @@
|
|
|
30
30
|
},
|
|
31
31
|
"license": "Apache-2.0",
|
|
32
32
|
"readmeFilename": "README.md",
|
|
33
|
-
"gitHead": "
|
|
33
|
+
"gitHead": "ff201308ae9336680e1911fc65f636225dfaa603"
|
|
34
34
|
}
|
|
@@ -336,13 +336,13 @@ public class Font {
|
|
|
336
336
|
ssb.setSpan(typefaceSpan, start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
337
337
|
}
|
|
338
338
|
|
|
339
|
-
if (bold && italic && (typeface == null
|
|
339
|
+
if (bold && italic && (typeface == null || (!typeface.isItalic() && !typeface.isBold()))) {
|
|
340
340
|
ssb.setSpan(new android.text.style.StyleSpan(android.graphics.Typeface.BOLD_ITALIC), start, end,
|
|
341
341
|
android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
342
|
-
} else if (bold && (typeface == null
|
|
342
|
+
} else if (bold && (typeface == null || !typeface.isBold())) {
|
|
343
343
|
ssb.setSpan(new android.text.style.StyleSpan(android.graphics.Typeface.BOLD), start, end,
|
|
344
344
|
android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
345
|
-
} else if (italic && (typeface == null
|
|
345
|
+
} else if (italic && (typeface == null || !typeface.isItalic())) {
|
|
346
346
|
ssb.setSpan(new android.text.style.StyleSpan(android.graphics.Typeface.ITALIC), start, end,
|
|
347
347
|
android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
348
348
|
}
|
|
@@ -366,8 +366,14 @@ public class Font {
|
|
|
366
366
|
|
|
367
367
|
Double letterSpacing = span.optDouble("letterSpacing");
|
|
368
368
|
if (!Double.isNaN(letterSpacing)) {
|
|
369
|
-
|
|
369
|
+
if (Build.VERSION.SDK_INT >= 21) {
|
|
370
|
+
ssb.setSpan(new com.nativescript.text.LetterSpacingSpan(letterSpacing.floatValue()), start, end,
|
|
370
371
|
android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
372
|
+
} else {
|
|
373
|
+
ssb.setSpan(new android.text.style.ScaleXSpan((letterSpacing.floatValue() + 1) / 10), start, end,
|
|
374
|
+
android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
375
|
+
}
|
|
376
|
+
|
|
371
377
|
}
|
|
372
378
|
Double lineHeight = span.optDouble("lineHeight");
|
|
373
379
|
if (!Double.isNaN(lineHeight)) {
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
package com.nativescript.text;
|
|
2
|
+
|
|
3
|
+
import android.annotation.TargetApi;
|
|
4
|
+
import android.content.Context;
|
|
5
|
+
import android.os.Parcel;
|
|
6
|
+
import android.text.TextPaint;
|
|
7
|
+
import android.text.style.MetricAffectingSpan;
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* Created by alex on 19/02/2015.
|
|
11
|
+
*/
|
|
12
|
+
public class LetterSpacingSpan extends MetricAffectingSpan {
|
|
13
|
+
private float letterSpacing;
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* @param letterSpacing
|
|
17
|
+
*/
|
|
18
|
+
public LetterSpacingSpan(float letterSpacing) {
|
|
19
|
+
this.letterSpacing = letterSpacing;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
public float getLetterSpacing() {
|
|
23
|
+
return letterSpacing;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
@Override
|
|
27
|
+
public void updateDrawState(TextPaint ds) {
|
|
28
|
+
apply(ds);
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
@Override
|
|
32
|
+
public void updateMeasureState(TextPaint paint) {
|
|
33
|
+
apply(paint);
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
private void apply(TextPaint paint) {
|
|
37
|
+
paint.setLetterSpacing(letterSpacing);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
Binary file
|