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

Author: farfromrefug

CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.24](https://github.com/nativescript-community/ui-label/compare/v1.2.23...v1.2.24) (2023-03-13)
+
+### Bug Fixes
+
+-   update auto font size on min/max fontSize change ([38d8356](https://github.com/nativescript-community/ui-label/commit/38d8356f63f60a795100e295e4e560de6b526ee7))
+
 ## [1.2.23](https://github.com/Akylas/nativescript-label/compare/v1.2.22...v1.2.23) (2023-02-25)
 
 ### Bug Fixes

lerna.json

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

plugin/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.24](https://github.com/nativescript-community/ui-label/compare/v1.2.23...v1.2.24) (2023-03-13)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
 ## [1.2.23](https://github.com/nativescript-community/ui-label/compare/v1.2.22...v1.2.23) (2023-02-25)
 
 **Note:** Version bump only for package @nativescript-community/ui-label

plugin/package.json

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

src/label.android.ts

@@ -44,7 +44,14 @@ import {
 import { maxLinesProperty } from '@nativescript/core/ui/text-base/text-base-common';
 import lazy from '@nativescript/core/utils/lazy';
 import { Label as LabelViewDefinition, LineBreak } from './label';
-import { autoFontSizeProperty, lineBreakProperty, selectableProperty, textShadowProperty } from './label-common';
+import {
+    autoFontSizeProperty,
+    lineBreakProperty,
+    maxFontSizeProperty,
+    minFontSizeProperty,
+    selectableProperty,
+    textShadowProperty
+} from './label-common';
 
 export { createNativeAttributedString, enableIOSDTCoreText } from '@nativescript-community/text';
 export * from './label-common';
@@ -537,6 +544,16 @@ export class Label extends LabelBase {
             android.util.TypedValue.COMPLEX_UNIT_DIP
         );
     }
+    [maxFontSizeProperty.setNative](value) {
+        if (this.mAutoFontSize) {
+            this.enableAutoSize();
+        }
+    }
+    [minFontSizeProperty.setNative](value) {
+        if (this.mAutoFontSize) {
+            this.enableAutoSize();
+        }
+    }
     private disableAutoSize() {
         androidx.core.widget.TextViewCompat.setAutoSizeTextTypeWithDefaults(
             this.nativeView,

src/label.ios.ts

@@ -29,6 +29,8 @@ import {
     lineBreakProperty,
     linkColorProperty,
     linkUnderlineProperty,
+    maxFontSizeProperty,
+    minFontSizeProperty,
     needFormattedStringComputation,
     selectableProperty,
     textShadowProperty
@@ -588,6 +590,17 @@ export class Label extends LabelBase {
             this._setNativeText();
         }
     }
+
+    [maxFontSizeProperty.setNative]() {
+        if (this.autoFontSize) {
+            this.updateAutoFontSize({ textView: this.nativeTextViewProtected, force: true });
+        }
+    }
+    [minFontSizeProperty.setNative]() {
+        if (this.autoFontSize) {
+            this.updateAutoFontSize({ textView: this.nativeTextViewProtected, force: true });
+        }
+    }
     _setSpannablesFontSizeWithRatio(ratio) {
         const nativeView = this.nativeTextViewProtected;
         const toChange: NSMutableAttributedString =