From 275b4bb98c39a28e2469032a7a2a3611b61eff0a Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Sun, 31 Mar 2024 11:47:38 +0800
Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/10806

---
 app/src/boot/globalEvent/keydown.ts | 18 +++++++++++++++++-
 app/src/protyle/wysiwyg/keydown.ts  | 16 ----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/src/boot/globalEvent/keydown.ts b/app/src/boot/globalEvent/keydown.ts
index fd9a014b7..5d120efc6 100644
--- a/app/src/boot/globalEvent/keydown.ts
+++ b/app/src/boot/globalEvent/keydown.ts
@@ -42,7 +42,7 @@ import {deleteFiles} from "../../editor/deleteFile";
 import {escapeHtml} from "../../util/escape";
 import {syncGuide} from "../../sync/syncGuide";
 import {showPopover} from "../../block/popover";
-import {getStartEndElement} from "../../protyle/wysiwyg/commonHotkey";
+import {getStartEndElement, goEnd, goHome} from "../../protyle/wysiwyg/commonHotkey";
 import {getNextFileLi, getPreviousFileLi} from "../../protyle/wysiwyg/getBlock";
 import {editor} from "../../config/editor";
 import {hintMoveBlock} from "../../protyle/hint/extend";
@@ -400,6 +400,22 @@ const editKeydown = (app: App, event: KeyboardEvent) => {
     if (target.tagName !== "TABLE" && ["INPUT", "TEXTAREA"].includes(target.tagName)) {
         return false;
     }
+    // ctrl+home 光标移动到顶
+    if (!event.altKey && !event.shiftKey && isOnlyMeta(event) && event.key === "Home") {
+        goHome(protyle);
+        hideElements(["select"], protyle);
+        event.stopPropagation();
+        event.preventDefault();
+        return;
+    }
+    // ctrl+end 光标移动到尾
+    if (!event.altKey && !event.shiftKey && isOnlyMeta(event) && event.key === "End") {
+        goEnd(protyle);
+        hideElements(["select"], protyle);
+        event.stopPropagation();
+        event.preventDefault();
+        return;
+    }
     if (matchHotKey(window.siyuan.config.keymap.editor.general.exitFocus.custom, event)) {
         event.preventDefault();
         zoomOut({protyle, id: protyle.block.rootID, focusId: protyle.block.id});
diff --git a/app/src/protyle/wysiwyg/keydown.ts b/app/src/protyle/wysiwyg/keydown.ts
index feec26d01..9153e7407 100644
--- a/app/src/protyle/wysiwyg/keydown.ts
+++ b/app/src/protyle/wysiwyg/keydown.ts
@@ -500,22 +500,6 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
             event.preventDefault();
             return;
         }
-        // ctrl+home 光标移动到顶
-        if (!event.altKey && !event.shiftKey && isOnlyMeta(event) && event.key === "Home") {
-            goHome(protyle);
-            hideElements(["select"], protyle);
-            event.stopPropagation();
-            event.preventDefault();
-            return;
-        }
-        // ctrl+end 光标移动到尾
-        if (!event.altKey && !event.shiftKey && isOnlyMeta(event) && event.key === "End") {
-            goEnd(protyle);
-            hideElements(["select"], protyle);
-            event.stopPropagation();
-            event.preventDefault();
-            return;
-        }
         // 向上/下滚动一屏
         if (!event.altKey && !event.shiftKey && isNotCtrl(event) && (event.key === "PageUp" || event.key === "PageDown")) {
             if (event.key === "PageUp") {