@nativescript-community/ui-label 1.2.0 → 1.2.4

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.4](https://github.com/nativescript-community/ui-label/compare/v1.2.3...v1.2.4) (2022-01-14)
+
+
+### Bug Fixes
+
+* uglify fix ([f04189f](https://github.com/nativescript-community/ui-label/commit/f04189f9838615d4eb037a6423fd245538860358))
+
+
+
+
+
+## [1.2.3](https://github.com/nativescript-community/ui-label/compare/v1.2.2...v1.2.3) (2022-01-13)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+
+
+
+
+## [1.2.2](https://github.com/nativescript-community/ui-label/compare/v1.2.1...v1.2.2) (2022-01-08)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+
+
+
+
+## [1.2.1](https://github.com/nativescript-community/ui-label/compare/v1.2.0...v1.2.1) (2022-01-02)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+
+
+
+
 # [1.2.0](https://github.com/nativescript-community/ui-label/compare/v1.1.25...v1.2.0) (2021-10-20)
 
 

package/label-common.js

@@ -9,15 +9,6 @@ import { layout } from '@nativescript/core/utils/utils';
 // }
 // init text to ensure font overrides are called
 init();
-// const CHILD_SPAN = 'Span';
-// const CHILD_FORMATTED_TEXT = 'formattedText';
-// const CHILD_FORMATTED_STRING = 'FormattedString';
-// FormattedString.prototype.addPropertyChangeHandler = function (span: Span) {
-//     span.on(Observable.propertyChangeEvent, this.onPropertyChange, this);
-// };
-// FormattedString.prototype.removePropertyChangeHandler = function (span: Span) {
-//     span.off(Observable.propertyChangeEvent, this.onPropertyChange, this);
-// };
 export const needFormattedStringComputation = function (target, propertyKey, descriptor) {
     const originalMethod = descriptor.value;
     descriptor.value = function (...args) {

package/label.android.d.ts

@@ -42,7 +42,7 @@ declare abstract class LabelBase extends View implements LabelViewDefinition {
     linkUnderline: boolean;
     html: string;
     selectable: boolean;
-    _isSingleLine: boolean;
+    mIsSingleLine: boolean;
     text: string;
     formattedText: FormattedString;
     get nativeTextViewProtected(): any;
@@ -76,10 +76,13 @@ declare abstract class LabelBase extends View implements LabelViewDefinition {
 }
 export declare class Label extends LabelBase {
     nativeViewProtected: com.nativescript.label.EllipsizingTextView;
-    handleFontSize: boolean;
+    mHandleFontSize: boolean;
+    private mAutoFontSize;
     private _defaultMovementMethod;
     get nativeTextViewProtected(): com.nativescript.label.EllipsizingTextView;
     createNativeView(): com.nativescript.label.EllipsizingTextView;
+    private enableAutoSize;
+    private disableAutoSize;
     createFormattedTextNative(value: any): any;
     createHTMLString(): globalAndroid.text.SpannableStringBuilder;
     _tappable: boolean;

package/label.android.js

@@ -1,5 +1,5 @@
 import { LightFormattedString, createNativeAttributedString, cssProperty, overrideSpanAndFormattedStringEnabled, verticalTextAlignmentProperty } from '@nativescript-community/text';
-import { CSSType, FormattedString, Observable, Property, Span, View, booleanConverter, profile } from '@nativescript/core';
+import { CSSType, Device, FormattedString, Observable, Property, Span, View, booleanConverter, profile } from '@nativescript/core';
 import { Color } from '@nativescript/core/color';
 import { Font } from '@nativescript/core/ui/styling/font';
 import { Length, colorProperty, fontInternalProperty, fontSizeProperty, paddingBottomProperty, paddingLeftProperty, paddingRightProperty, paddingTopProperty } from '@nativescript/core/ui/styling/style-properties';
@@ -7,12 +7,12 @@ import { letterSpacingProperty, textAlignmentProperty, textDecorationProperty, t
 import { lineHeightProperty } from '@nativescript/core/ui/text-base/text-base-common';
 import { layout } from '@nativescript/core/utils/utils';
 import { autoFontSizeProperty, lineBreakProperty, maxLinesProperty, selectableProperty, textShadowProperty } from './label-common';
+import lazy from '@nativescript/core/utils/lazy';
 export { createNativeAttributedString, enableIOSDTCoreText } from '@nativescript-community/text';
 export * from './label-common';
+const sdkVersion = lazy(() => parseInt(Device.sdkVersion, 10));
 let TextView;
-const CHILD_SPAN = 'Span';
 const CHILD_FORMATTED_TEXT = 'formattedText';
-const CHILD_FORMATTED_STRING = 'FormattedString';
 const resetSymbol = Symbol('textPropertyDefault');
 var SuspendType;
 (function (SuspendType) {
@@ -157,7 +157,7 @@ let LabelBase = class LabelBase extends View {
         }
     }
     _addChildFromBuilder(name, value) {
-        if (name === CHILD_SPAN) {
+        if (name === Span.name) {
             if (!this.formattedText) {
                 let formattedText;
                 if (overrideSpanAndFormattedStringEnabled) {
@@ -174,7 +174,7 @@ let LabelBase = class LabelBase extends View {
                 this.formattedText.spans.push(value);
             }
         }
-        else if (name === CHILD_FORMATTED_TEXT || name === CHILD_FORMATTED_STRING) {
+        else if (name === CHILD_FORMATTED_TEXT || name === FormattedString.name) {
             this.formattedText = value;
             value.parent = this;
         }
@@ -267,7 +267,8 @@ LabelBase = __decorate([
 export class Label extends LabelBase {
     constructor() {
         super(...arguments);
-        this.handleFontSize = true;
+        this.mHandleFontSize = true;
+        this.mAutoFontSize = false;
         this._tappable = false;
     }
     get nativeTextViewProtected() {
@@ -357,7 +358,7 @@ export class Label extends LabelBase {
     }
     [textAlignmentProperty.setNative](value) {
         const view = this.nativeTextViewProtected;
-        if (android.os.Build.VERSION.SDK_INT >= 25) {
+        if (android.os.Build.VERSION.SDK_INT >= 26) {
             if (value === 'justify') {
                 view.setJustificationMode(android.text.Layout.JUSTIFICATION_MODE_INTER_WORD);
             }
@@ -380,18 +381,37 @@ export class Label extends LabelBase {
         }
     }
     [fontSizeProperty.setNative](value) {
+        // setTextSize is ignored if autoFontSize is enabled
+        // so we need to disable autoFontSize just to set textSize
+        if (this.mAutoFontSize) {
+            this.disableAutoSize();
+        }
         if (typeof value === 'number') {
             this.nativeTextViewProtected.setTextSize(value);
         }
         else {
             this.nativeTextViewProtected.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, value.nativeSize);
         }
+        if (this.mAutoFontSize) {
+            this.enableAutoSize();
+        }
     }
     [lineHeightProperty.setNative](value) {
-        this.nativeTextViewProtected.setLineSpacing(value * layout.getDisplayDensity(), 1);
+        if (sdkVersion() >= 28) {
+            this.nativeTextViewProtected.setLineHeight(value * layout.getDisplayDensity());
+        }
+        else {
+            const fontHeight = this.nativeTextViewProtected.getPaint().getFontMetricsInt(null);
+            this.nativeTextViewProtected.setLineSpacing(value * layout.getDisplayDensity() - fontHeight, 1);
+        }
     }
     [fontInternalProperty.setNative](value) {
-        this.nativeTextViewProtected.setTypeface(value instanceof Font ? value.getAndroidTypeface() : value);
+        const androidFont = value instanceof Font ? value.getAndroidTypeface() : value;
+        this.nativeTextViewProtected.setTypeface(androidFont);
+        if (this.lineHeight && sdkVersion() < 28) {
+            const fontHeight = this.nativeTextViewProtected.getPaint().getFontMetricsInt(null);
+            this.nativeTextViewProtected.setLineSpacing(this.lineHeight * layout.getDisplayDensity() - fontHeight, 1);
+        }
     }
     [textDecorationProperty.setNative](value) {
         switch (value) {
@@ -439,12 +459,19 @@ export class Label extends LabelBase {
     [paddingLeftProperty.setNative](value) {
         org.nativescript.widgets.ViewHelper.setPaddingLeft(this.nativeTextViewProtected, Length.toDevicePixels(value, 0) + Length.toDevicePixels(this.style.borderLeftWidth, 0));
     }
+    enableAutoSize() {
+        androidx.core.widget.TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(this.nativeView, this.minFontSize || 10, this.maxFontSize || 200, this.autoFontSizeStep || 1, android.util.TypedValue.COMPLEX_UNIT_DIP);
+    }
+    disableAutoSize() {
+        androidx.core.widget.TextViewCompat.setAutoSizeTextTypeWithDefaults(this.nativeView, androidx.core.widget.TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE);
+    }
     [autoFontSizeProperty.setNative](value) {
+        this.mAutoFontSize = value;
         if (value) {
-            androidx.core.widget.TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(this.nativeView, this.minFontSize || 10, this.maxFontSize || 200, this.autoFontSizeStep || 1, android.util.TypedValue.COMPLEX_UNIT_DIP);
+            this.enableAutoSize();
         }
         else {
-            androidx.core.widget.TextViewCompat.setAutoSizeTextTypeWithDefaults(this.nativeView, androidx.core.widget.TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE);
+            this.disableAutoSize();
         }
     }
     [selectableProperty.setNative](value) {

package/label.ios.d.ts

@@ -1,4 +1,4 @@
-import { CoreTypes, FormattedString, Span } from '@nativescript/core';
+import { CoreTypes, FormattedString } from '@nativescript/core';
 import { LabelBase } from './label-common';
 export { createNativeAttributedString, enableIOSDTCoreText } from '@nativescript-community/text';
 export * from './label-common';
@@ -6,8 +6,6 @@ declare module '@nativescript/core/ui/text-base' {
     interface TextBase {
         _requestLayoutOnTextChanged(): any;
         _setNativeText(): any;
-        createMutableStringForSpan?(span: any, text: any): NSMutableAttributedString;
-        createNSMutableAttributedString?(formattedString: FormattedString): NSMutableAttributedString;
     }
 }
 export declare function getTransformedText(text: string, textTransform: CoreTypes.TextTransformType): string;
@@ -18,7 +16,6 @@ export declare class Label extends LabelBase {
     attributedString: NSMutableAttributedString;
     private _delegate;
     static DTCORETEXT_INIT: boolean;
-    constructor();
     createNativeView(): UITextView;
     initNativeView(): void;
     disposeNativeView(): void;
@@ -38,9 +35,8 @@ export declare class Label extends LabelBase {
     _setSpannablesFontSizeWithRatio(ratio: any): void;
     _setNativeText(): void;
     setTextDecorationAndTransform(): void;
-    currentMaxFontSize: number;
-    createNSMutableAttributedString(formattedString: FormattedString): NSMutableAttributedString;
-    createMutableStringForSpan(span: Span, text: string): NSMutableAttributedString;
+    createFormattedTextNative(value: FormattedString): any;
+    setFormattedTextDecorationAndTransform(): void;
     fontSizeRatio: number;
     _lastAutoSizeKey: string;
     textViewDidChange(textView: UITextView, width?: any, height?: any, force?: boolean): void;

package/label.ios.js

@@ -1,9 +1,9 @@
 var _a, _b, _c, _d;
-import { computeBaseLineOffset, createNativeAttributedString, usingIOSDTCoreText, verticalTextAlignmentProperty } from '@nativescript-community/text';
+import { createNativeAttributedString, verticalTextAlignmentProperty } from '@nativescript-community/text';
 import { Color, Font, View } from '@nativescript/core';
 import { borderBottomWidthProperty, borderLeftWidthProperty, borderRightWidthProperty, borderTopWidthProperty, fontInternalProperty, paddingBottomProperty, paddingLeftProperty, paddingRightProperty, paddingTopProperty } from '@nativescript/core/ui/styling/style-properties';
-import { formattedTextProperty, letterSpacingProperty, textDecorationProperty, whiteSpaceProperty } from '@nativescript/core/ui/text-base';
-import { getClosestPropertyValue, lineHeightProperty } from '@nativescript/core/ui/text-base/text-base-common';
+import { formattedTextProperty, letterSpacingProperty, whiteSpaceProperty } from '@nativescript/core/ui/text-base';
+import { lineHeightProperty } from '@nativescript/core/ui/text-base/text-base-common';
 import { isNullOrUndefined, isString } from '@nativescript/core/utils/types';
 import { iOSNativeHelper, layout } from '@nativescript/core/utils/utils';
 import { LabelBase, autoFontSizeProperty, htmlProperty, lineBreakProperty, linkColorProperty, linkUnderlineProperty, maxLinesProperty, needFormattedStringComputation, selectableProperty, textShadowProperty } from './label-common';
@@ -103,14 +103,16 @@ var ObserverClass = /** @class */ (function (_super) {
 }(NSObject));
 export class Label extends LabelBase {
     constructor() {
-        super();
-        this.currentMaxFontSize = 0;
+        super(...arguments);
         this.fontSizeRatio = 1;
-        // if (iOSUseDTCoreText && !Label.DTCORETEXT_INIT) {
-        //     Label.DTCORETEXT_INIT = true;
-        //     DTCoreTextFontDescriptor.asyncPreloadFontLookupTable();
-        // }
     }
+    // constructor() {
+    // super();
+    // if (iOSUseDTCoreText && !Label.DTCORETEXT_INIT) {
+    //     Label.DTCORETEXT_INIT = true;
+    //     DTCoreTextFontDescriptor.asyncPreloadFontLookupTable();
+    // }
+    // }
     createNativeView() {
         const view = UITextView.new();
         if (!view.font) {
@@ -123,13 +125,10 @@ export class Label extends LabelBase {
         view.backgroundColor = UIColor.clearColor;
         view.userInteractionEnabled = true;
         view.dataDetectorTypes = -1 /* All */;
-        view.textContainerInset = {
-            top: 0,
-            left: 0,
-            bottom: 0,
-            right: 0
-        };
-        view.textContainer.lineFragmentPadding = 0; // to remove left padding
+        view.textContainerInset = UIEdgeInsetsZero;
+        view.textContainer.lineFragmentPadding = 0;
+        // ignore font leading just like UILabel does
+        view.layoutManager.usesFontLeading = false;
         // view.textContainer.lineBreakMode = NSLineBreakMode.ByCharWrapping;
         return view;
     }
@@ -140,12 +139,6 @@ export class Label extends LabelBase {
         this._observer['_owner'] = new WeakRef(this);
         this.nativeViewProtected.addObserverForKeyPathOptionsContext(this._observer, 'contentSize', 1 /* New */, null);
         this.nativeViewProtected.attributedText = this.attributedString;
-        // this.htmlText = null;
-        // this.needsHTMLUpdate = false;
-        // this.updatingHTML = false;
-        // if (this.htmlText && this.needsHTMLUpdate) {
-        // this.updateHTMLString();
-        // }
     }
     disposeNativeView() {
         this._delegate = null;
@@ -169,20 +162,31 @@ export class Label extends LabelBase {
     }
     computeTextHeight(size) {
         const tv = this.nativeTextViewProtected;
+        const oldtextContainerInset = tv.textContainerInset;
+        tv.textContainerInset = UIEdgeInsetsZero;
+        // if (tv.attributedText) {
+        //     const result = tv.attributedText.boundingRectWithSizeOptionsContext(
+        //         size,
+        //         NSStringDrawingOptions.UsesLineFragmentOrigin | NSStringDrawingOptions.UsesFontLeading,
+        //         null
+        //     );
+        //     return Math.round(CGRectGetHeight(result));
+        // }
         const result = tv.sizeThatFits(size);
+        tv.textContainerInset = oldtextContainerInset;
         return result.height;
     }
     updateTextContainerInset(applyVerticalTextAlignment = true) {
-        // if (!this.text) {
-        //     return;
-        // }
+        var _e, _f;
         const tv = this.nativeTextViewProtected;
         const top = layout.toDeviceIndependentPixels(this.effectivePaddingTop + this.effectiveBorderTopWidth);
         const right = layout.toDeviceIndependentPixels(this.effectivePaddingRight + this.effectiveBorderRightWidth);
         const bottom = layout.toDeviceIndependentPixels(this.effectivePaddingBottom + this.effectiveBorderBottomWidth);
         const left = layout.toDeviceIndependentPixels(this.effectivePaddingLeft + this.effectiveBorderLeftWidth);
-        if (!applyVerticalTextAlignment || !this.verticalTextAlignment) {
-            this.nativeViewProtected.textContainerInset = {
+        if (!applyVerticalTextAlignment ||
+            !this.verticalTextAlignment ||
+            (((_e = tv.text) === null || _e === void 0 ? void 0 : _e.length) === 0 && ((_f = tv.attributedText) === null || _f === void 0 ? void 0 : _f.length) === 0)) {
+            tv.textContainerInset = {
                 top,
                 left,
                 bottom,
@@ -193,7 +197,7 @@ export class Label extends LabelBase {
         switch (this.verticalTextAlignment) {
             case 'initial': // not supported
             case 'top':
-                this.nativeViewProtected.textContainerInset = {
+                tv.textContainerInset = {
                     top,
                     left,
                     bottom,
@@ -205,7 +209,7 @@ export class Label extends LabelBase {
                 const height = this.computeTextHeight(CGSizeMake(tv.bounds.size.width, 10000));
                 let topCorrect = (tv.bounds.size.height - top - bottom - height * tv.zoomScale) / 2.0;
                 topCorrect = topCorrect < 0.0 ? 0.0 : topCorrect;
-                this.nativeViewProtected.textContainerInset = {
+                tv.textContainerInset = {
                     top: top + topCorrect,
                     left,
                     bottom,
@@ -215,9 +219,9 @@ export class Label extends LabelBase {
             }
             case 'bottom': {
                 const height = this.computeTextHeight(CGSizeMake(tv.bounds.size.width, 10000));
-                let bottomCorrect = tv.bounds.size.height - bottom - height * tv.zoomScale;
+                let bottomCorrect = tv.bounds.size.height - top - bottom - height * tv.zoomScale;
                 bottomCorrect = bottomCorrect < 0.0 ? 0.0 : bottomCorrect;
-                this.nativeViewProtected.textContainerInset = {
+                tv.textContainerInset = {
                     top: top + bottomCorrect,
                     left,
                     bottom,
@@ -231,78 +235,6 @@ export class Label extends LabelBase {
     get ios() {
         return this.nativeViewProtected;
     }
-    // setTextDecorationAndTransform() {
-    //     const style = this.style;
-    //     const dict = new Map<string, any>();
-    //     switch (style.textDecoration) {
-    //         case 'none':
-    //             break;
-    //         case 'underline':
-    //             // TODO: Replace deprecated `StyleSingle` with `Single` after the next typings update
-    //             dict.set(NSUnderlineStyleAttributeName, NSUnderlineStyle.Single);
-    //             break;
-    //         case 'line-through':
-    //             // TODO: Replace deprecated `StyleSingle` with `Single` after the next typings update
-    //             dict.set(NSStrikethroughStyleAttributeName, NSUnderlineStyle.Single);
-    //             break;
-    //         case 'underline line-through':
-    //             // TODO: Replace deprecated `StyleSingle` with `Single` after the next typings update
-    //             dict.set(NSUnderlineStyleAttributeName, NSUnderlineStyle.Single);
-    //             dict.set(NSStrikethroughStyleAttributeName, NSUnderlineStyle.Single);
-    //             break;
-    //         default:
-    //             throw new Error(`Invalid text decoration value: ${style.textDecoration}. Valid values are: 'none', 'underline', 'line-through', 'underline line-through'.`);
-    //     }
-    //     if (style.letterSpacing !== 0) {
-    //         dict.set(NSKernAttributeName, style.letterSpacing * this.nativeTextViewProtected.font.pointSize);
-    //     }
-    //     if (style.lineHeight || style.whiteSpace === 'nowrap' || (style['lineBreak'] && style['lineBreak'] !== 'none')) {
-    //         const paragraphStyle = NSMutableParagraphStyle.alloc().init();
-    //         paragraphStyle.minimumLineHeight = style.lineHeight;
-    //         // make sure a possible previously set text alignment setting is not lost when line height is specified
-    //         paragraphStyle.alignment = (this.nativeTextViewProtected as UITextField | UITextView | UILabel).textAlignment;
-    //         // make sure a possible previously set line break mode is not lost when line height is specified
-    //         if (style['lineBreak']) {
-    //             paragraphStyle.lineBreakMode = lineBreakToLineBreakMode(style['lineBreak']);
-    //         } else if (style.whiteSpace) {
-    //             paragraphStyle.lineBreakMode = whiteSpaceToLineBreakMode(style.whiteSpace);
-    //         }
-    //         dict.set(NSParagraphStyleAttributeName, paragraphStyle);
-    //     } else if (isTextView && this.style.textAlignment !== 'initial') {
-    //         const paragraphStyle = NSMutableParagraphStyle.alloc().init();
-    //         paragraphStyle.alignment = this.nativeTextViewProtected.textAlignment;
-    //         dict.set(NSParagraphStyleAttributeName, paragraphStyle);
-    //     }
-    //     if (style.color && dict.size > 0) {
-    //         // dict.set(NSForegroundColorAttributeName, style.color.ios);
-    //     }
-    //     const text = this.text;
-    //     const str = text === undefined || text === null ? '' : text.toString();
-    //     const source = getTransformedText(str, this.textTransform);
-    //     if (dict.size > 0) {
-    //         if (isTextView) {
-    //             // UITextView's font seems to change inside.
-    //             dict.set(NSFontAttributeName, this.nativeTextViewProtected.font);
-    //         }
-    //         const result = NSMutableAttributedString.alloc().initWithString(source);
-    //         result.setAttributesRange(dict as any, { location: 0, length: source.length });
-    //         if (this.nativeTextViewProtected instanceof UIButton) {
-    //             this.nativeTextViewProtected.setAttributedTitleForState(result, UIControlState.Normal);
-    //         } else {
-    //             this.nativeTextViewProtected.attributedText = result;
-    //         }
-    //     } else {
-    //         if (this.nativeTextViewProtected instanceof UIButton) {
-    //             // Clear attributedText or title won't be affected.
-    //             this.nativeTextViewProtected.setAttributedTitleForState(null, UIControlState.Normal);
-    //             this.nativeTextViewProtected.setTitleForState(source, UIControlState.Normal);
-    //         } else {
-    //             // Clear attributedText or text won't be affected.
-    //             this.nativeTextViewProtected.attributedText = undefined;
-    //             this.nativeTextViewProtected.text = source;
-    //         }
-    //     }
-    // }
     _requestLayoutOnTextChanged() {
         if (this._fixedSize === FixedSize.BOTH) {
             return;
@@ -390,14 +322,13 @@ export class Label extends LabelBase {
         // when in collectionView or pager
         // if this is done sync (without DTCoreText) while init the cell
         // it breaks the UICollectionView :s
-        if (usingIOSDTCoreText()) {
-            this._updateHTMLString();
-        }
-        else {
-            // setTimeout(() => {
-            this._updateHTMLString();
-            // }, 0);
-        }
+        // if (usingIOSDTCoreText()) {
+        //     this._updateHTMLString();
+        // } else {
+        // setTimeout(() => {
+        this._updateHTMLString();
+        // }, 0);
+        // }
     }
     _setColor(color) {
         if (this.nativeTextViewProtected instanceof UIButton) {
@@ -514,6 +445,7 @@ export class Label extends LabelBase {
         else {
             super._setNativeText();
         }
+        this.updateTextContainerInset();
         this._requestLayoutOnTextChanged();
     }
     setTextDecorationAndTransform() {
@@ -538,25 +470,18 @@ export class Label extends LabelBase {
         if (style.letterSpacing !== 0 && this.nativeTextViewProtected.font) {
             const kern = style.letterSpacing * this.nativeTextViewProtected.font.pointSize;
             dict.set(NSKernAttributeName, kern);
-            if (this.nativeTextViewProtected instanceof UITextField) {
-                this.nativeTextViewProtected.defaultTextAttributes.setValueForKey(kern, NSKernAttributeName);
-            }
         }
         const isTextView = false;
-        if (style.lineHeight) {
+        if (style.lineHeight !== undefined) {
+            let lineHeight = style.lineHeight;
+            if (lineHeight === 0) {
+                lineHeight = 0.00001;
+            }
             const paragraphStyle = NSMutableParagraphStyle.alloc().init();
-            paragraphStyle.lineSpacing = style.lineHeight;
+            paragraphStyle.minimumLineHeight = lineHeight;
+            paragraphStyle.maximumLineHeight = lineHeight;
             // make sure a possible previously set text alignment setting is not lost when line height is specified
-            if (this.nativeTextViewProtected instanceof UIButton) {
-                paragraphStyle.alignment = this.nativeTextViewProtected.titleLabel.textAlignment;
-            }
-            else {
-                paragraphStyle.alignment = this.nativeTextViewProtected.textAlignment;
-            }
-            if (this.nativeTextViewProtected instanceof UILabel) {
-                // make sure a possible previously set line break mode is not lost when line height is specified
-                paragraphStyle.lineBreakMode = this.nativeTextViewProtected.lineBreakMode;
-            }
+            paragraphStyle.alignment = this.nativeTextViewProtected.textAlignment;
             dict.set(NSParagraphStyleAttributeName, paragraphStyle);
         }
         else if (isTextView) {
@@ -580,81 +505,27 @@ export class Label extends LabelBase {
                 location: 0,
                 length: source.length
             });
-            if (this.nativeTextViewProtected instanceof UIButton) {
-                this.nativeTextViewProtected.setAttributedTitleForState(result, 0 /* Normal */);
-            }
-            else {
-                this.nativeTextViewProtected.attributedText = result;
-            }
+            this.nativeTextViewProtected.attributedText = result;
         }
         else {
-            if (this.nativeTextViewProtected instanceof UIButton) {
-                // Clear attributedText or title won't be affected.
-                this.nativeTextViewProtected.setAttributedTitleForState(null, 0 /* Normal */);
-                this.nativeTextViewProtected.setTitleForState(source, 0 /* Normal */);
-            }
-            else {
-                // Clear attributedText or text won't be affected.
-                this.nativeTextViewProtected.attributedText = undefined;
-                this.nativeTextViewProtected.text = source;
-            }
+            // Clear attributedText or text won't be affected.
+            this.nativeTextViewProtected.attributedText = undefined;
+            this.nativeTextViewProtected.text = source;
         }
         if (!style.color && majorVersion >= 13 && UIColor.labelColor) {
             this._setColor(UIColor.labelColor);
         }
     }
-    createNSMutableAttributedString(formattedString) {
-        var _e;
-        // we need to store the max Font size to pass it to createMutableStringForSpan
-        const length = formattedString.spans.length;
-        let maxFontSize = ((_e = formattedString.style) === null || _e === void 0 ? void 0 : _e.fontSize) || (this === null || this === void 0 ? void 0 : this.style.fontSize) || 0;
-        for (let i = 0; i < length; i++) {
-            const s = formattedString.spans.getItem(i);
-            if (s.style.fontSize) {
-                maxFontSize = Math.max(maxFontSize, s.style.fontSize);
-            }
-        }
-        this.currentMaxFontSize = maxFontSize;
-        return super.createNSMutableAttributedString(formattedString);
-    }
-    createMutableStringForSpan(span, text) {
-        const viewFont = this.nativeTextViewProtected.font;
-        const attrDict = {};
-        const style = span.style;
-        let align = style.verticalAlignment || span.parent.style.verticalAlignment;
-        if (!align || align === 'stretch') {
-            align = this.verticalTextAlignment;
-        }
-        const font = new Font(style.fontFamily, style.fontSize, style.fontStyle, style.fontWeight);
-        const iosFont = font.getUIFont(viewFont);
-        attrDict[NSFontAttributeName] = iosFont;
-        if (span.color) {
-            const color = span.color instanceof Color ? span.color : new Color(span.color);
-            attrDict[NSForegroundColorAttributeName] = color.ios;
-        }
-        // We don't use isSet function here because defaultValue for backgroundColor is null.
-        const backgroundColor = style.backgroundColor || span.parent.backgroundColor;
-        if (backgroundColor) {
-            const color = backgroundColor instanceof Color ? backgroundColor : new Color(backgroundColor);
-            attrDict[NSBackgroundColorAttributeName] = color.ios;
-        }
-        const textDecoration = getClosestPropertyValue(textDecorationProperty, span);
-        if (textDecoration) {
-            const underline = textDecoration.indexOf('underline') !== -1;
-            if (underline) {
-                attrDict[NSUnderlineStyleAttributeName] = underline;
-            }
-            const strikethrough = textDecoration.indexOf('line-through') !== -1;
-            if (strikethrough) {
-                attrDict[NSStrikethroughStyleAttributeName] = strikethrough;
-            }
-        }
-        if (align && align !== 'stretch') {
-            if (iosFont) {
-                attrDict[NSBaselineOffsetAttributeName] = -computeBaseLineOffset(align, -iosFont.ascender, -iosFont.descender, -iosFont.ascender, -iosFont.descender, iosFont.pointSize, this.currentMaxFontSize);
-            }
+    createFormattedTextNative(value) {
+        return createNativeAttributedString(value, this, this.autoFontSize, this.fontSizeRatio);
+    }
+    setFormattedTextDecorationAndTransform() {
+        const attrText = this.createFormattedTextNative(this.formattedText);
+        // we override parent class behavior because we apply letterSpacing and lineHeight on a per Span basis
+        if (majorVersion >= 13 && UIColor.labelColor) {
+            this.nativeTextViewProtected.textColor = UIColor.labelColor;
         }
-        return NSMutableAttributedString.alloc().initWithStringAttributes(text, attrDict);
+        this.nativeTextViewProtected.attributedText = attrText;
     }
     [paddingTopProperty.getDefault]() {
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-label",
-    "version": "1.2.0",
+    "version": "1.2.4",
     "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.21"
+        "@nativescript-community/text": "^1.4.32"
     },
-    "gitHead": "548a66a7342e4c8e1e33ce63a0b6dd9a6a57c5fb"
+    "gitHead": "27522e865296a86d576a68d8adc8973f384c572f"
 }

package/platforms/android/java/com/nativescript/label/EllipsizingTextView.java

@@ -1,497 +0,0 @@
-package com.nativescript.label;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.text.Layout;
-import android.text.Layout.Alignment;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.StaticLayout;
-import android.text.TextUtils;
-import android.text.TextUtils.TruncateAt;
-import android.text.style.ForegroundColorSpan;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.View;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.AppCompatTextView;
-
-/**
- * A {@link android.widget.TextView} that ellipsizes more intelligently.
- * This class supports ellipsizing multiline text through setting {@code android:ellipsize}
- * and {@code android:maxLines}.
- * <p/>
- * Note: {@link android.text.TextUtils.TruncateAt#MARQUEE} ellipsizing type is not supported.
- * <p>
- * 学习戚继光，一边儿读别人的源码，一边儿做笔记
- */
-public class EllipsizingTextView extends AppCompatTextView {
-    public static final int ELLIPSIZE_ALPHA = 0x88;
-    private SpannableString ELLIPSIS = new SpannableString("\u2026");
-
-    private static final Pattern DEFAULT_END_PUNCTUATION
-            = Pattern.compile("[\\.!?,;:\u2026]*$", Pattern.DOTALL);
-
-    private final List<EllipsizeListener> mEllipsizeListeners = new ArrayList<>();
-
-    private EllipsizeStrategy mEllipsizeStrategy;
-
-    private boolean isEllipsized;
-
-    //In order to be the reset method only needs to be called once
-    private boolean isStale;
-
-    //The entry used to determine the call setText () is RESETTEXT or otherwhere call, this practice is cool.
-    private boolean programmaticChange;
-
-    //text
-    private CharSequence mFullText;
-    private int mMaxLines;
-
-    //The line spacing, this point is considered, great.
-    private float mLineSpacingMult = 1.0f;
-    private float mLineAddVertPad = 0.0f;
-
-
-    private boolean wordWrap = true;
-    private float minTextSize = 20;
-    private float maxTextSize = 30;
-
-    /**
-     * The end punctuation which will be removed when appending {@link #ELLIPSIS}.
-     */
-    private Pattern mEndPunctPattern;
-
-    public EllipsizingTextView(Context context) {
-        this(context, null);
-    }
-
-
-    public EllipsizingTextView(Context context, AttributeSet attrs) {
-        this(context, attrs, android.R.attr.textViewStyle);
-    }
-
-
-    public EllipsizingTextView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        TypedArray a = context.obtainStyledAttributes(attrs,
-                new int[]{android.R.attr.maxLines, android.R.attr.ellipsize}, defStyle, 0);
-        setMaxLines(a.getInt(0, Integer.MAX_VALUE));
-        a.recycle();
-        setEndPunctuationPattern(DEFAULT_END_PUNCTUATION);
-        maxTextSize = this.getTextSize();
-        if (maxTextSize < 35) {
-            maxTextSize = 30;
-        }
-        super.setSingleLine(false);
-    }
-
-    public void setEndPunctuationPattern(Pattern pattern) {
-        mEndPunctPattern = pattern;
-    }
-
-    @SuppressWarnings("unused")
-    public void addEllipsizeListener(@NonNull EllipsizeListener listener) {
-        mEllipsizeListeners.add(listener);
-    }
-
-    @SuppressWarnings("unused")
-    public void removeEllipsizeListener(@NonNull EllipsizeListener listener) {
-        mEllipsizeListeners.remove(listener);
-    }
-
-    @SuppressWarnings("unused")
-    public boolean isEllipsized() {
-        return isEllipsized;
-    }
-
-    /**
-     * @return The maximum number of lines displayed in this {@link android.widget.TextView}.
-     */
-    public int getMaxLines() {
-        return mMaxLines;
-    }
-
-    @Override
-    public void setMaxLines(int maxLines) {
-        super.setMaxLines(maxLines);
-        // super.setMaxLines((maxLines == 0) ? Integer.MAX_VALUE : maxLines);
-        // if (maxLines == Integer.MAX_VALUE) {
-        //     maxLines = 0;
-        // }
-        // // super.setMaxLines((maxLines == 0) ? Integer.MAX_VALUE : maxLines);
-        mMaxLines = maxLines;
-        isStale = true;
-    }
-
-    public float getMinTextSize() {
-        return minTextSize;
-    }
-
-    public void setMinTextSize(float minTextSize) {
-        this.minTextSize = minTextSize;
-    }
-
-    public float getMaxTextSize() {
-        return maxTextSize;
-    }
-
-    public void setMaxTextSize(float minTextSize) {
-        this.maxTextSize = minTextSize;
-    }
-
-    /**
-     * Determines if the last fully visible line is being ellipsized.
-     *
-     * @return {@code true} if the last fully visible line is being ellipsized;
-     * otherwise, returns {@code false}.
-     */
-    public boolean ellipsizingLastFullyVisibleLine() {
-        return mMaxLines == Integer.MAX_VALUE;
-    }
-
-    @Override
-    public void setLineSpacing(float add, float mult) {
-        mLineAddVertPad = add;
-        mLineSpacingMult = mult;
-        super.setLineSpacing(add, mult);
-    }
-
-    @Override
-    public void setText(CharSequence text, BufferType type) {
-        if (!programmaticChange) {//Distribution source
-            mFullText = text instanceof Spanned ? (Spanned) text : text;
-            isStale = true;
-        }
-        super.setText(text, type);
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        int w = View.MeasureSpec.getSize(widthMeasureSpec);
-        // int wm = MeasureSpec.getMode(widthMeasureSpec);
-        int h = View.MeasureSpec.getSize(heightMeasureSpec);
-        int hm = View.MeasureSpec.getMode(heightMeasureSpec);
-        if (hm == 0)
-            h = 100000;
-        if ((hm == View.MeasureSpec.AT_MOST || hm == View.MeasureSpec.UNSPECIFIED)
-                && (mFullText == null || mFullText.length() == 0)) {
-            heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.EXACTLY);
-        }
-
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-    }
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        super.onSizeChanged(w, h, oldw, oldh);
-        if (ellipsizingLastFullyVisibleLine()) {//Rigorous, learning
-            isStale = true;
-        }
-    }
-
-    @Override
-    public void setPadding(int left, int top, int right, int bottom) {
-        super.setPadding(left, top, right, bottom);
-        if (ellipsizingLastFullyVisibleLine()) {//Rigorous, learning
-            isStale = true;
-        }
-    }
-
-    @Override
-    protected void onDraw(@NonNull Canvas canvas) {
-        if (isStale) {
-            resetText();
-        }
-        super.onDraw(canvas);
-    }
-
-    /**
-     * Sets the ellipsized text if appropriate.
-     */
-    private void resetText() {
-        int maxLines = getMaxLines();
-        CharSequence workingText = mFullText;
-        boolean ellipsized = false;
-
-        if (maxLines != -1) {
-            if (mEllipsizeStrategy == null) setEllipsize(null);
-            workingText = mEllipsizeStrategy.processText(mFullText);
-            ellipsized = !mEllipsizeStrategy.isInLayout(mFullText);
-        }
-
-        if (!workingText.equals(getText())) {//Avoid useless operations
-            programmaticChange = true;
-            try {
-                setText(workingText);
-            } finally {
-                programmaticChange = false;
-            }
-        }
-
-        isStale = false;//Switch status
-
-        //Notification listener
-        if (ellipsized != isEllipsized) {
-            isEllipsized = ellipsized;
-            for (EllipsizeListener listener : mEllipsizeListeners) {
-                listener.ellipsizeStateChanged(ellipsized);
-            }
-        }
-    }
-
-    /**
-     * Causes words in the text that are longer than the view is wide to be ellipsized
-     * instead of broken in the middle. Use {@code null} to turn off ellipsizing.
-     * <p/>
-     * Note: Method does nothing for {@link android.text.TextUtils.TruncateAt#MARQUEE}
-     * ellipsizing type.
-     *
-     * @param where part of text to ellipsize
-     */
-    @Override
-    public void setEllipsize(TruncateAt where) {
-        if (where == null) {
-            mEllipsizeStrategy = new EllipsizeNoneStrategy();
-            return;
-        }
-
-        switch (where) {
-            case END:
-                mEllipsizeStrategy = new EllipsizeEndStrategy();
-                break;
-            case START:
-                mEllipsizeStrategy = new EllipsizeStartStrategy();
-                break;
-            case MIDDLE:
-                mEllipsizeStrategy = new EllipsizeMiddleStrategy();
-                break;
-            case MARQUEE:
-            default:
-                mEllipsizeStrategy = new EllipsizeNoneStrategy();
-                break;
-        }
-    }
-
-    /**
-     * A listener that notifies when the ellipsize state has changed.
-     */
-    public interface EllipsizeListener {
-        void ellipsizeStateChanged(boolean ellipsized);
-    }
-
-    /**
-     * A base class for an ellipsize strategy.
-     */
-    private abstract class EllipsizeStrategy {
-        /**
-         * Returns ellipsized text if the text does not fit inside of the layout;
-         * otherwise, returns the full text.
-         *
-         * @param text text to process
-         * @return Ellipsized text if the text does not fit inside of the layout;
-         * otherwise, returns the full text.
-         */
-        public CharSequence processText(CharSequence text) {
-            return !isInLayout(text) ? createEllipsizedText(text) : text;
-        }
-
-        /**
-         * Determines if the text fits inside of the layout.
-         *
-         * @param text text to fit
-         * @return {@code true} if the text fits inside of the layout;
-         * otherwise, returns {@code false}.
-         */
-        public boolean isInLayout(CharSequence text) {
-            Layout layout = createWorkingLayout(text);
-            return layout.getLineCount() <= getLinesCount();
-        }
-
-        /**
-         * Creates a working layout with the given text.
-         *
-         * @param workingText text to create layout with
-         * @return {@link android.text.Layout} with the given text.
-         */
-        protected Layout createWorkingLayout(CharSequence workingText) {
-            return new StaticLayout(workingText, getPaint(),
-                    getWidth() - getCompoundPaddingLeft() - getCompoundPaddingRight(),
-                    Alignment.ALIGN_NORMAL, mLineSpacingMult,
-                    mLineAddVertPad, false /* includepad */);
-        }
-
-        /**
-         * Get how many lines of text we are allowed to display.
-         */
-        protected int getLinesCount() {
-            if (ellipsizingLastFullyVisibleLine()) {
-                int fullyVisibleLinesCount = getFullyVisibleLinesCount();
-                return fullyVisibleLinesCount == -1 ? 1 : fullyVisibleLinesCount;
-            } else {
-                return mMaxLines;
-            }
-        }
-
-        /**
-         * Get how many lines of text we can display so their full height is visible.
-         */
-        protected int getFullyVisibleLinesCount() {
-            Layout layout = createWorkingLayout("");
-            int height = getHeight() - getCompoundPaddingTop() - getCompoundPaddingBottom();
-            int lineHeight = layout.getLineBottom(0);
-            return height / lineHeight;
-        }
-
-        /**
-         * Creates ellipsized text from the given text.
-         *
-         * @param fullText text to ellipsize
-         * @return Ellipsized text
-         */
-        protected abstract CharSequence createEllipsizedText(CharSequence fullText);
-    }
-
-    /**
-     * An {@link EllipsizingTextView.EllipsizeStrategy} that
-     * does not ellipsize text.
-     */
-    private class EllipsizeNoneStrategy extends EllipsizeStrategy {
-        @Override
-        protected CharSequence createEllipsizedText(CharSequence fullText) {
-            return fullText;
-        }
-    }
-
-    /**
-     * An {@link EllipsizingTextView.EllipsizeStrategy} that
-     * ellipsizes text at the end.
-     */
-    private class EllipsizeEndStrategy extends EllipsizeStrategy {
-        @Override
-        protected CharSequence createEllipsizedText(CharSequence fullText) {
-            Layout layout = createWorkingLayout(fullText);
-            int lineCount = layout.getLineCount();
-            int lastLineIndex = Math.min(mMaxLines - 1, lineCount -1);
-            int cutOffIndex = layout.getLineEnd(lastLineIndex);
-            int textLength = fullText.length();
-            int cutOffLength = textLength - cutOffIndex;
-            if (cutOffLength < ELLIPSIS.length()) cutOffLength = ELLIPSIS.length();
-
-            //True to display text
-            CharSequence workingText = TextUtils.substring(fullText, 0, textLength - cutOffLength).trim();
-
-
-            final int lastLineStart = layout.getLineStart(lastLineIndex);
-            final CharSequence remainder = TextUtils.ellipsize(fullText.subSequence(lastLineStart,
-                    fullText.length()), getPaint(), getWidth(), TextUtils.TruncateAt.END);
-
-            //seems to be handling corner case when there is still too many chars
-            while (!isInLayout(TextUtils.concat(stripEndPunctuation(workingText), ELLIPSIS))) {
-                workingText = workingText.subSequence(0, workingText.length() - 1);
-        
-            }
-
-            //first we copy the text
-            workingText = TextUtils.concat(stripEndPunctuation(workingText), ELLIPSIS);
-            SpannableStringBuilder dest = new SpannableStringBuilder(workingText);
-
-            //then we apply spans if necessary
-            if (fullText instanceof Spanned) {
-                TextUtils.copySpansFrom((Spanned) fullText, 0, workingText.length(), null, dest, 0);
-            }
-            return dest;
-        }
-
-        /**
-         * Strips the end punctuation from a given text according to {@link #mEndPunctPattern}.
-         *
-         * @param workingText text to strip end punctuation from
-         * @return Text without end punctuation.
-         */
-        public String stripEndPunctuation(CharSequence workingText) {
-            return mEndPunctPattern.matcher(workingText).replaceFirst("");
-        }
-    }
-
-    /**
-     * An {@link EllipsizingTextView.EllipsizeStrategy} that
-     * ellipsizes text at the start.
-     */
-    private class EllipsizeStartStrategy extends EllipsizeStrategy {
-        @Override
-        protected CharSequence createEllipsizedText(CharSequence fullText) {
-            Layout layout = createWorkingLayout(fullText);
-            int cutOffIndex = layout.getLineEnd(mMaxLines - 1);
-            int textLength = fullText.length();
-            int cutOffLength = textLength - cutOffIndex;
-            if (cutOffLength < ELLIPSIS.length()) cutOffLength = ELLIPSIS.length();
-            CharSequence workingText = TextUtils.substring(fullText, cutOffLength, textLength).trim();
-
-            while (!isInLayout(TextUtils.concat(ELLIPSIS, workingText))) {
-                int firstSpace = TextUtils.indexOf(workingText, ' ');
-                if (firstSpace == -1) {
-                    break;
-                }
-                workingText = TextUtils.substring(workingText, firstSpace, workingText.length()).trim();
-            }
-
-            workingText = TextUtils.concat(ELLIPSIS, workingText);
-            SpannableStringBuilder dest = new SpannableStringBuilder(workingText);
-
-            if (fullText instanceof Spanned) {
-                TextUtils.copySpansFrom((Spanned) fullText, textLength - workingText.length(),
-                        textLength, null, dest, 0);
-            }
-            return dest;
-        }
-    }
-
-    /**
-     * An {@link EllipsizingTextView.EllipsizeStrategy} that
-     * ellipsizes text in the middle.
-     */
-    private class EllipsizeMiddleStrategy extends EllipsizeStrategy {
-        @Override
-        protected CharSequence createEllipsizedText(CharSequence fullText) {
-            Layout layout = createWorkingLayout(fullText);
-            int cutOffIndex = layout.getLineEnd(mMaxLines - 1);
-            int textLength = fullText.length();
-            int cutOffLength = textLength - cutOffIndex;
-            if (cutOffLength < ELLIPSIS.length()) cutOffLength = ELLIPSIS.length();
-            cutOffLength += cutOffIndex % 2;    // Make it even.
-            String firstPart = TextUtils.substring(
-                    fullText, 0, textLength / 2 - cutOffLength / 2).trim();
-            String secondPart = TextUtils.substring(
-                    fullText, textLength / 2 + cutOffLength / 2, textLength).trim();
-
-            while (!isInLayout(TextUtils.concat(firstPart, ELLIPSIS, secondPart))) {
-                int lastSpaceFirstPart = firstPart.lastIndexOf(' ');
-                int firstSpaceSecondPart = secondPart.indexOf(' ');
-                if (lastSpaceFirstPart == -1 || firstSpaceSecondPart == -1) break;
-                firstPart = firstPart.substring(0, lastSpaceFirstPart).trim();
-                secondPart = secondPart.substring(firstSpaceSecondPart, secondPart.length()).trim();
-            }
-
-            SpannableStringBuilder firstDest = new SpannableStringBuilder(firstPart);
-            SpannableStringBuilder secondDest = new SpannableStringBuilder(secondPart);
-
-            if (fullText instanceof Spanned) {
-                TextUtils.copySpansFrom((Spanned) fullText, 0, firstPart.length(),
-                        null, firstDest, 0);
-                TextUtils.copySpansFrom((Spanned) fullText, textLength - secondPart.length(),
-                        textLength, null, secondDest, 0);
-            }
-            return TextUtils.concat(firstDest, ELLIPSIS, secondDest);
-        }
-    }
-}