@nativescript-community/ui-label 1.2.10 → 1.2.12

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.12](https://github.com/nativescript-community/ui-label/compare/v1.2.11...v1.2.12) (2022-09-16)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+
+
+
+
+## [1.2.11](https://github.com/nativescript-community/ui-label/compare/v1.2.10...v1.2.11) (2022-09-09)
+
+**Note:** Version bump only for package @nativescript-community/ui-label
+
+
+
+
+
 ## [1.2.10](https://github.com/nativescript-community/ui-label/compare/v1.2.9...v1.2.10) (2022-09-01)
 
 **Note:** Version bump only for package @nativescript-community/ui-label

package/label.ios.d.ts

@@ -29,7 +29,9 @@ export declare class Label extends LabelBase {
     _requestLayoutOnTextChanged(): void;
     onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void;
     _onSizeChanged(): void;
-    textViewShouldInteractWithURLInRangeInteraction?(textView: UITextView, URL: NSURL, characterRange: NSRange, interaction: UITextItemInteraction): boolean;
+    _tappable: any;
+    _setTappableState(tappable: any): void;
+    textViewShouldInteractWithURLInRangeInteraction?(textView: UITextView, url: NSURL, characterRange: NSRange, interaction: UITextItemInteraction): boolean;
     _updateHTMLString(fontSize?: number): void;
     updateHTMLString(fontSize?: number): void;
     _setColor(color: any): void;

package/label.ios.js

@@ -1,6 +1,6 @@
 var _a, _b, _c, _d;
 import { createNativeAttributedString, verticalTextAlignmentProperty } from '@nativescript-community/text';
-import { Color, Font, View } from '@nativescript/core';
+import { Color, Font, Span, 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';
@@ -280,10 +280,32 @@ export class Label extends LabelBase {
             this.updateAutoFontSize({ textView: this.nativeTextViewProtected });
         }
     }
-    // _htmlTappable = false;
-    // _htmlTapGestureRecognizer;
-    textViewShouldInteractWithURLInRangeInteraction(textView, URL, characterRange, interaction) {
-        this.notify({ eventName: 'linkTap', object: this, link: URL.toString() });
+    _setTappableState(tappable) {
+        if (this._tappable !== tappable) {
+            this._tappable = tappable;
+            // we dont want the label gesture recognizer for linkTap
+            // so we override
+        }
+    }
+    textViewShouldInteractWithURLInRangeInteraction(textView, url, characterRange, interaction) {
+        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;
+            const textTransform = this.formattedText.parent.textTransform;
+            let spanText = isNullOrUndefined(text) ? '' : `${text}`;
+            if (textTransform !== 'none' && textTransform !== 'initial') {
+                spanText = getTransformedText(spanText, textTransform);
+            }
+            spanStart += spanText.length;
+            if (characterRange.location - 1 <= spanStart && characterRange.location - 1 + characterRange.length > spanStart) {
+                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() });
+                }
+                break;
+            }
+        }
         return false;
     }
     _updateHTMLString(fontSize) {
@@ -309,13 +331,14 @@ export class Label extends LabelBase {
                 textAlignment: this.nativeTextViewProtected.textAlignment
             }, this, this.autoFontSize, this.fontSizeRatio);
             let hasLink = false;
-            result &&
+            if (result) {
                 result.enumerateAttributeInRangeOptionsUsingBlock(NSLinkAttributeName, { location: 0, length: result.length }, 0, (value, range, stop) => {
                     hasLink = hasLink || (!!value && range.length > 0);
                     if (hasLink) {
                         stop[0] = true;
                     }
                 });
+            }
             this.nativeTextViewProtected.selectable = this.selectable === true || hasLink;
             this.attributedString = result;
         }
@@ -482,27 +505,31 @@ export class Label extends LabelBase {
             default:
                 throw new Error(`Invalid text decoration value: ${style.textDecoration}. Valid values are: 'none', 'underline', 'line-through', 'underline line-through'.`);
         }
+        let paragraphStyle;
+        const createParagraphStyle = () => {
+            if (!paragraphStyle) {
+                paragraphStyle = NSMutableParagraphStyle.alloc().init();
+                paragraphStyle.alignment = this.nativeTextViewProtected.textAlignment;
+                // make sure a possible previously set text alignment setting is not lost when line height is specified
+                dict.set(NSParagraphStyleAttributeName, paragraphStyle);
+            }
+        };
         if (style.letterSpacing !== 0 && this.nativeTextViewProtected.font) {
             const kern = style.letterSpacing * this.nativeTextViewProtected.font.pointSize;
             dict.set(NSKernAttributeName, kern);
+            createParagraphStyle();
         }
-        const isTextView = false;
+        // const isTextView = false;
         if (style.lineHeight !== undefined) {
             let lineHeight = style.lineHeight;
             if (lineHeight === 0) {
                 lineHeight = 0.00001;
             }
-            const paragraphStyle = NSMutableParagraphStyle.alloc().init();
+            createParagraphStyle();
             paragraphStyle.minimumLineHeight = lineHeight;
             paragraphStyle.maximumLineHeight = lineHeight;
-            // make sure a possible previously set text alignment setting is not lost when line height is specified
-            paragraphStyle.alignment = this.nativeTextViewProtected.textAlignment;
-            dict.set(NSParagraphStyleAttributeName, paragraphStyle);
-        }
-        else if (isTextView) {
-            const paragraphStyle = NSMutableParagraphStyle.alloc().init();
-            paragraphStyle.alignment = this.nativeTextViewProtected.textAlignment;
-            dict.set(NSParagraphStyleAttributeName, paragraphStyle);
+            // } else if (isTextView) {
+            // createParagraphStyle();
         }
         const source = getTransformedText(isNullOrUndefined(this.text) ? '' : `${this.text}`, this.textTransform);
         if (dict.size > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-label",
-    "version": "1.2.10",
+    "version": "1.2.12",
     "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.36"
+        "@nativescript-community/text": "^1.5.9"
     },
-    "gitHead": "4c0aa81f2706149c8df1250e9429ec861324ce8b"
+    "gitHead": "475f4a72bd7416c42596977a0a170183d057f6dd"
 }