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.

chore: split editor keydown handler

Steven5a723f00fa9d
diff --git a/web/src/components/MemoEditor/handlers.tsx b/web/src/components/MemoEditor/handlers.tsx
new file mode 100644
index 000000000..ff3d3f1cb
--- /dev/null
+++ b/web/src/components/MemoEditor/handlers.tsx
@@ -0,0 +1,43 @@
+import { EditorRefActions } from "./Editor";
+
+export const handleEditorKeydownWithMarkdownShortcuts = (event: React.KeyboardEvent, editorRef: EditorRefActions) => {
+ if (event.key === "b") {
+ const boldDelimiter = "**";
+ event.preventDefault();
+ styleHighlightedText(editorRef, boldDelimiter);
+ } else if (event.key === "i") {
+ const italicsDelimiter = "*";
+ event.preventDefault();
+ styleHighlightedText(editorRef, italicsDelimiter);
+ } else if (event.key === "k") {
+ event.preventDefault();
+ hyperlinkHighlightedText(editorRef);
+ }
+};
+
+const styleHighlightedText = (editor: EditorRefActions, delimiter: string) => {
+ const cursorPosition = editor.getCursorPosition();
+ const selectedContent = editor.getSelectedContent();
+ if (selectedContent.startsWith(delimiter) && selectedContent.endsWith(delimiter)) {
+ editor.insertText(selectedContent.slice(delimiter.length, -delimiter.length));
+ const newContentLength = selectedContent.length - delimiter.length * 2;
+ editor.setCursorPosition(cursorPosition, cursorPosition + newContentLength);
+ } else {
+ editor.insertText(`${delimiter}${selectedContent}${delimiter}`);
+ editor.setCursorPosition(cursorPosition + delimiter.length, cursorPosition + delimiter.length + selectedContent.length);
+ }
+};
+
+const hyperlinkHighlightedText = (editor: EditorRefActions, url?: string) => {
+ const cursorPosition = editor.getCursorPosition();
+ const selectedContent = editor.getSelectedContent();
+ const blankURL = "url";
+ url = url ?? blankURL;
+
+ editor.insertText(`[${selectedContent}](${url})`);
+
+ if (url === blankURL) {
+ const newCursorStart = cursorPosition + selectedContent.length + 3;
+ editor.setCursorPosition(newCursorStart, newCursorStart + url.length);
+ }
+};
diff --git a/web/src/components/MemoEditor/index.tsx b/web/src/components/MemoEditor/index.tsx
index ff76064e8..a9158e093 100644
--- a/web/src/components/MemoEditor/index.tsx
+++ b/web/src/components/MemoEditor/index.tsx
@@ -6,7 +6,6 @@ import { useTranslation } from "react-i18next";
import useLocalStorage from "react-use/lib/useLocalStorage";
import { memoServiceClient } from "@/grpcweb";
import { TAB_SPACE_WIDTH, UNKNOWN_ID } from "@/helpers/consts";
-import { isValidUrl } from "@/helpers/utils";
import { useGlobalStore, useResourceStore } from "@/store/module";
import { useMemoStore, useUserStore } from "@/store/v1";
import { MemoRelation, MemoRelation_Type } from "@/types/proto/api/v2/memo_relation_service";
@@ -24,6 +23,7 @@ import TagSelector from "./ActionButton/TagSelector";
import Editor, { EditorRefActions } from "./Editor";
import RelationListView from "./RelationListView";
import ResourceListView from "./ResourceListView";
+import { handleEditorKeydownWithMarkdownShortcuts } from "./handlers";
interface Props {
className?: string;
@@ -116,20 +116,8 @@ const MemoEditor = (props: Props) => {
handleSaveBtnClick();
return;
}
- if (event.key === "b") {
- const boldDelimiter = "**";
- event.preventDefault();
- styleHighlightedText(editorRef.current, boldDelimiter);
- }
- if (event.key === "i") {
- const italicsDelimiter = "*";
- event.preventDefault();
- styleHighlightedText(editorRef.current, italicsDelimiter);
- }
- if (event.key === "k") {
- event.preventDefault();
- hyperlinkHighlightedTest(editorRef.current);
- }
+
+ handleEditorKeydownWithMarkdownShortcuts(event, editorRef.current);
}
if (event.key === "Tab") {
event.preventDefault();
@@ -254,9 +242,6 @@ const MemoEditor = (props: Props) => {
if (event.clipboardData && event.clipboardData.files.length > 0) {
event.preventDefault();
await uploadMultiFiles(event.clipboardData.files);
- } else if (editorRef.current != null && isValidUrl(event.clipboardData.getData("Text"))) {
- event.preventDefault();
- hyperlinkHighlightedTest(editorRef.current, event.clipboardData.getData("Text"));
}
};
@@ -357,33 +342,6 @@ const MemoEditor = (props: Props) => {
editorRef.current?.focus();
};
- const styleHighlightedText = (editor: EditorRefActions, delimiter: string) => {
- const cursorPosition = editor.getCursorPosition();
- const selectedContent = editor.getSelectedContent();
- if (selectedContent.startsWith(delimiter) && selectedContent.endsWith(delimiter)) {
- editor.insertText(selectedContent.slice(delimiter.length, -delimiter.length));
- const newContentLength = selectedContent.length - delimiter.length * 2;
- editor.setCursorPosition(cursorPosition, cursorPosition + newContentLength);
- } else {
- editor.insertText(`${delimiter}${selectedContent}${delimiter}`);
- editor.setCursorPosition(cursorPosition + delimiter.length, cursorPosition + delimiter.length + selectedContent.length);
- }
- };
-
- const hyperlinkHighlightedTest = (editor: EditorRefActions, url?: string) => {
- const cursorPosition = editor.getCursorPosition();
- const selectedContent = editor.getSelectedContent();
- const blankURL = "url";
- url = url ?? blankURL;
-
- editor.insertText(`[${selectedContent}](${url})`);
-
- if (url === blankURL) {
- const newCursorStart = cursorPosition + selectedContent.length + 3;
- editor.setCursorPosition(newCursorStart, newCursorStart + url.length);
- }
- };
-
const editorConfig = useMemo(
() => ({
className: editorClassName ?? "",