@nativescript-community/ui-label 1.2.8 → 1.2.9

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.9](https://github.com/nativescript-community/ui-label/compare/v1.2.8...v1.2.9) (2022-07-22)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+
+
+
+
 ## [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

package/label-common.d.ts

@@ -2,7 +2,6 @@ import { VerticalTextAlignment } from '@nativescript-community/text';
 import { Color, CssProperty, FormattedString, Property, Style, Label as TNLabel } from '@nativescript/core';
 import { Label as LabelViewDefinition, LineBreak, TextShadow } from './label';
 export declare const needFormattedStringComputation: (target: any, propertyKey: string | Symbol, descriptor: PropertyDescriptor) => void;
-export declare const needFontComputation: (target: any, propertyKey: string | Symbol, descriptor: PropertyDescriptor) => void;
 export declare abstract class LabelBase extends TNLabel implements LabelViewDefinition {
     maxLines: string | number;
     verticalTextAlignment: VerticalTextAlignment;
@@ -16,9 +15,9 @@ export declare abstract class LabelBase extends TNLabel implements LabelViewDefi
     minFontSize: number;
     maxFontSize: number;
     autoFontSizeStep: number;
-    _canChangeText: boolean;
-    _needFormattedStringComputation: boolean;
-    _needFontComputation: boolean;
+    mCanChangeText: boolean;
+    mNeedFormattedStringComputation: boolean;
+    mNeedFontComputation: boolean;
     onResumeNativeUpdates(): void;
 }
 export declare const htmlProperty: Property<LabelBase, string>;

package/label-common.js

@@ -12,41 +12,41 @@ init();
 export const needFormattedStringComputation = function (target, propertyKey, descriptor) {
     const originalMethod = descriptor.value;
     descriptor.value = function (...args) {
-        if (!this._canChangeText) {
-            this._needFormattedStringComputation = true;
-            return;
-        }
-        return originalMethod.apply(this, args);
-    };
-};
-export const needFontComputation = function (target, propertyKey, descriptor) {
-    const originalMethod = descriptor.value;
-    descriptor.value = function (...args) {
-        if (!this._canChangeText) {
-            this._needFontComputation = true;
+        if (!this.mCanChangeText) {
+            this.mNeedFormattedStringComputation = true;
             return;
         }
         return originalMethod.apply(this, args);
     };
 };
+// export const needFontComputation = function (target: any, propertyKey: string | Symbol, descriptor: PropertyDescriptor) {
+//     const originalMethod = descriptor.value;
+//     descriptor.value = function (...args: any[]) {
+//         if (!this.mCanChangeText) {
+//             this._needFontComputation = true;
+//             return;
+//         }
+//         return originalMethod.apply(this, args);
+//     };
+// };
 let LabelBase = class LabelBase extends TNLabel {
     constructor() {
         super(...arguments);
-        this._canChangeText = true;
-        this._needFormattedStringComputation = false;
-        this._needFontComputation = false;
+        this.mCanChangeText = true;
+        this.mNeedFormattedStringComputation = false;
+        this.mNeedFontComputation = false;
     }
     onResumeNativeUpdates() {
         // {N} suspends properties update on `_suspendNativeUpdates`. So we only need to do this in onResumeNativeUpdates
-        this._canChangeText = false;
+        this.mCanChangeText = false;
         super.onResumeNativeUpdates();
-        this._canChangeText = true;
-        if (this._needFormattedStringComputation) {
-            this._needFormattedStringComputation = false;
+        this.mCanChangeText = true;
+        if (this.mNeedFormattedStringComputation) {
+            this.mNeedFormattedStringComputation = false;
             this._setNativeText();
         }
-        if (this._needFontComputation) {
-            this._needFontComputation = false;
+        if (this.mNeedFontComputation) {
+            this.mNeedFontComputation = false;
             this[fontInternalProperty.setNative](this.style.fontInternal);
         }
     }

package/label.android.d.ts

@@ -6,24 +6,6 @@ import { FontStyle, FontWeight } from '@nativescript/core/ui/styling/font';
 import { Label as LabelViewDefinition, LineBreak } from './label';
 export { createNativeAttributedString, enableIOSDTCoreText } from '@nativescript-community/text';
 export * from './label-common';
-declare enum SuspendType {
-    Incremental = 0,
-    Loaded = 1048576,
-    NativeView = 2097152,
-    UISetup = 4194304,
-    IncrementalCountMask = -7340033
-}
-declare module '@nativescript/core/ui/core/view-base' {
-    interface ViewBase {
-        _resumeNativeUpdates(type: SuspendType): any;
-        _defaultPaddingTop: number;
-        _defaultPaddingRight: number;
-        _defaultPaddingBottom: number;
-        _defaultPaddingLeft: number;
-        _isPaddingRelative: boolean;
-        _androidView: any;
-    }
-}
 declare module '@nativescript/core/ui/text-base' {
     interface TextBase {
         _setTappableState(tappable: boolean): any;
@@ -42,6 +24,7 @@ declare abstract class LabelBase extends View implements LabelViewDefinition {
     linkUnderline: boolean;
     html: string;
     selectable: boolean;
+    _isSingleLine: boolean;
     mIsSingleLine: boolean;
     text: string;
     formattedText: FormattedString;
@@ -63,8 +46,8 @@ declare abstract class LabelBase extends View implements LabelViewDefinition {
     paddingRight: CoreTypes.LengthType;
     paddingBottom: CoreTypes.LengthType;
     paddingLeft: CoreTypes.LengthType;
-    _canChangeText: boolean;
-    _needFormattedStringComputation: boolean;
+    mCanChangeText: boolean;
+    mNeedFormattedStringComputation: boolean;
     onResumeNativeUpdates(): void;
     get textWrap(): boolean;
     set textWrap(value: boolean);
@@ -77,17 +60,16 @@ declare abstract class LabelBase extends View implements LabelViewDefinition {
 export declare class Label extends LabelBase {
     nativeViewProtected: com.nativescript.label.EllipsizingTextView;
     mHandleFontSize: boolean;
+    mTappable: boolean;
     private mAutoFontSize;
-    private _defaultMovementMethod;
+    private mDefaultMovementMethod;
     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;
     _setTappableState(tappable: boolean): void;
     _setNativeText(reset?: boolean): void;
-    _setupUI(context: android.content.Context, atIndex?: number, parentIsLoaded?: boolean): void;
 }
 export declare function getTransformedText(text: string, textTransform: CoreTypes.TextTransformType): string;

package/label.android.js

@@ -3,25 +3,17 @@ import { CSSType, Device, FormattedString, Observable, Property, Span, View, boo
 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';
-import { letterSpacingProperty, textAlignmentProperty, textDecorationProperty, textTransformProperty, whiteSpaceProperty } from '@nativescript/core/ui/text-base';
-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 { letterSpacingProperty, lineHeightProperty, textAlignmentProperty, textDecorationProperty, textTransformProperty, whiteSpaceProperty } from '@nativescript/core/ui/text-base';
+import { maxLinesProperty } from '@nativescript/core/ui/text-base/text-base-common';
 import lazy from '@nativescript/core/utils/lazy';
+import { layout } from '@nativescript/core/utils/utils';
+import { autoFontSizeProperty, lineBreakProperty, selectableProperty, textShadowProperty } from './label-common';
 export { createNativeAttributedString, enableIOSDTCoreText } from '@nativescript-community/text';
 export * from './label-common';
 const sdkVersion = lazy(() => parseInt(Device.sdkVersion, 10));
 let TextView;
 const CHILD_FORMATTED_TEXT = 'formattedText';
 const resetSymbol = Symbol('textPropertyDefault');
-var SuspendType;
-(function (SuspendType) {
-    SuspendType[SuspendType["Incremental"] = 0] = "Incremental";
-    SuspendType[SuspendType["Loaded"] = 1048576] = "Loaded";
-    SuspendType[SuspendType["NativeView"] = 2097152] = "NativeView";
-    SuspendType[SuspendType["UISetup"] = 4194304] = "UISetup";
-    SuspendType[SuspendType["IncrementalCountMask"] = -7340033] = "IncrementalCountMask";
-})(SuspendType || (SuspendType = {}));
 const textProperty = new Property({ name: 'text', defaultValue: '', affectsLayout: true });
 const formattedTextProperty = new Property({
     name: 'formattedText',
@@ -31,13 +23,14 @@ const formattedTextProperty = new Property({
 export const htmlProperty = new Property({ name: 'html', defaultValue: null, affectsLayout: true });
 function getHorizontalGravity(textAlignment) {
     switch (textAlignment) {
-        case 'initial':
-        case 'left':
-            return 8388611; //Gravity.START
         case 'center':
             return 1; //Gravity.CENTER_HORIZONTAL
         case 'right':
             return 8388613; //Gravity.END
+        default:
+        case 'initial':
+        case 'left':
+            return 8388611; //Gravity.START
     }
 }
 function getVerticalGravity(textAlignment) {
@@ -121,8 +114,8 @@ let LabelBase = class LabelBase extends View {
     constructor() {
         super(...arguments);
         // for now code is duplicated as Android version is a full rewrite
-        this._canChangeText = true;
-        this._needFormattedStringComputation = false;
+        this.mCanChangeText = true;
+        this.mNeedFormattedStringComputation = false;
     }
     get nativeTextViewProtected() {
         return this.nativeViewProtected;
@@ -130,11 +123,11 @@ let LabelBase = class LabelBase extends View {
     _setTappableState(value) { }
     onResumeNativeUpdates() {
         // {N} suspends properties update on `_suspendNativeUpdates`. So we only need to do this in onResumeNativeUpdates
-        this._canChangeText = false;
+        this.mCanChangeText = false;
         super.onResumeNativeUpdates();
-        this._canChangeText = true;
-        if (this._needFormattedStringComputation) {
-            this._needFormattedStringComputation = false;
+        this.mCanChangeText = true;
+        if (this.mNeedFormattedStringComputation) {
+            this.mNeedFormattedStringComputation = false;
             this._setNativeText();
         }
     }
@@ -268,8 +261,8 @@ export class Label extends LabelBase {
     constructor() {
         super(...arguments);
         this.mHandleFontSize = true;
+        this.mTappable = false;
         this.mAutoFontSize = false;
-        this._tappable = false;
     }
     get nativeTextViewProtected() {
         return this.nativeViewProtected;
@@ -516,20 +509,20 @@ export class Label extends LabelBase {
         return result;
     }
     _setTappableState(tappable) {
-        if (this._tappable !== tappable) {
-            this._tappable = tappable;
-            if (this._tappable) {
+        if (this.mTappable !== tappable) {
+            this.mTappable = tappable;
+            if (this.mTappable) {
                 this.nativeViewProtected.setMovementMethod(android.text.method.LinkMovementMethod.getInstance());
                 this.nativeViewProtected.setHighlightColor(null);
             }
             else {
-                this.nativeViewProtected.setMovementMethod(this._defaultMovementMethod);
+                this.nativeViewProtected.setMovementMethod(this.mDefaultMovementMethod);
             }
         }
     }
     _setNativeText(reset = false) {
-        if (!this._canChangeText) {
-            this._needFormattedStringComputation = true;
+        if (!this.mCanChangeText) {
+            this.mNeedFormattedStringComputation = true;
             return;
         }
         if (reset) {
@@ -552,36 +545,6 @@ export class Label extends LabelBase {
         }
         this.nativeTextViewProtected.setText(transformedText);
     }
-    _setupUI(context, atIndex, parentIsLoaded) {
-        if (this._context === context) {
-            return;
-        }
-        else if (this._context) {
-            this._tearDownUI(true);
-        }
-        this._context = context;
-        // This will account for nativeView that is created in createNativeView, recycled
-        // or for backward compatability - set before _setupUI in iOS contructor.
-        let nativeView = this.nativeViewProtected;
-        if (!nativeView) {
-            nativeView = this.createNativeView();
-        }
-        this._androidView = nativeView;
-        // if (nativeView) {
-        // if (this._isPaddingRelative === undefined) {
-        //     this._isPaddingRelative = false;
-        // }
-        // this._defaultPaddingTop = 0;
-        // this._defaultPaddingRight = 0;
-        // this._defaultPaddingBottom = 0;
-        // this._defaultPaddingLeft = 0;
-        // }
-        this.setNativeView(nativeView);
-        if (this.parent) {
-            this._isAddedToNativeVisualTree = this.parent._addViewToNativeVisualTree(this, undefined);
-        }
-        this._resumeNativeUpdates(SuspendType.UISetup);
-    }
 }
 __decorate([
     profile
@@ -592,15 +555,12 @@ __decorate([
 __decorate([
     profile
 ], Label.prototype, "_setNativeText", null);
-__decorate([
-    profile
-], Label.prototype, "_setupUI", null);
 function getCapitalizedString(str) {
     const words = str.split(' ');
     const newWords = [];
     for (let i = 0, length = words.length; i < length; i++) {
         const word = words[i].toLowerCase();
-        newWords.push(word.substr(0, 1).toUpperCase() + word.substring(1));
+        newWords.push(word.substring(0, 1).toUpperCase() + word.substring(1));
     }
     return newWords.join(' ');
 }

package/label.ios.d.ts

@@ -10,12 +10,15 @@ declare module '@nativescript/core/ui/text-base' {
 }
 export declare function getTransformedText(text: string, textTransform: CoreTypes.TextTransformType): string;
 export declare class Label extends LabelBase {
-    private _observer;
+    private mObserver;
     nativeViewProtected: UITextView;
     nativeTextViewProtected: UITextView;
     attributedString: NSMutableAttributedString;
-    private _delegate;
+    private mDelegate;
+    private mFixedSize;
     static DTCORETEXT_INIT: boolean;
+    fontSizeRatio: number;
+    mLastAutoSizeKey: string;
     createNativeView(): UITextView;
     initNativeView(): void;
     disposeNativeView(): void;
@@ -23,8 +26,6 @@ export declare class Label extends LabelBase {
     onUnloaded(): void;
     computeTextHeight(size: CGSize): number;
     updateTextContainerInset(applyVerticalTextAlignment?: boolean): void;
-    get ios(): UITextView;
-    private _fixedSize;
     _requestLayoutOnTextChanged(): void;
     onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void;
     _onSizeChanged(): void;
@@ -37,8 +38,6 @@ export declare class Label extends LabelBase {
     setTextDecorationAndTransform(): void;
     createFormattedTextNative(value: FormattedString): any;
     setFormattedTextDecorationAndTransform(): void;
-    fontSizeRatio: number;
-    _lastAutoSizeKey: string;
     updateAutoFontSize({ textView, width, height, force, onlyMeasure }: {
         textView: UITextView;
         width?: any;

package/label.ios.js

@@ -2,11 +2,11 @@ var _a, _b, _c, _d;
 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, whiteSpaceProperty } from '@nativescript/core/ui/text-base';
-import { lineHeightProperty } from '@nativescript/core/ui/text-base/text-base-common';
+import { formattedTextProperty, letterSpacingProperty, lineHeightProperty, whiteSpaceProperty } from '@nativescript/core/ui/text-base';
+import { maxLinesProperty } 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';
+import { LabelBase, autoFontSizeProperty, htmlProperty, lineBreakProperty, linkColorProperty, linkUnderlineProperty, needFormattedStringComputation, selectableProperty, textShadowProperty } from './label-common';
 export { createNativeAttributedString, enableIOSDTCoreText } from '@nativescript-community/text';
 export * from './label-common';
 const majorVersion = iOSNativeHelper.MajorVersion;
@@ -39,24 +39,24 @@ export function getTransformedText(text, textTransform) {
 function lineBreakToLineBreakMode(value) {
     switch (value) {
         case 'end':
-            return 4 /* ByTruncatingTail */;
+            return 4 /* NSLineBreakMode.ByTruncatingTail */;
         case 'start':
-            return 3 /* ByTruncatingHead */;
+            return 3 /* NSLineBreakMode.ByTruncatingHead */;
         case 'middle':
-            return 5 /* ByTruncatingMiddle */;
+            return 5 /* NSLineBreakMode.ByTruncatingMiddle */;
         default:
         case 'none':
-            return 0 /* ByWordWrapping */;
+            return 0 /* NSLineBreakMode.ByWordWrapping */;
     }
 }
 function whiteSpaceToLineBreakMode(value) {
     switch (value) {
         case 'initial':
         case 'normal':
-            return 0 /* ByWordWrapping */;
+            return 0 /* NSLineBreakMode.ByWordWrapping */;
         default:
         case 'nowrap':
-            return 4 /* ByTruncatingTail */;
+            return 4 /* NSLineBreakMode.ByTruncatingTail */;
     }
 }
 var LabelUITextViewDelegateImpl = /** @class */ (function (_super) {
@@ -124,7 +124,7 @@ export class Label extends LabelBase {
         view.selectable = false;
         view.backgroundColor = UIColor.clearColor;
         view.userInteractionEnabled = true;
-        view.dataDetectorTypes = -1 /* All */;
+        view.dataDetectorTypes = -1 /* UIDataDetectorTypes.All */;
         view.textContainerInset = UIEdgeInsetsZero;
         view.textContainer.lineFragmentPadding = 0;
         // ignore font leading just like UILabel does
@@ -134,27 +134,27 @@ export class Label extends LabelBase {
     }
     initNativeView() {
         super.initNativeView();
-        this._delegate = LabelUITextViewDelegateImpl.initWithOwner(new WeakRef(this));
-        this._observer = LabelObserverClass.alloc().init();
-        this._observer['_owner'] = new WeakRef(this);
-        this.nativeViewProtected.addObserverForKeyPathOptionsContext(this._observer, 'contentSize', 1 /* New */, null);
+        this.mDelegate = LabelUITextViewDelegateImpl.initWithOwner(new WeakRef(this));
+        this.mObserver = LabelObserverClass.alloc().init();
+        this.mObserver['_owner'] = new WeakRef(this);
+        this.nativeViewProtected.addObserverForKeyPathOptionsContext(this.mObserver, 'contentSize', 1 /* NSKeyValueObservingOptions.New */, null);
         this.nativeViewProtected.attributedText = this.attributedString;
     }
     disposeNativeView() {
-        this._delegate = null;
+        this.mDelegate = null;
         super.disposeNativeView();
         // if (this._htmlTapGestureRecognizer) {
         //     this.nativeViewProtected.removeGestureRecognizer(this._htmlTapGestureRecognizer);
         //     this._htmlTapGestureRecognizer = null;
         // }
-        if (this._observer) {
-            this.nativeViewProtected.removeObserverForKeyPath(this._observer, 'contentSize');
-            this._observer = null;
+        if (this.mObserver) {
+            this.nativeViewProtected.removeObserverForKeyPath(this.mObserver, 'contentSize');
+            this.mObserver = null;
         }
     }
     onLoaded() {
         super.onLoaded();
-        this.nativeTextViewProtected.delegate = this._delegate;
+        this.nativeTextViewProtected.delegate = this.mDelegate;
     }
     onUnloaded() {
         this.nativeTextViewProtected.delegate = null;
@@ -231,15 +231,11 @@ export class Label extends LabelBase {
             }
         }
     }
-    // @ts-ignore
-    get ios() {
-        return this.nativeViewProtected;
-    }
     _requestLayoutOnTextChanged() {
-        if (this._fixedSize === FixedSize.BOTH) {
+        if (this.mFixedSize === FixedSize.BOTH) {
             return;
         }
-        if (this._fixedSize === FixedSize.WIDTH && !this.textWrap && this.getMeasuredHeight() > 0) {
+        if (this.mFixedSize === FixedSize.WIDTH && !this.textWrap && this.getMeasuredHeight() > 0) {
             // Single line label with fixed width will skip request layout on text change.
             return;
         }
@@ -420,8 +416,8 @@ export class Label extends LabelBase {
             nativeView.font = newFont;
         }
         else if (newFont) {
-            if (!this._canChangeText) {
-                this._needFormattedStringComputation = true;
+            if (!this.mCanChangeText) {
+                this.mNeedFormattedStringComputation = true;
                 return;
             }
             this._setNativeText();
@@ -670,11 +666,11 @@ export class Label extends LabelBase {
             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) {
+            if (!force && autoSizeKey === this.mLastAutoSizeKey && expectFont.pointSize === textView.font.pointSize) {
                 return null;
             }
             currentFont = textView.font;
-            this._lastAutoSizeKey = autoSizeKey;
+            this.mLastAutoSizeKey = autoSizeKey;
             const nbLines = textView.textContainer.maximumNumberOfLines;
             // we need to reset verticalTextAlignment or computation will be wrong
             this.updateTextContainerInset(false);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-label",
-    "version": "1.2.8",
+    "version": "1.2.9",
     "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,
@@ -34,5 +34,5 @@
     "dependencies": {
         "@nativescript-community/text": "^1.4.36"
     },
-    "gitHead": "3ca6ba169723fcb4190268c2a9f8f47ba74f26aa"
+    "gitHead": "7adb2579ca2d8f292770a8daaa12867f520e0bd7"
 }