Merge branch 'master' of github.com:Akylas/nativescript-label

Author: farfromrefug

CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.24](https://github.com/nativescript-community/ui-label/compare/v1.3.23...v1.3.24) (2024-03-05)
+
+### Bug Fixes
+
+-   **android:** regression fix ([07ec72b](https://github.com/nativescript-community/ui-label/commit/07ec72b6ef92d49ced93c70cd38dcd5c9a30f6bc))
+
+## [1.3.23](https://github.com/nativescript-community/ui-label/compare/v1.3.22...v1.3.23) (2024-03-05)
+
+### Bug Fixes
+
+-   **android:** prevent enableAutoSize to be called before min and max font size are set ([b1cdfd7](https://github.com/nativescript-community/ui-label/commit/b1cdfd738a1ba9c647f1d1ffff9c6ea12cc5b908))
+
+## [1.3.22](https://github.com/nativescript-community/ui-label/compare/v1.3.21...v1.3.22) (2024-02-22)
+
+### Bug Fixes
+
+-   **android:** wrong line height rendering on android < 28 ([4276ad6](https://github.com/nativescript-community/ui-label/commit/4276ad6494271f924ae5eafedfaa6f3e65607d95))
+
 ## [1.3.21](https://github.com/Akylas/nativescript-label/compare/v1.3.20...v1.3.21) (2024-02-15)
 
 ### Bug Fixes

lerna.json

@@ -1,6 +1,6 @@
 {
     "packages": ["plugin"],
-    "version": "1.3.21",
+    "version": "1.3.24",
     "command": {
         "publish": {
             "conventionalCommits": true

plugin/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.24](https://github.com/nativescript-community/ui-label/compare/v1.3.23...v1.3.24) (2024-03-05)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+## [1.3.23](https://github.com/nativescript-community/ui-label/compare/v1.3.22...v1.3.23) (2024-03-05)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+## [1.3.22](https://github.com/nativescript-community/ui-label/compare/v1.3.21...v1.3.22) (2024-02-22)
+
+### Bug Fixes
+
+-   **android:** wrong line height rendering on android < 28 ([4276ad6](https://github.com/nativescript-community/ui-label/commit/4276ad6494271f924ae5eafedfaa6f3e65607d95))
+
 ## [1.3.21](https://github.com/nativescript-community/ui-label/compare/v1.3.20...v1.3.21) (2024-02-15)
 
 **Note:** Version bump only for package @nativescript-community/ui-label

plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-label",
-    "version": "1.3.21",
+    "version": "1.3.24",
     "description": "Alternative to the built-in NativeScript Label but with better performance and additional features such as HTML rendering and more.",
     "main": "./label",
     "sideEffects": false,

plugin/platforms/android/java/com/nativescript/label/NSLabel.java

@@ -196,7 +196,7 @@ public void setLineHeight(int value) {
     @Override
     public void setTypeface(Typeface value) {
         super.setTypeface(value);
-        if (Build.VERSION.SDK_INT < 28 && lineHeight >= 0) {
+        if (Build.VERSION.SDK_INT < 28 && lineHeight > 0) {
             float fontHeight = getPaint().getFontMetrics(null);
             setLineSpacing(lineHeight - fontHeight, 1.0f);
         }

src/label.android.ts

@@ -127,13 +127,14 @@ abstract class LabelBase extends View implements LabelViewDefinition {
     @cssProperty paddingLeft: CoreTypes.LengthType;
 
     // for now code is duplicated as Android version is a full rewrite
-    mCanChangeText = true;
+    mInResumeNativeUpdates = false;
     mNeedSetText = false;
+    mNeedSetAutoSize = false;
     public onResumeNativeUpdates(): void {
         // {N} suspends properties update on `_suspendNativeUpdates`. So we only need to do this in onResumeNativeUpdates
-        this.mCanChangeText = false;
+        this.mInResumeNativeUpdates = true;
         super.onResumeNativeUpdates();
-        this.mCanChangeText = true;
+        this.mInResumeNativeUpdates = false;
         if (this.mNeedSetText) {
             this.mNeedSetText = false;
             this._setNativeText();
@@ -355,21 +356,43 @@ export class Label extends LabelBase {
             Length.toDevicePixels(value, 0) + Length.toDevicePixels(this.style.borderLeftWidth, 0)
         );
     }
+
+    // for now code is duplicated as Android version is a full rewrite
+    mNeedSetAutoSize = false;
+    public onResumeNativeUpdates(): void {
+        super.onResumeNativeUpdates();
+        if (this.mNeedSetAutoSize) {
+            this.mNeedSetAutoSize = false;
+            if (this.autoFontSize) {
+                this.enableAutoSize();
+            } else {
+                this.disableAutoSize();
+            }
+        }
+    }
     [maxFontSizeProperty.setNative](value) {
-        if (this.mAutoFontSize) {
+        if (this.autoFontSize) {
             this.enableAutoSize();
         }
     }
     [minFontSizeProperty.setNative](value) {
-        if (this.mAutoFontSize) {
+        if (this.autoFontSize) {
             this.enableAutoSize();
         }
     }
 
     protected enableAutoSize() {
+        if (this.mInResumeNativeUpdates) {
+            this.mNeedSetAutoSize = true;
+            return;
+        }
         this.nativeViewProtected.enableAutoSize(this.minFontSize || 10, this.maxFontSize || 200, this.autoFontSizeStep || 1);
     }
     protected disableAutoSize() {
+        if (this.mInResumeNativeUpdates) {
+            this.mNeedSetAutoSize = true;
+            return;
+        }
         this.nativeViewProtected.disableAutoSize();
     }
     [autoFontSizeProperty.setNative](value: boolean) {
@@ -434,7 +457,7 @@ export class Label extends LabelBase {
 
     @profile
     _setNativeText(reset: boolean = false): void {
-        if (!this.mCanChangeText) {
+        if (this.mInResumeNativeUpdates) {
             this.mNeedSetText = true;
             return;
         }