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

fix: reference page crash for deleted items (#3835)

Browse Source
This commit is contained in:
Peng Xiao
2023-08-19 02:52:09 +08:00
committed by GitHub
parent ba676eb937
commit bd826bb7f9
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/core/src/components/pure/workspace-slider-bar/components/reference-page.tsx
View File

@@ -29,7 +29,11 @@ export const ReferencePage = ({
const icon = setting?.mode === 'edgeless' ? <EdgelessIcon /> : <PageIcon />; const icon = setting?.mode === 'edgeless' ? <EdgelessIcon /> : <PageIcon />;
const references = useBlockSuitePageReferences(workspace, pageId); const references = useBlockSuitePageReferences(workspace, pageId);
const referencesToShow = useMemo(() => { const referencesToShow = useMemo(() => {
return [...new Set(references.filter(ref => !metaMapping[ref]?.trash))]; return [
...new Set(
references.filter(ref => metaMapping[ref] && !metaMapping[ref]?.trash)
),
];
}, [references, metaMapping]); }, [references, metaMapping]);
const [collapsed, setCollapsed] = useState(true); const [collapsed, setCollapsed] = useState(true);
const collapsible = referencesToShow.length > 0; const collapsible = referencesToShow.length > 0;

8
packages/hooks/src/use-block-suite-page-references.ts
View File

@@ -1,4 +1,3 @@
import { assertExists } from '@blocksuite/global/utils';
import type { Page, Workspace } from '@blocksuite/store'; import type { Page, Workspace } from '@blocksuite/store';
import { type Atom, atom, useAtomValue } from 'jotai'; import { type Atom, atom, useAtomValue } from 'jotai';
@@ -14,7 +13,11 @@ function getPageReferences(page: Page): string[] {
.filter(Boolean); .filter(Boolean);
} }
const getPageReferencesAtom = (page: Page) => { const getPageReferencesAtom = (page: Page | null) => {
if (!page) {
return atom([]);
}
if (!weakMap.has(page)) { if (!weakMap.has(page)) {
const baseAtom = atom<string[]>(getPageReferences(page)); const baseAtom = atom<string[]>(getPageReferences(page));
baseAtom.onMount = set => { baseAtom.onMount = set => {
@@ -35,6 +38,5 @@ export function useBlockSuitePageReferences(
pageId: string pageId: string
): string[] { ): string[] {
const page = useBlockSuiteWorkspacePage(blockSuiteWorkspace, pageId); const page = useBlockSuiteWorkspacePage(blockSuiteWorkspace, pageId);
assertExists(page);
return useAtomValue(getPageReferencesAtom(page)); return useAtomValue(getPageReferencesAtom(page));
} }