Merge remote-tracking branch 'origin/master'

Author: farfromrefug

CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.40](https://github.com/nativescript-community/ui-label/compare/v1.3.39...v1.3.40) (2025-09-29)
+
+### Bug Fixes
+
+* **ios:** another edge case for text as NSAttributedString ([691d460](https://github.com/nativescript-community/ui-label/commit/691d4607b4aca7a4ad83064976d974ed301f8cdc))
+
+## [1.3.39](https://github.com/nativescript-community/ui-label/compare/v1.3.38...v1.3.39) (2025-09-29)
+
+### Bug Fixes
+
+* **ios:** autoFontSize working with NSAttributedString in text property ([2aadecf](https://github.com/nativescript-community/ui-label/commit/2aadecffedc2efd4bad14e8ad282250c69bd9c63))
+
 ## [1.3.38](https://github.com/nativescript-community/ui-label/compare/v1.3.34...v1.3.38) (2025-09-26)
 
 ### Bug Fixes

demo-vue

@@ -1,5 +1,5 @@
 {
-    "version": "1.3.38",
+    "version": "1.3.40",
     "$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json",
     "packages": [
         "packages/*"

lerna.json

@@ -49,10 +49,10 @@
     "homepage": "https://github.com/nativescript-community/ui-label",
     "readmeFilename": "README.md",
     "dependencies": {
-        "@nativescript-community/plugin-seed-tools": "file:tools"
+        "@nativescript-community/plugin-seed-tools": "portal:tools"
     },
     "devDependencies": {
-        "@nativescript-community/text": "^1.6.8"
+        "@nativescript-community/text": "^1.6.15"
     },
     "bootstrapper": "nativescript-plugin-seed",
     "commitlint": {

package.json

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.40](https://github.com/nativescript-community/ui-label/compare/v1.3.39...v1.3.40) (2025-09-29)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+## [1.3.39](https://github.com/nativescript-community/ui-label/compare/v1.3.38...v1.3.39) (2025-09-29)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
 ## [1.3.38](https://github.com/nativescript-community/ui-label/compare/v1.3.34...v1.3.38) (2025-09-26)
 
 **Note:** Version bump only for package @nativescript-community/ui-label

packages/label/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-label",
-    "version": "1.3.38",
+    "version": "1.3.40",
     "description": "Alternative to the built-in NativeScript Label but with better performance and additional features such as HTML rendering and more.",
     "main": "./index",
     "sideEffects": false,
@@ -42,7 +42,7 @@
     "license": "Apache-2.0",
     "readmeFilename": "README.md",
     "dependencies": {
-        "@nativescript-community/text": "^1.6.8"
+        "@nativescript-community/text": "^1.6.15"
     },
     "gitHead": "a08eb50756c9a5d16fc8aa6ff7fba0051c71d1e0"
 }

packages/label/package.json

@@ -252,6 +252,10 @@ export class Label extends LabelBase {
         return result.height;
     }
 
+    useNSAttributedString() {
+        return this.formattedText || this.html || (this.text instanceof NSAttributedString)
+    }
+
     updateVerticalAlignment(applyVerticalTextAlignment = true) {
         const nativeView = this.nativeTextViewProtected;
         if (!this.mCanUpdateVerticalAlignment) {
@@ -407,7 +411,7 @@ export class Label extends LabelBase {
             // if (this.isUsingNSTextView) {
             // desiredSize.height += nativeView.textContainerInset.top + nativeView.textContainerInset.bottom;
             // }
-            if (resetFont && !this.formattedText && !this.html) {
+            if (resetFont && this.useNSAttributedString()) {
                 nativeView.font = resetFont;
             }
 
@@ -653,7 +657,7 @@ export class Label extends LabelBase {
         const nativeView = this.nativeTextViewProtected;
         const newFont: UIFont = value instanceof Font ? value.getUIFont(nativeView.font) : value;
         nativeView.font = newFont;
-        if (this.formattedText || this.html) {
+        if (this.useNSAttributedString()) {
             this._setNativeText();
         }
     }
@@ -877,9 +881,9 @@ export class Label extends LabelBase {
             let expectSize;
 
             const stepSize = this.autoFontSizeStep || 2;
-
+            const changeFont = !this.useNSAttributedString();
             const updateFontSize = (font) => {
-                if (this.formattedText || this.html) {
+                if (!changeFont) {
                     NSLabelUtils.updateFontRatioRatio(textView, font.pointSize / fontSize);
                 } else {
                     textView.font = font;
@@ -905,7 +909,7 @@ export class Label extends LabelBase {
                         expectFont = newFont;
                     } else {
                         expectFont = newFont;
-                        if (!this.formattedText && !this.html) {
+                        if (changeFont) {
                             textView.font = newFont;
                         }
                         break;