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.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: update insert content in editor (#336)
boojackfe5ba6850b99
diff --git a/web/src/components/Editor/Editor.tsx b/web/src/components/Editor/Editor.tsxindex 055257353..dd5443738 100644--- a/web/src/components/Editor/Editor.tsx+++ b/web/src/components/Editor/Editor.tsx@@ -47,19 +47,19 @@ const Editor = forwardRef((props: Props, ref: React.ForwardedRef<EditorRefActionfocus: () => {editorRef.current?.focus();},- insertText: (content = "", prefix = "", suffix = prefix) => {+ insertText: (content = "", prefix = "", suffix = "") => {if (!editorRef.current) {return;}+const cursorPosition = editorRef.current.selectionStart;const endPosition = editorRef.current.selectionEnd;const prevValue = editorRef.current.value;const value =prevValue.slice(0, cursorPosition) +prefix +- prevValue.slice(cursorPosition, endPosition) ++ (content || prevValue.slice(cursorPosition, endPosition)) +suffix +- content +prevValue.slice(endPosition);editorRef.current.value = value;diff --git a/web/src/components/MemoEditor.tsx b/web/src/components/MemoEditor.tsxindex d746caa75..25075b381 100644--- a/web/src/components/MemoEditor.tsx+++ b/web/src/components/MemoEditor.tsx@@ -76,38 +76,36 @@ const MemoEditor: React.FC = () => {prevGlobalStateRef.current = editorState;}, [state, editorState.editMemoId]);- const handleInsertMark = (mark: string) => {- editorRef.current?.insertText("", mark);- };-const handleKeyDown = (event: React.KeyboardEvent) => {if (event.key === "Escape" && state.fullscreen) {handleFullscreenBtnClick();return;}- if (event.key === "Enter" && (event.ctrlKey || event.metaKey)) {- handleSaveBtnClick();- return;- }if (event.key === "Tab") {event.preventDefault();editorRef.current?.insertText(" ".repeat(TAB_SPACE_WIDTH));return;}if (event.ctrlKey || event.metaKey) {- event.preventDefault();- switch (event.key) {- case "b":- handleInsertMark("**");- break;- case "i":- handleInsertMark("*");- break;- case "e":- handleInsertMark("`");- break;+ 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;}- return;}};@@ -235,9 +233,9 @@ const MemoEditor: React.FC = () => {const cursorPosition = editorRef.current.getCursorPosition();const prevValue = editorRef.current.getContent().slice(0, cursorPosition);if (prevValue === "" || prevValue.endsWith("\n")) {- editorRef.current?.insertText("- [ ] ");+ editorRef.current?.insertText("", "- [ ] ");} else {- editorRef.current?.insertText("\n- [ ] ");+ editorRef.current?.insertText("", "\n- [ ] ");}};@@ -249,9 +247,9 @@ const MemoEditor: React.FC = () => {const cursorPosition = editorRef.current.getCursorPosition();const prevValue = editorRef.current.getContent().slice(0, cursorPosition);if (prevValue === "" || prevValue.endsWith("\n")) {- editorRef.current?.insertText("```\n\n```");+ editorRef.current?.insertText("", "```\n", "\n```");} else {- editorRef.current?.insertText("\n```\n\n```");+ editorRef.current?.insertText("", "\n```\n", "\n```");}};@@ -375,7 +373,7 @@ const MemoEditor: React.FC = () => {)}</div></div>- <button className="action-btn">+ <button className="action-btn !hidden sm:!flex "><Icon.Smile className="icon-img" onClick={handleEmojiPickerBtnClick} /></button><button className="action-btn">