usememos/memos
1
1
Fork 0
mirror of https://github.com/usememos/memos.git synced 2024-09-21 06:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: simplify ordered list in editor (#767)

Browse source 
chore: simplify editor
This commit is contained in:
boojack 2022-12-18 12:44:46 +08:00 committed by GitHub
parent a41745c9ae
commit bd00fa798d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
web/src/components/MemoEditor.tsx
View file

@ -1,4 +1,4 @@
import { last, toLower } from "lodash";
import { isNumber, last, toLower } from "lodash";
import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { deleteMemoResource, upsertMemoResource } from "../helpers/api";
@ -15,7 +15,7 @@ import showResourcesSelectorDialog from "./ResourcesSelectorDialog";
import "../less/memo-editor.less";
const listItemSymbolList = ["- [ ] ", "- [x] ", "- [X] ", "* ", "- "];
const emptyOlReg = /^([1-9][0-9]*)\. $/;
const emptyOlReg = /^(\d+)\. $/;
const getEditorContentCache = (): string => {
return storage.get(["editorContentCache"]).editorContentCache ?? "";
@ -129,7 +129,7 @@ const MemoEditor = () => {
event.preventDefault();
editorRef.current.removeText(cursorPosition - rowValue.length, rowValue.length);
} else {
// unordered list / checked list
// unordered/todo list
let matched = false;
for (const listItemSymbol of listItemSymbolList) {
if (rowValue.startsWith(listItemSymbol)) {
@ -139,35 +139,15 @@ const MemoEditor = () => {
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);
}
const olMatchRes = /^(\d+)\. /.exec(rowValue);
if (olMatchRes) {
const order = parseInt(olMatchRes[1]);
if (isNumber(order)) {
event.preventDefault();
editorRef.current.insertText("", `\n${order + 1}. `);
}
}
}