@nativescript-community/ui-label 1.2.15 → 1.2.16

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 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

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';

package/label.ios.js

@@ -5,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;
@@ -177,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);
@@ -185,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,
@@ -301,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;
             }
@@ -316,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;
@@ -324,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.15",
+    "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": "98ae1f7d0175445bd4110458f2d52fac8d471271"
+    "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 {
+
+                }
+            }
+        }
+    }
+}