@nativescript-community/ui-label 1.2.4 → 1.2.7

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.7](https://github.com/nativescript-community/ui-label/compare/v1.2.6...v1.2.7) (2022-04-05)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+
+
+
+
+## [1.2.6](https://github.com/nativescript-community/ui-label/compare/v1.2.5...v1.2.6) (2022-02-09)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+
+
+
+
+## [1.2.5](https://github.com/nativescript-community/ui-label/compare/v1.2.4...v1.2.5) (2022-02-09)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+
+
+
+
 ## [1.2.4](https://github.com/nativescript-community/ui-label/compare/v1.2.3...v1.2.4) (2022-01-14)
 
 

package/label.ios.d.ts

@@ -39,5 +39,12 @@ export declare class Label extends LabelBase {
     setFormattedTextDecorationAndTransform(): void;
     fontSizeRatio: number;
     _lastAutoSizeKey: string;
-    textViewDidChange(textView: UITextView, width?: any, height?: any, force?: boolean): void;
+    updateAutoFontSize({ textView, width, height, force, onlyMeasure }: {
+        textView: UITextView;
+        width?: any;
+        height?: any;
+        force?: boolean;
+        onlyMeasure?: boolean;
+    }): any;
+    textViewDidChange(textView: UITextView): void;
 }

package/label.ios.js

@@ -79,19 +79,19 @@ var LabelUITextViewDelegateImpl = /** @class */ (function (_super) {
     LabelUITextViewDelegateImpl.prototype.textViewDidChange = function (textView) {
         var owner = this._owner.get();
         if (owner) {
-            owner.textViewDidChange(textView, undefined, undefined, true);
+            owner.textViewDidChange(textView);
         }
     };
     LabelUITextViewDelegateImpl.ObjCProtocols = [UITextViewDelegate];
     return LabelUITextViewDelegateImpl;
 }(NSObject));
-var ObserverClass = /** @class */ (function (_super) {
-    __extends(ObserverClass, _super);
-    function ObserverClass() {
+var LabelObserverClass = /** @class */ (function (_super) {
+    __extends(LabelObserverClass, _super);
+    function LabelObserverClass() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     // NOTE: Refactor this - use Typescript property instead of strings....
-    ObserverClass.prototype.observeValueForKeyPathOfObjectChangeContext = function (path, tv) {
+    LabelObserverClass.prototype.observeValueForKeyPathOfObjectChangeContext = function (path, tv) {
         if (path === 'contentSize') {
             var owner = this._owner && this._owner.get();
             if (owner) {
@@ -99,7 +99,7 @@ var ObserverClass = /** @class */ (function (_super) {
             }
         }
     };
-    return ObserverClass;
+    return LabelObserverClass;
 }(NSObject));
 export class Label extends LabelBase {
     constructor() {
@@ -135,7 +135,7 @@ export class Label extends LabelBase {
     initNativeView() {
         super.initNativeView();
         this._delegate = LabelUITextViewDelegateImpl.initWithOwner(new WeakRef(this));
-        this._observer = ObserverClass.alloc().init();
+        this._observer = LabelObserverClass.alloc().init();
         this._observer['_owner'] = new WeakRef(this);
         this.nativeViewProtected.addObserverForKeyPathOptionsContext(this._observer, 'contentSize', 1 /* New */, null);
         this.nativeViewProtected.attributedText = this.attributedString;
@@ -252,14 +252,23 @@ export class Label extends LabelBase {
             const widthMode = layout.getMeasureSpecMode(widthMeasureSpec);
             const height = layout.getMeasureSpecSize(heightMeasureSpec);
             const heightMode = layout.getMeasureSpecMode(heightMeasureSpec);
+            let resetFont;
             if (this.autoFontSize) {
                 const finiteWidth = widthMode === layout.EXACTLY;
                 const finiteHeight = heightMode === layout.EXACTLY;
                 if (!finiteWidth || !finiteHeight) {
-                    this.textViewDidChange(nativeView, layout.toDeviceIndependentPixels(width), layout.toDeviceIndependentPixels(height));
+                    resetFont = this.updateAutoFontSize({
+                        textView: nativeView,
+                        width: layout.toDeviceIndependentPixels(width),
+                        height: layout.toDeviceIndependentPixels(height),
+                        onlyMeasure: true
+                    });
                 }
             }
             const desiredSize = layout.measureNativeView(nativeView, width, widthMode, height, heightMode);
+            if (!this.formattedText && !this.html && resetFont) {
+                nativeView.font = resetFont;
+            }
             const labelWidth = widthMode === layout.AT_MOST ? Math.min(desiredSize.width, width) : desiredSize.width;
             // const labelHeight = heightMode === layout.AT_MOST ? Math.min(desiredSize.height, height) : desiredSize.height;
             const measureWidth = Math.max(labelWidth, this.effectiveMinWidth);
@@ -272,7 +281,7 @@ export class Label extends LabelBase {
     _onSizeChanged() {
         super._onSizeChanged();
         if (this.autoFontSize) {
-            this.textViewDidChange(this.nativeTextViewProtected);
+            this.updateAutoFontSize({ textView: this.nativeTextViewProtected });
         }
     }
     // _htmlTappable = false;
@@ -298,7 +307,7 @@ export class Label extends LabelBase {
                 fontSize,
                 familyName,
                 fontWeight,
-                color: this.color,
+                // color: this.color,
                 letterSpacing: this.letterSpacing,
                 lineHeight: this.lineHeight,
                 textAlignment: this.nativeTextViewProtected.textAlignment
@@ -337,7 +346,12 @@ export class Label extends LabelBase {
         }
         else {
             if (this.formattedText || this.html) {
-                this._setNativeText();
+                if (this.html) {
+                    this.updateHTMLString();
+                }
+                else {
+                    super._setNativeText();
+                }
             }
             else {
                 this.nativeTextViewProtected.textColor = color;
@@ -445,6 +459,10 @@ export class Label extends LabelBase {
         else {
             super._setNativeText();
         }
+        if (this.color) {
+            const color = this.color instanceof Color ? this.color.ios : this.color;
+            this._setColor(color);
+        }
         this.updateTextContainerInset();
         this._requestLayoutOnTextChanged();
     }
@@ -634,29 +652,32 @@ export class Label extends LabelBase {
             }
         }
     }
-    textViewDidChange(textView, width, height, force = false) {
+    updateAutoFontSize({ textView, width, height, force = false, onlyMeasure = false }) {
+        let currentFont;
         if (textView && this.autoFontSize) {
             if ((!textView.attributedText && !textView.text) ||
                 (width === undefined && height === undefined && CGSizeEqualToSize(textView.bounds.size, CGSizeZero))) {
-                return;
+                return currentFont;
             }
             const textViewSize = textView.frame.size;
             const fixedWidth = Math.floor(width !== undefined ? width : textViewSize.width);
             const fixedHeight = Math.floor(height !== undefined ? height : textViewSize.height);
             if (fixedWidth === 0 || fixedHeight === 0) {
-                return;
+                return currentFont;
             }
             const autoSizeKey = fixedWidth + '_' + fixedHeight;
-            if (!force && autoSizeKey === this._lastAutoSizeKey) {
-                return;
+            const fontSize = this.style.fontSize || 17;
+            let expectFont = (this.style.fontInternal || Font.default).getUIFont(UIFont.systemFontOfSize(fontSize));
+            //if we are not on the "default" font size we need to measure again or we could break
+            //the layout behavior like for flexbox where there are multiple measure passes
+            if (!force && autoSizeKey === this._lastAutoSizeKey && expectFont.pointSize === textView.font.pointSize) {
+                return null;
             }
+            currentFont = textView.font;
             this._lastAutoSizeKey = autoSizeKey;
             const nbLines = textView.textContainer.maximumNumberOfLines;
             // we need to reset verticalTextAlignment or computation will be wrong
             this.updateTextContainerInset(false);
-            const fontSize = this.style.fontSize || 17;
-            let expectFont = (this.style.fontInternal || Font.default).getUIFont(UIFont.systemFontOfSize(fontSize));
-            //first reset the font size
             let expectSize;
             const stepSize = this.autoFontSizeStep || 1;
             const updateFontSize = (font) => {
@@ -667,6 +688,7 @@ export class Label extends LabelBase {
                     textView.font = font;
                 }
             };
+            //first reset the font size
             updateFontSize(expectFont);
             const size = () => {
                 if (nbLines === 1) {
@@ -713,14 +735,20 @@ export class Label extends LabelBase {
                     }
                 }
             }
-            this.fontSizeRatio = expectFont.pointSize / fontSize;
+            if (!onlyMeasure) {
+                this.fontSizeRatio = expectFont.pointSize / fontSize;
+            }
             this.updateTextContainerInset();
         }
+        return currentFont;
+    }
+    textViewDidChange(textView) {
+        this.updateAutoFontSize({ textView, force: true });
     }
     [autoFontSizeProperty.setNative](value) {
         if (value) {
             if (this.isLayoutValid && (this.text || this.html || this.formattedText)) {
-                this.textViewDidChange(this.nativeTextViewProtected, undefined, undefined, true);
+                this.updateAutoFontSize({ textView: this.nativeTextViewProtected, force: true });
             }
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-label",
-    "version": "1.2.4",
+    "version": "1.2.7",
     "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.4.32"
+        "@nativescript-community/text": "^1.4.36"
     },
-    "gitHead": "27522e865296a86d576a68d8adc8973f384c572f"
+    "gitHead": "092a8246b892db73f17613a3d10b8f52444ef2ce"
 }