@douyinfe/semi-json-viewer-core 2.95.1 → 2.96.0

package/lib/index.js

@@ -363,45 +363,157 @@ var SelectionModel = class {
   toViewPosition() {
     const selection = window.getSelection();
     if (!selection) return;
-    const range = new Range();
     if (this.isSelectedAll) {
-      range.setStartBefore(this._view.scrollDom.firstChild);
-      range.setEndAfter(this._view.scrollDom.lastChild);
+      const firstChild = this._view.scrollDom.firstChild;
+      const lastChild = this._view.scrollDom.lastChild;
+      if (!firstChild || !lastChild) {
+        selection.removeAllRanges();
+        return;
+      }
+      const range2 = new Range();
+      range2.setStartBefore(firstChild);
+      range2.setEndAfter(lastChild);
       selection.removeAllRanges();
-      selection.addRange(range);
+      selection.addRange(range2);
+      return;
+    }
+    if (!this.isCollapsed) {
+      this._restoreMultiSelection(selection);
       return;
     }
     const row = this._jsonModel.lastChangeBufferPos.lineNumber;
     const col = this._jsonModel.lastChangeBufferPos.column - 1;
-    if (this.isSelecting) {
+    const firstVisibleLineElement = this._view.scrollDom.firstElementChild;
+    const lastVisibleLineElement = this._view.scrollDom.lastElementChild;
+    if (!firstVisibleLineElement || !lastVisibleLineElement) {
+      selection.removeAllRanges();
+      return;
     }
     const lineElement = this._view.getLineElement(row);
-    if (!lineElement) return;
-    if (col === 0) {
-      range.setStart(lineElement, 0);
-      range.setEnd(lineElement, 0);
+    const range = new Range();
+    if (!lineElement) {
+      const firstVisibleLineNumber = Number(firstVisibleLineElement.dataset.lineNumber || 0);
+      const lastVisibleLineNumber = Number(lastVisibleLineElement.dataset.lineNumber || 0);
+      if (row < firstVisibleLineNumber) {
+        range.setStartBefore(firstVisibleLineElement);
+        range.setEndBefore(firstVisibleLineElement);
+      } else if (row > lastVisibleLineNumber) {
+        range.setStartAfter(lastVisibleLineElement);
+        range.setEndAfter(lastVisibleLineElement);
+      } else {
+        selection.removeAllRanges();
+        return;
+      }
     } else {
-      const walker = document.createTreeWalker(
-        lineElement,
-        NodeFilter.SHOW_TEXT,
-        null
-      );
-      let node = walker.nextNode();
-      let currentOffset = 0;
-      while (node) {
-        const nodeLength = node.length;
-        if (currentOffset + nodeLength >= col) {
-          range.setStart(node, col - currentOffset);
-          range.setEnd(node, col - currentOffset);
-          break;
+      const position = this._findPositionInLine(lineElement, col);
+      if (position) {
+        range.setStart(position.node, position.offset);
+        range.setEnd(position.node, position.offset);
+      } else {
+        range.setStart(lineElement, 0);
+        range.setEnd(lineElement, 0);
+      }
+    }
+    selection.removeAllRanges();
+    selection.addRange(range);
+  }
+  /**
+   * Restore multi-selection (non-collapsed selection) after DOM re-render
+   */
+  _restoreMultiSelection(selection) {
+    var _a2;
+    const firstVisibleLineElement = this._view.scrollDom.firstElementChild;
+    const lastVisibleLineElement = this._view.scrollDom.lastElementChild;
+    if (!firstVisibleLineElement || !lastVisibleLineElement) {
+      selection.removeAllRanges();
+      return;
+    }
+    const startLineElement = this._view.getLineElement(this.startRow);
+    const endLineElement = this._view.getLineElement(this.endRow);
+    const firstVisibleLineNumber = Number(firstVisibleLineElement.dataset.lineNumber || 0);
+    const lastVisibleLineNumber = Number(lastVisibleLineElement.dataset.lineNumber || 0);
+    const isSelectionAboveViewport = this.endRow < firstVisibleLineNumber;
+    const isSelectionBelowViewport = this.startRow > lastVisibleLineNumber;
+    if (isSelectionAboveViewport) {
+      const range2 = new Range();
+      range2.setStartBefore(firstVisibleLineElement);
+      range2.setEndBefore(firstVisibleLineElement);
+      selection.removeAllRanges();
+      selection.addRange(range2);
+      return;
+    }
+    if (isSelectionBelowViewport) {
+      const range2 = new Range();
+      range2.setStartAfter(lastVisibleLineElement);
+      range2.setEndAfter(lastVisibleLineElement);
+      selection.removeAllRanges();
+      selection.addRange(range2);
+      return;
+    }
+    const range = new Range();
+    if (startLineElement) {
+      const startPos = this._findPositionInLine(startLineElement, this.startCol - 1);
+      if (startPos) {
+        range.setStart(startPos.node, startPos.offset);
+      } else {
+        range.setStart(startLineElement, 0);
+      }
+    } else {
+      range.setStartBefore(firstVisibleLineElement);
+    }
+    if (endLineElement) {
+      const endPos = this._findPositionInLine(endLineElement, this.endCol - 1);
+      if (endPos) {
+        range.setEnd(endPos.node, endPos.offset);
+      } else {
+        const lastChild = endLineElement.lastChild;
+        if (lastChild) {
+          if (lastChild.nodeType === Node.TEXT_NODE) {
+            range.setEnd(lastChild, ((_a2 = lastChild.textContent) == null ? void 0 : _a2.length) || 0);
+          } else {
+            range.setEnd(endLineElement, endLineElement.childNodes.length);
+          }
         }
-        currentOffset += nodeLength;
-        node = walker.nextNode();
       }
+    } else {
+      range.setEndAfter(lastVisibleLineElement);
     }
     selection.removeAllRanges();
     selection.addRange(range);
   }
+  /**
+   * Find the text node and offset for a given column position in a line element
+   */
+  _findPositionInLine(lineElement, col) {
+    if (col === 0) {
+      const walker2 = document.createTreeWalker(lineElement, NodeFilter.SHOW_TEXT, null);
+      const firstNode = walker2.nextNode();
+      if (firstNode) {
+        return { node: firstNode, offset: 0 };
+      }
+      return null;
+    }
+    const walker = document.createTreeWalker(lineElement, NodeFilter.SHOW_TEXT, null);
+    let node = walker.nextNode();
+    let currentOffset = 0;
+    while (node) {
+      const nodeLength = node.length;
+      if (currentOffset + nodeLength >= col) {
+        return { node, offset: col - currentOffset };
+      }
+      currentOffset += nodeLength;
+      node = walker.nextNode();
+    }
+    walker.currentNode = lineElement;
+    let lastNode = null;
+    while (walker.nextNode()) {
+      lastNode = walker.currentNode;
+    }
+    if (lastNode) {
+      return { node: lastNode, offset: lastNode.length };
+    }
+    return null;
+  }
   toLastPosition() {
     this.isCollapsed = true;
     this.isSelectedAll = false;
@@ -2878,6 +2990,9 @@ var CompletionItem;
 })(CompletionItem || (CompletionItem = {}));
 
 // src/service/parse.ts
+function getNodeValue2(node) {
+  return Json.getNodeValue(node);
+}
 function getNodePath2(node) {
   return Json.getNodePath(node);
 }
@@ -4434,11 +4549,11 @@ var View = class {
         container.appendChild(highlightedSpan);
       } else {
         if (((_a2 = this._options) == null ? void 0 : _a2.readOnly) && this._tryApplyCustomRender(token.scopes, content)) {
-          const offset = this._jsonModel.getOffsetAt(lineNumber, (start + end) / 2);
+          const offset = this._jsonModel.getOffsetAt(lineNumber, start + 1);
           const node = (_b = this._root) == null ? void 0 : _b.getNodeFromOffset(offset);
-          const path = getNodePath2(node);
+          const path = node ? getNodePath2(node) : [];
           const pathChain = getPathChain(path);
-          const customElement = this._renderCustomToken(content, this._customRenderRule, token, pathChain);
+          const customElement = this._renderCustomToken(content, this._customRenderRule, token, pathChain, node);
           if (customElement instanceof HTMLElement) {
             container.appendChild(customElement);
             continue;
@@ -4502,10 +4617,10 @@ var View = class {
     }
     return false;
   }
-  isMatch(content, pathChain, rule) {
+  isMatch(content, typedValue, pathChain, tokenType, rule) {
     const match = rule.match;
     if (typeof match === "function") {
-      return match(content, pathChain);
+      return match(typedValue, pathChain, tokenType);
     } else if (typeof match === "string") {
       return match === content;
     } else if (match instanceof RegExp) {
@@ -4513,10 +4628,17 @@ var View = class {
     }
     return false;
   }
-  _renderCustomToken(content, rule, token, pathChain) {
+  _renderCustomToken(content, rule, token, pathChain, node) {
     const realContent = content.replace(/^"|"$/g, "");
+    const tokenType = token.scopes === TOKEN_PROPERTY_NAME ? "key" : "value";
+    let typedValue = realContent;
+    if (token.scopes === TOKEN_VALUE_NUMBER || token.scopes === TOKEN_VALUE_BOOLEAN || token.scopes === TOKEN_VALUE_NULL) {
+      if (node) {
+        typedValue = getNodeValue2(node);
+      }
+    }
     for (const item of rule) {
-      if (this.isMatch(realContent, pathChain, item)) {
+      if (this.isMatch(realContent, typedValue, pathChain, tokenType, item)) {
         const element = item.render(content);
         return element;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-json-viewer-core",
-    "version": "2.95.1",
+    "version": "2.96.0",
     "description": "",
     "main": "lib/index.js",
     "module": "lib/index.js",
@@ -53,5 +53,5 @@
     ],
     "author": "",
     "license": "MIT",
-    "gitHead": "2a3f86116f503105a95f32045127b82a4f03c08d"
+    "gitHead": "25977da675cef6d8dd70e92531b2441030991952"
 }