@nativescript-community/text 1.5.35 → 1.5.36
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 +19 -19
- package/index.android.js.map +1 -1
- package/package.json +2 -2
- package/platforms/ios/src/NSTextUtils.swift +12 -14
package/index.android.js
CHANGED
|
@@ -88,27 +88,27 @@ function initializeClickableSpan() {
|
|
|
88
88
|
if (ClickableSpan) {
|
|
89
89
|
return;
|
|
90
90
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
view.invalidate();
|
|
104
|
-
}
|
|
105
|
-
updateDrawState(tp) {
|
|
106
|
-
// don't style as link
|
|
91
|
+
var ClickableSpanImpl = /** @class */ (function (_super) {
|
|
92
|
+
__extends(ClickableSpanImpl, _super);
|
|
93
|
+
function ClickableSpanImpl(owner) {
|
|
94
|
+
var _this = _super.call(this) || this;
|
|
95
|
+
_this.owner = new WeakRef(owner);
|
|
96
|
+
return global.__native(_this);
|
|
97
|
+
}
|
|
98
|
+
ClickableSpanImpl.prototype.onClick = function (view) {
|
|
99
|
+
var _a;
|
|
100
|
+
var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.get();
|
|
101
|
+
if (owner) {
|
|
102
|
+
owner._emit(Span.linkTapEvent);
|
|
107
103
|
}
|
|
104
|
+
view.clearFocus();
|
|
105
|
+
view.invalidate();
|
|
106
|
+
};
|
|
107
|
+
ClickableSpanImpl.prototype.updateDrawState = function (tp) {
|
|
108
|
+
// don't style as link
|
|
108
109
|
};
|
|
109
|
-
ClickableSpanImpl
|
|
110
|
-
|
|
111
|
-
], ClickableSpanImpl);
|
|
110
|
+
return ClickableSpanImpl;
|
|
111
|
+
}(android.text.style.ClickableSpan));
|
|
112
112
|
ClickableSpan = ClickableSpanImpl;
|
|
113
113
|
}
|
|
114
114
|
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":"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
|
|
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.36",
|
|
4
4
|
"description": "Expands the capabilities of NativeScript's text property.",
|
|
5
5
|
"main": "./index",
|
|
6
6
|
"sideEffects": false,
|
|
@@ -37,5 +37,5 @@
|
|
|
37
37
|
},
|
|
38
38
|
"license": "Apache-2.0",
|
|
39
39
|
"readmeFilename": "README.md",
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "4ca9016c9e235f55ad9aede5e02bb74962442957"
|
|
41
41
|
}
|
|
@@ -19,7 +19,7 @@ class NSTextUtils: NSObject {
|
|
|
19
19
|
attrDict[NSAttributedString.Key.strikethroughStyle] = (NSUnderlineStyle.single)
|
|
20
20
|
}
|
|
21
21
|
|
|
22
|
-
if letterSpacing != 0 && isTextType && (view as! UILabel).font != nil {
|
|
22
|
+
if letterSpacing != 0 && isTextType && view is UILabel && (view as! UILabel).font != nil {
|
|
23
23
|
let kern:NSNumber! = NSNumber.init(value: letterSpacing * (view as! UILabel).font.pointSize)
|
|
24
24
|
attrDict[NSAttributedString.Key.kern] = kern
|
|
25
25
|
}
|
|
@@ -40,10 +40,8 @@ class NSTextUtils: NSObject {
|
|
|
40
40
|
if (paragraphStyle != nil) {
|
|
41
41
|
if (view is UIButton) {
|
|
42
42
|
paragraphStyle.alignment = (view as! UIButton).titleLabel!.textAlignment
|
|
43
|
-
} else {
|
|
43
|
+
} else if (view is UILabel) {
|
|
44
44
|
paragraphStyle.alignment = (view as! UILabel).textAlignment
|
|
45
|
-
}
|
|
46
|
-
if (view is UILabel) {
|
|
47
45
|
// make sure a possible previously set line break mode is not lost when line height is specified
|
|
48
46
|
paragraphStyle.lineBreakMode = (view as! UILabel).lineBreakMode
|
|
49
47
|
}
|
|
@@ -67,7 +65,7 @@ class NSTextUtils: NSObject {
|
|
|
67
65
|
(view as! UIButton).setAttributedTitle(result, for:UIControl.State.normal)
|
|
68
66
|
}
|
|
69
67
|
else {
|
|
70
|
-
|
|
68
|
+
var attributedTextProperty = class_getProperty(type(of: view), "attributedText");
|
|
71
69
|
if (attributedTextProperty != nil) {
|
|
72
70
|
view.setValue(result, forKey: "attributedText")
|
|
73
71
|
}
|
|
@@ -78,8 +76,8 @@ class NSTextUtils: NSObject {
|
|
|
78
76
|
(view as! UIButton).setAttributedTitle(nil, for:UIControl.State.normal)
|
|
79
77
|
(view as! UIButton).setTitle(text, for:UIControl.State.normal)
|
|
80
78
|
} else {
|
|
81
|
-
|
|
82
|
-
|
|
79
|
+
var attributedTextProperty = class_getProperty(type(of: view), "attributedText");
|
|
80
|
+
var textProperty = class_getProperty(type(of: view), "text");
|
|
83
81
|
if (attributedTextProperty != nil) {
|
|
84
82
|
// Clear attributedText or text won't be affected.
|
|
85
83
|
view.setValue(nil, forKey: "attributedText")
|
|
@@ -141,7 +139,7 @@ class NSTextUtils: NSObject {
|
|
|
141
139
|
attributes.setObject(sValue[index!...], forKey:"CustomLinkAttribute" as NSCopying)
|
|
142
140
|
|
|
143
141
|
} else {
|
|
144
|
-
attributes.setObject(sValue
|
|
142
|
+
attributes.setObject(sValue!, forKey:"CustomLinkAttribute" as NSCopying)
|
|
145
143
|
}
|
|
146
144
|
attributes.removeObject(forKey: NSAttributedString.Key.link)
|
|
147
145
|
attrText.setAttributes(attributes as? [NSAttributedString.Key : Any], range:range)
|
|
@@ -200,7 +198,7 @@ class NSTextUtils: NSObject {
|
|
|
200
198
|
// }
|
|
201
199
|
}
|
|
202
200
|
if (paragraphStyle != nil) {
|
|
203
|
-
attrText.addAttribute(NSAttributedString.Key.paragraphStyle, value:paragraphStyle
|
|
201
|
+
attrText.addAttribute(NSAttributedString.Key.paragraphStyle, value:paragraphStyle!, range:fullRange)
|
|
204
202
|
}
|
|
205
203
|
return attrText
|
|
206
204
|
} catch {
|
|
@@ -220,7 +218,7 @@ class NSTextUtils: NSObject {
|
|
|
220
218
|
let attributes:NSMutableDictionary! = NSMutableDictionary()
|
|
221
219
|
let iosFont:UIFont! = spanDetails.object(forKey: "iosFont") as? UIFont
|
|
222
220
|
if (iosFont != nil) {
|
|
223
|
-
attributes.setObject(iosFont
|
|
221
|
+
attributes.setObject(iosFont!, forKey:NSAttributedString.Key.font as NSCopying)
|
|
224
222
|
}
|
|
225
223
|
let autoFontSizeEnabled:NSNumber! = spanDetails.object(forKey: "autoFontSizeEnabled") as? NSNumber
|
|
226
224
|
if autoFontSizeEnabled.boolValue {
|
|
@@ -238,12 +236,12 @@ class NSTextUtils: NSObject {
|
|
|
238
236
|
}
|
|
239
237
|
let color:UIColor! = spanDetails.object(forKey: "color") as? UIColor
|
|
240
238
|
if (color != nil) {
|
|
241
|
-
attributes.setObject(color
|
|
239
|
+
attributes.setObject(color!, forKey:NSAttributedString.Key.foregroundColor as NSCopying)
|
|
242
240
|
|
|
243
241
|
}
|
|
244
242
|
let backgroundColor:UIColor! = spanDetails.object(forKey: "backgroundColor") as? UIColor
|
|
245
243
|
if (backgroundColor != nil) {
|
|
246
|
-
attributes.setObject(backgroundColor
|
|
244
|
+
attributes.setObject(backgroundColor!, forKey:NSAttributedString.Key.backgroundColor as NSCopying)
|
|
247
245
|
}
|
|
248
246
|
let letterSpacing:NSNumber! = spanDetails.object(forKey: "letterSpacing") as? NSNumber
|
|
249
247
|
if (iosFont != nil) && (letterSpacing != nil) {
|
|
@@ -252,12 +250,12 @@ class NSTextUtils: NSObject {
|
|
|
252
250
|
|
|
253
251
|
let tapIndex:NSNumber! = spanDetails.object(forKey: "tapIndex") as? NSNumber
|
|
254
252
|
if (tapIndex != nil) {
|
|
255
|
-
attributes.setObject(tapIndex
|
|
253
|
+
attributes.setObject(tapIndex!, forKey:"CustomLinkAttribute" as NSCopying)
|
|
256
254
|
}
|
|
257
255
|
let lineHeight:NSNumber! = spanDetails.object(forKey: "lineHeight") as? NSNumber
|
|
258
256
|
let textAlignment:String! = spanDetails.object(forKey: "textAlignment") as? String
|
|
259
257
|
if (lineHeight != nil) || (textAlignment != nil) {
|
|
260
|
-
let paragraphStyle:NSMutableParagraphStyle
|
|
258
|
+
let paragraphStyle:NSMutableParagraphStyle = NSMutableParagraphStyle()
|
|
261
259
|
if (textAlignment == "middle") || (textAlignment == "center") {
|
|
262
260
|
paragraphStyle.alignment = NSTextAlignment.center
|
|
263
261
|
} else if (textAlignment == "right") {
|