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.26](https://github.com/Akylas/nativescript-label/compare/v1.3.25...v1.3.26) (2024-03-18)
+
+### Bug Fixes
+
+-   **ios:** formattedtext not working with button ([707ac80](https://github.com/Akylas/nativescript-label/commit/707ac80f719927c0964778d3753e9ed116c0c917))
+
+## [1.3.25](https://github.com/Akylas/nativescript-label/compare/v1.3.24...v1.3.25) (2024-03-06)
+
+### Bug Fixes
+
+-   **ios:** multiple fixes for autoFonSize ([f41473e](https://github.com/Akylas/nativescript-label/commit/f41473e7429606017beb427fd9fe70e06d1a082f))
+
 ## [1.3.24](https://github.com/nativescript-community/ui-label/compare/v1.3.23...v1.3.24) (2024-03-05)
 
 ### Bug Fixes

demo-vue/app/views/Home.vue

@@ -12,6 +12,11 @@
     <HTMLLabel fontSize="16" fontWeight="bold" text="test"/>
     <Label  fontSize="16" fontWeight="bold" text="test"/>
     <Label text="test" fontWeight="bold" fontSize="16"/>
+    <Button backgroundColor="red">
+            <FormattedString>
+              <Span text="hello world"></Span>
+            </FormattedString>
+          </Button>
     </StackLayout>
             <ListView ref="listView" itemRowHeight="80" for="example in examples" separatorColor="transparent" @itemTap="goToExample" row="1">
                 <v-template>

lerna.json

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

plugin/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.26](https://github.com/nativescript-community/ui-label/compare/v1.3.25...v1.3.26) (2024-03-18)
+
+### Bug Fixes
+
+-   **ios:** formattedtext not working with button ([707ac80](https://github.com/nativescript-community/ui-label/commit/707ac80f719927c0964778d3753e9ed116c0c917))
+
+## [1.3.25](https://github.com/nativescript-community/ui-label/compare/v1.3.24...v1.3.25) (2024-03-06)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
 ## [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

plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-label",
-    "version": "1.3.24",
+    "version": "1.3.26",
     "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,
@@ -32,7 +32,7 @@
     "license": "Apache-2.0",
     "readmeFilename": "README.md",
     "dependencies": {
-        "@nativescript-community/text": "^1.5.45"
+        "@nativescript-community/text": "^1.5.47"
     },
     "gitHead": "a08eb50756c9a5d16fc8aa6ff7fba0051c71d1e0"
 }

src/label.ios.ts

@@ -368,15 +368,16 @@ export class Label extends LabelBase {
         return inset;
     }
 
-    _requestLayoutOnTextChanged(): void {
+    _requestLayoutOnTextChanged() {
         if (this.mFixedSize === FixedSize.BOTH) {
-            return;
+            return false;
         }
         if (this.mFixedSize === FixedSize.WIDTH && !this.textWrap && this.getMeasuredHeight() > 0) {
             // Single line label with fixed width will skip request layout on text change.
-            return;
+            return false;
         }
         super._requestLayoutOnTextChanged();
+        return true;
     }
 
     private _measureNativeView(
@@ -414,6 +415,11 @@ export class Label extends LabelBase {
 
             const height = Utils.layout.getMeasureSpecSize(heightMeasureSpec);
             const heightMode = Utils.layout.getMeasureSpecMode(heightMeasureSpec);
+
+            this.mFixedSize =
+                (widthMode === Utils.layout.EXACTLY ? FixedSize.WIDTH : FixedSize.NONE) |
+                (heightMode === Utils.layout.EXACTLY ? FixedSize.HEIGHT : FixedSize.NONE);
+
             let resetFont;
             // reset insent or it will taken into account for measurement
             if (this.autoFontSize) {
@@ -727,11 +733,10 @@ export class Label extends LabelBase {
         }
         // no need to update veticalAlignment or autoSize as we ask for a layout
         // will be done in onMeasure and onLayout
-        // this.updateVerticalAlignment();
-        // if (this.autoFontSize) {
-        //     this.updateAutoFontSize({ textView: this.nativeTextViewProtected, force: true });
-        // }
-        this._requestLayoutOnTextChanged();
+
+        if (!this._requestLayoutOnTextChanged() && this.autoFontSize) {
+            this.updateAutoFontSize({ textView: this.nativeTextViewProtected, force: true });
+        }
     }
 
     setTextDecorationAndTransform() {
@@ -917,8 +922,8 @@ export class Label extends LabelBase {
                 return currentFont;
             }
             const textViewSize = NSLabelUtils.insetWithRectUIEdgeInsets(textView.bounds, textView.padding).size;
-            const fixedWidth = Math.floor(width !== undefined ? width : textViewSize.width);
-            const fixedHeight = Math.floor(height !== undefined ? height : textViewSize.height);
+            const fixedWidth = Math.ceil(width !== undefined ? width : textViewSize.width);
+            const fixedHeight = Math.ceil(height !== undefined ? height : textViewSize.height);
             if (fixedWidth === 0 || fixedHeight === 0) {
                 return currentFont;
             }
@@ -992,8 +997,9 @@ export class Label extends LabelBase {
             if (!onlyMeasure) {
                 this.fontSizeRatio = expectFont.pointSize / fontSize;
             }
-
-            this.updateVerticalAlignment();
+            if (!onlyMeasure) {
+                this.updateVerticalAlignment();
+            }
         }
         return currentFont;
     }