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: implement inline memo editor

Stevene2fd79200eb2
diff --git a/web/src/components/MemoActionMenu.tsx b/web/src/components/MemoActionMenu.tsx
index b1d44f2e1..6a8471b5c 100644
--- a/web/src/components/MemoActionMenu.tsx
+++ b/web/src/components/MemoActionMenu.tsx
@@ -15,6 +15,7 @@ interface Props {
memo: Memo;
className?: string;
hiddenActions?: ("edit" | "archive" | "delete" | "share" | "pin")[];
+ onEdit?: () => void;
}
const MemoActionMenu = (props: Props) => {
@@ -50,6 +51,12 @@ const MemoActionMenu = (props: Props) => {
};
const handleEditMemoClick = () => {
+ if (props.onEdit) {
+ props.onEdit();
+ return;
+ }
+
+ // TODO: remove me later.
showMemoEditorDialog({
memoName: memo.name,
cacheKey: `${memo.name}-${memo.updateTime}`,
diff --git a/web/src/components/MemoEditor/index.tsx b/web/src/components/MemoEditor/index.tsx
index f35f5ea03..a728a8dad 100644
--- a/web/src/components/MemoEditor/index.tsx
+++ b/web/src/components/MemoEditor/index.tsx
@@ -38,6 +38,7 @@ export interface Props {
autoFocus?: boolean;
memoPatchRef?: React.MutableRefObject<Partial<Memo>>;
onConfirm?: (memoName: string) => void;
+ onCancel?: () => void;
}
interface State {
@@ -439,7 +440,12 @@ const MemoEditor = (props: Props) => {
))}
</Select>
</div>
- <div className="shrink-0 flex flex-row justify-end items-center">
+ <div className="shrink-0 flex flex-row justify-end items-center gap-2">
+ {props.onCancel && (
+ <Button className="!font-normal" color="neutral" variant="plain" loading={state.isRequesting} onClick={props.onCancel}>
+ {t("common.cancel")}
+ </Button>
+ )}
<Button
className="!font-normal"
disabled={!allowSave}
diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsx
index 0ba4e064c..9ef3f0ef4 100644
--- a/web/src/components/MemoView.tsx
+++ b/web/src/components/MemoView.tsx
@@ -14,7 +14,7 @@ import { convertVisibilityToString } from "@/utils/memo";
import Icon from "./Icon";
import MemoActionMenu from "./MemoActionMenu";
import MemoContent from "./MemoContent";
-import showMemoEditorDialog from "./MemoEditor/MemoEditorDialog";
+import MemoEditor from "./MemoEditor";
import MemoReactionistView from "./MemoReactionListView";
import MemoRelationListView from "./MemoRelationListView";
import MemoResourceListView from "./MemoResourceListView";
@@ -45,6 +45,7 @@ const MemoView: React.FC<Props> = (props: Props) => {
const workspaceMemoRelatedSetting =
workspaceSettingStore.getWorkspaceSettingByKey(WorkspaceSettingKey.MEMO_RELATED).memoRelatedSetting ||
WorkspaceMemoRelatedSetting.fromPartial({});
+ const [showEditor, setShowEditor] = useState<boolean>(false);
const [creator, setCreator] = useState(userStore.getUserByName(memo.creator));
const memoContainerRef = useRef<HTMLDivElement>(null);
const referencedMemos = memo.relations.filter((relation) => relation.type === MemoRelation_Type.REFERENCE);
@@ -85,10 +86,7 @@ const MemoView: React.FC<Props> = (props: Props) => {
if (workspaceMemoRelatedSetting.enableDoubleClickEdit) {
e.preventDefault();
- showMemoEditorDialog({
- memoName: memo.name,
- cacheKey: `${memo.name}-${memo.updateTime}`,
- });
+ setShowEditor(true);
}
}, []);
@@ -137,50 +135,73 @@ const MemoView: React.FC<Props> = (props: Props) => {
</div>
)}
</div>
- <div className="flex flex-row justify-end items-center select-none shrink-0 gap-2">
- <div className="w-auto invisible group-hover:visible flex flex-row justify-between items-center gap-2">
- {props.showVisibility && memo.visibility !== Visibility.PRIVATE && (
- <Tooltip title={t(`memo.visibility.${convertVisibilityToString(memo.visibility).toLowerCase()}` as any)} placement="top">
- <span className="flex justify-center items-center hover:opacity-70">
- <VisibilityIcon visibility={memo.visibility} />
- </span>
+ {!showEditor && (
+ <div className="flex flex-row justify-end items-center select-none shrink-0 gap-2">
+ <div className="w-auto invisible group-hover:visible flex flex-row justify-between items-center gap-2">
+ {props.showVisibility && memo.visibility !== Visibility.PRIVATE && (
+ <Tooltip title={t(`memo.visibility.${convertVisibilityToString(memo.visibility).toLowerCase()}` as any)} placement="top">
+ <span className="flex justify-center items-center hover:opacity-70">
+ <VisibilityIcon visibility={memo.visibility} />
+ </span>
+ </Tooltip>
+ )}
+ {currentUser && <ReactionSelector className="border-none w-auto h-auto" memo={memo} />}
+ </div>
+ {!isInMemoDetailPage && (
+ <Link
+ className={clsx(
+ "flex flex-row justify-start items-center hover:opacity-70",
+ commentAmount === 0 && "invisible group-hover:visible",
+ )}
+ to={`/m/${memo.uid}#comments`}
+ unstable_viewTransition
+ >
+ <Icon.MessageCircleMore className="w-4 h-4 mx-auto text-gray-500 dark:text-gray-400" />
+ {commentAmount > 0 && <span className="text-xs text-gray-500 dark:text-gray-400">{commentAmount}</span>}
+ </Link>
+ )}
+ {props.showPinned && memo.pinned && (
+ <Tooltip title={t("common.pinned")} placement="top">
+ <Icon.Bookmark className="w-4 h-auto text-amber-500" />
</Tooltip>
)}
- {currentUser && <ReactionSelector className="border-none w-auto h-auto" memo={memo} />}
+ {!readonly && (
+ <MemoActionMenu
+ className="-ml-1"
+ memo={memo}
+ hiddenActions={props.showPinned ? [] : ["pin"]}
+ onEdit={() => setShowEditor(true)}
+ />
+ )}
</div>
- {!isInMemoDetailPage && (
- <Link
- className={clsx(
- "flex flex-row justify-start items-center hover:opacity-70",
- commentAmount === 0 && "invisible group-hover:visible",
- )}
- to={`/m/${memo.uid}#comments`}
- unstable_viewTransition
- >
- <Icon.MessageCircleMore className="w-4 h-4 mx-auto text-gray-500 dark:text-gray-400" />
- {commentAmount > 0 && <span className="text-xs text-gray-500 dark:text-gray-400">{commentAmount}</span>}
- </Link>
- )}
- {props.showPinned && memo.pinned && (
- <Tooltip title={t("common.pinned")} placement="top">
- <Icon.Bookmark className="w-4 h-auto text-amber-500" />
- </Tooltip>
- )}
- {!readonly && <MemoActionMenu className="-ml-1" memo={memo} hiddenActions={props.showPinned ? [] : ["pin"]} />}
- </div>
+ )}
</div>
- <MemoContent
- key={`${memo.name}-${memo.updateTime}`}
- memoName={memo.name}
- nodes={memo.nodes}
- readonly={readonly}
- onClick={handleMemoContentClick}
- onDoubleClick={handleMemoContentDoubleClick}
- compact={props.compact && workspaceMemoRelatedSetting.enableAutoCompact}
- />
- <MemoResourceListView resources={memo.resources} />
- <MemoRelationListView memo={memo} relations={referencedMemos} />
- <MemoReactionistView memo={memo} reactions={memo.reactions} />
+
+ {showEditor ? (
+ <MemoEditor
+ autoFocus
+ className="border-none !p-0 -mb-2"
+ cacheKey={`inline-memo-editor-${memo.name}`}
+ memoName={memo.name}
+ onConfirm={() => setShowEditor(false)}
+ onCancel={() => setShowEditor(false)}
+ />
+ ) : (
+ <>
+ <MemoContent
+ key={`${memo.name}-${memo.updateTime}`}
+ memoName={memo.name}
+ nodes={memo.nodes}
+ readonly={readonly}
+ onClick={handleMemoContentClick}
+ onDoubleClick={handleMemoContentDoubleClick}
+ compact={props.compact && workspaceMemoRelatedSetting.enableAutoCompact}
+ />
+ <MemoResourceListView resources={memo.resources} />
+ <MemoRelationListView memo={memo} relations={referencedMemos} />
+ <MemoReactionistView memo={memo} reactions={memo.reactions} />
+ </>
+ )}
</div>
);
};
diff --git a/web/src/pages/MemoDetail.tsx b/web/src/pages/MemoDetail.tsx
index cc3d15da7..7f44f7373 100644
--- a/web/src/pages/MemoDetail.tsx
+++ b/web/src/pages/MemoDetail.tsx
@@ -6,7 +6,7 @@ import { toast } from "react-hot-toast";
import { Link, useParams } from "react-router-dom";
import Icon from "@/components/Icon";
import { MemoDetailSidebar, MemoDetailSidebarDrawer } from "@/components/MemoDetailSidebar";
-import showMemoEditorDialog from "@/components/MemoEditor/MemoEditorDialog";
+import MemoEditor from "@/components/MemoEditor";
import MemoView from "@/components/MemoView";
import MobileHeader from "@/components/MobileHeader";
import useCurrentUser from "@/hooks/useCurrentUser";
@@ -27,6 +27,7 @@ const MemoDetail = () => {
const uid = params.uid;
const memo = memoStore.getMemoByUid(uid || "");
const [parentMemo, setParentMemo] = useState<Memo | undefined>(undefined);
+ const [showCommentEditor, setShowCommentEditor] = useState(false);
const commentRelations =
memo?.relations.filter((relation) => relation.relatedMemo === memo.name && relation.type === MemoRelation_Type.COMMENT) || [];
const comments = commentRelations.map((relation) => memoStore.getMemoByName(relation.memo)).filter((memo) => memo) as any as Memo[];
@@ -66,17 +67,13 @@ const MemoDetail = () => {
}
const handleShowCommentEditor = () => {
- showMemoEditorDialog({
- placeholder: t("editor.add-your-comment-here"),
- parentMemoName: memo.name,
- onConfirm: handleCommentCreated,
- cacheKey: `${memo.name}-${memo.updateTime}-comment`,
- });
+ setShowCommentEditor(true);
};
const handleCommentCreated = async (memoCommentName: string) => {
await memoStore.getOrFetchMemoByName(memoCommentName);
await memoStore.getOrFetchMemoByName(memo.name, { skipCache: true });
+ setShowCommentEditor(false);
};
return (
@@ -145,6 +142,18 @@ const MemoDetail = () => {
</>
)}
</div>
+ {showCommentEditor && (
+ <div className="w-full">
+ <MemoEditor
+ cacheKey={`${memo.name}-${memo.updateTime}-comment`}
+ placeholder={t("editor.add-your-comment-here")}
+ parentMemoName={memo.name}
+ autoFocus
+ onConfirm={handleCommentCreated}
+ onCancel={() => setShowCommentEditor(false)}
+ />
+ </div>
+ )}
</div>
</div>
{md && (