From d6640e0793daf8565543faf7d046696b4e431e05 Mon Sep 17 00:00:00 2001 From: DiamondThree <857159145@qq.com> Date: Mon, 9 Jan 2023 17:25:00 +0800 Subject: [PATCH] feat: add createWoresapce function --- .../src/components/create-workspace/index.tsx | 7 ++-- .../src/components/workspace-modal/index.tsx | 33 ++++++++----------- .../components/workspace-slider-bar/index.tsx | 6 ++-- .../providers/app-state-provider/Provider.tsx | 14 ++++++++ .../providers/app-state-provider/interface.ts | 3 +- 5 files changed, 38 insertions(+), 25 deletions(-) diff --git a/packages/app/src/components/create-workspace/index.tsx b/packages/app/src/components/create-workspace/index.tsx index 05c37f990..545eaec4c 100644 --- a/packages/app/src/components/create-workspace/index.tsx +++ b/packages/app/src/components/create-workspace/index.tsx @@ -6,6 +6,7 @@ import Input from '@/ui/input'; import { useTemporaryHelper } from '@/providers/temporary-helper-provider'; import { KeyboardEvent } from 'react'; import { useTranslation } from 'react-i18next'; +import { useAppState } from '@/providers/app-state-provider'; interface ICloseParams { workspaceId?: string; } @@ -16,11 +17,11 @@ interface ModalProps { export const CreateWorkspaceModal = ({ open, onClose }: ModalProps) => { const [workspaceName, setWorkspaceName] = useState(''); - const { createWorkspace, setActiveWorkspace } = useTemporaryHelper(); + const { createWorkspace } = useAppState(); const handleCreateWorkspace = () => { const workspace = createWorkspace(workspaceName); - onClose({ workspaceId: workspace.id }); - setActiveWorkspace(workspace); + // onClose({ workspaceId: workspace.id }); + // setActiveWorkspace(workspace); }; const handleKeyDown = (event: KeyboardEvent) => { if (event.key === 'Enter') { diff --git a/packages/app/src/components/workspace-modal/index.tsx b/packages/app/src/components/workspace-modal/index.tsx index cb0605a78..398a71acc 100644 --- a/packages/app/src/components/workspace-modal/index.tsx +++ b/packages/app/src/components/workspace-modal/index.tsx @@ -10,10 +10,11 @@ import { UsersIcon, AddIcon, } from '@blocksuite/icons'; -import { useConfirm } from '@/providers/confirm-provider'; +import { useConfirm } from '@/providers/ConfirmProvider'; import { toast } from '@/ui/toast'; import { WorkspaceAvatar } from '@/components/workspace-avatar'; -import { useTemporaryHelper } from '@/providers/temporary-helper-provider'; +// import { useTemporaryHelper } from '@/providers/temporary-helper-provider'; +import { useAppState } from '@/providers/app-state-provider'; interface LoginModalProps { open: boolean; @@ -23,13 +24,7 @@ interface LoginModalProps { export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => { const [createWorkspaceOpen, setCreateWorkspaceOpen] = useState(false); const { confirm } = useConfirm(); - const { - user, - login, - workspaceMetaList, - setActiveWorkspace, - updateWorkspaceMeta, - } = useTemporaryHelper(); + const { user, workspaceList } = useAppState(); return (
@@ -51,11 +46,11 @@ export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => { - {workspaceMetaList.map((item, index) => { + {workspaceList.map((item, index) => { return ( { - setActiveWorkspace(item); + // setActiveWorkspace(item); onClose(); }} key={index} @@ -93,10 +88,10 @@ export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => { top: '20px', }} > - {(item.type === 'local' || !item.type) && ( + {(item.provider === 'local' || !item.provider) && ( )} - {item.type === 'cloud' && ( + {item.provider === 'affine' && ( )} {item.isPublish && } @@ -136,7 +131,7 @@ export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => { {!user ? (