Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-08-05 03:19:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: journal conflict handle

Browse Source
This commit is contained in:
DarkSky
2026-01-15 00:55:35 +08:00
parent fc59dff9e2
commit 76e1721d70
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx
+2 -2
View File
@@ -442,7 +442,7 @@ const ConflictList = ({
...attrs ...attrs
}: ConflictListProps) => { }: ConflictListProps) => {
const t = useI18n(); const t = useI18n();
const currentDoc = useService(DocService).doc; const currentDocId = useServiceOptional(DocService)?.doc.id;
const journalService = useService(JournalService); const journalService = useService(JournalService);
const { openConfirmModal } = useConfirmModal(); const { openConfirmModal } = useConfirmModal();
@@ -479,7 +479,7 @@ const ConflictList = ({
{...attrs} {...attrs}
> >
{docRecords.map(docRecord => { {docRecords.map(docRecord => {
const isCurrent = docRecord.id === currentDoc.id; const isCurrent = currentDocId ? docRecord.id === currentDocId : false;
return ( return (
<PageItem <PageItem
aria-selected={isCurrent} aria-selected={isCurrent}