From 6f8e3432e983cb384b9e372385e902641b174bea Mon Sep 17 00:00:00 2001 From: Zeng1998 <1129142694@qq.com> Date: Thu, 8 Dec 2022 18:46:43 +0800 Subject: [PATCH] fix: correct priority of keys in editor (#703) --- web/src/components/MemoEditor.tsx | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/web/src/components/MemoEditor.tsx b/web/src/components/MemoEditor.tsx index a0c6bd10..3f715571 100644 --- a/web/src/components/MemoEditor.tsx +++ b/web/src/components/MemoEditor.tsx @@ -91,6 +91,27 @@ const MemoEditor = () => { }, [editorState.editMemoId]); const handleKeyDown = (event: React.KeyboardEvent) => { + if (event.ctrlKey || event.metaKey) { + if (event.key === "Enter") { + handleSaveBtnClick(); + return; + } + if (event.key === "b") { + event.preventDefault(); + editorRef.current?.insertText("", "**", "**"); + return; + } + if (event.key === "i") { + event.preventDefault(); + editorRef.current?.insertText("", "*", "*"); + return; + } + if (event.key === "e") { + event.preventDefault(); + editorRef.current?.insertText("", "`", "`"); + return; + } + } if (event.key === "Enter") { if (!editorRef.current) { return; @@ -127,27 +148,6 @@ const MemoEditor = () => { editorRef.current?.insertText(" ".repeat(TAB_SPACE_WIDTH)); return; } - if (event.ctrlKey || event.metaKey) { - if (event.key === "Enter") { - handleSaveBtnClick(); - return; - } - if (event.key === "b") { - event.preventDefault(); - editorRef.current?.insertText("", "**", "**"); - return; - } - if (event.key === "i") { - event.preventDefault(); - editorRef.current?.insertText("", "*", "*"); - return; - } - if (event.key === "e") { - event.preventDefault(); - editorRef.current?.insertText("", "`", "`"); - return; - } - } }; const handleDropEvent = async (event: React.DragEvent) => {