@nativescript-community/text 1.5.46 → 1.6.0
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/index-common.js +8 -3
- package/index-common.js.map +1 -1
- package/index.android.d.ts +5 -0
- package/index.android.js +8 -7
- package/index.android.js.map +1 -1
- package/index.ios.js.map +1 -1
- package/package.json +2 -2
- package/platforms/android/java/com/nativescript/text/Font.java +40 -38
- package/platforms/android/java/com/nativescript/text/HtmlToSpannedConverter.java +6 -1
- package/platforms/ios/src/NSTextUtils.swift +10 -10
- package/typings/android.d.ts +2 -1
package/index-common.js
CHANGED
|
@@ -295,10 +295,15 @@ export function overrideSpanAndFormattedString(useLightFormatString = true) {
|
|
|
295
295
|
const nativeView = this.nativeTextViewProtected;
|
|
296
296
|
const attrText = this.createFormattedTextNative(this.formattedText);
|
|
297
297
|
// we override parent class behavior because we apply letterSpacing and lineHeight on a per Span basis
|
|
298
|
-
if (
|
|
299
|
-
|
|
298
|
+
if (nativeView instanceof UIButton) {
|
|
299
|
+
nativeView.setAttributedTitleForState(attrText, 0 /* UIControlState.Normal */);
|
|
300
|
+
}
|
|
301
|
+
else {
|
|
302
|
+
if (majorVersion >= 13 && UIColor.labelColor) {
|
|
303
|
+
nativeView.textColor = UIColor.labelColor;
|
|
304
|
+
}
|
|
305
|
+
nativeView.attributedText = attrText;
|
|
300
306
|
}
|
|
301
|
-
nativeView.attributedText = attrText;
|
|
302
307
|
};
|
|
303
308
|
//@ts-ignore
|
|
304
309
|
TextBase.prototype.setTextDecorationAndTransform = function () {
|
package/index-common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index-common.js","sourceRoot":"../src/","sources":["index-common.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index-common.js","sourceRoot":"","sources":["../../src/text/index-common.ts"],"names":[],"mappings":"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"}
|
package/index.android.d.ts
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import { Color, CoreTypes, FormattedString, ViewBase } from '@nativescript/core';
|
|
2
2
|
import { ObjectSpans } from '.';
|
|
3
3
|
export * from './index-common';
|
|
4
|
+
declare module '@nativescript/core' {
|
|
5
|
+
interface Font {
|
|
6
|
+
_typeface: android.graphics.Typeface;
|
|
7
|
+
}
|
|
8
|
+
}
|
|
4
9
|
export declare function adjustMinMaxFontScale(value: any, view: any): void;
|
|
5
10
|
export declare const typefaceCache: {
|
|
6
11
|
[k: string]: android.graphics.Typeface;
|
package/index.android.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Color, FormattedString, Span, Utils, knownFolders, path, profile } from '@nativescript/core';
|
|
2
|
-
import { Font } from '@nativescript/core/ui/styling/font';
|
|
2
|
+
import { Font, FontVariationSettings } from '@nativescript/core/ui/styling/font';
|
|
3
3
|
import { getTransformedText } from '@nativescript/core/ui/text-base';
|
|
4
4
|
import { LightFormattedString } from './index-common';
|
|
5
5
|
export * from './index-common';
|
|
@@ -130,22 +130,23 @@ export function init() {
|
|
|
130
130
|
initialized = true;
|
|
131
131
|
context = Utils.android.getApplicationContext();
|
|
132
132
|
Font.prototype.getAndroidTypeface = profile('getAndroidTypeface', function () {
|
|
133
|
-
|
|
133
|
+
const theFont = this;
|
|
134
|
+
if (!theFont._typeface) {
|
|
134
135
|
// css loader to json transform font-family: res/toto to font-family: res,toto
|
|
135
|
-
const fontFamily =
|
|
136
|
-
const fontCacheKey = fontFamily + (
|
|
136
|
+
const fontFamily = theFont.fontFamily?.replace(/res,/g, 'res/');
|
|
137
|
+
const fontCacheKey = fontFamily + (theFont.fontWeight || '') + (theFont.fontStyle || '') + (theFont.fontVariationSettings || '');
|
|
137
138
|
const typeface = typefaceCache[fontCacheKey];
|
|
138
139
|
if (!typeface) {
|
|
139
140
|
if (!context) {
|
|
140
141
|
context = Utils.android.getApplicationContext();
|
|
141
142
|
}
|
|
142
|
-
|
|
143
|
+
theFont._typeface = typefaceCache[fontCacheKey] = com.nativescript.text.Font.createTypeface(context, fontPath, fontFamily, theFont.fontWeight, theFont.isBold, theFont.isItalic, FontVariationSettings.toString(theFont.fontVariationSettings));
|
|
143
144
|
}
|
|
144
145
|
else {
|
|
145
|
-
|
|
146
|
+
theFont._typeface = typeface;
|
|
146
147
|
}
|
|
147
148
|
}
|
|
148
|
-
return
|
|
149
|
+
return theFont._typeface;
|
|
149
150
|
});
|
|
150
151
|
FormattedString.prototype.toNativeString = LightFormattedString.prototype.toNativeString = function () {
|
|
151
152
|
return formattedStringToNativeString(this);
|
package/index.android.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.android.js","sourceRoot":"
|
|
1
|
+
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../src/text/index.android.ts"],"names":[],"mappings":"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"}
|
package/index.ios.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../src/text/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.
|
|
3
|
+
"version": "1.6.0",
|
|
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": "f891d0cb217c4e09a141223c5e98905fe13a1b3f"
|
|
34
34
|
}
|
|
@@ -34,12 +34,14 @@ public class Font {
|
|
|
34
34
|
|
|
35
35
|
static final String TAG = "Font";
|
|
36
36
|
|
|
37
|
-
public static Typeface loadFontFromFile(Context context, String fontFolder, String fontFamily) {
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
public static Typeface loadFontFromFile(Context context, String fontFolder, String fontFamily, String fontVariationSettings) {
|
|
38
|
+
String key = (Build.VERSION.SDK_INT >= 26 && fontVariationSettings != null) ? (fontFamily + "_" + fontVariationSettings) : fontFamily;
|
|
39
|
+
if (typefaceCache.containsKey(key)) {
|
|
40
|
+
return typefaceCache.get(key);
|
|
40
41
|
}
|
|
41
42
|
Typeface result = null;
|
|
42
43
|
if (fontFamily.startsWith("res/")) {
|
|
44
|
+
// TODO: for now fontVariationSettings is not supported in res:/. Maybe use androidx.core.provider.FontRequest
|
|
43
45
|
int fontID = context.getResources().getIdentifier(fontFamily.substring(4), "font",
|
|
44
46
|
context.getPackageName());
|
|
45
47
|
try {
|
|
@@ -48,7 +50,10 @@ public class Font {
|
|
|
48
50
|
Log.w(TAG, "\"Error loading font res: " + fontFamily + "," + e.getLocalizedMessage());
|
|
49
51
|
}
|
|
50
52
|
if (result != null) {
|
|
51
|
-
|
|
53
|
+
// if (Build.VERSION.SDK_INT >= 26 && fontVariationSettings != null) {
|
|
54
|
+
// result = new Typeface.Builder(result).setFontVariationSettings(fontVariationSettings).build();
|
|
55
|
+
// }
|
|
56
|
+
typefaceCache.put(key, result);
|
|
52
57
|
return result;
|
|
53
58
|
}
|
|
54
59
|
}
|
|
@@ -60,7 +65,7 @@ public class Font {
|
|
|
60
65
|
return null;
|
|
61
66
|
}
|
|
62
67
|
|
|
63
|
-
result = typefaceCache.get(
|
|
68
|
+
result = typefaceCache.get(key);
|
|
64
69
|
// Check for undefined explicitly as null mean we tried to load the font, but
|
|
65
70
|
// failed.
|
|
66
71
|
File file = new File(fontFolder, fontFamily + ".ttf");
|
|
@@ -77,11 +82,24 @@ public class Font {
|
|
|
77
82
|
}
|
|
78
83
|
|
|
79
84
|
try {
|
|
80
|
-
|
|
85
|
+
if (Build.VERSION.SDK_INT >= 26) {
|
|
86
|
+
android.graphics.Typeface.Builder builder = new android.graphics.Typeface.Builder(file.getAbsolutePath());
|
|
87
|
+
if (builder != null) {
|
|
88
|
+
if (fontVariationSettings != null) {
|
|
89
|
+
builder.setFontVariationSettings(fontVariationSettings);
|
|
90
|
+
}
|
|
91
|
+
result = builder.build();
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
if (result == null) {
|
|
95
|
+
result = Typeface.createFromFile(file.getAbsolutePath());
|
|
96
|
+
}
|
|
81
97
|
} catch (Exception e) {
|
|
82
98
|
Log.w(TAG, "\"Error loading font asset: " + file.getAbsolutePath() + "," + e.getLocalizedMessage());
|
|
83
99
|
}
|
|
84
|
-
|
|
100
|
+
if (result != null) {
|
|
101
|
+
typefaceCache.put(key, result);
|
|
102
|
+
}
|
|
85
103
|
|
|
86
104
|
return result;
|
|
87
105
|
}
|
|
@@ -201,7 +219,7 @@ public class Font {
|
|
|
201
219
|
}
|
|
202
220
|
|
|
203
221
|
public static Typeface createTypeface(Context context, String fontFolder, String fontFamily, String fontWeight,
|
|
204
|
-
boolean isBold, boolean isItalic) {
|
|
222
|
+
boolean isBold, boolean isItalic, String fontVariationSettings) {
|
|
205
223
|
|
|
206
224
|
int fontStyle = 0;
|
|
207
225
|
if (isBold) {
|
|
@@ -243,42 +261,25 @@ public class Font {
|
|
|
243
261
|
String newFontFamily = currentFontFamily;
|
|
244
262
|
// on pre 28 Typeface.create does not support passing the fontWeight
|
|
245
263
|
// so we need to try and load the font directly hoping the file is named correctly
|
|
246
|
-
if(fontWeightInt
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
}
|
|
264
|
+
if(fontWeightInt != 400) {
|
|
265
|
+
newFontFamily += getCustomFontWeightSuffix(fontWeightInt);
|
|
266
|
+
}
|
|
267
|
+
if (isItalic) {
|
|
268
|
+
result = loadFontFromFile(context, fontFolder, newFontFamily + "_italic", fontVariationSettings);
|
|
269
|
+
if (result != null) {
|
|
270
|
+
fontStyle = 0;
|
|
254
271
|
} else {
|
|
255
|
-
result = loadFontFromFile(context, fontFolder, newFontFamily);
|
|
256
|
-
if (result != null) {
|
|
257
|
-
fontStyle = 0;
|
|
258
|
-
}
|
|
272
|
+
result = loadFontFromFile(context, fontFolder, newFontFamily, fontVariationSettings);
|
|
259
273
|
}
|
|
260
274
|
} else {
|
|
261
|
-
|
|
262
|
-
if (
|
|
263
|
-
|
|
264
|
-
if (result != null) {
|
|
265
|
-
// Log.d("JS", "Font loading font style found: " + newFontFamily + ",fontStyle "
|
|
266
|
-
// + fontStyle + ",fontWeightInt " + fontWeightInt);
|
|
267
|
-
fontStyle = 0;
|
|
268
|
-
} else {
|
|
269
|
-
result = loadFontFromFile(context, fontFolder, newFontFamily);
|
|
270
|
-
}
|
|
271
|
-
} else {
|
|
272
|
-
result = loadFontFromFile(context, fontFolder, newFontFamily);
|
|
273
|
-
if (result != null) {
|
|
274
|
-
fontStyle = 0;
|
|
275
|
-
}
|
|
275
|
+
result = loadFontFromFile(context, fontFolder, newFontFamily, fontVariationSettings);
|
|
276
|
+
if (result != null) {
|
|
277
|
+
fontStyle = 0;
|
|
276
278
|
}
|
|
277
|
-
|
|
278
279
|
}
|
|
279
280
|
}
|
|
280
281
|
if(result == null) {
|
|
281
|
-
result = loadFontFromFile(context, fontFolder, currentFontFamily);
|
|
282
|
+
result = loadFontFromFile(context, fontFolder, currentFontFamily, fontVariationSettings);
|
|
282
283
|
}
|
|
283
284
|
|
|
284
285
|
if (result != null && (fontStyle != 0 || fontWeightInt != 400)) {
|
|
@@ -336,7 +337,8 @@ public class Font {
|
|
|
336
337
|
}
|
|
337
338
|
Typeface typeface = null;
|
|
338
339
|
if (fontFamily != null) {
|
|
339
|
-
|
|
340
|
+
String fontVariationSettings = span.optString("fontVariationSettings", null);
|
|
341
|
+
typeface = createTypeface(context, fontFolder, fontFamily,fontWeight, bold, italic, fontVariationSettings);
|
|
340
342
|
TypefaceSpan typefaceSpan = new CustomTypefaceSpan(fontFamily, typeface);
|
|
341
343
|
ssb.setSpan(typefaceSpan, start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
342
344
|
}
|
|
@@ -440,6 +440,7 @@ class HtmlToSpannedConverter extends DefaultHandler {
|
|
|
440
440
|
int radius = 0;
|
|
441
441
|
String fontWeight = null;
|
|
442
442
|
String fontFamily = this.parentFontFamily;
|
|
443
|
+
String fontVariationSettings = null;
|
|
443
444
|
String fontStyle = null;
|
|
444
445
|
float fontSize = 0;
|
|
445
446
|
boolean needsBgdSpan = false;
|
|
@@ -470,6 +471,10 @@ class HtmlToSpannedConverter extends DefaultHandler {
|
|
|
470
471
|
fontFamily = value;
|
|
471
472
|
needsFontSpan = true;
|
|
472
473
|
break;
|
|
474
|
+
case "font-variation-settings":
|
|
475
|
+
fontVariationSettings = value;
|
|
476
|
+
needsFontSpan = true;
|
|
477
|
+
break;
|
|
473
478
|
case "font-size":
|
|
474
479
|
fontSize = Float.parseFloat(value.replace("px", "").replace("pt", "").trim());
|
|
475
480
|
needsFontSpan = true;
|
|
@@ -498,7 +503,7 @@ class HtmlToSpannedConverter extends DefaultHandler {
|
|
|
498
503
|
boolean isBold = fontWeight != null && (fontWeight.equals("bold") || fontWeight.equals("700"));
|
|
499
504
|
if (fontFamily != null) {
|
|
500
505
|
result.add(new CustomTypefaceSpan(fontFamily, Font.createTypeface(this.context, this.fontFolder,
|
|
501
|
-
fontFamily, fontWeight, isBold, false)));
|
|
506
|
+
fontFamily, fontWeight, isBold, false, fontVariationSettings)));
|
|
502
507
|
} else {
|
|
503
508
|
if (isBold) {
|
|
504
509
|
result.add(new android.text.style.StyleSpan(android.graphics.Typeface.BOLD));
|
|
@@ -7,7 +7,7 @@ import CoreGraphics
|
|
|
7
7
|
class NSTextUtils: NSObject {
|
|
8
8
|
class func setTextDecorationAndTransformOn(view:UIView!, text:String!, textDecoration:String!, letterSpacing:CGFloat, lineHeight:CGFloat, color:UIColor!) {
|
|
9
9
|
let attrDict:NSMutableDictionary! = NSMutableDictionary()
|
|
10
|
-
|
|
10
|
+
let paragraphStyle:NSMutableParagraphStyle! = nil
|
|
11
11
|
let isTextType:Bool = (view is UITextField) || (view is UITextView) || (view is UILabel) || (view is UIButton)
|
|
12
12
|
let isTextView:Bool = (view is UITextView)
|
|
13
13
|
|
|
@@ -23,7 +23,7 @@ class NSTextUtils: NSObject {
|
|
|
23
23
|
let kern:NSNumber! = NSNumber.init(value: letterSpacing * (view as! UILabel).font.pointSize)
|
|
24
24
|
attrDict[NSAttributedString.Key.kern] = kern
|
|
25
25
|
}
|
|
26
|
-
|
|
26
|
+
let fLineHeight = lineHeight
|
|
27
27
|
if fLineHeight >= 0 {
|
|
28
28
|
if fLineHeight == 0 {
|
|
29
29
|
fLineHeight = 0.00001
|
|
@@ -65,7 +65,7 @@ class NSTextUtils: NSObject {
|
|
|
65
65
|
(view as! UIButton).setAttributedTitle(result, for:UIControl.State.normal)
|
|
66
66
|
}
|
|
67
67
|
else {
|
|
68
|
-
|
|
68
|
+
let attributedTextProperty = class_getProperty(type(of: view), "attributedText");
|
|
69
69
|
if (attributedTextProperty != nil) {
|
|
70
70
|
view.setValue(result, forKey: "attributedText")
|
|
71
71
|
}
|
|
@@ -76,8 +76,8 @@ class NSTextUtils: NSObject {
|
|
|
76
76
|
(view as! UIButton).setAttributedTitle(nil, for:UIControl.State.normal)
|
|
77
77
|
(view as! UIButton).setTitle(text, for:UIControl.State.normal)
|
|
78
78
|
} else {
|
|
79
|
-
|
|
80
|
-
|
|
79
|
+
let attributedTextProperty = class_getProperty(type(of: view), "attributedText");
|
|
80
|
+
let textProperty = class_getProperty(type(of: view), "text");
|
|
81
81
|
if (attributedTextProperty != nil) {
|
|
82
82
|
// Clear attributedText or text won't be affected.
|
|
83
83
|
view.setValue(nil, forKey: "attributedText")
|
|
@@ -89,7 +89,7 @@ class NSTextUtils: NSObject {
|
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
class func computeBaseLineOffset(align:String!, fontAscent:Float, fontDescent:Float, fontBottom:Float, fontTop:Float, fontSize:Float, maxFontSize:Float) -> Float {
|
|
92
|
-
|
|
92
|
+
let result:Float = 0
|
|
93
93
|
if (align == "top") {
|
|
94
94
|
result = -maxFontSize - fontBottom - fontTop
|
|
95
95
|
} else if (align == "bottom") {
|
|
@@ -128,7 +128,7 @@ class NSTextUtils: NSObject {
|
|
|
128
128
|
attrText.enumerateAttribute(NSAttributedString.Key.link, in: fullRange) { value, range, stop in
|
|
129
129
|
if (value != nil) {
|
|
130
130
|
let attributes:NSMutableDictionary! = NSMutableDictionary(dictionary:attrText.attributes(at: range.location, longestEffectiveRange:nil, in:range))
|
|
131
|
-
|
|
131
|
+
let sValue:String! = nil
|
|
132
132
|
if (value is NSURL) {
|
|
133
133
|
sValue = (value as! NSURL).absoluteString
|
|
134
134
|
} else {
|
|
@@ -162,7 +162,7 @@ class NSTextUtils: NSObject {
|
|
|
162
162
|
if (letterSpacing != nil) && letterSpacing.floatValue != 0 {
|
|
163
163
|
attrText.addAttribute(NSAttributedString.Key.kern, value:letterSpacing.floatValue * fontSize.floatValue, range:fullRange)
|
|
164
164
|
}
|
|
165
|
-
|
|
165
|
+
let paragraphStyle:NSMutableParagraphStyle! = nil
|
|
166
166
|
let textAlignment:NSNumber! = data.object(forKey:"textAlignment") as? NSNumber
|
|
167
167
|
let createParagraphStyle:()->Void = {
|
|
168
168
|
if (paragraphStyle == nil) {
|
|
@@ -186,7 +186,7 @@ class NSTextUtils: NSObject {
|
|
|
186
186
|
let lineHeight:NSNumber! = data.object(forKey:"lineHeight") as? NSNumber
|
|
187
187
|
if (lineHeight != nil) {
|
|
188
188
|
createParagraphStyle()
|
|
189
|
-
|
|
189
|
+
let fLineHeight:Float = lineHeight.floatValue
|
|
190
190
|
if fLineHeight == 0.0 {
|
|
191
191
|
fLineHeight = 0.00001
|
|
192
192
|
}
|
|
@@ -264,7 +264,7 @@ class NSTextUtils: NSObject {
|
|
|
264
264
|
paragraphStyle.alignment = NSTextAlignment.left
|
|
265
265
|
}
|
|
266
266
|
if (lineHeight != nil) {
|
|
267
|
-
|
|
267
|
+
let fLineHeight:CGFloat = CGFloat(lineHeight.floatValue)
|
|
268
268
|
if fLineHeight == 0.0 {
|
|
269
269
|
fLineHeight = 0.00001
|
|
270
270
|
}
|
package/typings/android.d.ts
CHANGED
|
@@ -39,7 +39,8 @@ declare namespace com {
|
|
|
39
39
|
fontFamily: string,
|
|
40
40
|
fontWeight: string,
|
|
41
41
|
isBold: boolean,
|
|
42
|
-
isItalic: boolean
|
|
42
|
+
isItalic: boolean,
|
|
43
|
+
fontVariationSettings: string,
|
|
43
44
|
): globalAndroid.graphics.Typeface;
|
|
44
45
|
static getFontSizeFactor(context: globalAndroid.content.Context): number;
|
|
45
46
|
}
|