fix: open non-trash page when open (#2431)

toeverything · May 18, 2023 · d80dae8 · d80dae8 · vercel · May 18, 2023
1 parent 34ff08b
commit d80dae8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/apps/web/src/components/page-detail-editor.tsx b/apps/web/src/components/page-detail-editor.tsx
@@ -84,6 +84,7 @@ export const PageDetailEditor: React.FC<PageDetailEditorProps> = ({
             page.workspace.setPageMeta(page.id, {
               updatedDate: Date.now(),
             });
+            localStorage.setItem('last_page_id', page.id);
             onLoad?.(page, editor);
           },
           [onLoad, setEditor]

diff --git a/apps/web/src/pages/index.tsx b/apps/web/src/pages/index.tsx
@@ -21,13 +21,19 @@ const IndexPageInner = () => {
       return;
     }
     const lastId = localStorage.getItem('last_workspace_id');
+    const lastPageId = localStorage.getItem('last_page_id');
     const targetWorkspace =
       (lastId && workspaces.find(({ id }) => id === lastId)) ||
       workspaces.at(0);
 
     if (targetWorkspace) {
+      const nonTrashPages =
+        targetWorkspace.blockSuiteWorkspace.meta.pageMetas.filter(
+          ({ trash }) => !trash
+        );
       const pageId =
-        targetWorkspace.blockSuiteWorkspace.meta.pageMetas.at(0)?.id;
+        nonTrashPages.find(({ id }) => id === lastPageId)?.id ??
+        nonTrashPages.at(0)?.id;
       if (pageId) {
         logger.debug('Found target workspace. Jump to page', pageId);
         void jumpToPage(targetWorkspace.id, pageId, RouteLogic.REPLACE);