From 96bfe89c2a0bfda039ef3dc833b741e87669f6f0 Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Sat, 28 Jan 2023 12:12:01 +0530 Subject: [PATCH] fix: fixed issue where clicking on calendar cell in daily mode would not open correct note (#2185) --- .../Daily/DailyContentList.tsx | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/packages/web/src/javascripts/Components/ContentListView/Daily/DailyContentList.tsx b/packages/web/src/javascripts/Components/ContentListView/Daily/DailyContentList.tsx index 8b70e6056..79264c022 100644 --- a/packages/web/src/javascripts/Components/ContentListView/Daily/DailyContentList.tsx +++ b/packages/web/src/javascripts/Components/ContentListView/Daily/DailyContentList.tsx @@ -4,7 +4,12 @@ import { ItemListController } from '@/Controllers/ItemList/ItemListController' import { SelectedItemsController } from '@/Controllers/SelectedItemsController' import { useResponsiveAppPane } from '../../Panes/ResponsivePaneProvider' import { AppPaneId } from '../../Panes/AppPaneMetadata' -import { createDailyItemsWithToday, createItemsByDateMapping, insertBlanks } from './CreateDailySections' +import { + createDailyItemsWithToday, + createItemsByDateMapping, + insertBlanks, + templateEntryForDate, +} from './CreateDailySections' import { DailyItemsDay } from './DailyItemsDaySection' import { DailyItemCell } from './DailyItemCell' import { SNTag, pluralize } from '@standardnotes/snjs' @@ -161,19 +166,15 @@ const DailyContentList: FunctionComponent = ({ const onCalendarSelect = useCallback( (date: Date) => { - const dailyItem = dailyItemForDate(date) - if (dailyItem) { - const items = itemsByDateMapping[dailyItem.id] - if (items?.length > 0) { - void onClickItem(dailyItem, items[0], false) - } else if (dailyItem) { - void onClickTemplate(dailyItem.date) - } - } else { - void onClickTemplate(date) + const dailyItem = templateEntryForDate(date) + const items = itemsByDateMapping[dailyItem.id] + if (items?.length > 0) { + void onClickItem(dailyItem, items[0], false) + } else if (dailyItem) { + void onClickTemplate(dailyItem.date) } }, - [onClickItem, onClickTemplate, dailyItemForDate, itemsByDateMapping], + [onClickItem, onClickTemplate, itemsByDateMapping], ) const hasItemsOnSelectedDay = selectedDay && itemsByDateMapping[dateToDailyDayIdentifier(selectedDay)]?.length > 0