From de8af5f11495859ecc6c76c8d283fbe4a87d7980 Mon Sep 17 00:00:00 2001 From: himself65 Date: Thu, 8 Jun 2023 16:54:42 +0800 Subject: [PATCH] revert: page jump once --- apps/web/src/layouts/workspace-layout.tsx | 35 +++++++++++++++-------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/apps/web/src/layouts/workspace-layout.tsx b/apps/web/src/layouts/workspace-layout.tsx index 8523910146..0603d9450c 100644 --- a/apps/web/src/layouts/workspace-layout.tsx +++ b/apps/web/src/layouts/workspace-layout.tsx @@ -335,19 +335,30 @@ export const WorkspaceLayoutInner: FC = ({ children }) => { }; }, [currentWorkspace]); - const page = currentWorkspace.blockSuiteWorkspace.getPage( - DEFAULT_HELLO_WORLD_PAGE_ID - ); - if (page && page.meta.jumpOnce) { - currentWorkspace.blockSuiteWorkspace.meta.setPageMeta( - DEFAULT_HELLO_WORLD_PAGE_ID, - { - jumpOnce: false, - } + useEffect(() => { + if (!currentWorkspace) { + return; + } + const page = currentWorkspace.blockSuiteWorkspace.getPage( + DEFAULT_HELLO_WORLD_PAGE_ID ); - setCurrentPageId(currentPageId); - void jumpToPage(currentWorkspace.id, page.id); - } + if (page && page.meta.jumpOnce) { + currentWorkspace.blockSuiteWorkspace.meta.setPageMeta( + DEFAULT_HELLO_WORLD_PAGE_ID, + { + jumpOnce: false, + } + ); + setCurrentPageId(currentPageId); + void jumpToPage(currentWorkspace.id, page.id); + } + }, [ + currentPageId, + currentWorkspace, + jumpToPage, + router.query.pageId, + setCurrentPageId, + ]); const { openPage } = useRouterHelper(router); const [, setOpenWorkspacesModal] = useAtom(openWorkspacesModalAtom);