Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-07-16 01:26:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: getPage with undefined pageId

Browse Source
This commit is contained in:
alt0
2022-12-22 17:14:40 +08:00
parent c9055befd1
commit c9e4fdf317
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/app/src/providers/app-state-provider/hooks.ts
+15 -13
View File
@@ -28,21 +28,23 @@ export const useLoadPage = () => {
return;
}
const page = pageId ? workspace?.getPage(pageId) : null;
if (!page) {
const savedPageId = workspace.meta.pageMetas[0]?.id;
if (savedPageId) {
router.push(`/workspace/${currentWorkspaceId}/${savedPageId}`);
if (page) {
loadPage?.current?.(pageId);
return;
}
const savedPageId = workspace.meta.pageMetas[0]?.id;
if (savedPageId) {
router.push(`/workspace/${currentWorkspaceId}/${savedPageId}`);
return;
}
createPage?.current?.()?.then(async pageId => {
if (!pageId) {
return;
}
createPage?.current?.()?.then(async pageId => {
if (!pageId) {
return;
}
router.push(`/workspace/${currentWorkspaceId}/${pageId}`);
});
}
loadPage?.current?.(pageId);
router.push(`/workspace/${currentWorkspaceId}/${pageId}`);
});
}, [workspace, pageId, loadPage, createPage, router, currentWorkspaceId]);
return currentPage?.pageId === pageId ? currentPage : null;
packages/app/src/providers/app-state-provider/provider.tsx
+1 -1
View File
@@ -78,7 +78,7 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => {
if (pageId === currentPage?.pageId) {
return currentPage;
}
const page = currentWorkspace?.getPage(pageId) || null;
const page = (pageId ? currentWorkspace?.getPage(pageId) : null) || null;
setState(state => ({ ...state, currentPage: page }));
return page;
};