From e208ab6033361579dba0f1636aa794eca79172a2 Mon Sep 17 00:00:00 2001 From: QiShaoXuan Date: Tue, 10 Jan 2023 14:22:08 +0800 Subject: [PATCH] fix: type error --- .../src/providers/app-state-provider/Provider.tsx | 14 +++++++------- .../src/providers/app-state-provider/interface.ts | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/app/src/providers/app-state-provider/Provider.tsx b/packages/app/src/providers/app-state-provider/Provider.tsx index 03c0abe13c..2c85e560e7 100644 --- a/packages/app/src/providers/app-state-provider/Provider.tsx +++ b/packages/app/src/providers/app-state-provider/Provider.tsx @@ -28,12 +28,9 @@ export const AppStateProvider = ({ if (dataCenter.workspaces.length === 0) { await createDefaultWorkspace(dataCenter); } - let currentWorkspace = appState.currentWorkspace; - if (!currentWorkspace) { - currentWorkspace = await dataCenter.loadWorkspace( - dataCenter.workspaces[0].id - ); - } + const currentWorkspace = await dataCenter.loadWorkspace( + dataCenter.workspaces[0].id + ); const currentMetaWorkSpace = dataCenter.workspaces.find(item => { return item.id === currentWorkspace.room; }); @@ -53,7 +50,7 @@ export const AppStateProvider = ({ }; init(); - }, [appState.currentWorkspace]); + }, []); useEffect(() => { if (!appState?.currentWorkspace) { @@ -116,6 +113,9 @@ export const AppStateProvider = ({ currentWorkspace: workspace, currentWorkspaceId: workspaceId, currentMetaWorkSpace: currentMetaWorkSpace ?? null, + pageList: currentWorkspace.meta.pageMetas as PageMeta[], + currentPage: null, + editor: null, }); return workspace; diff --git a/packages/app/src/providers/app-state-provider/interface.ts b/packages/app/src/providers/app-state-provider/interface.ts index db8c8ba564..4e5ec6a9b9 100644 --- a/packages/app/src/providers/app-state-provider/interface.ts +++ b/packages/app/src/providers/app-state-provider/interface.ts @@ -1,4 +1,4 @@ -import { DataCenter, User, Workspace } from '@affine/datacenter'; +import { DataCenter, User, WorkspaceInfo } from '@affine/datacenter'; import type { EditorContainer } from '@blocksuite/editor'; import type { @@ -18,9 +18,9 @@ export interface PageMeta extends StorePageMeta { export type AppStateValue = { dataCenter: DataCenter; user: User | null; - workspaceList: Workspace[]; + workspaceList: WorkspaceInfo[]; currentWorkspace: StoreWorkspace; - currentMetaWorkSpace: Workspace | null; + currentMetaWorkSpace: WorkspaceInfo | null; currentWorkspaceId: string; pageList: PageMeta[]; currentPage: StorePage | null;