fix(android): now the properties order is html/text/formattedString(c…

…hildren)
nativescript-community · Sep 18, 2024 · f6fadd2 · f6fadd2
1 parent 09063b5
commit f6fadd2
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/label.android.ts b/src/label.android.ts
@@ -470,18 +470,20 @@ export class Label extends LabelBase {
         if (this.html) {
             transformedText = this.createHTMLString();
             textProperty.nativeValueChange(this, this.html === null || this.html === undefined ? '' : this.html);
+        } else if (this.text) {
+            if (this.text instanceof java.lang.CharSequence || this.text instanceof android.text.Spanned) {
+                transformedText = this.text;
+            } else {
+                const text = this.text;
+                const stringValue = text === null || text === undefined ? '' : text.toString();
+                transformedText = getTransformedText(stringValue, this.textTransform);
+            }
         } 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) {
-            transformedText = this.text;
-        } else {
-            const text = this.text;
-            const stringValue = text === null || text === undefined ? '' : text.toString();
-            transformedText = getTransformedText(stringValue, this.textTransform);
         }
         this.nativeTextViewProtected.setLabelText(transformedText);
     }