Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-04 08:38:34 +00: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

4
packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx
View File

@@ -442,7 +442,7 @@ const ConflictList = ({
...attrs
}: ConflictListProps) => {
const t = useI18n();
const currentDoc = useService(DocService).doc;
const currentDocId = useServiceOptional(DocService)?.doc.id;
const journalService = useService(JournalService);
const { openConfirmModal } = useConfirmModal();
@@ -479,7 +479,7 @@ const ConflictList = ({
{...attrs}
>
{docRecords.map(docRecord => {
const isCurrent = docRecord.id === currentDoc.id;
const isCurrent = currentDocId ? docRecord.id === currentDocId : false;
return (
<PageItem
aria-selected={isCurrent}