feat: #642 在调用setMarkdown/setValue时保持页面的滚动位置

Tencent · Dec 7, 2023 · 5106859 · 5106859
1 parent b58de6d
commit 5106859
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Cherry.js b/src/Cherry.js
@@ -330,6 +330,7 @@ export default class Cherry extends CherryStatic {
    * @param {boolean} keepCursor 是否保持光标位置
    */
   setValue(content, keepCursor = false) {
+    this.editor.storeDocumentScroll();
     if (keepCursor === false) {
       return this.editor.editor.setValue(content);
     }
@@ -607,6 +608,7 @@ export default class Cherry extends CherryStatic {
         }
         // 强制每次编辑（包括undo、redo）编辑器都会自动滚动到光标位置
         codemirror.scrollIntoView(null);
+        this.editor.restoreDocumentScroll();
       }, 50);
     } catch (e) {
       throw new NestedError(e);

diff --git a/src/Editor.js b/src/Editor.js
@@ -378,6 +378,7 @@ export default class Editor {
     if (!this.options.keepDocumentScrollAfterInit) {
       return;
     }
+    this.needRestoreDocumentScroll = true;
     this.documentElementScrollTop = document.documentElement.scrollTop;
     this.documentElementScrollLeft = document.documentElement.scrollLeft;
   }
@@ -386,9 +387,10 @@ export default class Editor {
    * 在cherry初始化后恢复到这个高度
    */
   restoreDocumentScroll() {
-    if (!this.options.keepDocumentScrollAfterInit) {
+    if (!this.options.keepDocumentScrollAfterInit || !this.needRestoreDocumentScroll) {
       return;
     }
+    this.needRestoreDocumentScroll = false;
     window.scrollTo(this.documentElementScrollLeft, this.documentElementScrollTop);
   }