fix: fixed issue where clicking on calendar cell in daily mode would not open correct note (#2185)

This commit is contained in:
Aman Harwara
2023-01-28 12:12:01 +05:30
committed by GitHub
parent 0b20a069c6
commit 96bfe89c2a

View File

@@ -4,7 +4,12 @@ import { ItemListController } from '@/Controllers/ItemList/ItemListController'
import { SelectedItemsController } from '@/Controllers/SelectedItemsController' import { SelectedItemsController } from '@/Controllers/SelectedItemsController'
import { useResponsiveAppPane } from '../../Panes/ResponsivePaneProvider' import { useResponsiveAppPane } from '../../Panes/ResponsivePaneProvider'
import { AppPaneId } from '../../Panes/AppPaneMetadata' import { AppPaneId } from '../../Panes/AppPaneMetadata'
import { createDailyItemsWithToday, createItemsByDateMapping, insertBlanks } from './CreateDailySections' import {
createDailyItemsWithToday,
createItemsByDateMapping,
insertBlanks,
templateEntryForDate,
} from './CreateDailySections'
import { DailyItemsDay } from './DailyItemsDaySection' import { DailyItemsDay } from './DailyItemsDaySection'
import { DailyItemCell } from './DailyItemCell' import { DailyItemCell } from './DailyItemCell'
import { SNTag, pluralize } from '@standardnotes/snjs' import { SNTag, pluralize } from '@standardnotes/snjs'
@@ -161,19 +166,15 @@ const DailyContentList: FunctionComponent<Props> = ({
const onCalendarSelect = useCallback( const onCalendarSelect = useCallback(
(date: Date) => { (date: Date) => {
const dailyItem = dailyItemForDate(date) const dailyItem = templateEntryForDate(date)
if (dailyItem) { const items = itemsByDateMapping[dailyItem.id]
const items = itemsByDateMapping[dailyItem.id] if (items?.length > 0) {
if (items?.length > 0) { void onClickItem(dailyItem, items[0], false)
void onClickItem(dailyItem, items[0], false) } else if (dailyItem) {
} else if (dailyItem) { void onClickTemplate(dailyItem.date)
void onClickTemplate(dailyItem.date)
}
} else {
void onClickTemplate(date)
} }
}, },
[onClickItem, onClickTemplate, dailyItemForDate, itemsByDateMapping], [onClickItem, onClickTemplate, itemsByDateMapping],
) )
const hasItemsOnSelectedDay = selectedDay && itemsByDateMapping[dateToDailyDayIdentifier(selectedDay)]?.length > 0 const hasItemsOnSelectedDay = selectedDay && itemsByDateMapping[dateToDailyDayIdentifier(selectedDay)]?.length > 0