fix: text/html can now be native NSAttributedString or Spannable

Author: farfromrefug

src/label/index-common.ts

@@ -31,8 +31,9 @@ export abstract class LabelBase extends TNLabel implements LabelViewDefinition {
     @cssProperty linkColor: Color;
     @cssProperty linkUnderline: boolean;
     @cssProperty selectable: boolean;
-    html: string;
-    //@ts-ignore
+
+    html: string | NSAttributedString;
+
     formattedText: FormattedString;
 
     @cssProperty autoFontSize: boolean;

src/label/index.android.ts

@@ -427,13 +427,15 @@ export class Label extends LabelBase {
             return;
         }
         let transformedText: any = null;
+        const constructorName = (this.html || this.text)?.constructor?.name;
+        const nativeData = constructorName === 'java.lang.CharSequence' || constructorName === 'android.text.Spanned' || constructorName === 'android.text.SpannableStringBuilder';
         if (this.html) {
-            transformedText = this.createHTMLString();
+            transformedText = nativeData ? this.html : this.createHTMLString();
             textProperty.nativeValueChange(this, this.html === null || this.html === undefined ? '' : this.html);
         } else if (this.formattedText) {
             transformedText = this.createFormattedTextNative(this.formattedText);
             textProperty.nativeValueChange(this, this.formattedText === null || this.formattedText === undefined ? '' : this.formattedText.toString());
-        } else if (this.text instanceof java.lang.CharSequence || this.text instanceof android.text.Spanned) {
+        } else if (nativeData) {
             transformedText = this.text;
         } else {
             const text = this.text;

src/label/index.d.ts

@@ -21,9 +21,14 @@ export declare class Label extends TNLabel {
     ios: any /* UITextView */;
 
     /**
-     * Gets or sets html string for the HtmlView.
+     * Gets or sets html string for the Label.
      */
-    html: string;
+    html: any; // can be string but also native NSAttributedString or android spannable
+
+    /**
+     * Gets or sets string for the Label.
+     */
+    text: any; // can be string but also native NSAttributedString or android spannable
 
     verticalTextAlignment: VerticalTextAlignment;
     lineBreak: LineBreak;

src/label/index.ios.ts

@@ -160,7 +160,7 @@ export class Label extends LabelBase {
     private mObserver: LabelObserverClass;
     nativeViewProtected: NSLabel | NSTextView;
     nativeTextViewProtected: NSLabel | NSTextView;
-    attributedString: NSMutableAttributedString;
+    attributedString: NSAttributedString;
     private mDelegate: LabelNSTextViewDelegateImpl;
     private mFixedSize: FixedSize;
     static DTCORETEXT_INIT = false;
@@ -502,6 +502,8 @@ export class Label extends LabelBase {
                 (nativeView as NSTextView).selectable = this.selectable === true;
             }
             this.attributedString = null;
+        } else if (this.html instanceof NSAttributedString) {
+            this.attributedString = this.html;
         } else {
             const font = nativeView.font;
             const style = this.style;