AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.
HTML ai-agentcloudflarecloudflare-d1cloudflare-r2cloudflare-workersdockerelectronevernoteevernote-alternativeknowledge-basemcpnote-takingobsidian-alternativeoffline-firstpersonal-knowledge-basepwaself-hostedsqlitetiptapweb-clipper
fix: keep empty trash optimistic without blank screen
tianma-if127e75cadcd5
diff --git a/apps/web/src/components/WorkspaceApp.tsx b/apps/web/src/components/WorkspaceApp.tsxindex 67a79f00..bc10a9af 100644--- a/apps/web/src/components/WorkspaceApp.tsx+++ b/apps/web/src/components/WorkspaceApp.tsx@@ -1622,10 +1622,8 @@ export const WorkspaceApp = ({const emptyTrashMutation = useMutation({mutationFn: api.emptyTrash,onMutate: async (): Promise<EmptyTrashOptimisticContext> => {- setEmptyTrashConfirmationOpen(false);- clearMemoSelection();- setSelectedMemoId(null);- setActivePane("memos");+ const previousActivePane = activePane;+ const previousSelectedMemoId = selectedMemoId;await Promise.all([queryClient.cancelQueries({ queryKey: ["memos"] }),@@ -1636,14 +1634,16 @@ export const WorkspaceApp = ({const previousMemoLists = queryClient.getQueriesData<MemoListQueryData>({ queryKey: ["memos"] });const previousMemoDetails = queryClient.getQueriesData<{ memo: MemoDetail }>({ queryKey: ["memo"] });+ // Keep the optimistic update limited to list data. Removing the active+ // memo detail query here can make the editor render with a missing memo+ // during the same React update and blank the whole workspace.clearTrashMemoLists(queryClient);- for (const [queryKey] of previousMemoDetails) {- if (queryKey[2] === "trash") {- queryClient.removeQueries({ queryKey });- }- }+ setEmptyTrashConfirmationOpen(false);+ clearMemoSelection();+ setSelectedMemoId(null);+ setActivePane("memos");- return { previousMemoLists, previousMemoDetails, previousActivePane: activePane, previousSelectedMemoId: selectedMemoId };+ return { previousMemoLists, previousMemoDetails, previousActivePane, previousSelectedMemoId };},onError: (_error, _variables, context) => {context?.previousMemoLists.forEach(([queryKey, data]) => {@@ -1659,13 +1659,11 @@ export const WorkspaceApp = ({description: t("workspaceDialogs.emptyTrashFailedDescription"),});},- onSettled: (_data, error) => {- const refetchType = error ? "active" : "inactive";-+ onSettled: () => {void Promise.all([- queryClient.invalidateQueries({ queryKey: ["memos"], refetchType }),- queryClient.invalidateQueries({ queryKey: ["memo"], refetchType }),- queryClient.invalidateQueries({ queryKey: ["resources"], refetchType }),+ queryClient.invalidateQueries({ queryKey: ["memos"], refetchType: "active" }),+ queryClient.invalidateQueries({ queryKey: ["memo"], refetchType: "active" }),+ queryClient.invalidateQueries({ queryKey: ["resources"], refetchType: "active" }),]);},});diff --git a/package.json b/package.jsonindex f2d9e5f0..7d7a1f20 100644--- a/package.json+++ b/package.json@@ -1,6 +1,6 @@{"name": "edgeever",- "version": "1.6.19",+ "version": "1.6.20","private": true,"type": "module","workspaces": [