refactor: remove null type in hooks (#1955)

apps/web/src/components/pure/quick-search-modal/Footer.tsx

@@ -3,12 +3,12 @@ import { useTranslation } from '@affine/i18n';
 import type { PageBlockModel } from '@blocksuite/blocks';
 import { PlusIcon } from '@blocksuite/icons';
 import { assertEquals, nanoid } from '@blocksuite/store';
+import { useBlockSuiteWorkspaceHelper } from '@toeverything/hooks/use-block-suite-workspace-helper';
 import { Command } from 'cmdk';
 import type { NextRouter } from 'next/router';
 import type React from 'react';
 import { useCallback } from 'react';
 
-import { useBlockSuiteWorkspaceHelper } from '../../../hooks/use-blocksuite-workspace-helper';
 import { useRouterHelper } from '../../../hooks/use-router-helper';
 import type { BlockSuiteWorkspace } from '../../../shared';
 import { StyledModalFooterContent } from './style';

apps/web/src/components/pure/quick-search-modal/PublishedResults.tsx

@@ -1,12 +1,12 @@
 import { useTranslation } from '@affine/i18n';
 import { EdgelessIcon, PageIcon } from '@blocksuite/icons';
+import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta';
 import { Command } from 'cmdk';
 import Image from 'next/legacy/image';
 import { useRouter } from 'next/router';
 import type { FC } from 'react';
 import { useEffect, useMemo, useState } from 'react';
 
-import { usePageMeta } from '../../../hooks/use-page-meta';
 import type { BlockSuiteWorkspace } from '../../../shared';
 import { StyledListItem, StyledNotFound } from './style';
 
@@ -26,7 +26,7 @@ export const PublishedResults: FC<PublishedResultsProps> = ({
 }) => {
   const [results, setResults] = useState(new Map<string, string | undefined>());
   const router = useRouter();
-  const pageList = usePageMeta(blockSuiteWorkspace);
+  const pageList = useBlockSuitePageMeta(blockSuiteWorkspace);
   // useEffect(() => {
   //   dataCenter
   //     .loadPublicWorkspace(router.query.workspaceId as string)

apps/web/src/components/pure/quick-search-modal/Results.tsx

@@ -2,14 +2,14 @@ import { UNTITLED_WORKSPACE_NAME } from '@affine/env';
 import { useTranslation } from '@affine/i18n';
 import { EdgelessIcon, PageIcon } from '@blocksuite/icons';
 import { assertExists } from '@blocksuite/store';
+import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta';
+import { useBlockSuiteWorkspaceHelper } from '@toeverything/hooks/use-block-suite-workspace-helper';
 import { Command } from 'cmdk';
 import Image from 'next/legacy/image';
 import type { NextRouter } from 'next/router';
 import type { Dispatch, FC, SetStateAction } from 'react';
 import { useEffect } from 'react';
 
-import { useBlockSuiteWorkspaceHelper } from '../../../hooks/use-blocksuite-workspace-helper';
-import { usePageMeta } from '../../../hooks/use-page-meta';
 import { useRecentlyViewed } from '../../../hooks/use-recent-views';
 import { useRouterHelper } from '../../../hooks/use-router-helper';
 import type { BlockSuiteWorkspace } from '../../../shared';
@@ -31,7 +31,7 @@ export const Results: FC<ResultsProps> = ({
   onClose,
 }) => {
   useBlockSuiteWorkspaceHelper(blockSuiteWorkspace);
-  const pageList = usePageMeta(blockSuiteWorkspace);
+  const pageList = useBlockSuitePageMeta(blockSuiteWorkspace);
   assertExists(blockSuiteWorkspace.id);
   const List = useSwitchToConfig(blockSuiteWorkspace.id);
 

apps/web/src/components/pure/quick-search-modal/navigation-path/index.tsx

@@ -7,11 +7,11 @@ import {
   MoreHorizontalIcon,
 } from '@blocksuite/icons';
 import type { PageMeta } from '@blocksuite/store';
+import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta';
 import { useRouter } from 'next/router';
 import type { MouseEvent } from 'react';
 import { Fragment, useCallback, useMemo, useState } from 'react';
 
-import { usePageMeta } from '../../../../hooks/use-page-meta';
 import type { PinboardNode } from '../../../../hooks/use-pinboard-data';
 import { usePinboardData } from '../../../../hooks/use-pinboard-data';
 import { useRouterHelper } from '../../../../hooks/use-router-helper';
@@ -33,7 +33,7 @@ export const NavigationPath = ({
   pageId?: string;
   onJumpToPage?: (pageId: string) => void;
 }) => {
-  const metas = usePageMeta(blockSuiteWorkspace);
+  const metas = useBlockSuitePageMeta(blockSuiteWorkspace);
   const router = useRouter();
   const { t } = useTranslation();
 

apps/web/src/components/pure/workspace-slider-bar/Pinboard.tsx

@@ -1,5 +1,5 @@
 import { TreeView } from '@affine/component';
-import type { PageMeta } from '@blocksuite/store';
+import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta';
 import type { MouseEvent } from 'react';
 import { useCallback } from 'react';
 
@@ -12,14 +12,10 @@ import { PinboardRender } from '../../affine/pinboard';
 export type PinboardProps = {
   blockSuiteWorkspace: BlockSuiteWorkspace;
   openPage: (pageId: string) => void;
-  allMetas: PageMeta[];
 };
 
-export const Pinboard = ({
-  blockSuiteWorkspace,
-  openPage,
-  allMetas,
-}: PinboardProps) => {
+export const Pinboard = ({ blockSuiteWorkspace, openPage }: PinboardProps) => {
+  const allMetas = useBlockSuitePageMeta(blockSuiteWorkspace);
   const handlePinboardClick = useCallback(
     (e: MouseEvent<HTMLDivElement>, node: PinboardNode) => {
       openPage(node.id);

apps/web/src/components/pure/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx

@@ -1,6 +1,6 @@
 import { WorkspaceAvatar } from '@affine/component/workspace-avatar';
 import { CloudWorkspaceIcon, LocalWorkspaceIcon } from '@blocksuite/icons';
-import { useBlockSuiteWorkspaceName } from '@toeverything/hooks/use-blocksuite-workspace-name';
+import { useBlockSuiteWorkspaceName } from '@toeverything/hooks/use-block-suite-workspace-name';
 import type React from 'react';
 
 import { useCurrentWorkspace } from '../../../../hooks/current/use-current-workspace';

apps/web/src/components/pure/workspace-slider-bar/favorite/index.tsx

@@ -1,12 +1,14 @@
 import { useTranslation } from '@affine/i18n';
 import { ArrowDownSmallIcon, FavoriteIcon } from '@blocksuite/icons';
+import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta';
 import { useCallback, useState } from 'react';
 
-import { usePageMeta } from '../../../../hooks/use-page-meta';
+import type { AllWorkspace } from '../../../../shared';
 import type { WorkSpaceSliderBarProps } from '../index';
 import { StyledCollapseButton, StyledListItem } from '../shared-styles';
 import { StyledLink } from '../style';
 import FavoriteList from './favorite-list';
+
 export const Favorite = ({
   currentPath,
   paths,
@@ -15,10 +17,12 @@ export const Favorite = ({
   currentWorkspace,
 }: Pick<
   WorkSpaceSliderBarProps,
-  'currentPath' | 'paths' | 'currentPageId' | 'openPage' | 'currentWorkspace'
->) => {
-  const currentWorkspaceId = currentWorkspace?.id || null;
-  const pageMeta = usePageMeta(currentWorkspace?.blockSuiteWorkspace ?? null);
+  'currentPath' | 'paths' | 'currentPageId' | 'openPage'
+> & {
+  currentWorkspace: AllWorkspace;
+}) => {
+  const currentWorkspaceId = currentWorkspace.id;
+  const pageMeta = useBlockSuitePageMeta(currentWorkspace.blockSuiteWorkspace);
 
   const [showSubFavorite, setOpenSubFavorite] = useState(true);
 

apps/web/src/components/pure/workspace-slider-bar/index.tsx

@@ -14,7 +14,6 @@ import type React from 'react';
 import type { UIEvent } from 'react';
 import { lazy, Suspense, useCallback, useEffect, useState } from 'react';
 
-import { usePageMeta } from '../../../hooks/use-page-meta';
 import {
   useSidebarFloating,
   useSidebarResizing,
@@ -85,7 +84,6 @@ export const WorkSpaceSliderBar: React.FC<WorkSpaceSliderBarProps> = ({
   const blockSuiteWorkspace = currentWorkspace?.blockSuiteWorkspace;
   const { t } = useTranslation();
   const [sidebarOpen, setSidebarOpen] = useSidebarStatus();
-  const pageMeta = usePageMeta(blockSuiteWorkspace ?? null);
   const onClickNewPage = useCallback(async () => {
     const page = await createPage();
     openPage(page.id);
@@ -190,18 +188,19 @@ export const WorkSpaceSliderBar: React.FC<WorkSpaceSliderBarProps> = ({
                   : setIsScrollAtTop(false);
               }}
             >
-              <Favorite
-                currentPath={currentPath}
-                paths={paths}
-                currentPageId={currentPageId}
-                openPage={openPage}
-                currentWorkspace={currentWorkspace}
-              />
-              {!!blockSuiteWorkspace && (
+              {blockSuiteWorkspace && (
+                <Favorite
+                  currentPath={currentPath}
+                  paths={paths}
+                  currentPageId={currentPageId}
+                  openPage={openPage}
+                  currentWorkspace={currentWorkspace}
+                />
+              )}
+              {blockSuiteWorkspace && (
                 <Pinboard
                   blockSuiteWorkspace={blockSuiteWorkspace}
                   openPage={openPage}
-                  allMetas={pageMeta}
                 />
               )}
             </StyledScrollWrapper>