From 7c8358ca0aa97e727f3a8314550935aed528244d Mon Sep 17 00:00:00 2001 From: Yifeng Wang Date: Fri, 23 Dec 2022 13:06:01 +0800 Subject: [PATCH] chore: rename blocksuite workspace to `StoreWorkspace` --- .../src/components/workspace-setting/general/general.tsx | 4 ++-- .../providers/app-state-provider/dynamic-blocksuite.tsx | 6 +++--- .../app/src/providers/app-state-provider/provider.tsx | 9 ++++++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/app/src/components/workspace-setting/general/general.tsx b/packages/app/src/components/workspace-setting/general/general.tsx index 1b7ba0707d..da2d0be213 100644 --- a/packages/app/src/components/workspace-setting/general/general.tsx +++ b/packages/app/src/components/workspace-setting/general/general.tsx @@ -13,7 +13,7 @@ import { Workspace, WorkspaceType } from '@pathfinder/data-services'; import { useAppState } from '@/providers/app-state-provider'; import { WorkspaceDetails } from '@/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent'; import { WorkspaceDelete } from './delete'; -import { Workspace as StoreWorkspaces } from '@blocksuite/store'; +import { Workspace as StoreWorkspace } from '@blocksuite/store'; import { debounce } from '@/utils'; export const GeneralPage = ({ @@ -22,7 +22,7 @@ export const GeneralPage = ({ }: { workspace: Workspace; owner: WorkspaceDetails[string]['owner']; - workspaces: Record; + workspaces: Record; }) => { const { user, diff --git a/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx b/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx index d9667f5c31..215aef8096 100644 --- a/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx +++ b/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx @@ -3,7 +3,7 @@ import type { Page } from '@blocksuite/store'; import { // createWebsocketDocProvider, IndexedDBDocProvider, - Workspace, + Workspace as StoreWorkspace, } from '@blocksuite/store'; import '@blocksuite/blocks'; import '@blocksuite/blocks/style'; @@ -35,7 +35,7 @@ const DynamicBlocksuite = ({ ) => // eslint-disable-next-line no-async-promise-executor new Promise(async resolve => { - const workspace = new Workspace({ + const workspace = new StoreWorkspace({ room: workspaceId, providers: [], }).register(BlockSchema); @@ -70,7 +70,7 @@ const DynamicBlocksuite = ({ ); const updates = await downloadWorkspace({ workspaceId }); updates && - Workspace.Y.applyUpdate(workspace.doc, new Uint8Array(updates)); + StoreWorkspace.Y.applyUpdate(workspace.doc, new Uint8Array(updates)); // if after update, the space:meta is empty, then we need to get map with doc workspace.doc.getMap('space:meta'); if (indexDBProvider) { diff --git a/packages/app/src/providers/app-state-provider/provider.tsx b/packages/app/src/providers/app-state-provider/provider.tsx index ad5d5d697b..aea9f01774 100644 --- a/packages/app/src/providers/app-state-provider/provider.tsx +++ b/packages/app/src/providers/app-state-provider/provider.tsx @@ -13,7 +13,7 @@ import type { CreateEditorHandler, LoadWorkspaceHandler, } from './context'; -import { Page, Workspace } from '@blocksuite/store'; +import { Page, Workspace as StoreWorkspace } from '@blocksuite/store'; import { EditorContainer } from '@blocksuite/editor'; const DynamicBlocksuite = dynamic(() => import('./dynamic-blocksuite'), { ssr: false, @@ -49,7 +49,10 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => { if (workspace) { const updates = await downloadWorkspace({ workspaceId }); updates && - Workspace.Y.applyUpdate(workspace.doc, new Uint8Array(updates)); + StoreWorkspace.Y.applyUpdate( + workspace.doc, + new Uint8Array(updates) + ); // if after update, the space:meta is empty, then we need to get map with doc workspace.doc.getMap('space:meta'); } @@ -65,7 +68,7 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => { return { id, workspace }; }) ); - const workspaces: Record = {}; + const workspaces: Record = {}; workspacesList.forEach(({ id, workspace }) => { workspaces[id] = workspace; });