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.

feat(web): improve list auto-completion and tag insertion UX (#5240)

Johnnya2ccf6b2019f
diff --git a/web/src/components/MemoEditor/Editor/TagSuggestions.tsx b/web/src/components/MemoEditor/Editor/TagSuggestions.tsx
index 780cae3aa..da2141aef 100644
--- a/web/src/components/MemoEditor/Editor/TagSuggestions.tsx
+++ b/web/src/components/MemoEditor/Editor/TagSuggestions.tsx
@@ -43,9 +43,9 @@ const TagSuggestions = observer(({ editorRef, editorActions }: TagSuggestionsPro
return items.filter((tag) => tag.toLowerCase().includes(searchQuery));
},
onAutocomplete: (tag, word, index, actions) => {
- // Replace the trigger word with the complete tag
+ // Replace the trigger word with the complete tag and add a trailing space
actions.removeText(index, word.length);
- actions.insertText(`#${tag}`);
+ actions.insertText(`#${tag} `);
},
});
diff --git a/web/src/components/MemoEditor/Editor/useListAutoCompletion.ts b/web/src/components/MemoEditor/Editor/useListAutoCompletion.ts
index 2fd3aa703..ce250b1ef 100644
--- a/web/src/components/MemoEditor/Editor/useListAutoCompletion.ts
+++ b/web/src/components/MemoEditor/Editor/useListAutoCompletion.ts
@@ -52,8 +52,28 @@ export function useListAutoCompletion({ editorRef, editorActions, isInIME }: Use
if (listInfo.type) {
event.preventDefault();
- const continuation = generateListContinuation(listInfo);
- actions.insertText("\n" + continuation);
+
+ // Check if current list item is empty (GitHub-style behavior)
+ // Extract the current line
+ const lines = contentBeforeCursor.split("\n");
+ const currentLine = lines[lines.length - 1];
+
+ // Check if line only contains list marker (no content after it)
+ const isEmptyListItem =
+ /^(\s*)([-*+])\s*$/.test(currentLine) || // Empty unordered list
+ /^(\s*)([-*+])\s+\[([ xX])\]\s*$/.test(currentLine) || // Empty task list
+ /^(\s*)(\d+)[.)]\s*$/.test(currentLine); // Empty ordered list
+
+ if (isEmptyListItem) {
+ // Remove the empty list marker and exit list mode
+ const lineStartPos = cursorPosition - currentLine.length;
+ actions.removeText(lineStartPos, currentLine.length);
+ actions.insertText("\n");
+ } else {
+ // Continue the list with the next item
+ const continuation = generateListContinuation(listInfo);
+ actions.insertText("\n" + continuation);
+ }
}
};