Skip to content

Commit f991000

Browse files
author
farfromrefug
committed
fix(android): regression fix
1 parent 97c5aad commit f991000

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

Diff for: src/label.android.ts

+6-8
Original file line numberDiff line numberDiff line change
@@ -470,20 +470,18 @@ export class Label extends LabelBase {
470470
if (this.html) {
471471
transformedText = this.createHTMLString();
472472
textProperty.nativeValueChange(this, this.html === null || this.html === undefined ? '' : this.html);
473-
} else if (this.text) {
474-
if (this.text instanceof java.lang.CharSequence || this.text instanceof android.text.Spanned) {
475-
transformedText = this.text;
476-
} else {
477-
const text = this.text;
478-
const stringValue = text === null || text === undefined ? '' : text.toString();
479-
transformedText = getTransformedText(stringValue, this.textTransform);
480-
}
481473
} else if (this.formattedText) {
482474
transformedText = this.createFormattedTextNative(this.formattedText);
483475
textProperty.nativeValueChange(
484476
this,
485477
this.formattedText === null || this.formattedText === undefined ? '' : this.formattedText.toString()
486478
);
479+
} else if (this.text instanceof java.lang.CharSequence || this.text instanceof android.text.Spanned) {
480+
transformedText = this.text;
481+
} else {
482+
const text = this.text;
483+
const stringValue = text === null || text === undefined ? '' : text.toString();
484+
transformedText = getTransformedText(stringValue, this.textTransform);
487485
}
488486
this.nativeTextViewProtected.setLabelText(transformedText);
489487
}

0 commit comments

Comments
 (0)