@nativescript-community/text 1.5.39 → 1.5.41
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.d.ts +1 -1
- package/index-common.js +4 -4
- package/index-common.js.map +1 -1
- package/index.android.js +32 -28
- package/index.android.js.map +1 -1
- package/index.ios.js +2 -2
- package/index.ios.js.map +1 -1
- package/package.json +2 -9
- package/platforms/android/java/com/nativescript/text/Font.java +20 -4
- package/platforms/android/java/com/nativescript/text/HtmlToSpannedConverter.java +1 -1
- package/typings/android.d.ts +1 -0
package/index-common.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ export interface ObjectSpans extends Partial<Pick<LightFormattedString, keyof Li
|
|
|
11
11
|
export declare function computeBaseLineOffset(align: any, fontAscent: any, fontDescent: any, fontBottom: any, fontTop: any, fontSize: any, maxFontSize: any): number;
|
|
12
12
|
export declare function getTransformedText(text: string, textTransform: CoreTypes.TextTransformType): string;
|
|
13
13
|
export declare const cssProperty: (target: Object, key: string | symbol) => void;
|
|
14
|
-
export
|
|
14
|
+
export type VerticalTextAlignment = 'initial' | 'top' | 'middle' | 'bottom' | 'center';
|
|
15
15
|
export declare const verticalTextAlignmentConverter: (value: any) => VerticalTextAlignment;
|
|
16
16
|
export declare const verticalTextAlignmentProperty: InheritedCssProperty<Style, VerticalTextAlignment>;
|
|
17
17
|
export declare const textAlignmentConverter: (value: any) => CoreTypes.TextAlignmentType;
|
package/index-common.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Color,
|
|
1
|
+
import { Color, FormattedString, InheritedCssProperty, Observable, ObservableArray, Span, Style, colorProperty, makeParser, makeValidator } from '@nativescript/core';
|
|
2
2
|
import { TextBase } from '@nativescript/core/ui/text-base';
|
|
3
3
|
import { createNativeAttributedString } from './index';
|
|
4
4
|
import { iOSNativeHelper } from '@nativescript/core/utils';
|
|
@@ -86,14 +86,14 @@ export const verticalTextAlignmentProperty = new InheritedCssProperty({
|
|
|
86
86
|
verticalTextAlignmentProperty.register(Style);
|
|
87
87
|
export const textAlignmentConverter = makeParser(makeValidator('initial', 'left', 'right', 'center'));
|
|
88
88
|
export class LightFormattedString extends Observable {
|
|
89
|
+
static get isFormattedString() {
|
|
90
|
+
return true;
|
|
91
|
+
}
|
|
89
92
|
constructor() {
|
|
90
93
|
super();
|
|
91
94
|
this._spans = new ObservableArray();
|
|
92
95
|
this._spans.addEventListener(ObservableArray.changeEvent, this.onSpansCollectionChanged, this);
|
|
93
96
|
}
|
|
94
|
-
static get isFormattedString() {
|
|
95
|
-
return true;
|
|
96
|
-
}
|
|
97
97
|
get style() {
|
|
98
98
|
return this;
|
|
99
99
|
}
|
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":"../src/","sources":["index-common.ts"],"names":[],"mappings":"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"}
|
package/index.android.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Color,
|
|
1
|
+
import { Color, FormattedString, Span, Utils, knownFolders, path, profile } from '@nativescript/core';
|
|
2
2
|
import { Font } from '@nativescript/core/ui/styling/font';
|
|
3
|
-
import { getTransformedText
|
|
3
|
+
import { getTransformedText } from '@nativescript/core/ui/text-base';
|
|
4
4
|
import { LightFormattedString } from './index-common';
|
|
5
5
|
export * from './index-common';
|
|
6
6
|
export function adjustMinMaxFontScale(value, view) {
|
|
@@ -18,19 +18,19 @@ function formattedStringToNativeString(formattedString, parent, parentView = for
|
|
|
18
18
|
parent = formattedString;
|
|
19
19
|
}
|
|
20
20
|
formattedString.spans.forEach((s, index) => {
|
|
21
|
-
const spanDetails = spanToNativeString(s, parent, parentView, maxFontSize, index, density);
|
|
21
|
+
const spanDetails = typeof s === 'string' ? s : spanToNativeString(s, parent, parentView, maxFontSize, index, density);
|
|
22
22
|
if (spanDetails) {
|
|
23
23
|
options.push(spanDetails);
|
|
24
24
|
}
|
|
25
25
|
});
|
|
26
26
|
return `[${options.join(',')}]`;
|
|
27
27
|
}
|
|
28
|
+
let FONT_SIZE_FACTOR;
|
|
28
29
|
function spanToNativeString(span, parent, parentView, maxFontSize, index = -1, density) {
|
|
29
30
|
let text = span.text;
|
|
30
31
|
if (!text || (span.visibility && span.visibility !== 'visible')) {
|
|
31
32
|
return null;
|
|
32
33
|
}
|
|
33
|
-
const spanStyle = span.style;
|
|
34
34
|
const textTransform = span.textTransform || parentView?.textTransform;
|
|
35
35
|
let fontWeight = span.fontWeight;
|
|
36
36
|
let fontStyle = span.fontStyle;
|
|
@@ -52,8 +52,11 @@ function spanToNativeString(span, parent, parentView, maxFontSize, index = -1, d
|
|
|
52
52
|
text = getTransformedText(text, textTransform);
|
|
53
53
|
}
|
|
54
54
|
if (!density) {
|
|
55
|
-
|
|
56
|
-
|
|
55
|
+
if (!FONT_SIZE_FACTOR) {
|
|
56
|
+
FONT_SIZE_FACTOR = com.nativescript.text.Font.getFontSizeFactor(Utils.android.getApplicationContext());
|
|
57
|
+
}
|
|
58
|
+
// that means not for canvaslabel, so we need to apply the font scale factor as applied with TextView.setTextSize
|
|
59
|
+
density = FONT_SIZE_FACTOR;
|
|
57
60
|
verticalTextAlignment = span.verticalAlignment || parent?.verticalAlignment;
|
|
58
61
|
}
|
|
59
62
|
let backgroundColor = span.backgroundColor || parent?.backgroundColor;
|
|
@@ -91,27 +94,27 @@ function initializeClickableSpan() {
|
|
|
91
94
|
if (ClickableSpan) {
|
|
92
95
|
return;
|
|
93
96
|
}
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
97
|
+
let ClickableSpanImpl = class ClickableSpanImpl extends android.text.style.ClickableSpan {
|
|
98
|
+
constructor(owner) {
|
|
99
|
+
super();
|
|
100
|
+
this.owner = new WeakRef(owner);
|
|
101
|
+
return global.__native(this);
|
|
102
|
+
}
|
|
103
|
+
onClick(view) {
|
|
104
|
+
const owner = this.owner?.get();
|
|
105
|
+
if (owner) {
|
|
106
|
+
owner._emit(Span.linkTapEvent);
|
|
107
|
+
}
|
|
108
|
+
view.clearFocus();
|
|
109
|
+
view.invalidate();
|
|
110
|
+
}
|
|
111
|
+
updateDrawState(tp) {
|
|
112
|
+
// don't style as link
|
|
106
113
|
}
|
|
107
|
-
view.clearFocus();
|
|
108
|
-
view.invalidate();
|
|
109
|
-
};
|
|
110
|
-
ClickableSpanImpl.prototype.updateDrawState = function (tp) {
|
|
111
|
-
// don't style as link
|
|
112
114
|
};
|
|
113
|
-
|
|
114
|
-
|
|
115
|
+
ClickableSpanImpl = __decorate([
|
|
116
|
+
NativeClass
|
|
117
|
+
], ClickableSpanImpl);
|
|
115
118
|
ClickableSpan = ClickableSpanImpl;
|
|
116
119
|
}
|
|
117
120
|
export const typefaceCache = {};
|
|
@@ -123,7 +126,7 @@ export function init() {
|
|
|
123
126
|
return;
|
|
124
127
|
}
|
|
125
128
|
initialized = true;
|
|
126
|
-
context = Utils.
|
|
129
|
+
context = Utils.android.getApplicationContext();
|
|
127
130
|
Font.prototype.getAndroidTypeface = profile('getAndroidTypeface', function () {
|
|
128
131
|
if (!this._typeface) {
|
|
129
132
|
// css loader to json transform font-family: res/toto to font-family: res,toto
|
|
@@ -132,7 +135,7 @@ export function init() {
|
|
|
132
135
|
const typeface = typefaceCache[fontCacheKey];
|
|
133
136
|
if (!typeface) {
|
|
134
137
|
if (!context) {
|
|
135
|
-
context = Utils.
|
|
138
|
+
context = Utils.android.getApplicationContext();
|
|
136
139
|
}
|
|
137
140
|
this._typeface = typefaceCache[fontCacheKey] = com.nativescript.text.Font.createTypeface(context, fontPath, fontFamily, this.fontWeight, this.isBold, this.isItalic);
|
|
138
141
|
}
|
|
@@ -168,7 +171,8 @@ density // used only on Android
|
|
|
168
171
|
init();
|
|
169
172
|
}
|
|
170
173
|
if (data instanceof FormattedString || data instanceof LightFormattedString || data['spans']) {
|
|
171
|
-
|
|
174
|
+
const strData = formattedStringToNativeString(data, undefined, this, density);
|
|
175
|
+
return com.nativescript.text.Font.stringBuilderFromFormattedString(context, fontPath, parentView?.['fontFamily'] || null, strData, null);
|
|
172
176
|
}
|
|
173
177
|
const linkColor = data.linkColor || parentView?.['linkColor'];
|
|
174
178
|
const aLinkColor = linkColor ? (linkColor instanceof Color ? linkColor : new Color(linkColor)).android : null;
|
package/index.android.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.android.js","sourceRoot":"../src/","sources":["index.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"index.android.js","sourceRoot":"../src/","sources":["index.android.ts"],"names":[],"mappings":"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"}
|
package/index.ios.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Color,
|
|
1
|
+
import { Color, Font, FormattedString, fontInternalProperty, fontSizeProperty } from '@nativescript/core';
|
|
2
2
|
import { getTransformedText } from '@nativescript/core/ui/text-base';
|
|
3
3
|
import { getMaxFontSize, textAlignmentConverter } from './index-common';
|
|
4
4
|
import { LightFormattedString } from './index.android';
|
|
@@ -49,7 +49,7 @@ export function createNativeAttributedString(data, parent, parentView, autoFontS
|
|
|
49
49
|
parent = data;
|
|
50
50
|
}
|
|
51
51
|
data['spans'].forEach((s, index) => {
|
|
52
|
-
const spanDetails = createSpannableDetails(s, index, parentView, parent, maxFontSize, autoFontSizeEnabled, fontSizeRatio);
|
|
52
|
+
const spanDetails = typeof s === 'string' ? s : createSpannableDetails(s, index, parentView, parent, maxFontSize, autoFontSizeEnabled, fontSizeRatio);
|
|
53
53
|
if (spanDetails) {
|
|
54
54
|
details.push(spanDetails);
|
|
55
55
|
if (s._tappable) {
|
package/index.ios.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"../src/","sources":["index.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,
|
|
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.5.
|
|
3
|
+
"version": "1.5.41",
|
|
4
4
|
"description": "Expands the capabilities of NativeScript's text property.",
|
|
5
5
|
"main": "./index",
|
|
6
6
|
"sideEffects": false,
|
|
@@ -11,13 +11,6 @@
|
|
|
11
11
|
"ios": "3.0.0"
|
|
12
12
|
}
|
|
13
13
|
},
|
|
14
|
-
"scripts": {
|
|
15
|
-
"build": "npm run tsc",
|
|
16
|
-
"build.all": "npm run build",
|
|
17
|
-
"readme": "readme generate -c ../../tools/readme/blueprint.json",
|
|
18
|
-
"tsc": "cpy '**/*.d.ts' '../../packages/text' --parents --cwd=../../src/text && tsc -skipLibCheck -d",
|
|
19
|
-
"clean": "rimraf ./*.d.ts ./*.js ./*.js.map"
|
|
20
|
-
},
|
|
21
14
|
"keywords": [
|
|
22
15
|
"NativeScript",
|
|
23
16
|
"JavaScript",
|
|
@@ -37,5 +30,5 @@
|
|
|
37
30
|
},
|
|
38
31
|
"license": "Apache-2.0",
|
|
39
32
|
"readmeFilename": "README.md",
|
|
40
|
-
"gitHead": "
|
|
33
|
+
"gitHead": "957df2f5560c7c6450d751685633486aa48d062d"
|
|
41
34
|
}
|
|
@@ -2,6 +2,7 @@ package com.nativescript.text;
|
|
|
2
2
|
|
|
3
3
|
import android.content.Context;
|
|
4
4
|
import android.content.res.AssetManager;
|
|
5
|
+
import android.graphics.Color;
|
|
5
6
|
import android.graphics.Typeface;
|
|
6
7
|
import android.os.Build;
|
|
7
8
|
import android.text.SpannableStringBuilder;
|
|
@@ -386,11 +387,18 @@ public class Font {
|
|
|
386
387
|
android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
387
388
|
}
|
|
388
389
|
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
390
|
+
if (!span.isNull("color")) {
|
|
391
|
+
String strColor = span.optString("color", null);
|
|
392
|
+
try {
|
|
393
|
+
int color = Integer.parseInt(strColor);
|
|
394
|
+
ssb.setSpan(new ForegroundColorSpan(color), start, end,
|
|
395
|
+
android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
396
|
+
} catch (NumberFormatException nfe) {
|
|
397
|
+
ssb.setSpan(new ForegroundColorSpan(Color.parseColor(strColor)), start, end,
|
|
398
|
+
android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
399
|
+
}
|
|
393
400
|
}
|
|
401
|
+
|
|
394
402
|
|
|
395
403
|
int backgroundColor = span.optInt("backgroundColor", -1);
|
|
396
404
|
if (backgroundColor != -1) {
|
|
@@ -495,4 +503,12 @@ public class Font {
|
|
|
495
503
|
public static CharSequence fromHtml(Context context, String fontFolder, String parentFontFamily, CharSequence html, final boolean disableLinkUnderline, final int linkColor) {
|
|
496
504
|
return fromHtml(html, context, fontFolder, parentFontFamily, disableLinkUnderline, linkColor);
|
|
497
505
|
}
|
|
506
|
+
private static float FONT_SIZE_FACTOR = -1;
|
|
507
|
+
public static float getFontSizeFactor(Context context) {
|
|
508
|
+
if (FONT_SIZE_FACTOR == -1) {
|
|
509
|
+
FONT_SIZE_FACTOR = android.util.TypedValue.applyDimension(
|
|
510
|
+
android.util.TypedValue.COMPLEX_UNIT_SP, 1, context.getResources().getDisplayMetrics());
|
|
511
|
+
}
|
|
512
|
+
return FONT_SIZE_FACTOR;
|
|
513
|
+
}
|
|
498
514
|
}
|
|
@@ -472,7 +472,7 @@ class HtmlToSpannedConverter extends DefaultHandler {
|
|
|
472
472
|
needsFontSpan = true;
|
|
473
473
|
break;
|
|
474
474
|
case "font-size":
|
|
475
|
-
fontSize = Float.parseFloat(value.replace("px", "").replace("pt", "").trim()) *
|
|
475
|
+
fontSize = Float.parseFloat(value.replace("px", "").replace("pt", "").trim()) * Font.getFontSizeFactor(this.context);
|
|
476
476
|
needsFontSpan = true;
|
|
477
477
|
break;
|
|
478
478
|
case "font-weight":
|
package/typings/android.d.ts
CHANGED
|
@@ -41,6 +41,7 @@ declare namespace com {
|
|
|
41
41
|
isBold: boolean,
|
|
42
42
|
isItalic: boolean
|
|
43
43
|
): globalAndroid.graphics.Typeface;
|
|
44
|
+
static getFontSizeFactor(context: globalAndroid.content.Context): number;
|
|
44
45
|
}
|
|
45
46
|
export class URLSpanClickListener {
|
|
46
47
|
constructor(impl?: { onClick(span: android.text.style.URLSpan) });
|