fix(mobile): can navigate in journal conflicts (#9170)

This commit is contained in:
CatsJuice
2024-12-17 02:54:10 +00:00
parent 12954ec82c
commit d3e7edf7c4
2 changed files with 4 additions and 2 deletions
@@ -38,6 +38,7 @@ export const docItem = style({
display: 'flex', display: 'flex',
gap: 8, gap: 8,
alignItems: 'center', alignItems: 'center',
color: 'unset',
}); });
export const icon = style({ export const icon = style({
fontSize: 20, fontSize: 20,
@@ -1,6 +1,7 @@
import { IconButton, Menu } from '@affine/component'; import { IconButton, Menu } from '@affine/component';
import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta'; import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta';
import { JournalService } from '@affine/core/modules/journal'; import { JournalService } from '@affine/core/modules/journal';
import { WorkbenchLink } from '@affine/core/modules/workbench';
import { useI18n } from '@affine/i18n'; import { useI18n } from '@affine/i18n';
import { EditIcon, TodayIcon } from '@blocksuite/icons/rc'; import { EditIcon, TodayIcon } from '@blocksuite/icons/rc';
import type { DocRecord } from '@toeverything/infra'; import type { DocRecord } from '@toeverything/infra';
@@ -58,7 +59,7 @@ const ConflictItem = ({ docRecord }: { docRecord: DocRecord }) => {
const title = i18n.t(titleMeta); const title = i18n.t(titleMeta);
return ( return (
<div className={styles.docItem}> <WorkbenchLink className={styles.docItem} to={`/${docId}`}>
<TodayIcon className={styles.icon} /> <TodayIcon className={styles.icon} />
<div className={styles.content}> <div className={styles.content}>
<div className={styles.title}>{title}</div> <div className={styles.title}>{title}</div>
@@ -69,6 +70,6 @@ const ConflictItem = ({ docRecord }: { docRecord: DocRecord }) => {
<Menu items={<ResolveConflictOperations docRecord={docRecord} />}> <Menu items={<ResolveConflictOperations docRecord={docRecord} />}>
<IconButton className={styles.edit} icon={<EditIcon />} /> <IconButton className={styles.edit} icon={<EditIcon />} />
</Menu> </Menu>
</div> </WorkbenchLink>
); );
}; };