From 401ce701536a203720eb459d3c99dda13513d957 Mon Sep 17 00:00:00 2001 From: L-Sun Date: Tue, 11 Feb 2025 13:26:43 +0000 Subject: [PATCH] refactor(core): remove the unused compareDate field from DocDisplayIconOptions (#10095) --- .../core/src/components/root-app-sidebar/journal-button.tsx | 6 +----- .../pages/workspace/detail-page/tabs/journal/index.tsx | 4 +--- .../core/src/mobile/components/app-tabs/journal.tsx | 4 +--- .../pages/workspace/detail/menu/journal-conflicts.tsx | 4 +--- .../pages/workspace/detail/menu/journal-today-activity.tsx | 4 +--- .../modules/doc-display-meta/services/doc-display-meta.ts | 1 - 6 files changed, 5 insertions(+), 18 deletions(-) diff --git a/packages/frontend/core/src/components/root-app-sidebar/journal-button.tsx b/packages/frontend/core/src/components/root-app-sidebar/journal-button.tsx index 4edd07210a..9bc1d2ed20 100644 --- a/packages/frontend/core/src/components/root-app-sidebar/journal-button.tsx +++ b/packages/frontend/core/src/components/root-app-sidebar/journal-button.tsx @@ -15,11 +15,7 @@ export const AppSidebarJournalButton = () => { const maybeDocId = location.pathname.split('/')[1]; const isJournal = !!useLiveData(journalService.journalDate$(maybeDocId)); - const JournalIcon = useLiveData( - docDisplayMetaService.icon$(maybeDocId, { - compareDate: new Date(), - }) - ); + const JournalIcon = useLiveData(docDisplayMetaService.icon$(maybeDocId)); const Icon = isJournal ? JournalIcon : TodayIcon; return ( diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx index 7e0105ca1d..01bca7094e 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx +++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx @@ -61,9 +61,7 @@ const PageItem = ({ }: PageItemProps) => { const i18n = useI18n(); const docDisplayMetaService = useService(DocDisplayMetaService); - const Icon = useLiveData( - docDisplayMetaService.icon$(docId, { compareDate: new Date() }) - ); + const Icon = useLiveData(docDisplayMetaService.icon$(docId)); const title = useLiveData(docDisplayMetaService.title$(docId)); return ( diff --git a/packages/frontend/core/src/mobile/components/app-tabs/journal.tsx b/packages/frontend/core/src/mobile/components/app-tabs/journal.tsx index 138757a8ea..8a324ec844 100644 --- a/packages/frontend/core/src/mobile/components/app-tabs/journal.tsx +++ b/packages/frontend/core/src/mobile/components/app-tabs/journal.tsx @@ -16,9 +16,7 @@ export const AppTabJournal = ({ tab }: AppTabCustomFCProps) => { const maybeDocId = location.pathname.split('/')[1]; const journalDate = useLiveData(journalService.journalDate$(maybeDocId)); - const JournalIcon = useLiveData( - docDisplayMetaService.icon$(maybeDocId, { compareDate: new Date() }) - ); + const JournalIcon = useLiveData(docDisplayMetaService.icon$(maybeDocId)); const handleOpenToday = useCallback(() => { const docId = journalService.ensureJournalByDate(new Date()).id; diff --git a/packages/frontend/core/src/mobile/pages/workspace/detail/menu/journal-conflicts.tsx b/packages/frontend/core/src/mobile/pages/workspace/detail/menu/journal-conflicts.tsx index 2ea4d7feda..f20d7e1708 100644 --- a/packages/frontend/core/src/mobile/pages/workspace/detail/menu/journal-conflicts.tsx +++ b/packages/frontend/core/src/mobile/pages/workspace/detail/menu/journal-conflicts.tsx @@ -94,9 +94,7 @@ const DocItem = ({ docRecord }: { docRecord: DocRecord }) => { const docId = docRecord.id; const i18n = useI18n(); const docDisplayMetaService = useService(DocDisplayMetaService); - const Icon = useLiveData( - docDisplayMetaService.icon$(docId, { compareDate: new Date() }) - ); + const Icon = useLiveData(docDisplayMetaService.icon$(docId)); const title = useLiveData(docDisplayMetaService.title$(docId)); return ( diff --git a/packages/frontend/core/src/mobile/pages/workspace/detail/menu/journal-today-activity.tsx b/packages/frontend/core/src/mobile/pages/workspace/detail/menu/journal-today-activity.tsx index 88dddde319..e57c66ce5b 100644 --- a/packages/frontend/core/src/mobile/pages/workspace/detail/menu/journal-today-activity.tsx +++ b/packages/frontend/core/src/mobile/pages/workspace/detail/menu/journal-today-activity.tsx @@ -24,9 +24,7 @@ type Category = 'created' | 'updated'; const DocItem = ({ docId }: { docId: string }) => { const docDisplayMetaService = useService(DocDisplayMetaService); - const Icon = useLiveData( - docDisplayMetaService.icon$(docId, { compareDate: new Date() }) - ); + const Icon = useLiveData(docDisplayMetaService.icon$(docId)); const title = useLiveData(docDisplayMetaService.title$(docId)); return ( diff --git a/packages/frontend/core/src/modules/doc-display-meta/services/doc-display-meta.ts b/packages/frontend/core/src/modules/doc-display-meta/services/doc-display-meta.ts index c29a1302ac..4f1207e80c 100644 --- a/packages/frontend/core/src/modules/doc-display-meta/services/doc-display-meta.ts +++ b/packages/frontend/core/src/modules/doc-display-meta/services/doc-display-meta.ts @@ -34,7 +34,6 @@ import type { JournalService } from '../../journal'; type IconType = 'rc' | 'lit'; interface DocDisplayIconOptions { type?: T; - compareDate?: Date | Dayjs; /** * Override the mode detected inside the hook: * by default, it will use the `primaryMode$` of the doc.