fix: support latest text plugin

Author: farfromrefug

package.json

@@ -56,7 +56,7 @@
         "@angular/router": "~10.1.0",
         "@commitlint/cli": "^9.1.2",
         "@commitlint/config-conventional": "^9.1.2",
-        "@nativescript-community/text": "^1.3.2",
+        "@nativescript-community/text": "^1.3.4",
         "@nativescript/angular": "10.1.0",
         "@nativescript/core": "7.0.0",
         "@nativescript/types-android": "7.0.2",
@@ -83,4 +83,4 @@
             "@commitlint/config-conventional"
         ]
     }
-}
+}

plugin/package.json

@@ -28,6 +28,6 @@
     "homepage": "https://github.com/nativescript-community/ui-label",
     "readmeFilename": "README.md",
     "dependencies": {
-        "@nativescript-community/text": "^1.3.2"
+        "@nativescript-community/text": "^1.3.4"
     }
-}
+}

src/label-common.ts

@@ -1,56 +1,46 @@
 import {
     CSSType,
+    ChangedData,
     Color,
     CssProperty,
     FormattedString,
     InheritedCssProperty,
     Observable,
+    ObservableArray,
     Property,
+    PropertyChangeData,
     Span,
     Style,
     Label as TNLabel,
     booleanConverter,
     makeParser,
     makeValidator,
 } from '@nativescript/core';
-import { dip } from '@nativescript/core/ui/core/view';
-import { TextAlignment } from '@nativescript/core/ui/text-base';
+import { View, dip } from '@nativescript/core/ui/core/view';
+import { TextAlignment, TextDecoration } from '@nativescript/core/ui/text-base';
 import { layout } from '@nativescript/core/utils/utils';
 import { Label as LabelViewDefinition, LineBreak, TextShadow } from './label';
-import { VerticalTextAlignment, cssProperty } from '@nativescript-community/text';
+import { LightFormattedString, VerticalTextAlignment, cssProperty } from '@nativescript-community/text';
+import { FontStyle, FontWeight } from '@nativescript/core/ui/styling/font';
 
 declare module '@nativescript/core/ui/text-base/formatted-string' {
     interface FormattedString {
         addPropertyChangeHandler(span: Span);
         removePropertyChangeHandler(span: Span);
     }
 }
-// FormattedString.prototype.onPropertyChange = function(data: PropertyChangeData) {
-//     this.notifyPropertyChange(data.propertyName, this);
-// }
-FormattedString.prototype.addPropertyChangeHandler = function (span: Span) {
-    span.on(Observable.propertyChangeEvent, this.onPropertyChange, this);
-    // const style = span.style;
-    // style.on('fontFamilyChange', this.onPropertyChange, this);
-    // style.on('fontSizeChange', this.onPropertyChange, this);
-    // style.on('fontStyleChange', this.onPropertyChange, this);
-    // style.on('fontWeightChange', this.onPropertyChange, this);
-    // style.on('textDecorationChange', this.onPropertyChange, this);
-    // style.on('colorChange', this.onPropertyChange, this);
-};
-FormattedString.prototype.removePropertyChangeHandler = function (span: Span) {
-    span.off(Observable.propertyChangeEvent, this.onPropertyChange, this);
-    // const style = span.style;
-    // style.off('fontFamilyChange', this.onPropertyChange, this);
-    // style.off('fontSizeChange', this.onPropertyChange, this);
-    // style.off('fontStyleChange', this.onPropertyChange, this);
-    // style.off('fontWeightChange', this.onPropertyChange, this);
-    // style.off('textDecorationChange', this.onPropertyChange, this);
-    // style.off('colorChange', this.onPropertyChange, this);
-};
-// FormattedString.prototype.eachChild = function(callback: (child: ViewBase) => boolean): void {
-//     this.spans.forEach((v, i, arr) => callback(v));
+
+const CHILD_SPAN = 'Span';
+const CHILD_FORMATTED_TEXT = 'formattedText';
+const CHILD_FORMATTED_STRING = 'FormattedString';
+// FormattedString.prototype.addPropertyChangeHandler = function (span: Span) {
+//     span.on(Observable.propertyChangeEvent, this.onPropertyChange, this);
 // };
+// FormattedString.prototype.removePropertyChangeHandler = function (span: Span) {
+//     span.off(Observable.propertyChangeEvent, this.onPropertyChange, this);
+// };
+
+
 
 export const needFormattedStringComputation = function (
     target: any,
@@ -74,6 +64,8 @@ export abstract class LabelBase extends TNLabel implements LabelViewDefinition {
     @cssProperty verticalTextAlignment: VerticalTextAlignment;
     @cssProperty lineBreak: LineBreak;
     html: string;
+    //@ts-ignore
+    formattedText: FormattedString;
 
     _canChangeText = true;
     _needFormattedStringComputation = false;

src/label.android.ts

@@ -1,7 +1,9 @@
 import {
+    LightFormattedString,
     VerticalTextAlignment,
     createNativeAttributedString,
     cssProperty,
+    overrideSpanAndFormattedStringEnabled,
     verticalTextAlignmentProperty,
 } from '@nativescript-community/text';
 import {
@@ -128,8 +130,9 @@ abstract class LabelBase extends View implements LabelViewDefinition {
 
     public _isSingleLine: boolean;
     public text: string;
-    public formattedText: FormattedString;
     public spannableStringBuilder: globalAndroid.text.SpannableStringBuilder;
+    //@ts-ignore
+    formattedText: FormattedString;
 
     get nativeTextViewProtected() {
         return this.nativeViewProtected;
@@ -190,28 +193,35 @@ abstract class LabelBase extends View implements LabelViewDefinition {
     public _addChildFromBuilder(name: string, value: any): void {
         if (name === CHILD_SPAN) {
             if (!this.formattedText) {
-                const formattedText = new FormattedString();
+                let formattedText: FormattedString;
+                if (overrideSpanAndFormattedStringEnabled) {
+                    formattedText = new LightFormattedString() as any;
+                } else {
+                    formattedText = new FormattedString();
+                }
                 formattedText.spans.push(value);
                 this.formattedText = formattedText;
+                (formattedText as any).parent = this;
             } else {
                 this.formattedText.spans.push(value);
             }
         } else if (name === CHILD_FORMATTED_TEXT || name === CHILD_FORMATTED_STRING) {
             this.formattedText = value;
+            value.parent = this;
         }
     }
 
     _requestLayoutOnTextChanged(): void {
         this.requestLayout();
     }
 
-    // without this spans class wont work :s
-    eachChild(callback: (child: ViewBase) => boolean): void {
-        const text = this.formattedText;
-        if (text) {
-            callback(text);
-        }
-    }
+    // // without this spans class wont work :s
+    // eachChild(callback: (child: ViewBase) => boolean): void {
+    //     const text = this.formattedText;
+    //     if (text) {
+    //         callback(text);
+    //     }
+    // }
 
     abstract _setNativeText(reset?: boolean): void;
 
@@ -446,7 +456,7 @@ export class Label extends LabelBase {
     @profile
     createSpannableStringBuilder() {
         const formattedText = this.formattedText;
-        const result = createNativeAttributedString(formattedText);
+        const result = createNativeAttributedString(formattedText as any);
         let indexSearch = 0;
         let str: string ;
         formattedText.spans.forEach(s=>{
@@ -578,16 +588,20 @@ formattedTextProperty.register(Label);
 function onFormattedTextPropertyChanged(textBase: Label, oldValue: FormattedString, newValue: FormattedString) {
     if (oldValue) {
         oldValue.off(Observable.propertyChangeEvent, textBase._onFormattedTextContentsChanged, textBase);
-        textBase._removeView(oldValue);
+        if (oldValue instanceof FormattedString){
+            textBase._removeView(oldValue);
+        }
     }
 
     if (newValue) {
-        const oldParent = newValue.parent;
         // In case formattedString is attached to new TextBase
-        if (oldParent) {
-            oldParent._removeView(newValue);
+        if (newValue instanceof FormattedString){
+            const oldParent = newValue.parent;
+            if (oldParent) {
+                oldParent._removeView(newValue);
+            }
+            textBase._addView(newValue);
         }
-        textBase._addView(newValue);
         newValue.on(Observable.propertyChangeEvent, textBase._onFormattedTextContentsChanged, textBase);
     }
 }