usememos/memos
1
1
Fork 0
mirror of https://github.com/usememos/memos.git synced 2024-12-20 09:41:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: optimize the logic of the checkbox button. (#2227)

Browse Source
This commit is contained in:
Zeng1998 2023-09-18 20:37:28 +08:00 committed by GitHub
parent 58026c52ea
commit 462f10ab60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/src/components/MemoEditor/Editor/index.tsx
View File

@ -12,6 +12,9 @@ export interface EditorRefActions {
getSelectedContent: () => string; getSelectedContent: () => string;
getCursorPosition: () => number; getCursorPosition: () => number;
setCursorPosition: (startPos: number, endPos?: number) => void; setCursorPosition: (startPos: number, endPos?: number) => void;
getCursorLineNumber: () => number;
getLine: (lineNumber: number) => string;
setLine: (lineNumber: number, text: string) => void;
} }
interface Props { interface Props {
@ -115,6 +118,24 @@ const Editor = forwardRef(function Editor(props: Props, ref: React.ForwardedRef<
const _endPos = isNaN(endPos as number) ? startPos : (endPos as number); const _endPos = isNaN(endPos as number) ? startPos : (endPos as number);
editorRef.current?.setSelectionRange(startPos, _endPos); editorRef.current?.setSelectionRange(startPos, _endPos);
}, },
getCursorLineNumber: () => {
const cursorPosition = editorRef.current?.selectionStart ?? 0;
const lines = editorRef.current?.value.slice(0, cursorPosition).split("\n") ?? [];
return lines.length - 1;
},
getLine: (lineNumber: number) => {
return editorRef.current?.value.split("\n")[lineNumber] ?? "";
},
setLine: (lineNumber: number, text: string) => {
const lines = editorRef.current?.value.split("\n") ?? [];
lines[lineNumber] = text;
if (editorRef.current) {
editorRef.current.value = lines.join("\n");
editorRef.current.focus();
handleContentChangeCallback(editorRef.current.value);
updateEditorHeight();
}
},
}), }),
[] []
); );

22
web/src/components/MemoEditor/index.tsx
View File

@ -322,14 +322,24 @@ const MemoEditor = (props: Props) => {
if (!editorRef.current) { if (!editorRef.current) {
return; return;
} }
const currentPosition = editorRef.current?.getCursorPosition();
const cursorPosition = editorRef.current.getCursorPosition(); const currentLineNumber = editorRef.current?.getCursorLineNumber();
const prevValue = editorRef.current.getContent().slice(0, cursorPosition); const currentLine = editorRef.current?.getLine(currentLineNumber);
if (prevValue === "" || prevValue.endsWith("\n")) { let newLine = "";
editorRef.current?.insertText("", "- [ ] "); let cursorChange = 0;
if (/^- \[( |x|X)\] /.test(currentLine)) {
newLine = currentLine.replace(/^- \[( |x|X)\] /, "");
cursorChange = -6;
} else if (/^\d+\. |- /.test(currentLine)) {
const match = currentLine.match(/^\d+\. |- /) ?? [""];
newLine = currentLine.replace(/^\d+\. |- /, "- [ ] ");
cursorChange = -match[0].length + 6;
} else { } else {
editorRef.current?.insertText("", "\n- [ ] "); newLine = "- [ ] " + currentLine;
cursorChange = 6;
} }
editorRef.current?.setLine(currentLineNumber, newLine);
editorRef.current.setCursorPosition(currentPosition + cursorChange);
editorRef.current?.scrollToCursor(); editorRef.current?.scrollToCursor();
}; };