chore: migrate page method to hooks

This commit is contained in:
QiShaoXuan
2022-12-20 17:40:05 +08:00
parent 9fdb3c4311
commit 393da326e6
12 changed files with 159 additions and 54 deletions
@@ -28,15 +28,11 @@ import { useRouter } from 'next/router';
import { useConfirm } from '@/providers/confirm-provider';
import { SyncIcon } from './sync-icon';
import { toast } from '@/components/toast';
import useCurrentPageMeta from '@/hooks/use-current-page-meta';
import { usePageHelper } from '@/hooks/use-page-helper';
const PopoverContent = () => {
const {
getPageMeta,
editor,
currentPage,
toggleFavoritePage,
toggleDeletePage,
} = useAppState();
const { getPageMeta, editor, currentPage } = useAppState();
const { toggleFavoritePage, toggleDeletePage } = usePageHelper();
const { mode, setMode } = useEditor();
const { confirm } = useConfirm();
@@ -192,7 +188,8 @@ const HeaderRight = () => {
export const Header = ({ children }: PropsWithChildren<{}>) => {
const [showWarning, setShowWarning] = useState(shouldShowWarning());
const currentPageMeta = useCurrentPageMeta();
console.log('currentPageMeta', currentPageMeta);
return (
<StyledHeaderContainer hasWarning={showWarning}>
<BrowserWarning
@@ -22,13 +22,14 @@ import { Tooltip } from '@/ui/tooltip';
import { useRouter } from 'next/router';
import { useAppState } from '@/providers/app-state-provider/context';
import { toast } from '@/components/toast';
import { usePageHelper } from '@/hooks/use-page-helper';
const FavoriteTag = ({
pageMeta: { favorite, id },
}: {
pageMeta: PageMeta;
}) => {
const { toggleFavoritePage } = useAppState();
const { toggleFavoritePage } = usePageHelper();
return (
<Tooltip
content={favorite ? 'Favourited' : 'Favourite'}
@@ -1,4 +1,3 @@
import { useRouter } from 'next/router';
import { PageMeta, useEditor } from '@/providers/editor-provider';
import { useConfirm } from '@/providers/confirm-provider';
import { useAppState } from '@/providers/app-state-provider/context';
@@ -16,11 +15,12 @@ import {
TrashIcon,
} from '@blocksuite/icons';
import { toast } from '@/components/toast';
import { usePageHelper } from '@/hooks/use-page-helper';
export const OperationCell = ({ pageMeta }: { pageMeta: PageMeta }) => {
const { id, favorite } = pageMeta;
const goToPage = useGoToPage();
const { toggleFavoritePage, toggleDeletePage } = useAppState();
const { toggleFavoritePage, toggleDeletePage } = usePageHelper();
const { confirm } = useConfirm();
const OperationMenu = (
@@ -11,6 +11,7 @@ import { usePageList } from '@/providers/app-state-provider/usePageList';
import { useLoadWorkspace } from '@/providers/app-state-provider/hooks';
import NextImage from 'next/image';
import noResultImage from './jungle-searching.png';
import { usePageHelper } from '@/hooks/use-page-helper';
export const Results = (props: {
query: string;
loading: boolean;
@@ -26,7 +27,8 @@ export const Results = (props: {
const pageList = usePageList(workspace);
const goToPage = useGoToPage();
const router = useRouter();
const { search, currentWorkspaceId } = useAppState();
const { currentWorkspaceId } = useAppState();
const { search } = usePageHelper();
const List = config(currentWorkspaceId);
const [results, setResults] = useState(new Map<string, string | undefined>());
useEffect(() => {
@@ -0,0 +1,23 @@
import { useCallback } from 'react';
import { useAppState } from '@/providers/app-state-provider';
import { PageMeta } from '@blocksuite/store';
export type ChangePageMeta = (
pageId: string,
pageMeta: Partial<PageMeta>
) => void;
export const useChangePageMeta = () => {
const { currentWorkspace } = useAppState();
return useCallback<ChangePageMeta>(
(pageId, pageMeta) => {
currentWorkspace?.setPageMeta(pageId, {
...pageMeta,
});
},
[currentWorkspace]
);
};
export default ChangePageMeta;
@@ -0,0 +1,37 @@
import { useCallback, useEffect, useState } from 'react';
import { useAppState } from '@/providers/app-state-provider';
import { PageMeta } from '@blocksuite/store';
export const useCurrentPageMeta = () => {
const { currentPage, currentWorkspace } = useAppState();
const pageMetaHandler = useCallback(() => {
if (!currentPage || !currentWorkspace) {
return null;
}
return (
currentWorkspace?.meta.pageMetas.find(p => p.id === currentPage.pageId) ??
null
);
}, [currentPage, currentWorkspace]);
const [currentPageMeta, setCurrentPageMeta] = useState<PageMeta | null>(
pageMetaHandler
);
useEffect(() => {
setCurrentPageMeta(pageMetaHandler);
const dispose = currentWorkspace?.meta.pagesUpdated.on(res => {
setCurrentPageMeta(pageMetaHandler);
}).dispose;
return () => {
dispose?.();
};
}, [currentPage, currentWorkspace, pageMetaHandler]);
return currentPageMeta;
};
export default useCurrentPageMeta;
@@ -0,0 +1,7 @@
import { useState } from 'react';
import { EditorContainer } from '@blocksuite/editor';
import { useAppState } from '@/providers/app-state-provider';
export const usePageHandler = () => {
return null;
};
+52
View File
@@ -0,0 +1,52 @@
import { Page } from '@blocksuite/store';
import { QueryContent } from '@blocksuite/store/dist/workspace/search';
import { PageMeta } from '@/providers/editor-provider';
import { useAppState } from '@/providers/app-state-provider';
export type EditorHandlers = {
// createPage: (params?: { pageId?: string; title?: string }) => Promise<Page>;
// openPage: (
// pageId: string,
// query?: { [key: string]: string }
// ) => Promise<boolean>;
// getPageMeta: (pageId?: string) => PageMeta;
toggleDeletePage: (pageId: string) => void;
toggleFavoritePage: (pageId: string) => void;
// permanentlyDeletePage: (pageId: string) => void;
search: (query: QueryContent) => Map<string, string | undefined>;
// changeEditorMode: (pageId: string) => void;
};
export const usePageHelper = (): EditorHandlers => {
const { currentWorkspace } = useAppState();
return {
toggleFavoritePage: (pageId: string) => {
if (!currentWorkspace) {
return;
}
const pageMeta = currentWorkspace.meta.pageMetas.find(
p => p.id === pageId
);
if (pageMeta) {
currentWorkspace.setPageMeta(pageId, {
favorite: !pageMeta.favorite,
});
}
},
toggleDeletePage: (pageId: string) => {
const pageMeta = currentWorkspace?.meta.pageMetas.find(
p => p.id === pageId
);
if (pageMeta) {
currentWorkspace!.setPageMeta(pageId, {
trash: !pageMeta.trash,
trashDate: +new Date(),
});
}
},
search: (query: QueryContent) => {
return currentWorkspace!.search(query);
},
};
};
@@ -0,0 +1,25 @@
import { useEffect, useState } from 'react';
import { PageMeta } from '@/providers/app-state-provider/usePageList';
import { useAppState } from '@/providers/app-state-provider';
export const usePageMetaList = () => {
const { currentWorkspace } = useAppState();
const [pageList, setPageList] = useState<PageMeta[]>([]);
useEffect(() => {
if (!currentWorkspace) {
return;
}
setPageList(currentWorkspace.meta.pageMetas as PageMeta[]);
const dispose = currentWorkspace.meta.pagesUpdated.on(res => {
setPageList(currentWorkspace.meta.pageMetas as PageMeta[]);
}).dispose;
return () => {
dispose();
};
}, [currentWorkspace]);
return pageList;
};
export default usePageMetaList;
@@ -43,9 +43,6 @@ export interface AppStateContext extends AppStateValue {
((pageId?: string) => Promise<string | null>) | undefined
>;
getPageMeta: (pageId: string) => PageMeta | null;
toggleFavoritePage: (pageId: string) => void;
toggleDeletePage: (pageId: string) => void;
search: (query: QueryContent) => Map<string, string | undefined>;
}
export const AppState = createContext<AppStateContext>({
@@ -66,9 +63,6 @@ export const AppState = createContext<AppStateContext>({
loadPage: undefined,
createPage: undefined,
getPageMeta: () => null,
toggleFavoritePage: () => {},
toggleDeletePage: () => {},
search: () => new Map<string, string>(),
});
export const useAppState = () => {
@@ -0,0 +1 @@
export * from './context';
@@ -9,11 +9,9 @@ import {
import { AppState } from './context';
import type {
AppStateValue,
AppStateContext,
CreateEditorHandler,
LoadWorkspaceHandler,
} from './context';
import { QueryContent } from '@blocksuite/store/dist/workspace/search';
import type { Page, Workspace } from '@blocksuite/store';
import { EditorContainer } from '@blocksuite/editor';
@@ -25,12 +23,9 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => {
const [state, setState] = useState<AppStateValue>({
user: null,
workspacesMeta: [],
currentWorkspaceId: '',
currentWorkspace: null,
currentPage: null,
editor: null,
});
@@ -45,6 +40,7 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => {
const [createEditorHandler, _setCreateEditorHandler] =
useState<CreateEditorHandler>();
const setCreateEditorHandler = useCallback(
(handler: CreateEditorHandler) => {
_setCreateEditorHandler(() => handler);
@@ -151,36 +147,6 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => {
null
);
},
toggleFavoritePage: (pageId: string) => {
const { currentWorkspace } = state;
if (!currentWorkspace) {
return;
}
const pageMeta = currentWorkspace.meta.pageMetas.find(
p => p.id === pageId
);
if (pageMeta) {
currentWorkspace.setPageMeta(pageId, {
favorite: !pageMeta.favorite,
});
}
},
toggleDeletePage: (pageId: string) => {
const { currentWorkspace } = state;
const pageMeta = currentWorkspace?.meta.pageMetas.find(
p => p.id === pageId
);
if (pageMeta) {
currentWorkspace!.setPageMeta(pageId, {
trash: !pageMeta.trash,
trashDate: +new Date(),
});
}
},
search: (query: QueryContent) => {
const { currentWorkspace } = state;
return currentWorkspace!.search(query);
},
}),
[state, setState, loadPage, loadWorkspace]
);