administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-03 17:55:21 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix LastDayInRange when a time is selected

Browse Source
This commit is contained in:
Bernt Christian Egeland 2023-01-23 19:58:40 +01:00
parent 6a98ec9665
commit dd609bfa21
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
web/src/components/Calendar.jsx
View File

@ -102,8 +102,9 @@ const Calendar = ({ onChange, calendarRef, close, dateRange, children }) => {
...prev,
selectedDay: todayTimestamp,
monthDetails: getMonthDetails(year, month),
timeRange: { ...dateRange },
}));
}, [year, month, getMonthDetails]);
}, [year, month, getMonthDetails, dateRange]);
useEffect(() => {
// add refs for keyboard navigation
@ -136,10 +137,14 @@ const Calendar = ({ onChange, calendarRef, close, dateRange, children }) => {
const isLastDayInRange = useCallback(
(day) => {
return (
new Date(state.timeRange.before).setHours(24) === new Date(day.timestamp).setHours(24) ||
state.timeRange.before === new Date(day.timestamp).setHours(24)
);
// if the hour is not above 0, we will use 24 hour.
const beforeHour = new Date(state.timeRange.before).getHours() || 24;
/**
* When user selects a day in the calendar, the before will be 00:00.
* When user selects a time in timepicker, the day.timestamp hour must be changed to match the selected end () hour.
*/
return state.timeRange.before === new Date(day.timestamp).setHours(beforeHour);
},
[state.timeRange.before]
);