@nativescript-community/text 1.5.33 → 1.5.35
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.ios.js +8 -3
- package/index.ios.js.map +1 -1
- package/package.json +2 -2
- package/platforms/ios/src/NSTextUtils.swift +3 -3
package/index.ios.js
CHANGED
|
@@ -109,7 +109,9 @@ export function createSpannableDetails(span, index, parentView, parent, maxFontS
|
|
|
109
109
|
const realMaxFontSize = Math.max(maxFontSize, realFontSize || 0);
|
|
110
110
|
const fontWeight = span.fontWeight;
|
|
111
111
|
const fontstyle = span.fontStyle;
|
|
112
|
-
const textColor = span.color || (parent && parent.color) || (parentView && !(parentView.nativeView instanceof UIButton) && parentView.color);
|
|
112
|
+
// const textColor = span.color || (parent && parent.color) || (parentView && !(parentView.nativeView instanceof UIButton) && parentView.color);
|
|
113
|
+
// TODO: ensure we dont need parent view color. First test says no
|
|
114
|
+
const textColor = span.color || (parent && parent.color);
|
|
113
115
|
const backgroundcolor = span.backgroundColor || (parent && parent.backgroundColor);
|
|
114
116
|
const textDecoration = span.textDecoration || (parent && parent.textDecoration);
|
|
115
117
|
const letterSpacing = span.letterSpacing || (parent && parent.letterSpacing);
|
|
@@ -121,9 +123,12 @@ export function createSpannableDetails(span, index, parentView, parent, maxFontS
|
|
|
121
123
|
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));
|
|
122
124
|
iosFont = font.getUIFont(UIFont.systemFontOfSize(realFontSize));
|
|
123
125
|
}
|
|
124
|
-
else {
|
|
126
|
+
else if (parentView) {
|
|
125
127
|
iosFont = parentView[fontInternalProperty.getDefault]();
|
|
126
128
|
}
|
|
129
|
+
else {
|
|
130
|
+
iosFont = Font.default.getUIFont(UIFont.systemFontOfSize(16));
|
|
131
|
+
}
|
|
127
132
|
return {
|
|
128
133
|
text,
|
|
129
134
|
tapIndex: span._tappable ? index : undefined,
|
|
@@ -138,7 +143,7 @@ export function createSpannableDetails(span, index, parentView, parent, maxFontS
|
|
|
138
143
|
letterSpacing,
|
|
139
144
|
lineHeight,
|
|
140
145
|
verticalTextAlignment,
|
|
141
|
-
textAlignment
|
|
146
|
+
textAlignment: textAlignment !== 'initial' ? textAlignment : null
|
|
142
147
|
};
|
|
143
148
|
}
|
|
144
149
|
//# sourceMappingURL=index.ios.js.map
|
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.5.
|
|
3
|
+
"version": "1.5.35",
|
|
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": "e95f314dc65256d928b7d6634727b59052f0b75c"
|
|
41
41
|
}
|
|
@@ -67,7 +67,7 @@ class NSTextUtils: NSObject {
|
|
|
67
67
|
(view as! UIButton).setAttributedTitle(result, for:UIControl.State.normal)
|
|
68
68
|
}
|
|
69
69
|
else {
|
|
70
|
-
|
|
70
|
+
let attributedTextProperty = class_getProperty(type(of: view), "attributedText");
|
|
71
71
|
if (attributedTextProperty != nil) {
|
|
72
72
|
view.setValue(result, forKey: "attributedText")
|
|
73
73
|
}
|
|
@@ -78,8 +78,8 @@ class NSTextUtils: NSObject {
|
|
|
78
78
|
(view as! UIButton).setAttributedTitle(nil, for:UIControl.State.normal)
|
|
79
79
|
(view as! UIButton).setTitle(text, for:UIControl.State.normal)
|
|
80
80
|
} else {
|
|
81
|
-
|
|
82
|
-
|
|
81
|
+
let attributedTextProperty = class_getProperty(type(of: view), "attributedText");
|
|
82
|
+
let textProperty = class_getProperty(type(of: view), "text");
|
|
83
83
|
if (attributedTextProperty != nil) {
|
|
84
84
|
// Clear attributedText or text won't be affected.
|
|
85
85
|
view.setValue(nil, forKey: "attributedText")
|