diff --git a/packages/app/src/components/page-list/operation-cell.tsx b/packages/app/src/components/page-list/operation-cell.tsx index afe0b249d2..25b2091ace 100644 --- a/packages/app/src/components/page-list/operation-cell.tsx +++ b/packages/app/src/components/page-list/operation-cell.tsx @@ -71,8 +71,7 @@ export const OperationCell = ({ pageMeta }: { pageMeta: PageMeta }) => { export const TrashOperationCell = ({ pageMeta }: { pageMeta: PageMeta }) => { const { id } = pageMeta; - const { openPage } = usePageHelper(); - const { getPageMeta } = useAppState(); + const { openPage, getPageMeta } = usePageHelper(); const { toggleDeletePage, permanentlyDeletePage } = usePageHelper(); const { confirm } = useConfirm(); diff --git a/packages/app/src/hooks/use-page-helper.ts b/packages/app/src/hooks/use-page-helper.ts index 36ce66e356..cfc8444e5f 100644 --- a/packages/app/src/hooks/use-page-helper.ts +++ b/packages/app/src/hooks/use-page-helper.ts @@ -1,6 +1,6 @@ import { Workspace } from '@blocksuite/store'; import { QueryContent } from '@blocksuite/store/dist/workspace/search'; -import { useAppState } from '@/providers/app-state-provider'; +import { PageMeta, useAppState } from '@/providers/app-state-provider'; import { EditorContainer } from '@blocksuite/editor'; import { useChangePageMeta } from '@/hooks/use-change-page-meta'; import { useRouter } from 'next/router'; @@ -11,7 +11,7 @@ export type EditorHandlers = { pageId: string, query?: { [key: string]: string } ) => Promise; - // getPageMeta: (pageId?: string) => PageMeta; + getPageMeta: (pageId: string) => PageMeta | null; toggleDeletePage: (pageId: string) => Promise; toggleFavoritePage: (pageId: string) => Promise; permanentlyDeletePage: (pageId: string) => void; @@ -84,5 +84,16 @@ export const usePageHelper = (): EditorHandlers => { query, }); }, + getPageMeta: pageId => { + if (!currentWorkspace) { + return null; + } + + return ( + (currentWorkspace.meta.pageMetas.find( + page => page.id === pageId + ) as PageMeta) || null + ); + }, }; }; diff --git a/packages/app/src/providers/app-state-provider/context.ts b/packages/app/src/providers/app-state-provider/context.ts index 115ef7fb84..eb1f84ffea 100644 --- a/packages/app/src/providers/app-state-provider/context.ts +++ b/packages/app/src/providers/app-state-provider/context.ts @@ -40,7 +40,6 @@ export interface AppStateContext extends AppStateValue { createPage?: MutableRefObject< ((pageId?: string) => Promise) | undefined >; - getPageMeta: (pageId: string) => PageMeta | null; } export const AppState = createContext({ @@ -60,7 +59,6 @@ export const AppState = createContext({ loadWorkspace: undefined, loadPage: undefined, createPage: undefined, - getPageMeta: () => null, }); export const useAppState = () => { diff --git a/packages/app/src/providers/app-state-provider/provider.tsx b/packages/app/src/providers/app-state-provider/provider.tsx index 50ff911f74..bcff422438 100644 --- a/packages/app/src/providers/app-state-provider/provider.tsx +++ b/packages/app/src/providers/app-state-provider/provider.tsx @@ -14,7 +14,6 @@ import type { } from './context'; import type { Page, Workspace } from '@blocksuite/store'; import { EditorContainer } from '@blocksuite/editor'; -import { PageMeta } from './interface'; const DynamicBlocksuite = dynamic(() => import('./dynamic-blocksuite'), { ssr: false, }); @@ -137,17 +136,6 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => { loadWorkspace, loadPage, createPage, - getPageMeta: (pageId: string) => { - const { currentWorkspace } = state; - if (!currentWorkspace) { - return null; - } - return ( - (currentWorkspace.meta.pageMetas.find( - page => page.id === pageId - ) as PageMeta) || null - ); - }, }), [state, setState, loadPage, loadWorkspace] ); diff --git a/packages/app/src/ui/toast/toast.ts b/packages/app/src/ui/toast/toast.ts index 576eda160c..327dd9b000 100644 --- a/packages/app/src/ui/toast/toast.ts +++ b/packages/app/src/ui/toast/toast.ts @@ -52,7 +52,10 @@ export type ToastOptions = { * toast('Hello World'); * ``` */ -export const toast = (message: string, { duration = 2500 }: ToastOptions) => { +export const toast = ( + message: string, + { duration }: ToastOptions = { duration: 2500 } +) => { if (!ToastContainer) { ToastContainer = createToastContainer(); } @@ -105,5 +108,4 @@ export const toast = (message: string, { duration = 2500 }: ToastOptions) => { return element; }; - export default toast;