fix: a series of bugs

This commit is contained in:
QiShaoXuan
2022-12-16 16:32:45 +08:00
parent 37aca4a99e
commit a8ba7afed2
29 changed files with 308 additions and 211 deletions
@@ -42,7 +42,7 @@ export const EditorProvider = ({
const { mode, setMode } = useMode({ workspace, page });
const editorHandlers = useEditorHandler({ workspace, editor });
const editorHandlers = useEditorHandler({ workspace, editor, page });
const onPropsUpdated = usePropsUpdated(editor);
const onHistoryUpdated = useHistoryUpdated(page);
// Modify the updatedDate when history change
@@ -1,6 +1,6 @@
import { QueryContent } from '@blocksuite/store/dist/workspace/search';
import { createPage, initialPage, generateDefaultPageId } from '../utils';
import { Workspace } from '@blocksuite/store';
import { Workspace, Page } from '@blocksuite/store';
import { useRouter } from 'next/router';
import { EditorHandlers, PageMeta } from '../interface';
import { EditorContainer } from '@blocksuite/editor';
@@ -8,8 +8,10 @@ import toast from '@/components/toast';
export const useEditorHandler = ({
editor,
workspace,
page,
}: {
workspace?: Workspace;
page?: Page;
editor?: EditorContainer;
}): EditorHandlers => {
const router = useRouter();
@@ -20,8 +22,8 @@ export const useEditorHandler = ({
initialPage(page, title);
return page;
},
getPageMeta(pageId: string) {
pageId = pageId.replace('space:', '');
getPageMeta(pageId) {
pageId = (pageId ?? page!.id).replace('space:', '');
return workspace!.meta.pageMetas.find(
page => page.id === pageId
) as PageMeta;
@@ -31,7 +31,7 @@ export type EditorHandlers = {
pageId: string,
query?: { [key: string]: string }
) => Promise<boolean>;
getPageMeta: (pageId: string) => PageMeta | void;
getPageMeta: (pageId?: string) => PageMeta | void;
toggleDeletePage: (pageId: string) => void;
toggleFavoritePage: (pageId: string) => void;
permanentlyDeletePage: (pageId: string) => void;