YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: editor enhancement for order list (#763)

Browse Source
This commit is contained in:
Zeng1998
2022-12-18 11:02:42 +08:00
committed by GitHub
parent 1eec474007
commit a41745c9ae
3 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
web/src/components/MemoEditor.tsx
View File

@ -15,6 +15,7 @@ import showResourcesSelectorDialog from "./ResourcesSelectorDialog";
import "../less/memo-editor.less";
const listItemSymbolList = ["- [ ] ", "- [x] ", "- [X] ", "* ", "- "];
const emptyOlReg = /^([1-9][0-9]*)\. $/;
const getEditorContentCache = (): string => {
return storage.get(["editorContentCache"]).editorContentCache ?? "";
@ -124,17 +125,52 @@ const MemoEditor = () => {
const contentBeforeCursor = editorRef.current.getContent().slice(0, cursorPosition);
const rowValue = last(contentBeforeCursor.split("\n"));
if (rowValue) {
if (listItemSymbolList.includes(rowValue)) {
if (listItemSymbolList.includes(rowValue) || emptyOlReg.test(rowValue)) {
event.preventDefault();
editorRef.current.removeText(cursorPosition - rowValue.length, rowValue.length);
} else {
// unordered list / checked list
let matched = false;
for (const listItemSymbol of listItemSymbolList) {
if (rowValue.startsWith(listItemSymbol)) {
event.preventDefault();
editorRef.current.insertText("", `\n${listItemSymbol}`);
matched = true;
break;
}
}
if (!matched) {
// ordered list
const olReg = /^([1-9][0-9]*)\. /;
const olRes = olReg.exec(rowValue);
if (olRes) {
let order = parseInt(olRes[1]) + 1;
event.preventDefault();
const contentAfterCursor = editorRef.current.getContent().slice(cursorPosition);
editorRef.current.insertText("", `\n${order}. `);
if (contentAfterCursor) {
// correct the order
order++;
const nextRows = contentAfterCursor.split("\n").slice(1);
const rowStart = contentBeforeCursor.split("\n").length + 1;
const content = editorRef.current.getContent().split("\n");
let updated = false;
for (let i = 0; i < nextRows.length; i++) {
const rowRes = olReg.exec(nextRows[i]);
if (rowRes) {
content[rowStart + i] = nextRows[i].replace(rowRes[1], (order + i).toString());
updated = true;
} else {
break;
}
}
if (updated) {
editorRef.current.setContent(content.join("\n"));
editorRef.current.setCursorPosition(cursorPosition + 4);
}
}
}
}
}
}
return;