@nativescript-community/ui-label 1.2.5 → 1.2.8

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.8](https://github.com/nativescript-community/ui-label/compare/v1.2.7...v1.2.8) (2022-04-26)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+
+
+
+
+## [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

package/label-common.d.ts

@@ -22,7 +22,7 @@ export declare abstract class LabelBase extends TNLabel implements LabelViewDefi
     onResumeNativeUpdates(): void;
 }
 export declare const htmlProperty: Property<LabelBase, string>;
-export declare const maxLinesProperty: CssProperty<Style, number>;
+export declare const maxLinesProperty: Property<LabelBase, number>;
 export declare const lineBreakProperty: CssProperty<Style, string>;
 export declare const linkColorProperty: CssProperty<Style, Color>;
 export declare const linkUnderlineProperty: CssProperty<Style, boolean>;

package/label-common.js

@@ -92,11 +92,11 @@ export const htmlProperty = new Property({
     affectsLayout: global.isAndroid
 });
 htmlProperty.register(LabelBase);
-export const maxLinesProperty = new CssProperty({
+export const maxLinesProperty = new Property({
     name: 'maxLines',
-    cssName: 'max-lines'
+    affectsLayout: global.isAndroid
 });
-maxLinesProperty.register(Style);
+maxLinesProperty.register(LabelBase);
 export const lineBreakProperty = new CssProperty({
     name: 'lineBreak',
     cssName: 'line-break'

package/label.ios.js

@@ -85,13 +85,13 @@ var LabelUITextViewDelegateImpl = /** @class */ (function (_super) {
     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;
@@ -266,7 +266,7 @@ export class Label extends LabelBase {
                 }
             }
             const desiredSize = layout.measureNativeView(nativeView, width, widthMode, height, heightMode);
-            if (resetFont) {
+            if (!this.formattedText && !this.html && resetFont) {
                 nativeView.font = resetFont;
             }
             const labelWidth = widthMode === layout.AT_MOST ? Math.min(desiredSize.width, width) : desiredSize.width;
@@ -307,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
@@ -346,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;
@@ -454,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();
     }
@@ -657,7 +666,11 @@ export class Label extends LabelBase {
                 return currentFont;
             }
             const autoSizeKey = fixedWidth + '_' + fixedHeight;
-            if (!force && autoSizeKey === this._lastAutoSizeKey) {
+            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;
@@ -665,9 +678,6 @@ export class Label extends LabelBase {
             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) => {
@@ -678,6 +688,7 @@ export class Label extends LabelBase {
                     textView.font = font;
                 }
             };
+            //first reset the font size
             updateFontSize(expectFont);
             const size = () => {
                 if (nbLines === 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-label",
-    "version": "1.2.5",
+    "version": "1.2.8",
     "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": "7af7ba4fd7ec88e0d42ec3e36e3497e318f4cb37"
+    "gitHead": "3ca6ba169723fcb4190268c2a9f8f47ba74f26aa"
 }