feat(core): move help island to workbench (#6535)

toeverything · Apr 15, 2024 · d11d69d · d11d69d
1 parent 1656b33
commit d11d69d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/packages/frontend/core/src/modules/workbench/view/workbench-root.tsx b/packages/frontend/core/src/modules/workbench/view/workbench-root.tsx
@@ -1,3 +1,4 @@
+import { HubIsland } from '@affine/core/components/affine/hub-island';
 import { useLiveData, useService } from '@toeverything/infra';
 import { useCallback, useEffect, useRef } from 'react';
 import { useLocation } from 'react-router-dom';
@@ -43,12 +44,16 @@ export const WorkbenchRoot = () => {
   }, [basename, workbench.basename$]);
 
   return (
-    <SplitView
-      className={styles.workbenchRootContainer}
-      views={views}
-      renderer={panelRenderer}
-      onMove={onMove}
-    />
+    <>
+      <HubIsland />
+
+      <SplitView
+        className={styles.workbenchRootContainer}
+        views={views}
+        renderer={panelRenderer}
+        onMove={onMove}
+      />
+    </>
   );
 };
 

diff --git a/packages/frontend/core/src/pages/workspace/index.tsx b/packages/frontend/core/src/pages/workspace/index.tsx
@@ -13,7 +13,6 @@ import { Suspense, useEffect, useMemo } from 'react';
 import { useParams } from 'react-router-dom';
 
 import { AffineErrorBoundary } from '../../components/affine/affine-error-boundary';
-import { HubIsland } from '../../components/affine/hub-island';
 import { WorkspaceFallback } from '../../components/workspace';
 import { WorkspaceLayout } from '../../layouts/workspace-layout';
 import { RightSidebarContainer } from '../../modules/right-sidebar';
@@ -115,7 +114,6 @@ export const Component = (): ReactElement => {
           <WorkspaceLayout>
             <WorkbenchRoot />
             <RightSidebarContainer />
-            <HubIsland />
           </WorkspaceLayout>
         </AffineErrorBoundary>
       </Suspense>