Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

fix: correct priority of keys in editor (#703)

Zeng19986f8e3432e983
diff --git a/web/src/components/MemoEditor.tsx b/web/src/components/MemoEditor.tsx
index a0c6bd101..3f7155714 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) => {