@lynx-js/web-elements 0.12.5 → 0.12.7

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @lynx-js/web-elements
 
+## 0.12.7
+
+### Patch Changes
+
+- Fix internal variable typo (`mesaurement` -> `measurement`). No behavior change. ([#3128](https://github.com/lynx-family/lynx-stack/pull/3128))
+
+- Fix x-text custom truncation when inline x-view elements are included in the measured text. ([#2998](https://github.com/lynx-family/lynx-stack/pull/2998))
+
+- Update `dompurify` from `^3.3.1` to `^3.4.12` ([#3200](https://github.com/lynx-family/lynx-stack/pull/3200))
+
+- Update `markdown-it` from `^14.1.0` to `^14.3.0` ([#3121](https://github.com/lynx-family/lynx-stack/pull/3121))
+
+- Document and verify the `message` event forwarded from an `x-webview` iframe. ([#3167](https://github.com/lynx-family/lynx-stack/pull/3167))
+
+## 0.12.6
+
+### Patch Changes
+
+- Fix `x-text` custom inline truncation so inline `x-view` children are measured as one inline box instead of double-counting their descendants as extra lines. ([#2917](https://github.com/lynx-family/lynx-stack/pull/2917))
+
 ## 0.12.5
 
 ### Patch Changes

package/dist/elements/XText/XTextTruncation.js

@@ -7,6 +7,39 @@ import { __esDecorate, __runInitializers } from "tslib";
 import { boostedQueueMicrotask, genDomGetter, registerAttributeHandler, } from '../../element-reactive/index.js';
 import { commonComponentEventSetting } from '../common/commonEventInitConfiguration.js';
 import { registerEventEnableStatusChangeHandler } from '../../element-reactive/index.js';
+const clamp = (value, min, max) => Math.min(Math.max(value, min), max);
+const getSiblingIndex = (node) => {
+    let index = 0;
+    let previousNode = node.previousSibling;
+    while (previousNode) {
+        index++;
+        previousNode = previousNode.previousSibling;
+    }
+    return index;
+};
+const getRangePosition = (nodeInfo, offsetInNode) => {
+    const { node } = nodeInfo;
+    if (node.nodeType === Node.TEXT_NODE) {
+        return {
+            container: node,
+            offset: clamp(offsetInNode, 0, node.data.length),
+        };
+    }
+    // Elements are one virtual character, while DOM Range offsets address child
+    // indexes. Use the parent's before/after-element boundary instead.
+    const elementOffset = offsetInNode > 0 ? 1 : 0;
+    const parentNode = node.parentNode;
+    if (!parentNode) {
+        return {
+            container: node,
+            offset: clamp(elementOffset, 0, node.childNodes.length),
+        };
+    }
+    return {
+        container: parentNode,
+        offset: getSiblingIndex(node) + elementOffset,
+    };
+};
 let XTextTruncation = (() => {
     var _a;
     let _instanceExtraInitializers = [];
@@ -144,12 +177,14 @@ let XTextTruncation = (() => {
                         let currentNodeInfo = measure
                             .getNodeInfoByCharIndex(maxLineEndAt);
                         const endCharInNodeIndex = end - currentNodeInfo.start;
-                        range.setEnd(currentNodeInfo.node, endCharInNodeIndex);
-                        range.setStart(currentNodeInfo.node, endCharInNodeIndex);
+                        const initialRangePosition = getRangePosition(currentNodeInfo, endCharInNodeIndex);
+                        range.setEnd(initialRangePosition.container, initialRangePosition.offset);
+                        range.setStart(initialRangePosition.container, initialRangePosition.offset);
                         while (range.getBoundingClientRect().width < inlineTruncationWidth
                             && (maxLineEndAt -= 1)
                             && (currentNodeInfo = measure.getNodeInfoByCharIndex(maxLineEndAt))) {
-                            range.setStart(currentNodeInfo.node, maxLineEndAt - currentNodeInfo.start);
+                            const rangePosition = getRangePosition(currentNodeInfo, maxLineEndAt - currentNodeInfo.start);
+                            range.setStart(rangePosition.container, rangePosition.offset);
                         }
                     }
                     else {
@@ -353,11 +388,11 @@ class TextRenderingMeasureTool {
         if (lastRectInfo.node.nodeType === Node.TEXT_NODE) {
             const { rect, rectIndex } = lastRectInfo;
             const textNode = lastRectInfo.node;
-            const mesaurementRange = document.createRange();
-            mesaurementRange.selectNode(textNode);
+            const measurementRange = document.createRange();
+            measurementRange.selectNode(textNode);
             for (let charIndex = 0; charIndex < textNode.data.length; charIndex++) {
-                mesaurementRange.setEnd(textNode, charIndex);
-                const targetRect = mesaurementRange.getClientRects().item(rectIndex);
+                measurementRange.setEnd(textNode, charIndex);
+                const targetRect = measurementRange.getClientRects().item(rectIndex);
                 if (targetRect && targetRect.right === rect.right) {
                     return charIndex;
                 }
@@ -543,6 +578,12 @@ class LazyNodesList {
     #treeWalker;
     constructor(dom) {
         this.#treeWalker = document.createTreeWalker(dom, NodeFilter.SHOW_TEXT | NodeFilter.SHOW_ELEMENT, (node) => {
+            for (let element = node.parentElement; element && element !== dom; element = element.parentElement) {
+                if (element.tagName === 'X-VIEW') {
+                    // x-view is measured as a single inline box, so skip its subtree.
+                    return NodeFilter.FILTER_REJECT;
+                }
+            }
             if (node.nodeType === Node.ELEMENT_NODE) {
                 const tagName = node.tagName;
                 if (tagName === 'X-TEXT'

package/dist/elements/XWebView/index.d.ts

@@ -10,6 +10,8 @@
  * Events:
  * - `bindload`: Fired when the page loads. Detail: `{ url }`.
  * - `binderror`: Fired when an error occurs. Detail: `{ errorMsg }`.
+ * - `message`: Fired when the page posts a message to its parent. Detail:
+ *   `{ msg, data }`.
  * - `bindmessage`: Fired when a message is received from the page. Detail: `{ msg }`.
  *
  * Methods:

package/dist/elements/XWebView/index.js

@@ -13,6 +13,8 @@
  * Events:
  * - `bindload`: Fired when the page loads. Detail: `{ url }`.
  * - `binderror`: Fired when an error occurs. Detail: `{ errorMsg }`.
+ * - `message`: Fired when the page posts a message to its parent. Detail:
+ *   `{ msg, data }`.
  * - `bindmessage`: Fired when a message is received from the page. Detail: `{ msg }`.
  *
  * Methods:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lynx-js/web-elements",
-  "version": "0.12.5",
+  "version": "0.12.7",
   "private": false,
   "repository": {
     "type": "git",
@@ -134,15 +134,16 @@
     "**/*.css"
   ],
   "dependencies": {
-    "dompurify": "^3.3.1",
-    "markdown-it": "^14.1.0"
+    "dompurify": "^3.4.12",
+    "markdown-it": "^14.3.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.61.1",
-    "@rsbuild/core": "2.0.11",
-    "@rsbuild/plugin-source-build": "1.0.5",
-    "@types/markdown-it": "^14.1.1",
-    "nyc": "^17.1.0",
+    "@rsbuild/core": "2.1.7",
+    "@rsbuild/plugin-source-build": "1.0.6",
+    "@types/markdown-it": "^14.1.2",
+    "@types/node": "^24.13.3",
+    "nyc": "^18.0.0",
     "tslib": "^2.8.1",
     "@lynx-js/playwright-fixtures": "0.0.0"
   },