✨ fix #304

Vanessa219 · Apr 11, 2020 · c6123ec · c6123ec
1 parent ad9a066
commit c6123ec
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/src/ts/ir/index.ts b/src/ts/ir/index.ts
@@ -11,6 +11,7 @@ import {expandMarker} from "./expandMarker";
 import {highlightToolbar} from "./highlightToolbar";
 import {input} from "./input";
 import {processAfterRender, processHint} from "./process";
+import {hidePanel} from "../toolbar/setToolbar";
 
 class IR {
     public element: HTMLPreElement;
@@ -39,7 +40,7 @@ class IR {
 
     private bindEvent(vditor: IVditor) {
         this.element.addEventListener("scroll", () => {
-            vditor.hint.element.style.display = "none";
+            hidePanel(vditor, ["hint", "headings", "emoji", "edit-mode"]);
         });
 
         this.element.addEventListener("copy", (event: ClipboardEvent & { target: HTMLElement }) => {

diff --git a/src/ts/sv/index.ts b/src/ts/sv/index.ts
@@ -6,6 +6,7 @@ import {getSelectText} from "./getSelectText";
 import {html2md} from "./html2md";
 import {inputEvent} from "./inputEvent";
 import {insertText} from "./insertText";
+import {hidePanel} from "../toolbar/setToolbar";
 
 class Editor {
     public element: HTMLPreElement;
@@ -61,7 +62,7 @@ class Editor {
         });
 
         this.element.addEventListener("scroll", () => {
-            vditor.hint.element.style.display = "none";
+            hidePanel(vditor, ["hint", "headings", "emoji", "edit-mode"]);
             if (!vditor.preview || (vditor.preview && vditor.preview.element.style.display === "none")) {
                 return;
             }

diff --git a/src/ts/wysiwyg/index.ts b/src/ts/wysiwyg/index.ts
@@ -62,14 +62,25 @@ class WYSIWYG {
                 });
         }
 
-        this.element.addEventListener("scroll", () => {
-            hidePanel(vditor, ["hint", "headings", "emoji", "edit-mode"]);
-            if (this.popover.style.display !== "block") {
-                return;
-            }
-            const top = parseInt(this.popover.getAttribute("data-top"), 10) - vditor.wysiwyg.element.scrollTop;
-            this.popover.style.top = Math.max(-8, Math.min(top, this.element.clientHeight - 21)) + "px";
-        });
+        if (vditor.options.typewriterMode) {
+            window.addEventListener("scroll", () => {
+                hidePanel(vditor, ["hint", "headings", "emoji", "edit-mode"]);
+                if (this.popover.style.display !== "block") {
+                    return;
+                }
+                const top = parseInt(this.popover.getAttribute("data-top"), 10);
+                this.popover.style.top = Math.max(top, (window.scrollY - vditor.element.offsetTop - 8)) + "px";
+            });
+        } else {
+            this.element.addEventListener("scroll", () => {
+                hidePanel(vditor, ["hint", "headings", "emoji", "edit-mode"]);
+                if (this.popover.style.display !== "block") {
+                    return;
+                }
+                const top = parseInt(this.popover.getAttribute("data-top"), 10) - vditor.wysiwyg.element.scrollTop;
+                this.popover.style.top = Math.max(-8, Math.min(top, this.element.clientHeight - 21)) + "px";
+            });
+        }
 
         this.element.addEventListener("copy", (event: ClipboardEvent & { target: HTMLElement }) => {
             const range = getSelection().getRangeAt(0);