@nativescript-community/ui-label 1.2.15 → 1.2.18

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.18](https://github.com/nativescript-community/ui-label/compare/v1.2.17...v1.2.18) (2023-01-17)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+## [1.2.17](https://github.com/nativescript-community/ui-label/compare/v1.2.16...v1.2.17) (2023-01-12)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+## [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
@@ -282,7 +294,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ## [1.0.41](https://github.com/nativescript-community/ui-label/compare/v1.0.40...v1.0.41) (2020-07-26)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.40](https://github.com/nativescript-community/ui-label/compare/v1.0.39...v1.0.40) (2020-07-26)
 
@@ -310,7 +322,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ## [1.0.36](https://github.com/nativescript-community/ui-label/compare/v1.0.35...v1.0.36) (2020-05-21)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.35](https://github.com/nativescript-community/ui-label/compare/v1.0.34...v1.0.35) (2020-05-21)
 
@@ -320,11 +332,11 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ## [1.0.34](https://github.com/nativescript-community/ui-label/compare/v1.0.33...v1.0.34) (2020-05-21)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.33](https://github.com/nativescript-community/ui-label/compare/v1.0.32...v1.0.33) (2020-05-21)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.32](https://github.com/nativescript-community/ui-label/compare/v1.0.31...v1.0.32) (2020-05-10)
 
@@ -352,7 +364,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ## [1.0.28](https://github.com/nativescript-community/ui-label/compare/v1.0.27...v1.0.28) (2020-04-29)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.27](https://github.com/nativescript-community/ui-label/compare/v1.0.26...v1.0.27) (2020-03-30)
 
@@ -368,19 +380,19 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ## [1.0.25](https://github.com/nativescript-community/ui-label/compare/v1.0.24...v1.0.25) (2020-03-04)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.24](https://github.com/nativescript-community/ui-label/compare/v1.0.23...v1.0.24) (2020-03-04)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.23](https://github.com/nativescript-community/ui-label/compare/v1.0.22...v1.0.23) (2020-03-02)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.22](https://github.com/nativescript-community/ui-label/compare/v1.0.21...v1.0.22) (2020-02-27)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.21](https://github.com/nativescript-community/ui-label/compare/v1.0.20...v1.0.21) (2020-02-26)
 
@@ -390,11 +402,11 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ## [1.0.20](https://github.com/nativescript-community/ui-label/compare/v1.0.19...v1.0.20) (2020-02-17)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.19](https://github.com/nativescript-community/ui-label/compare/v1.0.18...v1.0.19) (2020-02-17)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.18](https://github.com/nativescript-community/ui-label/compare/v1.0.17...v1.0.18) (2020-02-14)
 
@@ -416,35 +428,35 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ## [1.0.15](https://github.com/nativescript-community/ui-label/compare/v1.0.14...v1.0.15) (2020-02-07)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.14](https://github.com/nativescript-community/ui-label/compare/v1.0.13...v1.0.14) (2019-10-18)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.13](https://github.com/nativescript-community/ui-label/compare/v1.0.12...v1.0.13) (2019-10-16)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.12](https://github.com/nativescript-community/ui-label/compare/v1.0.11...v1.0.12) (2019-10-16)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.11](https://github.com/nativescript-community/ui-label/compare/v1.0.10...v1.0.11) (2019-08-22)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.10](https://github.com/nativescript-community/ui-label/compare/v1.0.9...v1.0.10) (2019-08-02)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.9](https://github.com/nativescript-community/ui-label/compare/v1.0.8...v1.0.9) (2019-07-29)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## [1.0.8](https://github.com/nativescript-community/ui-label/compare/v1.0.7...v1.0.8) (2019-07-12)
 
-**Note:** Version bump only for package nativescript-htmllabel
+**Note:** Version bump only for package @nativescript-community/ui-label
 
 ## 1.0.7 (2019-07-12)
 

package/README.md

@@ -1,8 +1,8 @@
 # NativeScript Label widget
 
-[![npm downloads](https://img.shields.io/npm/dm/nativescript-htmllabel.svg)](https://www.npmjs.com/package/nativescript-htmllabel)
-[![npm downloads](https://img.shields.io/npm/dt/nativescript-htmllabel.svg)](https://www.npmjs.com/package/nativescript-htmllabel)
-[![npm](https://img.shields.io/npm/v/nativescript-htmllabel.svg)](https://www.npmjs.com/package/nativescript-htmllabel)
+[![npm downloads](https://img.shields.io/npm/dm/@nativescript-community/ui-label.svg)](https://www.npmjs.com/package/@nativescript-community/ui-label)
+[![npm downloads](https://img.shields.io/npm/dt/@nativescript-community/ui-label.svg)](https://www.npmjs.com/package/@nativescript-community/ui-label)
+[![npm](https://img.shields.io/npm/v/@nativescript-community/ui-label.svg)](https://www.npmjs.com/package/@nativescript-community/ui-label)
 
 A NativeScript Label widget. It is a direct replacement for the {N} Label widget.
 
@@ -12,7 +12,7 @@ Run the following command from the root of your project:
 
 `tns plugin add @nativescript-community/ui-label`
 
-This command automatically installs the necessary files, as well as stores nativescript-htmllabel as a dependency in your project's package.json file.
+This command automatically installs the necessary files, as well as stores nativescript-community/ui-label as a dependency in your project's package.json file.
 
 ## Configuration
 

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 { Utils } from '@nativescript/core';
 // declare module '@nativescript/core/ui/text-base/formatted-string' {
 //     interface FormattedString {
 //         addPropertyChangeHandler(span: Span);
@@ -141,7 +141,7 @@ export const maxFontSizeProperty = new CssProperty({
 maxFontSizeProperty.register(Style);
 function parseDIPs(value) {
     if (value.indexOf('px') !== -1) {
-        return layout.toDeviceIndependentPixels(parseFloat(value.replace('px', '').trim()));
+        return Utils.layout.toDeviceIndependentPixels(parseFloat(value.replace('px', '').trim()));
     }
     else {
         return parseFloat(value.replace('dip', '').trim());

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

@@ -1,12 +1,11 @@
 import { LightFormattedString, createNativeAttributedString, cssProperty, overrideSpanAndFormattedStringEnabled, verticalTextAlignmentProperty } from '@nativescript-community/text';
-import { CSSType, Device, FormattedString, Observable, Property, Span, View, booleanConverter, profile } from '@nativescript/core';
+import { CSSType, Device, FormattedString, Observable, Property, Span, Utils, 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';
 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';
@@ -391,11 +390,11 @@ export class Label extends LabelBase {
     }
     [lineHeightProperty.setNative](value) {
         if (sdkVersion() >= 28) {
-            this.nativeTextViewProtected.setLineHeight(value * layout.getDisplayDensity());
+            this.nativeTextViewProtected.setLineHeight(value * Utils.layout.getDisplayDensity());
         }
         else {
             const fontHeight = this.nativeTextViewProtected.getPaint().getFontMetricsInt(null);
-            this.nativeTextViewProtected.setLineSpacing(value * layout.getDisplayDensity() - fontHeight, 1);
+            this.nativeTextViewProtected.setLineSpacing(value * Utils.layout.getDisplayDensity() - fontHeight, 1);
         }
     }
     [fontInternalProperty.setNative](value) {
@@ -403,7 +402,7 @@ export class Label extends LabelBase {
         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);
+            this.nativeTextViewProtected.setLineSpacing(this.lineHeight * Utils.layout.getDisplayDensity() - fontHeight, 1);
         }
     }
     [textDecorationProperty.setNative](value) {

package/label.ios.js

@@ -1,11 +1,11 @@
 var _a, _b, _c, _d;
 import { createNativeAttributedString, verticalTextAlignmentProperty } from '@nativescript-community/text';
-import { Color, Font, Span, View } from '@nativescript/core';
+import { Color, Font, Span, Utils, View } from '@nativescript/core';
 import { borderBottomWidthProperty, borderLeftWidthProperty, borderRightWidthProperty, borderTopWidthProperty, fontInternalProperty, paddingBottomProperty, paddingLeftProperty, paddingRightProperty, paddingTopProperty } from '@nativescript/core/ui/styling/style-properties';
 import { formattedTextProperty, letterSpacingProperty, lineHeightProperty, whiteSpaceProperty } from '@nativescript/core/ui/text-base';
 import { maxLinesProperty } from '@nativescript/core/ui/text-base/text-base-common';
+import { iOSNativeHelper } from '@nativescript/core/utils';
 import { isNullOrUndefined, isString } from '@nativescript/core/utils/types';
-import { iOSNativeHelper, layout } from '@nativescript/core/utils/utils';
 import { LabelBase, autoFontSizeProperty, htmlProperty, lineBreakProperty, linkColorProperty, linkUnderlineProperty, needFormattedStringComputation, selectableProperty, textShadowProperty } from './label-common';
 export { createNativeAttributedString, enableIOSDTCoreText } from '@nativescript-community/text';
 export * from './label-common';
@@ -177,15 +177,14 @@ 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);
-        const bottom = layout.toDeviceIndependentPixels(this.effectivePaddingBottom + this.effectiveBorderBottomWidth);
-        const left = layout.toDeviceIndependentPixels(this.effectivePaddingLeft + this.effectiveBorderLeftWidth);
+        const top = Utils.layout.toDeviceIndependentPixels(this.effectivePaddingTop + this.effectiveBorderTopWidth);
+        const right = Utils.layout.toDeviceIndependentPixels(this.effectivePaddingRight + this.effectiveBorderRightWidth);
+        const bottom = Utils.layout.toDeviceIndependentPixels(this.effectivePaddingBottom + this.effectiveBorderBottomWidth);
+        const left = Utils.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,
@@ -244,28 +243,28 @@ export class Label extends LabelBase {
     onMeasure(widthMeasureSpec, heightMeasureSpec) {
         const nativeView = this.nativeTextViewProtected;
         if (nativeView) {
-            const width = layout.getMeasureSpecSize(widthMeasureSpec);
-            const widthMode = layout.getMeasureSpecMode(widthMeasureSpec);
-            const height = layout.getMeasureSpecSize(heightMeasureSpec);
-            const heightMode = layout.getMeasureSpecMode(heightMeasureSpec);
+            const width = Utils.layout.getMeasureSpecSize(widthMeasureSpec);
+            const widthMode = Utils.layout.getMeasureSpecMode(widthMeasureSpec);
+            const height = Utils.layout.getMeasureSpecSize(heightMeasureSpec);
+            const heightMode = Utils.layout.getMeasureSpecMode(heightMeasureSpec);
             let resetFont;
             if (this.autoFontSize) {
-                const finiteWidth = widthMode === layout.EXACTLY;
-                const finiteHeight = heightMode === layout.EXACTLY;
+                const finiteWidth = widthMode === Utils.layout.EXACTLY;
+                const finiteHeight = heightMode === Utils.layout.EXACTLY;
                 if (!finiteWidth || !finiteHeight) {
                     resetFont = this.updateAutoFontSize({
                         textView: nativeView,
-                        width: layout.toDeviceIndependentPixels(width),
-                        height: layout.toDeviceIndependentPixels(height),
+                        width: Utils.layout.toDeviceIndependentPixels(width),
+                        height: Utils.layout.toDeviceIndependentPixels(height),
                         onlyMeasure: true
                     });
                 }
             }
-            const desiredSize = layout.measureNativeView(nativeView, width, widthMode, height, heightMode);
+            const desiredSize = Utils.layout.measureNativeView(nativeView, width, widthMode, height, heightMode);
             if (!this.formattedText && !this.html && resetFont) {
                 nativeView.font = resetFont;
             }
-            const labelWidth = widthMode === layout.AT_MOST ? Math.min(desiredSize.width, width) : desiredSize.width;
+            const labelWidth = widthMode === Utils.layout.AT_MOST ? Math.min(desiredSize.width, width) : desiredSize.width;
             // const labelHeight = heightMode === layout.AT_MOST ? Math.min(desiredSize.height, height) : desiredSize.height;
             const measureWidth = Math.max(labelWidth, this.effectiveMinWidth);
             const measureHeight = Math.max(desiredSize.height, this.effectiveMinHeight);
@@ -288,6 +287,12 @@ export class Label extends LabelBase {
         }
     }
     textViewShouldInteractWithURLInRangeInteraction(textView, url, characterRange, interaction) {
+        if (!this.formattedText?.spans) {
+            if (url) {
+                this.notify({ eventName: Span.linkTapEvent, link: url?.toString() });
+            }
+            return false;
+        }
         for (let i = 0, spanStart = 0, length = this.formattedText.spans.length; i < length; i++) {
             const span = this.formattedText.spans.getItem(i);
             const text = span.text;
@@ -301,7 +306,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;
             }
@@ -316,7 +321,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;
@@ -324,7 +329,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.15",
+    "version": "1.2.18",
     "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": "98ae1f7d0175445bd4110458f2d52fac8d471271"
+    "gitHead": "ae294ad826343d7d82fae189b32a95f9ad14b4af"
 }

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 {
+
+                }
+            }
+        }
+    }
+}