@nativescript-community/text 1.5.41 → 1.5.42
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.android.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Color, FormattedString, Span, Utils, knownFolders, path, profile } from '@nativescript/core';
|
|
1
|
+
import { Color, FormattedString, Screen, Span, Utils, knownFolders, path, profile } from '@nativescript/core';
|
|
2
2
|
import { Font } from '@nativescript/core/ui/styling/font';
|
|
3
3
|
import { getTransformedText } from '@nativescript/core/ui/text-base';
|
|
4
4
|
import { LightFormattedString } from './index-common';
|
|
@@ -53,9 +53,9 @@ function spanToNativeString(span, parent, parentView, maxFontSize, index = -1, d
|
|
|
53
53
|
}
|
|
54
54
|
if (!density) {
|
|
55
55
|
if (!FONT_SIZE_FACTOR) {
|
|
56
|
-
FONT_SIZE_FACTOR = com.nativescript.text.Font.getFontSizeFactor(Utils.android.getApplicationContext());
|
|
56
|
+
FONT_SIZE_FACTOR = com.nativescript.text.Font.getFontSizeFactor(Utils.android.getApplicationContext()) / Screen.mainScreen.scale;
|
|
57
57
|
}
|
|
58
|
-
// that means not for canvaslabel
|
|
58
|
+
// that means not for canvaslabel
|
|
59
59
|
density = FONT_SIZE_FACTOR;
|
|
60
60
|
verticalTextAlignment = span.verticalAlignment || parent?.verticalAlignment;
|
|
61
61
|
}
|
|
@@ -94,27 +94,27 @@ function initializeClickableSpan() {
|
|
|
94
94
|
if (ClickableSpan) {
|
|
95
95
|
return;
|
|
96
96
|
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
view.invalidate();
|
|
110
|
-
}
|
|
111
|
-
updateDrawState(tp) {
|
|
112
|
-
// don't style as link
|
|
97
|
+
var ClickableSpanImpl = /** @class */ (function (_super) {
|
|
98
|
+
__extends(ClickableSpanImpl, _super);
|
|
99
|
+
function ClickableSpanImpl(owner) {
|
|
100
|
+
var _this = _super.call(this) || this;
|
|
101
|
+
_this.owner = new WeakRef(owner);
|
|
102
|
+
return global.__native(_this);
|
|
103
|
+
}
|
|
104
|
+
ClickableSpanImpl.prototype.onClick = function (view) {
|
|
105
|
+
var _a;
|
|
106
|
+
var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.get();
|
|
107
|
+
if (owner) {
|
|
108
|
+
owner._emit(Span.linkTapEvent);
|
|
113
109
|
}
|
|
110
|
+
view.clearFocus();
|
|
111
|
+
view.invalidate();
|
|
112
|
+
};
|
|
113
|
+
ClickableSpanImpl.prototype.updateDrawState = function (tp) {
|
|
114
|
+
// don't style as link
|
|
114
115
|
};
|
|
115
|
-
ClickableSpanImpl
|
|
116
|
-
|
|
117
|
-
], ClickableSpanImpl);
|
|
116
|
+
return ClickableSpanImpl;
|
|
117
|
+
}(android.text.style.ClickableSpan));
|
|
118
118
|
ClickableSpan = ClickableSpanImpl;
|
|
119
119
|
}
|
|
120
120
|
export const typefaceCache = {};
|
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,EAAa,eAAe,EAAE,IAAI,EAAE,KAAK,EAAY,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.android.js","sourceRoot":"../src/","sources":["index.android.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.42",
|
|
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": "38fdf528125192a719b2010306036f624c3edc22"
|
|
34
34
|
}
|
|
@@ -361,7 +361,7 @@ public class Font {
|
|
|
361
361
|
|
|
362
362
|
}
|
|
363
363
|
if (!Double.isNaN(fontSize)) {
|
|
364
|
-
ssb.setSpan(new AbsoluteSizeSpan(fontSize.intValue()), start, end,
|
|
364
|
+
ssb.setSpan(new AbsoluteSizeSpan(fontSize.intValue(), true), start, end,
|
|
365
365
|
android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
366
366
|
}
|
|
367
367
|
Double relativeSize = span.optDouble("relativeSize");
|