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.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
feat: match sublist indentation when adding a new item (#4433)
Michael Baumgarten9f01b451df80
diff --git a/web/src/components/MemoEditor/Editor/index.tsx b/web/src/components/MemoEditor/Editor/index.tsxindex aa9f40df5..2d48f6c6f 100644--- a/web/src/components/MemoEditor/Editor/index.tsx+++ b/web/src/components/MemoEditor/Editor/index.tsx@@ -1,7 +1,7 @@import { last } from "lodash-es";import { forwardRef, ReactNode, useCallback, useEffect, useImperativeHandle, useRef, useState } from "react";import { markdownServiceClient } from "@/grpcweb";-import { NodeType, OrderedListItemNode, TaskListItemNode, UnorderedListItemNode } from "@/types/proto/api/v1/markdown_service";+import { Node, NodeType, OrderedListItemNode, TaskListItemNode, UnorderedListItemNode } from "@/types/proto/api/v1/markdown_service";import { cn } from "@/utils";import TagSuggestions from "./TagSuggestions";@@ -150,6 +150,20 @@ const Editor = forwardRef(function Editor(props: Props, ref: React.ForwardedRef<updateEditorHeight();}, []);+ const getLastNode = (nodes: Node[]): Node | undefined => {+ const lastNode = last(nodes);+ if (!lastNode) {+ return undefined;+ }+ if (lastNode.type === NodeType.LIST) {+ const children = lastNode.listNode?.children;+ if (children) {+ return getLastNode(children);+ }+ }+ return lastNode;+ };+const handleEditorKeyDown = async (event: React.KeyboardEvent<HTMLTextAreaElement>) => {if (event.key === "Enter" && !isInIME) {if (event.shiftKey || event.ctrlKey || event.metaKey || event.altKey) {@@ -159,7 +173,7 @@ const Editor = forwardRef(function Editor(props: Props, ref: React.ForwardedRef<const cursorPosition = editorActions.getCursorPosition();const prevContent = editorActions.getContent().substring(0, cursorPosition);const { nodes } = await markdownServiceClient.parseMarkdown({ markdown: prevContent });- const lastNode = last(last(nodes)?.listNode?.children);+ const lastNode = getLastNode(nodes);if (!lastNode) {return;}@@ -171,13 +185,13 @@ const Editor = forwardRef(function Editor(props: Props, ref: React.ForwardedRef<let insertText = indentationMatch ? indentationMatch[0] : ""; // Keep the indentation of the previous lineif (lastNode.type === NodeType.TASK_LIST_ITEM) {const { symbol } = lastNode.taskListItemNode as TaskListItemNode;- insertText = `${symbol} [ ] `;+ insertText += `${symbol} [ ] `;} else if (lastNode.type === NodeType.UNORDERED_LIST_ITEM) {const { symbol } = lastNode.unorderedListItemNode as UnorderedListItemNode;- insertText = `${symbol} `;+ insertText += `${symbol} `;} else if (lastNode.type === NodeType.ORDERED_LIST_ITEM) {const { number } = lastNode.orderedListItemNode as OrderedListItemNode;- insertText = `${Number(number) + 1}. `;+ insertText += `${Number(number) + 1}. `;}if (insertText) {editorActions.insertText(insertText);