Fix next/current events when there's no current event
This commit is contained in:
parent
099d4725ba
commit
bd1617a7f1
1 changed files with 7 additions and 1 deletions
|
|
@ -55,8 +55,14 @@ interface Data {
|
|||
const processCalendar = (cal: ProcessedEvent[]): Data => {
|
||||
const data: Data = { concurrent_event_count: 0, upcoming_count: 0 };
|
||||
const now = Date.now();
|
||||
const seen = new Set();
|
||||
|
||||
for (let event of cal) {
|
||||
const eventToken = `${event.start.valueOf()}|${event.summary}|${event.end.valueOf()}`;
|
||||
if (seen.has(eventToken)) continue;
|
||||
|
||||
seen.add(eventToken);
|
||||
|
||||
if (event.start.valueOf() > now) data.upcoming_count++;
|
||||
if (event.isFullDay) continue;
|
||||
|
||||
|
|
@ -299,7 +305,7 @@ const Main = ({ data, events }: { data: Data; events: ProcessedEvent[] }) => {
|
|||
<div className="grid grid--cols-2 gap--medium grow">
|
||||
<NextEvent
|
||||
event={
|
||||
data.current_event ? data.secondary_event : data.next_event
|
||||
data.current_event ? data.next_event : data.secondary_event
|
||||
}
|
||||
hasNow={!!data.current_event}
|
||||
/>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue