@nativescript-community/ui-label 1.2.14 → 1.2.16

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.16](https://github.com/nativescript-community/ui-label/compare/v1.2.15...v1.2.16) (2022-12-01)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+## [1.2.15](https://github.com/nativescript-community/ui-label/compare/v1.2.14...v1.2.15) (2022-11-21)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
 ## [1.2.14](https://github.com/nativescript-community/ui-label/compare/v1.2.13...v1.2.14) (2022-11-20)
 
 **Note:** Version bump only for package @nativescript-community/ui-label

package/label-common.js

@@ -1,6 +1,6 @@
 import { cssProperty, init } from '@nativescript-community/text';
 import { CSSType, Color, CssProperty, Property, Style, Label as TNLabel, booleanConverter, fontInternalProperty } from '@nativescript/core';
-import { layout } from '@nativescript/core/utils/utils';
+import { layout } from '@nativescript/core/utils/layout-helper';
 // declare module '@nativescript/core/ui/text-base/formatted-string' {
 //     interface FormattedString {
 //         addPropertyChangeHandler(span: Span);

package/label.android.d.ts

@@ -2,7 +2,7 @@ import { VerticalTextAlignment } from '@nativescript-community/text';
 import { CoreTypes, FormattedString, Property, PropertyChangeData, View } from '@nativescript/core';
 import { Color } from '@nativescript/core/color';
 import { CSSShadow } from '@nativescript/core/ui/styling/css-shadow';
-import { FontStyle, FontWeight } from '@nativescript/core/ui/styling/font';
+import { FontStyleType, FontWeightType } from '@nativescript/core/ui/styling/font';
 import { Label as LabelViewDefinition, LineBreak } from './label';
 export { createNativeAttributedString, enableIOSDTCoreText } from '@nativescript-community/text';
 export * from './label-common';
@@ -32,8 +32,8 @@ declare abstract class LabelBase extends View implements LabelViewDefinition {
     _setTappableState(value: boolean): void;
     fontFamily: string;
     fontSize: number;
-    fontStyle: FontStyle;
-    fontWeight: FontWeight;
+    fontStyle: FontStyleType;
+    fontWeight: FontWeightType;
     letterSpacing: number;
     lineHeight: number;
     lineBreak: LineBreak;

package/label.android.js

@@ -6,7 +6,7 @@ import { Length, colorProperty, fontInternalProperty, fontSizeProperty, paddingB
 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 { layout } from '@nativescript/core/utils/layout-helper';
 import { autoFontSizeProperty, lineBreakProperty, selectableProperty, textShadowProperty } from './label-common';
 export { createNativeAttributedString, enableIOSDTCoreText } from '@nativescript-community/text';
 export * from './label-common';
@@ -51,27 +51,26 @@ function initializeClickableSpan() {
     if (ClickableSpan) {
         return;
     }
-    let ClickableSpanImpl = class ClickableSpanImpl extends android.text.style.ClickableSpan {
-        constructor(owner) {
-            super();
-            this.owner = new WeakRef(owner);
-            return global.__native(this);
-        }
-        onClick(view) {
-            const owner = this.owner.get();
-            if (owner) {
-                owner._emit(Span.linkTapEvent);
-            }
-            view.clearFocus();
-            view.invalidate();
-        }
-        updateDrawState(tp) {
-            // don't style as link
+    var ClickableSpanImpl = /** @class */ (function (_super) {
+    __extends(ClickableSpanImpl, _super);
+    function ClickableSpanImpl(owner) {
+        var _this = _super.call(this) || this;
+        _this.owner = new WeakRef(owner);
+        return global.__native(_this);
+    }
+    ClickableSpanImpl.prototype.onClick = function (view) {
+        var owner = this.owner.get();
+        if (owner) {
+            owner._emit(Span.linkTapEvent);
         }
+        view.clearFocus();
+        view.invalidate();
+    };
+    ClickableSpanImpl.prototype.updateDrawState = function (tp) {
+        // don't style as link
     };
-    ClickableSpanImpl = __decorate([
-        NativeClass
-    ], ClickableSpanImpl);
+    return ClickableSpanImpl;
+}(android.text.style.ClickableSpan));
     ClickableSpan = ClickableSpanImpl;
 }
 // eslint-disable-next-line no-redeclare
@@ -80,36 +79,35 @@ function initializeURLClickableSpan() {
     if (URLClickableSpan) {
         return;
     }
-    let URLClickableSpanImpl = class URLClickableSpanImpl extends android.text.style.URLSpan {
-        constructor(url, owner) {
-            super(url);
-            this.owner = new WeakRef(owner);
-            return global.__native(this);
+    var URLClickableSpanImpl = /** @class */ (function (_super) {
+    __extends(URLClickableSpanImpl, _super);
+    function URLClickableSpanImpl(url, owner) {
+        var _this = _super.call(this, url) || this;
+        _this.owner = new WeakRef(owner);
+        return global.__native(_this);
+    }
+    URLClickableSpanImpl.prototype.onClick = function (view) {
+        var owner = this.owner.get();
+        if (owner) {
+            owner.notify({ eventName: Span.linkTapEvent, object: owner, link: this.getURL() });
         }
-        onClick(view) {
-            const owner = this.owner.get();
-            if (owner) {
-                owner.notify({ eventName: Span.linkTapEvent, object: owner, link: this.getURL() });
-            }
-            view.clearFocus();
-            view.invalidate();
+        view.clearFocus();
+        view.invalidate();
+    };
+    URLClickableSpanImpl.prototype.updateDrawState = function (tp) {
+        var owner = this.owner.get();
+        if (!owner || owner.linkUnderline !== false) {
+            _super.prototype.updateDrawState.call(this, tp);
         }
-        updateDrawState(tp) {
-            const owner = this.owner.get();
-            if (!owner || owner.linkUnderline !== false) {
-                super.updateDrawState(tp);
-            }
-            if (owner && owner.linkColor) {
-                const color = !owner.linkColor || owner.linkColor instanceof Color
-                    ? owner.linkColor
-                    : new Color(owner.linkColor);
-                tp.setColor(color.android);
-            }
+        if (owner && owner.linkColor) {
+            var color = !owner.linkColor || owner.linkColor instanceof Color
+                ? owner.linkColor
+                : new Color(owner.linkColor);
+            tp.setColor(color.android);
         }
     };
-    URLClickableSpanImpl = __decorate([
-        NativeClass
-    ], URLClickableSpanImpl);
+    return URLClickableSpanImpl;
+}(android.text.style.URLSpan));
     URLClickableSpan = URLClickableSpanImpl;
 }
 let LabelBase = class LabelBase extends View {

package/label.ios.js

@@ -1,4 +1,3 @@
-var LabelUITextViewDelegateImpl_1;
 var _a, _b, _c, _d;
 import { createNativeAttributedString, verticalTextAlignmentProperty } from '@nativescript-community/text';
 import { Color, Font, Span, View } from '@nativescript/core';
@@ -6,8 +5,9 @@ import { borderBottomWidthProperty, borderLeftWidthProperty, borderRightWidthPro
 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 { layout } from '@nativescript/core/utils/layout-helper';
 import { LabelBase, autoFontSizeProperty, htmlProperty, lineBreakProperty, linkColorProperty, linkUnderlineProperty, needFormattedStringComputation, selectableProperty, textShadowProperty } from './label-common';
+import { iOSNativeHelper } from '@nativescript/core/utils';
 export { createNativeAttributedString, enableIOSDTCoreText } from '@nativescript-community/text';
 export * from './label-common';
 const majorVersion = iOSNativeHelper.MajorVersion;
@@ -60,44 +60,48 @@ function whiteSpaceToLineBreakMode(value) {
             return 4 /* NSLineBreakMode.ByTruncatingTail */;
     }
 }
-let LabelUITextViewDelegateImpl = LabelUITextViewDelegateImpl_1 = class LabelUITextViewDelegateImpl extends NSObject {
-    static initWithOwner(owner) {
-        const impl = LabelUITextViewDelegateImpl_1.new();
+var LabelUITextViewDelegateImpl = /** @class */ (function (_super) {
+    __extends(LabelUITextViewDelegateImpl, _super);
+    function LabelUITextViewDelegateImpl() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    LabelUITextViewDelegateImpl.initWithOwner = function (owner) {
+        var impl = LabelUITextViewDelegateImpl.new();
         impl._owner = owner;
         return impl;
-    }
-    textViewShouldInteractWithURLInRangeInteraction(textView, URL, characterRange, interaction) {
-        const owner = this._owner.get();
+    };
+    LabelUITextViewDelegateImpl.prototype.textViewShouldInteractWithURLInRangeInteraction = function (textView, URL, characterRange, interaction) {
+        var owner = this._owner.get();
         if (owner) {
             return owner.textViewShouldInteractWithURLInRangeInteraction(textView, URL, characterRange, interaction);
         }
         return false;
-    }
-    textViewDidChange(textView) {
-        const owner = this._owner.get();
+    };
+    LabelUITextViewDelegateImpl.prototype.textViewDidChange = function (textView) {
+        var owner = this._owner.get();
         if (owner) {
             owner.textViewDidChange(textView);
         }
+    };
+    LabelUITextViewDelegateImpl.ObjCProtocols = [UITextViewDelegate];
+    return LabelUITextViewDelegateImpl;
+}(NSObject));
+var LabelObserverClass = /** @class */ (function (_super) {
+    __extends(LabelObserverClass, _super);
+    function LabelObserverClass() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
-};
-LabelUITextViewDelegateImpl.ObjCProtocols = [UITextViewDelegate];
-LabelUITextViewDelegateImpl = LabelUITextViewDelegateImpl_1 = __decorate([
-    NativeClass
-], LabelUITextViewDelegateImpl);
-let LabelObserverClass = class LabelObserverClass extends NSObject {
     // NOTE: Refactor this - use Typescript property instead of strings....
-    observeValueForKeyPathOfObjectChangeContext(path, tv) {
+    LabelObserverClass.prototype.observeValueForKeyPathOfObjectChangeContext = function (path, tv) {
         if (path === 'contentSize') {
-            const owner = this._owner && this._owner.get();
+            var owner = this._owner && this._owner.get();
             if (owner) {
                 owner.updateTextContainerInset();
             }
         }
-    }
-};
-LabelObserverClass = __decorate([
-    NativeClass
-], LabelObserverClass);
+    };
+    return LabelObserverClass;
+}(NSObject));
 export class Label extends LabelBase {
     constructor() {
         super(...arguments);
@@ -174,7 +178,6 @@ export class Label extends LabelBase {
         return result.height;
     }
     updateTextContainerInset(applyVerticalTextAlignment = true) {
-        var _e, _f;
         const tv = this.nativeTextViewProtected;
         const top = layout.toDeviceIndependentPixels(this.effectivePaddingTop + this.effectiveBorderTopWidth);
         const right = layout.toDeviceIndependentPixels(this.effectivePaddingRight + this.effectiveBorderRightWidth);
@@ -182,7 +185,7 @@ export class Label extends LabelBase {
         const left = layout.toDeviceIndependentPixels(this.effectivePaddingLeft + this.effectiveBorderLeftWidth);
         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.text?.length === 0 && tv.attributedText?.length === 0)) {
             tv.textContainerInset = {
                 top,
                 left,
@@ -298,7 +301,7 @@ export class Label extends LabelBase {
                 const span = this.formattedText.spans.getItem(i);
                 if (span && span.tappable) {
                     // if the span is found and tappable emit the linkTap event
-                    span.notify({ eventName: Span.linkTapEvent, link: url === null || url === void 0 ? void 0 : url.toString() });
+                    span.notify({ eventName: Span.linkTapEvent, link: url?.toString() });
                 }
                 break;
             }
@@ -313,7 +316,7 @@ export class Label extends LabelBase {
         else {
             const font = this.nativeViewProtected.font;
             if (!fontSize) {
-                fontSize = this.fontSize || (font === null || font === void 0 ? void 0 : font.pointSize) || 17;
+                fontSize = this.fontSize || font?.pointSize || 17;
             }
             const fontWeight = this.style.fontWeight;
             const familyName = this.style.fontFamily || (this.style.fontInternal && this.style.fontInternal.fontFamily) || undefined;
@@ -321,7 +324,7 @@ export class Label extends LabelBase {
                 text: this.html,
                 fontSize,
                 familyName,
-                fontWeight,
+                fontWeight: fontWeight,
                 // color: this.color,
                 letterSpacing: this.letterSpacing,
                 lineHeight: this.lineHeight,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-label",
-    "version": "1.2.14",
+    "version": "1.2.16",
     "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.5.9"
     },
-    "gitHead": "8e25e7262711dca1e2742e0c8e16c50db611afa5"
+    "gitHead": "f00f8a1e5c2ba68a3fd44b9a7c5818ced99100f1"
 }

package/references.d.ts

@@ -0,0 +1 @@
+/// <reference path="./typings/DTCoreText.ios.d.ts" />

package/typings/DTCoreText.ios.d.ts

@@ -0,0 +1,23 @@
+declare var DTDefaultTextAlignment: string;
+declare var DTDefaultFontStyle: string;
+declare var DTIgnoreLinkStyleOption: string;
+declare var DTDefaultFontFamily: string;
+declare var DTUseiOS6Attributes: string;
+declare var DTDocumentPreserveTrailingSpaces: string;
+declare var DTDefaultLineBreakMode: string;
+declare var NSTextSizeMultiplierDocumentOption: string;
+declare var kCTLineBreakByWordWrapping: string;
+declare var kCTLeftTextAlignment: string;
+declare var NSAttributedStringEnumerationReverse: number;
+
+
+declare namespace DTCoreTextFontDescriptor {
+    function asyncPreloadFontLookupTable()
+}
+
+declare interface NSAttributedString {
+     initWithHTMLDataOptionsDocumentAttributes(data, options, attr);
+}
+declare interface NSMutableAttributedString {
+     initWithHTMLDataOptionsDocumentAttributes(data, options, attr);
+}

package/typings/android.d.ts

@@ -0,0 +1,11 @@
+declare module com {
+    export module lsjwzh {
+        export module widget {
+            export module text {
+                export class FastTextView extends globalAndroid.view.View {
+
+                }
+            }
+        }
+    }
+}