From b11b675e33c9011341a0e5735f7293012e9db554 Mon Sep 17 00:00:00 2001 From: Karl Kristiansen Date: Tue, 14 Nov 2023 17:20:39 +0100 Subject: [PATCH 1/5] If the endTime is >=24, then set endTime to 23:59 (this prevents 0-length events to be created) --- src/features/calendar/components/CalendarWeekView/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/features/calendar/components/CalendarWeekView/index.tsx b/src/features/calendar/components/CalendarWeekView/index.tsx index cff0099ed9..3ada6ca3b7 100644 --- a/src/features/calendar/components/CalendarWeekView/index.tsx +++ b/src/features/calendar/components/CalendarWeekView/index.tsx @@ -173,8 +173,8 @@ const CalendarWeekView = ({ focusDate, onClickDay }: CalendarWeekViewProps) => { date.getFullYear(), date.getMonth(), date.getDate(), - endTime[0], - endTime[1] + endTime[0] >= 24 && endTime[1] >= 0 ? '23' : endTime[0], + endTime[0] >= 24 && endTime[1] >= 0 ? '59' : endTime[0] ) ); From c80ca3cc742bc5f11178a170debba3cc4c9effbf Mon Sep 17 00:00:00 2001 From: Karl Kristiansen Date: Tue, 14 Nov 2023 17:32:27 +0100 Subject: [PATCH 2/5] Wops, the numbers in the logic should be numbers, and not strings. Sorry typescript. --- src/features/calendar/components/CalendarWeekView/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/features/calendar/components/CalendarWeekView/index.tsx b/src/features/calendar/components/CalendarWeekView/index.tsx index 3ada6ca3b7..6709a8b33f 100644 --- a/src/features/calendar/components/CalendarWeekView/index.tsx +++ b/src/features/calendar/components/CalendarWeekView/index.tsx @@ -173,8 +173,8 @@ const CalendarWeekView = ({ focusDate, onClickDay }: CalendarWeekViewProps) => { date.getFullYear(), date.getMonth(), date.getDate(), - endTime[0] >= 24 && endTime[1] >= 0 ? '23' : endTime[0], - endTime[0] >= 24 && endTime[1] >= 0 ? '59' : endTime[0] + endTime[0] >= 24 && endTime[1] >= 0 ? 23 : endTime[0], + endTime[0] >= 24 && endTime[1] >= 0 ? 59 : endTime[0] ) ); From 10d22e31984281b1f8ea3a3f0719ae48554a9eb1 Mon Sep 17 00:00:00 2001 From: Karl Kristiansen Date: Tue, 14 Nov 2023 17:54:29 +0100 Subject: [PATCH 3/5] Simplification --- src/features/calendar/components/CalendarWeekView/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/features/calendar/components/CalendarWeekView/index.tsx b/src/features/calendar/components/CalendarWeekView/index.tsx index 6709a8b33f..f4784bc57e 100644 --- a/src/features/calendar/components/CalendarWeekView/index.tsx +++ b/src/features/calendar/components/CalendarWeekView/index.tsx @@ -173,8 +173,8 @@ const CalendarWeekView = ({ focusDate, onClickDay }: CalendarWeekViewProps) => { date.getFullYear(), date.getMonth(), date.getDate(), - endTime[0] >= 24 && endTime[1] >= 0 ? 23 : endTime[0], - endTime[0] >= 24 && endTime[1] >= 0 ? 59 : endTime[0] + endTime[0] >= 24 ? 23 : endTime[0], + endTime[0] >= 24 ? 59 : endTime[0] ) ); From 3acff7e5366726c667ac8d937cdeab3c44d9a5d5 Mon Sep 17 00:00:00 2001 From: Karl Kristiansen Date: Tue, 14 Nov 2023 20:07:09 +0100 Subject: [PATCH 4/5] Setting overflow:hidden on calender, to prevent user from expanding it when dragging out of bounds --- src/features/calendar/components/CalendarWeekView/index.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/features/calendar/components/CalendarWeekView/index.tsx b/src/features/calendar/components/CalendarWeekView/index.tsx index f4784bc57e..f5a7084188 100644 --- a/src/features/calendar/components/CalendarWeekView/index.tsx +++ b/src/features/calendar/components/CalendarWeekView/index.tsx @@ -154,6 +154,7 @@ const CalendarWeekView = ({ focusDate, onClickDay }: CalendarWeekViewProps) => { sx={{ backgroundImage: `repeating-linear-gradient(180deg, ${theme.palette.grey[400]}, ${theme.palette.grey[400]} 1px, ${theme.palette.grey[200]} 1px, ${theme.palette.grey[200]} ${HOUR_HEIGHT}px)`, marginTop: '0.6em', // Aligns the hour marker on each day to the hour on the hour column + overflow: 'hidden', // Will prevent the ghostElement to expand the size of the calender, showing vertical scrollbar and whitespace underneath calender #issue-#1614 }} > Date: Tue, 14 Nov 2023 20:20:24 +0100 Subject: [PATCH 5/5] Correcting typo; was wrongfully setting endTime = startTime. --- src/features/calendar/components/CalendarWeekView/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/calendar/components/CalendarWeekView/index.tsx b/src/features/calendar/components/CalendarWeekView/index.tsx index f5a7084188..06b93985db 100644 --- a/src/features/calendar/components/CalendarWeekView/index.tsx +++ b/src/features/calendar/components/CalendarWeekView/index.tsx @@ -175,7 +175,7 @@ const CalendarWeekView = ({ focusDate, onClickDay }: CalendarWeekViewProps) => { date.getMonth(), date.getDate(), endTime[0] >= 24 ? 23 : endTime[0], - endTime[0] >= 24 ? 59 : endTime[0] + endTime[0] >= 24 ? 59 : endTime[1] ) );