luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(core): adjust error boundary level (#5493)

Browse Source 
Allowing showing page title for page detail when page throws error.

![image.png](https://graphite-user-uploaded-assets-prod.s3.amazonaws.com/T2klNLEk0wxLh4NRDzhk/398bef13-c52d-40b4-bf53-5157582d030a.png)
This commit is contained in:
Peng Xiao
2024-01-02 13:20:13 +00:00
parent 922bc11f16
commit 444de6d4ac
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx
View File

@@ -79,7 +79,7 @@ const ModalContainer = ({
withoutCloseButton withoutCloseButton
contentOptions={contentOptions} contentOptions={contentOptions}
> >
<AffineErrorBoundary>{children}</AffineErrorBoundary> {children}
</Modal> </Modal>
); );
}; };
@@ -138,12 +138,14 @@ const HistoryEditorPreview = ({
</div> </div>
{snapshotPage ? ( {snapshotPage ? (
<BlockSuiteEditor <AffineErrorBoundary>
className={styles.editor} <BlockSuiteEditor
mode={mode} className={styles.editor}
page={snapshotPage} mode={mode}
onModeChange={onModeChange} page={snapshotPage}
/> onModeChange={onModeChange}
/>
</AffineErrorBoundary>
) : ( ) : (
<div className={styles.loadingContainer}> <div className={styles.loadingContainer}>
<Loading size={24} /> <Loading size={24} />

26
packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx
View File

@@ -177,14 +177,17 @@ const DetailPageImpl = memo(function DetailPageImpl({ page }: { page: Page }) {
</> </>
} }
main={ main={
<div className={styles.editorContainer}> // Add a key to force rerender when page changed, to avoid error boundary persisting.
<PageDetailEditor <AffineErrorBoundary key={currentPageId}>
pageId={currentPageId} <div className={styles.editorContainer}>
onLoad={onLoad} <PageDetailEditor
workspace={blockSuiteWorkspace} pageId={currentPageId}
/> onLoad={onLoad}
<HubIsland /> workspace={blockSuiteWorkspace}
</div> />
<HubIsland />
</div>
</AffineErrorBoundary>
} }
footer={isInTrash ? <TrashPageFooter pageId={page.id} /> : null} footer={isInTrash ? <TrashPageFooter pageId={page.id} /> : null}
sidebar={ sidebar={
@@ -268,10 +271,5 @@ export const Component = () => {
const pageId = params.pageId; const pageId = params.pageId;
// Add a key to force rerender when page changed, to avoid error boundary persisting. return pageId ? <DetailPage pageId={pageId} /> : null;
return (
<AffineErrorBoundary key={params.pageId}>
{pageId ? <DetailPage pageId={pageId} /> : null}
</AffineErrorBoundary>
);
}; };