toeverything/AFFiNE
1
1
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2024-12-23 02:21:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: ensure subpage is appended in its parent after subpageLinked (#1872)

Browse Source
This commit is contained in:
Qi 2023-04-11 22:43:35 +08:00 committed by GitHub
parent 778f76dfed
commit f5e51bb471
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
apps/web/src/pages/workspace/[workspaceId]/[pageId].tsx
View File

@ -9,7 +9,7 @@ import { PageLoading } from '../../../components/pure/loading';
import { useReferenceLink } from '../../../hooks/affine/use-reference-link'; import { useReferenceLink } from '../../../hooks/affine/use-reference-link';
import { useCurrentPageId } from '../../../hooks/current/use-current-page-id'; import { useCurrentPageId } from '../../../hooks/current/use-current-page-id';
import { useCurrentWorkspace } from '../../../hooks/current/use-current-workspace'; import { useCurrentWorkspace } from '../../../hooks/current/use-current-workspace';
import { usePageMeta } from '../../../hooks/use-page-meta'; import { usePageMeta, usePageMetaHelper } from '../../../hooks/use-page-meta';
import { usePinboardHandler } from '../../../hooks/use-pinboard-handler'; import { usePinboardHandler } from '../../../hooks/use-pinboard-handler';
import { useSyncRecentViewsWithRouter } from '../../../hooks/use-recent-views'; import { useSyncRecentViewsWithRouter } from '../../../hooks/use-recent-views';
import { useRouterHelper } from '../../../hooks/use-router-helper'; import { useRouterHelper } from '../../../hooks/use-router-helper';
@ -32,11 +32,12 @@ function enableFullFlags(blockSuiteWorkspace: BlockSuiteWorkspace) {
const WorkspaceDetail: React.FC = () => { const WorkspaceDetail: React.FC = () => {
const router = useRouter(); const router = useRouter();
const { openPage } = useRouterHelper(router); const { openPage } = useRouterHelper(router);
const [pageId] = useCurrentPageId(); const [currentPageId] = useCurrentPageId();
const [currentWorkspace] = useCurrentWorkspace(); const [currentWorkspace] = useCurrentWorkspace();
const blockSuiteWorkspace = currentWorkspace?.blockSuiteWorkspace ?? null;
const { setPageMeta, getPageMeta } = usePageMetaHelper(blockSuiteWorkspace);
const { deletePin } = usePinboardHandler({ const { deletePin } = usePinboardHandler({
blockSuiteWorkspace: currentWorkspace?.blockSuiteWorkspace ?? null, blockSuiteWorkspace,
metas: usePageMeta(currentWorkspace?.blockSuiteWorkspace ?? null ?? null), metas: usePageMeta(currentWorkspace?.blockSuiteWorkspace ?? null ?? null),
}); });
@ -56,7 +57,20 @@ const WorkspaceDetail: React.FC = () => {
}, },
[deletePin] [deletePin]
), ),
subpageLinked: useCallback(
({ pageId }: { pageId: string }) => {
const meta = currentPageId && getPageMeta(currentPageId);
if (!meta || meta.subpageIds?.includes(pageId)) {
return;
}
setPageMeta(currentPageId, {
subpageIds: [...(meta.subpageIds ?? []), pageId],
}); });
},
[currentPageId, getPageMeta, setPageMeta]
),
});
useEffect(() => { useEffect(() => {
if (currentWorkspace) { if (currentWorkspace) {
enableFullFlags(currentWorkspace.blockSuiteWorkspace); enableFullFlags(currentWorkspace.blockSuiteWorkspace);
@ -65,18 +79,24 @@ const WorkspaceDetail: React.FC = () => {
if (currentWorkspace === null) { if (currentWorkspace === null) {
return <PageLoading />; return <PageLoading />;
} }
if (!pageId) { if (!currentPageId) {
return <PageLoading />; return <PageLoading />;
} }
if (currentWorkspace.flavour === WorkspaceFlavour.AFFINE) { if (currentWorkspace.flavour === WorkspaceFlavour.AFFINE) {
const PageDetail = WorkspacePlugins[currentWorkspace.flavour].UI.PageDetail; const PageDetail = WorkspacePlugins[currentWorkspace.flavour].UI.PageDetail;
return ( return (
<PageDetail currentWorkspace={currentWorkspace} currentPageId={pageId} /> <PageDetail
currentWorkspace={currentWorkspace}
currentPageId={currentPageId}
/>
); );
} else if (currentWorkspace.flavour === WorkspaceFlavour.LOCAL) { } else if (currentWorkspace.flavour === WorkspaceFlavour.LOCAL) {
const PageDetail = WorkspacePlugins[currentWorkspace.flavour].UI.PageDetail; const PageDetail = WorkspacePlugins[currentWorkspace.flavour].UI.PageDetail;
return ( return (
<PageDetail currentWorkspace={currentWorkspace} currentPageId={pageId} /> <PageDetail
currentWorkspace={currentWorkspace}
currentPageId={currentPageId}
/>
); );
} }
throw new Unreachable(); throw new Unreachable();