Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix: add trash view return action

yomabb915aa99c87
diff --git a/apps/web/src/components/MemoListPane.tsx b/apps/web/src/components/MemoListPane.tsx
index 8c409931..024de450 100644
--- a/apps/web/src/components/MemoListPane.tsx
+++ b/apps/web/src/components/MemoListPane.tsx
@@ -354,6 +354,7 @@ export const MemoListPane = ({
onOpenTags,
onOpenAssets,
onOpenTrash,
+ onBackFromTrash,
onOpenSettings,
onSyncMemos,
onCreateMemo,
@@ -425,6 +426,7 @@ export const MemoListPane = ({
onOpenTags: () => void;
onOpenAssets: () => void;
onOpenTrash: () => void;
+ onBackFromTrash: () => void;
onOpenSettings: () => void;
onSyncMemos: () => void;
onCreateMemo: () => void;
@@ -978,6 +980,17 @@ export const MemoListPane = ({
{!mobileSearchActive && (
<div className="mb-3 flex items-center justify-between gap-3 lg:hidden">
<div className="flex min-w-0 items-center gap-2">
+ {view === "trash" && (
+ <button
+ className="flex h-8 w-8 shrink-0 items-center justify-center rounded-md text-slate-600 transition hover:bg-slate-100 hover:text-slate-900"
+ type="button"
+ title={t("notebookPane.backToList")}
+ aria-label={t("notebookPane.backToList")}
+ onClick={onBackFromTrash}
+ >
+ <ChevronLeft className="h-4 w-4" />
+ </button>
+ )}
<button
className="flex min-w-0 items-center gap-1 rounded-md px-1 py-1 text-left transition hover:bg-slate-100 lg:hidden"
type="button"
@@ -1008,10 +1021,24 @@ export const MemoListPane = ({
</div>
)}
- <div className="mb-3 hidden min-w-0 lg:block">
- <div className="truncate text-lg font-semibold leading-6 text-slate-950">{listTitle}</div>
- <div className="mt-0.5 truncate text-xs text-slate-500">
- {listContextLabel} · {listCountLabel}
+ <div className="mb-3 hidden min-w-0 lg:flex items-start gap-1">
+ {view === "trash" && (
+ <Button
+ className="-ml-2 mt-0.5 shrink-0"
+ size="icon"
+ variant="ghost"
+ title={t("notebookPane.backToList")}
+ aria-label={t("notebookPane.backToList")}
+ onClick={onBackFromTrash}
+ >
+ <ChevronLeft className="h-4 w-4" />
+ </Button>
+ )}
+ <div className="min-w-0">
+ <div className="truncate text-lg font-semibold leading-6 text-slate-950">{listTitle}</div>
+ <div className="mt-0.5 truncate text-xs text-slate-500">
+ {listContextLabel} · {listCountLabel}
+ </div>
</div>
</div>
diff --git a/apps/web/src/components/NotebookPane.tsx b/apps/web/src/components/NotebookPane.tsx
index 1d781793..8e74fa06 100644
--- a/apps/web/src/components/NotebookPane.tsx
+++ b/apps/web/src/components/NotebookPane.tsx
@@ -112,9 +112,9 @@ const SidebarTrashShortcut = ({
<div className="group relative min-w-0">
<SidebarShortcutButton active={active} icon={<Trash2 className="h-4 w-4" />} label={t("notebookPane.trash")} onClick={onOpenTrash} />
{!active && (
- <div className="pointer-events-none absolute left-1/2 top-full z-20 w-max -translate-x-1/2 pt-1 opacity-0 transition-opacity duration-150 group-hover:pointer-events-auto group-hover:opacity-100">
+ <div className="pointer-events-none absolute right-0 top-full z-20 w-max pt-1 opacity-0 transition-opacity duration-150 group-hover:pointer-events-auto group-hover:opacity-100">
<button
- className="flex h-8 items-center gap-1.5 rounded-md border border-rose-200 bg-white px-2 text-xs font-medium text-rose-700 shadow-lg shadow-slate-900/10 transition-colors hover:bg-rose-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-rose-400/70"
+ className="relative flex h-8 items-center gap-1.5 rounded-md border border-rose-200 bg-white px-2 text-xs font-medium text-rose-700 shadow-lg shadow-slate-900/10 transition-colors before:absolute before:-top-1 before:right-16 before:h-2 before:w-2 before:rotate-45 before:border-l before:border-t before:border-rose-200 before:bg-white hover:bg-rose-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-rose-400/70"
type="button"
onClick={onEmptyTrash}
>
diff --git a/apps/web/src/components/WorkspaceApp.tsx b/apps/web/src/components/WorkspaceApp.tsx
index e366f4bb..f0621ef0 100644
--- a/apps/web/src/components/WorkspaceApp.tsx
+++ b/apps/web/src/components/WorkspaceApp.tsx
@@ -2444,6 +2444,7 @@ export const WorkspaceApp = ({
setSelectedMemoId(null);
setActivePane("memos");
}}
+ onBackFromTrash={handleSelectAllMemos}
onOpenMemo={(memoId) => {
navigateWorkspaceHome();
setRightView("editor");