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
fix: auto complete in memo editor (#720)
boojackab8c7b9d8a79
diff --git a/web/src/components/ArchivedMemo.tsx b/web/src/components/ArchivedMemo.tsxindex addc2edef..a919460e7 100644--- a/web/src/components/ArchivedMemo.tsx+++ b/web/src/components/ArchivedMemo.tsx@@ -51,7 +51,7 @@ const ArchivedMemo: React.FC<Props> = (props: Props) => {};return (- <div className={`memo-wrapper archived-memo ${"memos-" + memo.id}`} onMouseLeave={handleMouseLeaveMemoWrapper}>+ <div className={`memo-wrapper archived ${"memos-" + memo.id}`} onMouseLeave={handleMouseLeaveMemoWrapper}><div className="memo-top-wrapper"><span className="time-text">{t("common.archived-at")} {utils.getDateTimeString(memo.updatedTs)}diff --git a/web/src/components/Editor/Editor.tsx b/web/src/components/Editor/Editor.tsxindex f6e8324f3..8c27dd27a 100644--- a/web/src/components/Editor/Editor.tsx+++ b/web/src/components/Editor/Editor.tsx@@ -5,6 +5,7 @@ import "../../less/editor.less";export interface EditorRefActions {focus: FunctionType;insertText: (text: string, prefix?: string, suffix?: string) => void;+ removeText: (start: number, length: number) => void;setContent: (text: string) => void;getContent: () => string;getSelectedContent: () => string;@@ -67,6 +68,19 @@ const Editor = forwardRef(function Editor(props: Props, ref: React.ForwardedRef<handleContentChangeCallback(editorRef.current.value);refresh();},+ removeText: (start: number, length: number) => {+ if (!editorRef.current) {+ return;+ }++ const prevValue = editorRef.current.value;+ const value = prevValue.slice(0, start) + prevValue.slice(start + length);+ editorRef.current.value = value;+ editorRef.current.focus();+ editorRef.current.selectionEnd = start;+ handleContentChangeCallback(editorRef.current.value);+ refresh();+ },setContent: (text: string) => {if (editorRef.current) {editorRef.current.value = text;diff --git a/web/src/components/MemoEditor.tsx b/web/src/components/MemoEditor.tsxindex 3f7155714..1fb8900df 100644--- a/web/src/components/MemoEditor.tsx+++ b/web/src/components/MemoEditor.tsx@@ -1,4 +1,4 @@-import { toLower } from "lodash";+import { last, toLower } from "lodash";import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";import { useTranslation } from "react-i18next";import { deleteMemoResource, upsertMemoResource } from "../helpers/api";@@ -14,6 +14,8 @@ import ResourceIcon from "./ResourceIcon";import showResourcesSelectorDialog from "./ResourcesSelectorDialog";import "../less/memo-editor.less";+const listItemSymbolList = ["* ", "- ", "- [ ] ", "- [x] ", "- [X] "];+const getEditorContentCache = (): string => {return storage.get(["editorContentCache"]).editorContentCache ?? "";};@@ -48,7 +50,7 @@ const MemoEditor = () => {shouldShowEmojiPicker: false,});const [allowSave, setAllowSave] = useState<boolean>(false);- const prevGlobalStateRef = useRef(editorState);+ const prevEditorStateRef = useRef(editorState);const editorRef = useRef<EditorRefActions>(null);const tagSelectorRef = useRef<HTMLDivElement>(null);const memoVisibilityOptionSelectorItems = VISIBILITY_SELECTOR_ITEMS.map((item) => {@@ -87,10 +89,14 @@ const MemoEditor = () => {storage.remove(["editingMemoIdCache"]);}- prevGlobalStateRef.current = editorState;+ prevEditorStateRef.current = editorState;}, [editorState.editMemoId]);const handleKeyDown = (event: React.KeyboardEvent) => {+ if (!editorRef.current) {+ return;+ }+if (event.ctrlKey || event.metaKey) {if (event.key === "Enter") {handleSaveBtnClick();@@ -98,39 +104,36 @@ const MemoEditor = () => {}if (event.key === "b") {event.preventDefault();- editorRef.current?.insertText("", "**", "**");+ editorRef.current.insertText("", "**", "**");return;}if (event.key === "i") {event.preventDefault();- editorRef.current?.insertText("", "*", "*");+ editorRef.current.insertText("", "*", "*");return;}if (event.key === "e") {event.preventDefault();- editorRef.current?.insertText("", "`", "`");+ editorRef.current.insertText("", "`", "`");return;}}+if (event.key === "Enter") {- if (!editorRef.current) {- return;- }const cursorPosition = editorRef.current.getCursorPosition();- const prevValue = editorRef.current.getContent().slice(0, cursorPosition);- const prevRows = prevValue.split("\n");- const prevRowValue = prevRows[prevRows.length - 1];- if (prevRowValue === "- " || prevRowValue === "- [ ] " || prevRowValue === "- [x] " || prevRowValue === "- [X] ") {- event.preventDefault();- prevRows[prevRows.length - 1] = "";- editorRef.current.setContent(prevRows.join("\n"));- } else {- if (prevRowValue.startsWith("- [ ] ") || prevRowValue.startsWith("- [x] ") || prevRowValue.startsWith("- [X] ")) {+ const contentBeforeCursor = editorRef.current.getContent().slice(0, cursorPosition);+ const rowValue = last(contentBeforeCursor.split("\n"));+ if (rowValue) {+ if (listItemSymbolList.includes(rowValue)) {event.preventDefault();- editorRef.current.insertText("", "\n- [ ] ");- } else if (prevRowValue.startsWith("- ")) {- event.preventDefault();- editorRef.current.insertText("", "\n- ");+ editorRef.current.removeText(cursorPosition - rowValue.length, rowValue.length);+ } else {+ for (const listItemSymbol of listItemSymbolList) {+ if (rowValue.startsWith(listItemSymbol)) {+ event.preventDefault();+ editorRef.current.insertText("", `\n${listItemSymbol}`);+ }+ }}}return;@@ -138,14 +141,14 @@ const MemoEditor = () => {if (event.key === "Escape") {if (state.fullscreen) {handleFullscreenBtnClick();- } else {+ } else if (editorState.editMemoId) {handleCancelEdit();}return;}if (event.key === "Tab") {event.preventDefault();- editorRef.current?.insertText(" ".repeat(TAB_SPACE_WIDTH));+ editorRef.current.insertText(" ".repeat(TAB_SPACE_WIDTH));return;}};@@ -251,11 +254,13 @@ const MemoEditor = () => {};const handleCancelEdit = () => {- editorStateService.clearEditMemo();- editorStateService.clearResourceList();- editorRef.current?.setContent("");- setEditorContentCache("");- storage.remove(["editingMemoVisibilityCache"]);+ if (editorState.editMemoId) {+ editorStateService.clearEditMemo();+ editorStateService.clearResourceList();+ editorRef.current?.setContent("");+ setEditorContentCache("");+ storage.remove(["editingMemoVisibilityCache"]);+ }};const handleContentChange = (content: string) => {diff --git a/web/src/components/Settings/SystemSection.tsx b/web/src/components/Settings/SystemSection.tsxindex 94c050534..98d8a215c 100644--- a/web/src/components/Settings/SystemSection.tsx+++ b/web/src/components/Settings/SystemSection.tsx@@ -117,20 +117,16 @@ const SystemSection = () => {<span className="normal-text">{t("setting.system-section.database-file-size")}: <span className="font-mono font-medium">{formatBytes(state.dbSize)}</span></span>- <Button size="sm" onClick={handleVacuumBtnClick}>- {t("common.vacuum")}- </Button>+ <Button onClick={handleVacuumBtnClick}>{t("common.vacuum")}</Button></label><p className="title-text">{t("sidebar.setting")}</p><label className="form-label"><span className="normal-text">{t("setting.system-section.allow-user-signup")}</span>- <Switch size="sm" checked={state.allowSignUp} onChange={(event) => handleAllowSignUpChanged(event.target.checked)} />+ <Switch checked={state.allowSignUp} onChange={(event) => handleAllowSignUpChanged(event.target.checked)} /></label><div className="form-label"><span className="normal-text">{t("setting.system-section.additional-style")}</span>- <Button size="sm" onClick={handleSaveAdditionalStyle}>- {t("common.save")}- </Button>+ <Button onClick={handleSaveAdditionalStyle}>{t("common.save")}</Button></div><TextareaclassName="w-full"@@ -139,16 +135,14 @@ const SystemSection = () => {fontSize: "14px",}}minRows={4}- maxRows={10}+ maxRows={4}placeholder={t("setting.system-section.additional-style-placeholder")}value={state.additionalStyle}onChange={(event) => handleAdditionalStyleChanged(event.target.value)}/><div className="form-label mt-2"><span className="normal-text">{t("setting.system-section.additional-script")}</span>- <Button size="sm" onClick={handleSaveAdditionalScript}>- {t("common.save")}- </Button>+ <Button onClick={handleSaveAdditionalScript}>{t("common.save")}</Button></div><TextareaclassName="w-full"@@ -158,7 +152,7 @@ const SystemSection = () => {fontSize: "14px",}}minRows={4}- maxRows={10}+ maxRows={4}placeholder={t("setting.system-section.additional-script-placeholder")}value={state.additionalScript}onChange={(event) => handleAdditionalScriptChanged(event.target.value)}diff --git a/web/src/less/memo.less b/web/src/less/memo.lessindex 9fd31940d..4dd2826f8 100644--- a/web/src/less/memo.less+++ b/web/src/less/memo.less@@ -5,6 +5,10 @@@apply border-gray-200 border-2 dark:border-zinc-600;}+ &.archived {+ @apply border-gray-200 dark:border-zinc-600;+ }+> .corner-container {@apply absolute top-0 right-0 z-1;