@douyinfe/semi-json-viewer-core 2.72.2-alpha.0 → 2.72.2-alpha.2

package/lib/index.js

@@ -754,6 +754,7 @@ var HiddenRangeModel = class {
   constructor(foldingModel) {
     this._hiddenRanges = [];
     this._hasLineChanged = false;
+    this.emitter = getEmitter();
     this._foldingModel = foldingModel;
     if (this._foldingModel.regions.length) {
       this.updateHiddenRanges();
@@ -793,6 +794,7 @@ var HiddenRangeModel = class {
   applyHiddenRanges(newHiddenAreas) {
     this._hasLineChanged = false;
     this._hiddenRanges = newHiddenAreas;
+    this.emitter.emit("forceRender", void 0);
   }
   get hiddenRanges() {
     return this._hiddenRanges;
@@ -816,14 +818,12 @@ var HiddenRangeModel = class {
   }
   notifyChangeModelContent(e) {
     if (this._hiddenRanges.length && !this._hasLineChanged) {
-      console.log("notifyChangeModelContent", e);
       if (Array.isArray(e)) {
         this._hasLineChanged = e.some((change) => {
           return change.range.endLineNumber !== change.range.startLineNumber || countEOL(change.newText)[0] !== 0 || countEOL(change.oldText)[0] !== 0;
         });
       } else {
         this._hasLineChanged = e.range.endLineNumber !== e.range.startLineNumber || countEOL(e.newText)[0] !== 0 || countEOL(e.oldText)[0] !== 0;
-        console.log("notifyChangeModelContent", this._hasLineChanged);
       }
     }
   }
@@ -837,6 +837,9 @@ var FoldingModel = class {
     this.emitter = getEmitter();
     this._jsonModel = jsonModel;
     this.updateFoldingRanges();
+    this.emitter.on("contentChanged", (e) => {
+      this._hiddenRangeModel.notifyChangeModelContent(e);
+    });
     this.emitter.on("problemsChanged", (e) => {
       this._jsonWorkerManager.foldRange().then((ranges) => {
         const newRegions = FoldingRegions.fromFoldRanges(ranges);
@@ -855,7 +858,7 @@ var FoldingModel = class {
     });
   }
   update(newRegions, blockedLineNumers = []) {
-    const foldedOrManualRanges = this._currentFoldedOrManualRanges(blockedLineNumers);
+    const foldedOrManualRanges = this._currentFoldedOrManualRanges(blockedLineNumers, newRegions);
     const newRanges = FoldingRegions.sanitizeAndMerge(
       newRegions,
       foldedOrManualRanges,
@@ -863,17 +866,35 @@ var FoldingModel = class {
     );
     this._regions = FoldingRegions.fromFoldRanges(newRanges);
   }
-  _currentFoldedOrManualRanges(blockedLineNumers = []) {
+  _currentFoldedOrManualRanges(blockedLineNumers = [], newRegions) {
+    const isBlocked = (startLineNumber, endLineNumber) => {
+      if (newRegions) {
+        const index = newRegions.findRange(startLineNumber);
+        if (index === -1) return true;
+        const region = newRegions.toRegion(index);
+        if (!region || region.endLineNumber !== endLineNumber) return true;
+      }
+      for (const blockedLineNumber of blockedLineNumers) {
+        if (startLineNumber < blockedLineNumber && blockedLineNumber <= endLineNumber) {
+          return true;
+        }
+      }
+      return false;
+    };
     const foldedRanges = [];
     for (let i = 0; i < this._regions.length; i++) {
       if (this._regions.isCollapsed(i)) {
-        foldedRanges.push({
-          startLineNumber: this._regions.getStartLineNumber(i),
-          endLineNumber: this._regions.getEndLineNumber(i),
-          isCollapsed: true,
-          source: 0 /* provider */,
-          type: this._regions.getType(i)
-        });
+        const startLineNumber = this._regions.getStartLineNumber(i);
+        const endLineNumber = this._regions.getEndLineNumber(i);
+        if (!isBlocked(startLineNumber, endLineNumber)) {
+          foldedRanges.push({
+            startLineNumber,
+            endLineNumber,
+            isCollapsed: true,
+            source: 0 /* provider */,
+            type: this._regions.getType(i)
+          });
+        }
       }
     }
     return foldedRanges;
@@ -912,6 +933,29 @@ var FoldingModel = class {
     if (!this._regions || !this._hiddenRangeModel) return this._jsonModel.getLineCount();
     return this._jsonModel.getLineCount() - this._hiddenRangeModel.getHiddenLineCount();
   }
+  getActualLineNumber(visibleLineNumber) {
+    if (!this._regions || !this._hiddenRangeModel) return visibleLineNumber;
+    let actualLine = visibleLineNumber;
+    const hiddenRanges = this._hiddenRangeModel.hiddenRanges;
+    for (const range of hiddenRanges) {
+      if (range.startLineNumber <= actualLine) {
+        actualLine += range.endLineNumber - range.startLineNumber + 1;
+      } else {
+        break;
+      }
+    }
+    return actualLine;
+  }
+  getNextVisibleLine(actualLineNumber) {
+    if (!this._regions || !this._hiddenRangeModel) return actualLineNumber + 1;
+    let nextLine = actualLineNumber + 1;
+    const hiddenRanges = this._hiddenRangeModel.hiddenRanges;
+    const containingRange = this._hiddenRangeModel.findRange(nextLine, hiddenRanges);
+    if (containingRange) {
+      return containingRange.endLineNumber + 1;
+    }
+    return nextLine;
+  }
   getRegionAtLine(lineNumber) {
     if (this._regions) {
       const index = this._regions.findRange(lineNumber);
@@ -1499,7 +1543,6 @@ var EditWidget = class {
   }
   _copyHandler() {
     const op = this.buildBaseOperation("replace");
-    console.log(op);
     navigator.clipboard.writeText(op.oldText);
   }
 };
@@ -3906,13 +3949,16 @@ var View = class {
     this.emitter.on("contentChanged", () => {
       this.resetScalingManagerConfigAndCell(0);
       if (this._jsonModel.lastChangeBufferPos.lineNumber >= this.visibleLineCount + this.startLineNumber) {
-        this.scrollToLine(
-          this._jsonModel.lastChangeBufferPos.lineNumber - this.visibleLineCount + 1
-        );
+        this.scrollToLine(this._jsonModel.lastChangeBufferPos.lineNumber - this.visibleLineCount + 1);
         return;
       }
       this.layout();
     });
+    this.emitter.on("forceRender", () => {
+      this.resetScalingManagerConfigAndCell(0);
+      this.layout();
+      this._errorWidget.renderErrorLine();
+    });
   }
   getLineElement(lineNumber) {
     return this.scrollDom.querySelector(`[data-line-number="${lineNumber}"]`);
@@ -4102,14 +4148,14 @@ var View = class {
   }
   renderVisibleLines(startVisibleLine, endVisibleLine) {
     this._tokenizationJsonModelPart.forceTokenize(endVisibleLine + 1);
-    let actualLineNumber = startVisibleLine + 1;
+    let actualLineNumber = this._foldingModel.getActualLineNumber(startVisibleLine + 1);
     let visibleLineNumber = startVisibleLine;
     while (visibleLineNumber <= endVisibleLine && actualLineNumber <= this._jsonModel.getLineCount()) {
       if (!this._foldingModel.isLineCollapsed(actualLineNumber)) {
         this.renderLine(actualLineNumber, visibleLineNumber);
         visibleLineNumber++;
       }
-      actualLineNumber++;
+      actualLineNumber = this._foldingModel.getNextVisibleLine(actualLineNumber);
     }
   }
   renderLine(actualLineNumber, visibleLineNumber) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-json-viewer-core",
-    "version": "2.72.2-alpha.0",
+    "version": "2.72.2-alpha.2",
     "description": "",
     "main": "lib/index.js",
     "module": "lib/index.js",
@@ -53,5 +53,5 @@
     ],
     "author": "",
     "license": "MIT",
-    "gitHead": "99c0a782670dd4decf43c29308a8f7ace14125ea"
+    "gitHead": "49ecf64970618ad594ae216fccf6d35b507bc52f"
 }