@nativescript-community/text 1.5.19 → 1.5.21
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.d.ts +2 -2
- package/index.android.js +12 -119
- package/index.android.js.map +1 -1
- package/index.ios.d.ts +1 -1
- package/index.ios.js +13 -8
- package/index.ios.js.map +1 -1
- package/package.json +2 -2
- package/platforms/ios/src/NSTextUtils.swift +3 -2
package/index.android.d.ts
CHANGED
|
@@ -28,5 +28,5 @@ export declare function createNativeAttributedString(data: {
|
|
|
28
28
|
linkColor?: string | Color;
|
|
29
29
|
linkDecoration?: string;
|
|
30
30
|
textAlignment?: number | CoreTypes.TextAlignmentType;
|
|
31
|
-
} | FormattedString | ObjectSpans, parent?: ViewBase, autoFontSizeEnabled?: boolean, fontSizeRatio?: number): any;
|
|
32
|
-
export declare function createSpannable(span: any, parentView: any, parent?: any, maxFontSize?: number):
|
|
31
|
+
} | FormattedString | ObjectSpans, parent?: any, parentView?: ViewBase, autoFontSizeEnabled?: boolean, fontSizeRatio?: number): any;
|
|
32
|
+
export declare function createSpannable(span: any, parentView: any, parent?: any, maxFontSize?: number): globalAndroid.text.SpannableStringBuilder;
|
package/index.android.js
CHANGED
|
@@ -3,8 +3,7 @@ import { Font } from '@nativescript/core/ui/styling/font';
|
|
|
3
3
|
import { getTransformedText, textDecorationProperty } from '@nativescript/core/ui/text-base';
|
|
4
4
|
import { LightFormattedString } from './index-common';
|
|
5
5
|
export * from './index-common';
|
|
6
|
-
function formattedStringToNativeString(formattedString) {
|
|
7
|
-
const parentView = formattedString.parent;
|
|
6
|
+
function formattedStringToNativeString(formattedString, parent, parentView = formattedString.parent) {
|
|
8
7
|
let maxFontSize = formattedString?.fontSize || parentView?.fontSize || 0;
|
|
9
8
|
formattedString.spans.forEach((s) => {
|
|
10
9
|
if (s.fontSize) {
|
|
@@ -12,8 +11,11 @@ function formattedStringToNativeString(formattedString) {
|
|
|
12
11
|
}
|
|
13
12
|
});
|
|
14
13
|
const options = [];
|
|
14
|
+
if (!parent) {
|
|
15
|
+
parent = formattedString;
|
|
16
|
+
}
|
|
15
17
|
formattedString.spans.forEach((s, index) => {
|
|
16
|
-
const spanDetails = spanToNativeString(s,
|
|
18
|
+
const spanDetails = spanToNativeString(s, parent, parentView, maxFontSize, index);
|
|
17
19
|
if (spanDetails) {
|
|
18
20
|
options.push(spanDetails);
|
|
19
21
|
}
|
|
@@ -163,138 +165,29 @@ export function init() {
|
|
|
163
165
|
return spanToNativeString(this, parent, grandParent, maxFontSize);
|
|
164
166
|
};
|
|
165
167
|
}
|
|
166
|
-
function
|
|
167
|
-
return fontWeight === 'bold' || fontWeight === '700' || fontWeight === '800' || fontWeight === '900';
|
|
168
|
-
}
|
|
169
|
-
export function createNativeAttributedString(data, parent, autoFontSizeEnabled = false, fontSizeRatio = 1 // used only on iOS
|
|
168
|
+
export function createNativeAttributedString(data, parent, parentView, autoFontSizeEnabled = false, fontSizeRatio = 1 // used only on iOS
|
|
170
169
|
) {
|
|
171
170
|
if (!context) {
|
|
172
171
|
init();
|
|
173
172
|
}
|
|
174
173
|
if (data instanceof FormattedString || data instanceof LightFormattedString || data.hasOwnProperty('spans')) {
|
|
175
|
-
return com.nativescript.text.Font.stringBuilderFromFormattedString(context, fontPath,
|
|
174
|
+
return com.nativescript.text.Font.stringBuilderFromFormattedString(context, fontPath, parentView?.['fontFamily'] || null, formattedStringToNativeString(data, undefined, this), null);
|
|
176
175
|
}
|
|
177
|
-
const linkColor =
|
|
176
|
+
const linkColor = data.linkColor || parentView?.['linkColor'];
|
|
178
177
|
const aLinkColor = linkColor ? android.graphics.Color.valueOf((linkColor instanceof Color ? linkColor : new Color(linkColor)).android) : null;
|
|
179
|
-
const result = com.nativescript.text.Font.stringBuilderFromHtmlString(context, fontPath,
|
|
178
|
+
const result = com.nativescript.text.Font.stringBuilderFromHtmlString(context, fontPath, data.familyName || parentView?.['fontFamily'] || null, data.text, (data.linkDecoration && data.linkDecoration) !== 'underline' || parentView?.['linkUnderline'] === false, aLinkColor);
|
|
180
179
|
return result;
|
|
181
180
|
}
|
|
182
181
|
export function createSpannable(span, parentView, parent, maxFontSize) {
|
|
183
182
|
const details = spanToNativeString(span, parent, parentView, maxFontSize);
|
|
183
|
+
let ssb;
|
|
184
184
|
if (details) {
|
|
185
|
-
|
|
185
|
+
ssb = com.nativescript.text.Font.stringBuilderFromFormattedString(context, fontPath, parentView?.['fontFamily'] || null, `[${details}]`, span._ssb);
|
|
186
186
|
if (span.tappable) {
|
|
187
187
|
initializeClickableSpan();
|
|
188
188
|
ssb.setSpan(new ClickableSpan(span), 0, length, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
189
189
|
}
|
|
190
190
|
}
|
|
191
|
-
|
|
192
|
-
// if (!text || (span.visibility && span.visibility !== 'visible')) {
|
|
193
|
-
// return null;
|
|
194
|
-
// }
|
|
195
|
-
// const fontSize = span.fontSize;
|
|
196
|
-
// let fontWeight = span.fontWeight;
|
|
197
|
-
// let fontStyle = span.fontStyle;
|
|
198
|
-
// let fontFamily = span.fontFamily;
|
|
199
|
-
// const color = span.color;
|
|
200
|
-
// const textDecorations = span.textDecoration || (parent && parent.textDecoration);
|
|
201
|
-
// const backgroundcolor = span.backgroundColor || (parent && parent.backgroundColor);
|
|
202
|
-
// const verticalTextAlignment = span.verticalTextAlignment;
|
|
203
|
-
// const letterSpacing = span.letterSpacing || (parent && parent.letterSpacing);
|
|
204
|
-
// const lineHeight = span.lineHeight || (parent && parent.lineHeight);
|
|
205
|
-
// const realMaxFontSize = Math.max(maxFontSize, parentView.fontSize || 0);
|
|
206
|
-
// if (typeof text === 'boolean' || typeof text === 'number') {
|
|
207
|
-
// text = text.toString();
|
|
208
|
-
// }
|
|
209
|
-
// const textTransform = span.textTransform || (parent && parent.textTransform);
|
|
210
|
-
// if (textTransform) {
|
|
211
|
-
// text = getTransformedText(text, textTransform);
|
|
212
|
-
// }
|
|
213
|
-
// if (typeof text === 'string') {
|
|
214
|
-
// if (text.indexOf('\n') !== -1) {
|
|
215
|
-
// if (!lineSeparator) {
|
|
216
|
-
// lineSeparator = java.lang.System.getProperty('line.separator');
|
|
217
|
-
// }
|
|
218
|
-
// text = text.replace(/\\n/g, lineSeparator);
|
|
219
|
-
// }
|
|
220
|
-
// }
|
|
221
|
-
// const length = typeof text.length === 'function' ? text.length() : text.length;
|
|
222
|
-
// let ssb = span._ssb;
|
|
223
|
-
// if (!ssb) {
|
|
224
|
-
// span._ssb = ssb = new android.text.SpannableStringBuilder(text);
|
|
225
|
-
// } else {
|
|
226
|
-
// ssb.clear();
|
|
227
|
-
// ssb.clearSpans();
|
|
228
|
-
// ssb.append(text);
|
|
229
|
-
// }
|
|
230
|
-
// if (!Style) {
|
|
231
|
-
// Style = android.text.style;
|
|
232
|
-
// }
|
|
233
|
-
// if (!Spanned) {
|
|
234
|
-
// Spanned = android.text.Spanned;
|
|
235
|
-
// }
|
|
236
|
-
// const bold = isBold(fontWeight);
|
|
237
|
-
// const italic = fontStyle === 'italic';
|
|
238
|
-
// // if (getSDK() < 28) {
|
|
239
|
-
// if (bold && italic) {
|
|
240
|
-
// ssb.setSpan(new Style.StyleSpan(android.graphics.Typeface.BOLD_ITALIC), 0, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
241
|
-
// } else if (bold) {
|
|
242
|
-
// ssb.setSpan(new Style.StyleSpan(android.graphics.Typeface.BOLD), 0, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
243
|
-
// } else if (italic) {
|
|
244
|
-
// ssb.setSpan(new Style.StyleSpan(android.graphics.Typeface.ITALIC), 0, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
245
|
-
// }
|
|
246
|
-
// // }
|
|
247
|
-
// if (fontFamily || fontWeight || fontStyle) {
|
|
248
|
-
// fontFamily = fontFamily || (parent && parent.fontFamily) || (parentView && parentView.fontFamily);
|
|
249
|
-
// fontWeight = fontWeight || (parent && parent.fontWeight) || (parentView && parentView.fontWeight);
|
|
250
|
-
// fontStyle = fontWeight || (parent && parent.fontStyle) || (parentView && parentView.fontStyle);
|
|
251
|
-
// const fontCacheKey = fontFamily + fontWeight + fontStyle;
|
|
252
|
-
// let typeface = typefaceCache[fontCacheKey];
|
|
253
|
-
// if (!typeface) {
|
|
254
|
-
// // for now we dont handle CSpan (from @nativescript-community/ui-canvaslabel)
|
|
255
|
-
// const font = new Font(fontFamily, 10, fontStyle, fontWeight);
|
|
256
|
-
// typeface = typefaceCache[fontCacheKey] = font.getAndroidTypeface();
|
|
257
|
-
// }
|
|
258
|
-
// const typefaceSpan = new com.nativescript.text.CustomTypefaceSpan(fontFamily, typeface);
|
|
259
|
-
// ssb.setSpan(typefaceSpan, 0, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
260
|
-
// }
|
|
261
|
-
// if (verticalTextAlignment && verticalTextAlignment !== 'initial') {
|
|
262
|
-
// ssb.setSpan(new com.nativescript.text.BaselineAdjustedSpan(fontSize, verticalTextAlignment, realMaxFontSize as any), 0, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
263
|
-
// }
|
|
264
|
-
// if (fontSize) {
|
|
265
|
-
// ssb.setSpan(new Style.AbsoluteSizeSpan(fontSize), 0, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
266
|
-
// }
|
|
267
|
-
// if (span.relativeSize) {
|
|
268
|
-
// ssb.setSpan(new Style.RelativeSizeSpan(span.relativeSize), 0, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
269
|
-
// }
|
|
270
|
-
// if (letterSpacing) {
|
|
271
|
-
// ssb.setSpan(new Style.ScaleXSpan((letterSpacing + 1) / 10), 0, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
272
|
-
// }
|
|
273
|
-
// if (lineHeight !== undefined) {
|
|
274
|
-
// ssb.setSpan(new com.nativescript.text.HeightSpan(lineHeight), 0, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
275
|
-
// }
|
|
276
|
-
// if (color) {
|
|
277
|
-
// const ncolor = color instanceof Color ? color : new Color(color);
|
|
278
|
-
// ssb.setSpan(new Style.ForegroundColorSpan(ncolor.android), 0, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
279
|
-
// }
|
|
280
|
-
// if (backgroundcolor) {
|
|
281
|
-
// const color = backgroundcolor instanceof Color ? backgroundcolor : new Color(backgroundcolor);
|
|
282
|
-
// ssb.setSpan(new Style.BackgroundColorSpan(color.android), 0, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
283
|
-
// }
|
|
284
|
-
// if (textDecorations) {
|
|
285
|
-
// const underline = textDecorations.indexOf('underline') !== -1;
|
|
286
|
-
// if (underline) {
|
|
287
|
-
// ssb.setSpan(new Style.UnderlineSpan(), 0, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
288
|
-
// }
|
|
289
|
-
// const strikethrough = textDecorations.indexOf('line-through') !== -1;
|
|
290
|
-
// if (strikethrough) {
|
|
291
|
-
// ssb.setSpan(new Style.StrikethroughSpan(), 0, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
292
|
-
// }
|
|
293
|
-
// }
|
|
294
|
-
// if (span.tappable) {
|
|
295
|
-
// initializeClickableSpan();
|
|
296
|
-
// ssb.setSpan(new ClickableSpan(span), 0, length, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
|
297
|
-
// }
|
|
298
|
-
// return ssb;
|
|
191
|
+
return ssb;
|
|
299
192
|
}
|
|
300
193
|
//# sourceMappingURL=index.android.js.map
|
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,EAAE,SAAS,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC3H,OAAO,EAAE,IAAI,EAAkB,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAE7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,cAAc,gBAAgB,CAAC;AAI/B,SAAS,6BAA6B,CAAC,eAAe
|
|
1
|
+
{"version":3,"file":"index.android.js","sourceRoot":"../src/","sources":["index.android.ts"],"names":[],"mappings":"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"}
|
package/index.ios.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ export declare function createNativeAttributedString(data: {
|
|
|
10
10
|
letterSpacing?: number;
|
|
11
11
|
lineHeight?: number;
|
|
12
12
|
textAlignment?: NSTextAlignment | CoreTypes.TextAlignmentType;
|
|
13
|
-
} | FormattedString | ObjectSpans, parent
|
|
13
|
+
} | FormattedString | ObjectSpans, parent?: any, parentView?: ViewBase, autoFontSizeEnabled?: boolean, fontSizeRatio?: number): any;
|
|
14
14
|
export declare function createSpannable(span: any, index: any, parentView: any, parent?: any, maxFontSize?: any, autoFontSizeEnabled?: boolean, fontSizeRatio?: number): any;
|
|
15
15
|
export declare function createSpannableDetails(span: any, index: any, parentView: any, parent?: any, maxFontSize?: any, autoFontSizeEnabled?: boolean, fontSizeRatio?: number): {
|
|
16
16
|
text: any;
|
package/index.ios.js
CHANGED
|
@@ -37,16 +37,19 @@ function _createNativeAttributedString({ text, familyName = '-apple-system', fon
|
|
|
37
37
|
useCustomLinkTag
|
|
38
38
|
});
|
|
39
39
|
}
|
|
40
|
-
export function createNativeAttributedString(data, parent, autoFontSizeEnabled = false, fontSizeRatio = 1) {
|
|
41
|
-
if (data instanceof FormattedString || data instanceof LightFormattedString || data
|
|
40
|
+
export function createNativeAttributedString(data, parent, parentView, autoFontSizeEnabled = false, fontSizeRatio = 1) {
|
|
41
|
+
if (data instanceof FormattedString || data instanceof LightFormattedString || data['spans']) {
|
|
42
42
|
// const ssb = NSMutableAttributedString.new();
|
|
43
43
|
const maxFontSize = getMaxFontSize(data);
|
|
44
|
-
const _spanRanges = [];
|
|
44
|
+
// const _spanRanges = [];
|
|
45
45
|
// let spanStart = 0;
|
|
46
46
|
let hasLink = false;
|
|
47
47
|
const details = [];
|
|
48
|
+
if (!parent) {
|
|
49
|
+
parent = data;
|
|
50
|
+
}
|
|
48
51
|
data['spans'].forEach((s, index) => {
|
|
49
|
-
const spanDetails = createSpannableDetails(s, index,
|
|
52
|
+
const spanDetails = createSpannableDetails(s, index, parentView, parent, maxFontSize, autoFontSizeEnabled, fontSizeRatio);
|
|
50
53
|
if (spanDetails) {
|
|
51
54
|
details.push(spanDetails);
|
|
52
55
|
if (s._tappable) {
|
|
@@ -54,10 +57,12 @@ export function createNativeAttributedString(data, parent, autoFontSizeEnabled =
|
|
|
54
57
|
}
|
|
55
58
|
}
|
|
56
59
|
});
|
|
57
|
-
if (
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
60
|
+
if (parentView) {
|
|
61
|
+
if (parentView['nativeTextViewProtected']) {
|
|
62
|
+
parentView['nativeTextViewProtected'].selectable = parentView['selectable'] === true || hasLink;
|
|
63
|
+
}
|
|
64
|
+
if (parentView._setTappableState) {
|
|
65
|
+
parentView._setTappableState(hasLink);
|
|
61
66
|
}
|
|
62
67
|
// parent['_spanRanges'] = _spanRanges;
|
|
63
68
|
}
|
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,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC7G,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAe,cAAc,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACrF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,cAAc,gBAAgB,CAAC;AAE/B,MAAM,UAAU,IAAI,KAAI,CAAC;AAEzB,SAAS,6BAA6B,CAAC,EACnC,IAAI,EACJ,UAAU,GAAG,eAAe,EAC5B,QAAQ,EACR,UAAU,EACV,aAAa,EACb,UAAU,EACV,SAAS,EACT,SAAS,EACT,cAAc,EACd,KAAK,EACL,aAAa,EACb,mBAAmB,GAAG,KAAK,EAC3B,aAAa,GAAG,CAAC,EACjB,gBAAgB,EAgBnB;IACG,MAAM,cAAc,GAAG,UAAU;QAC7B,CAAC,CAAC,UAAU;aACL,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;aACjB,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;aACpB,IAAI,CAAC,GAAG,CAAC;QAChB,CAAC,CAAC,IAAI,CAAC;IAEX,0BAA0B;IAC1B,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,SAAS,IAAI,cAAc,EAAE;QAC7B,KAAK,GAAG,SAAS,GAAG,0BAA0B,SAAS,CAAC,CAAC,CAAC,SAAS,SAAS,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,qBAAqB,cAAc,IAAI,MAAM,KAAK,GAAG,UAAU,CAAC;KACtK;IACD,MAAM,UAAU,GACZ,KAAK;QACL,CAAC,KAAK,IAAI,UAAU,IAAI,QAAQ,IAAI,UAAU;YAC1C,CAAC,CAAC,iBAAiB,KAAK,CAAC,CAAC,CAAC,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,cAAc,CAAC,CAAC,CAAC,eAAe,cAAc,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,cAAc,QAAQ,GAAG,aAAa,KAAK,CAAC,CAAC,CAAC,EAAE,GACrK,UAAU,CAAC,CAAC,CAAC,gBAAgB,UAAU,GAAG,CAAC,CAAC,CAAC,EACjD,KAAK,IAAI,SAAS;YACpB,CAAC,CAAC,IAAI,CAAC,CAAC;IAChB,OAAO,WAAW,CAAC,gCAAgC,CAAC;QAChD,UAAU;QACV,QAAQ;QACR,UAAU;QACV,aAAa;QACb,UAAU;QACV,SAAS;QACT,SAAS;QACT,cAAc;QACd,KAAK;QACL,aAAa;QACb,mBAAmB;QACnB,aAAa;QACb,gBAAgB;KACnB,CAAC,CAAC;AACP,CAAC;AAID,MAAM,UAAU,4BAA4B,CACxC,IAWiB,EACjB,
|
|
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.21",
|
|
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": "fb2b7a4218c4391bcb02aca01c0512962ae5f0db"
|
|
41
41
|
}
|
|
@@ -121,7 +121,7 @@ class NSTextUtils: NSObject {
|
|
|
121
121
|
let fullRange:NSRange = NSRange(location: 0, length: attrText.length)
|
|
122
122
|
let linkColor:UIColor! = data.object(forKey:"linkColor") as? UIColor
|
|
123
123
|
let useCustomLinkTag:NSNumber! = data.object(forKey:"useCustomLinkTag") as? NSNumber
|
|
124
|
-
if (linkColor != nil) || useCustomLinkTag.boolValue {
|
|
124
|
+
if (linkColor != nil) || (useCustomLinkTag != nil && useCustomLinkTag.boolValue) {
|
|
125
125
|
// if linkColor is used for non UITextView we cant use NSLinkAttributeName
|
|
126
126
|
// as it will force the rendered color
|
|
127
127
|
attrText.enumerateAttribute(NSAttributedString.Key.link, in: fullRange) { value, range, stop in
|
|
@@ -285,7 +285,8 @@ class NSTextUtils: NSObject {
|
|
|
285
285
|
}
|
|
286
286
|
if text is NSAttributedString {
|
|
287
287
|
let resultSpan:NSMutableAttributedString! = NSMutableAttributedString(attributedString:text as! NSAttributedString)
|
|
288
|
-
resultSpan.setAttributes(attributes as? [NSAttributedString.Key : Any], range:NSRange(location: 0, length: (text as! NSAttributedString).length))
|
|
288
|
+
resultSpan.setAttributes(attributes as? [NSAttributedString.Key : Any], range:NSRange(location: 0, length: (text as! NSAttributedString).length))
|
|
289
|
+
result.append(resultSpan)
|
|
289
290
|
}
|
|
290
291
|
else if text is String {
|
|
291
292
|
result.append(NSMutableAttributedString(string:text as! String, attributes:attributes as? [NSAttributedString.Key : Any]))
|