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: update IME mode checks

Steven8bba7f706e8f
diff --git a/web/src/components/MemoEditor/Editor/index.tsx b/web/src/components/MemoEditor/Editor/index.tsx
index 1ebfcc527..c4ab235f8 100644
--- a/web/src/components/MemoEditor/Editor/index.tsx
+++ b/web/src/components/MemoEditor/Editor/index.tsx
@@ -1,6 +1,7 @@
import classNames from "classnames";
-import { forwardRef, ReactNode, useCallback, useEffect, useImperativeHandle, useRef } from "react";
-import { useAutoComplete } from "../hooks";
+import { last } from "lodash-es";
+import { forwardRef, ReactNode, useCallback, useEffect, useImperativeHandle, useRef, useState } from "react";
+import { NodeType, OrderedListNode, TaskListNode, UnorderedListNode } from "@/types/node";
import TagSuggestions from "./TagSuggestions";
export interface EditorRefActions {
@@ -30,6 +31,7 @@ interface Props {
const Editor = forwardRef(function Editor(props: Props, ref: React.ForwardedRef<EditorRefActions>) {
const { className, initialContent, placeholder, onPaste, onContentChange: handleContentChangeCallback } = props;
+ const [isInIME, setIsInIME] = useState(false);
const editorRef = useRef<HTMLTextAreaElement>(null);
useEffect(() => {
@@ -133,8 +135,6 @@ const Editor = forwardRef(function Editor(props: Props, ref: React.ForwardedRef<
},
};
- useAutoComplete(editorActions);
-
useImperativeHandle(ref, () => editorActions, []);
const updateEditorHeight = () => {
@@ -149,6 +149,33 @@ const Editor = forwardRef(function Editor(props: Props, ref: React.ForwardedRef<
updateEditorHeight();
}, []);
+ const handleEditorKeyDown = (event: React.KeyboardEvent<HTMLTextAreaElement>) => {
+ if (event.key === "Enter" && !isInIME) {
+ const cursorPosition = editorActions.getCursorPosition();
+ const prevContent = editorActions.getContent().substring(0, cursorPosition);
+ const lastNode = last(window.parse(prevContent));
+ if (!lastNode) {
+ return;
+ }
+
+ let insertText = "";
+ if (lastNode.type === NodeType.TASK_LIST) {
+ const { complete } = lastNode.value as TaskListNode;
+ insertText = complete ? "- [x] " : "- [ ] ";
+ } else if (lastNode.type === NodeType.UNORDERED_LIST) {
+ const { symbol } = lastNode.value as UnorderedListNode;
+ insertText = `${symbol} `;
+ } else if (lastNode.type === NodeType.ORDERED_LIST) {
+ const { number } = lastNode.value as OrderedListNode;
+ insertText = `${Number(number) + 1}. `;
+ }
+ if (insertText) {
+ editorActions.insertText(`\n${insertText}`);
+ event.preventDefault();
+ }
+ }
+ };
+
return (
<div
className={classNames(
@@ -163,6 +190,9 @@ const Editor = forwardRef(function Editor(props: Props, ref: React.ForwardedRef<
ref={editorRef}
onPaste={onPaste}
onInput={handleEditorInput}
+ onKeyDown={handleEditorKeyDown}
+ onCompositionStart={() => setIsInIME(true)}
+ onCompositionEnd={() => setTimeout(() => setIsInIME(false))}
></textarea>
<TagSuggestions editorRef={editorRef} editorActions={ref} />
</div>
diff --git a/web/src/components/MemoEditor/hooks/index.ts b/web/src/components/MemoEditor/hooks/index.ts
deleted file mode 100644
index d1293f1ad..000000000
--- a/web/src/components/MemoEditor/hooks/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import useAutoComplete from "./useAutoComplete";
-
-export { useAutoComplete };
diff --git a/web/src/components/MemoEditor/hooks/useAutoComplete.ts b/web/src/components/MemoEditor/hooks/useAutoComplete.ts
deleted file mode 100644
index e28e1b1c1..000000000
--- a/web/src/components/MemoEditor/hooks/useAutoComplete.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { last } from "lodash-es";
-import { useEffect } from "react";
-import { NodeType, OrderedListNode, TaskListNode, UnorderedListNode } from "@/types/node";
-import { EditorRefActions } from "../Editor";
-
-const useAutoComplete = (actions: EditorRefActions) => {
- useEffect(() => {
- const editor = actions.getEditor();
- if (!editor) return;
-
- editor.addEventListener("keydown", (event) => {
- if (event.key === "Enter") {
- if (event.isComposing) {
- return;
- }
- const cursorPosition = actions.getCursorPosition();
- const prevContent = actions.getContent().substring(0, cursorPosition);
- const lastNode = last(window.parse(prevContent));
- if (!lastNode) {
- return;
- }
-
- let insertText = "";
- if (lastNode.type === NodeType.TASK_LIST) {
- const { complete } = lastNode.value as TaskListNode;
- insertText = complete ? "- [x] " : "- [ ] ";
- } else if (lastNode.type === NodeType.UNORDERED_LIST) {
- const { symbol } = lastNode.value as UnorderedListNode;
- insertText = `${symbol} `;
- } else if (lastNode.type === NodeType.ORDERED_LIST) {
- const { number } = lastNode.value as OrderedListNode;
- insertText = `${Number(number) + 1}. `;
- }
- if (insertText) {
- actions.insertText(`\n${insertText}`);
- event.preventDefault();
- }
- }
- });
- }, []);
-};
-
-export default useAutoComplete;