toeverything/AFFiNE
1
1
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2024-11-24 11:24:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: dispose on editor props.onInit (#2521)

Browse Source
This commit is contained in:
Himself65 2023-05-25 14:11:41 +08:00 committed by himself65
parent ad4737850d
commit 3d423c3299
No known key found for this signature in database
GPG Key ID: 35F07049B7A1E625
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/web/src/adapters/affine/index.tsx
View File

@ -311,7 +311,7 @@ export const AffinePlugin: WorkspaceAdapter<WorkspaceFlavour.AFFINE> = {
</Suspense>
);
},
PageDetail: ({ currentWorkspace, currentPageId }) => {
PageDetail: ({ currentWorkspace, currentPageId, onLoadEditor }) => {
const page = currentWorkspace.blockSuiteWorkspace.getPage(currentPageId);
if (!page) {
throw new PageNotFoundError(
@ -325,6 +325,7 @@ export const AffinePlugin: WorkspaceAdapter<WorkspaceFlavour.AFFINE> = {
pageId={currentPageId}
workspace={currentWorkspace}
onInit={initPage}
onLoad={onLoadEditor}
/>
</>
);

25
packages/component/src/components/block-suite-editor/index.tsx
View File

@ -43,10 +43,10 @@ const ImagePreviewModal = lazy(() =>
);
const BlockSuiteEditorImpl = (props: EditorProps): ReactElement => {
const { onLoad, page, mode, style, onInit } = props;
const JotaiEditorContainer = useAtomValue(
editorContainerModuleAtom
) as typeof EditorContainer;
const page = props.page;
assertExists(page, 'page should not be null');
const editorRef = useRef<EditorContainer | null>(null);
const blockHubRef = useRef<BlockHub | null>(null);
@ -57,19 +57,24 @@ const BlockSuiteEditorImpl = (props: EditorProps): ReactElement => {
}
const editor = editorRef.current;
assertExists(editorRef, 'editorRef.current should not be null');
if (editor.mode !== props.mode) {
editor.mode = props.mode;
if (editor.mode !== mode) {
editor.mode = mode;
}
useEffect(() => {
if (editor.page !== props.page) {
editor.page = props.page;
if (editor.page !== page) {
editor.page = page;
if (page.root === null) {
props.onInit(page, editor);
onInit(page, editor);
}
return props.onLoad?.(page, editor);
}
}, [props.page, props.onInit, props.onLoad, editor, props, page]);
}, [onInit, editor, props, page]);
useEffect(() => {
if (editor.page && onLoad) {
return onLoad(page, editor);
}
}, [editor, editor.page, page, onLoad]);
const ref = useRef<HTMLDivElement>(null);
@ -108,9 +113,9 @@ const BlockSuiteEditorImpl = (props: EditorProps): ReactElement => {
const className = `editor-wrapper ${editor.mode}-mode`;
return (
<div
data-testid={`editor-${props.page.id}`}
data-testid={`editor-${page.id}`}
className={className}
style={props.style}
style={style}
ref={ref}
/>
);