From 1a5f7c89f784eed36a8c20d41acf50daadfd7142 Mon Sep 17 00:00:00 2001 From: syam babu Date: Mon, 30 Sep 2024 16:59:38 +0530 Subject: [PATCH 1/2] fix: fixed issue start date getting disabled in rangepicker after a partial selection. closes #1340 --- src/pages/Dashboard/AddEvent/AddEvent.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/Dashboard/AddEvent/AddEvent.jsx b/src/pages/Dashboard/AddEvent/AddEvent.jsx index 264e4472..15783be5 100644 --- a/src/pages/Dashboard/AddEvent/AddEvent.jsx +++ b/src/pages/Dashboard/AddEvent/AddEvent.jsx @@ -2701,6 +2701,9 @@ function AddEvent() { setStartDate(dates?.[0]); setEndDate(dates?.[1]); }} + onOpenChange={(open) => { + if (!open && startDate && !endDate) setStartDate(null); + }} disabledDate={(current) => (startDate && current.isSame(startDate, 'day')) || (endDate && current.isSame(endDate, 'day')) From ceb05e5423fec7a8613e467f2d9b09858b96d55c Mon Sep 17 00:00:00 2001 From: syam babu Date: Mon, 30 Sep 2024 17:30:33 +0530 Subject: [PATCH 2/2] fix: fix for disabled startdate extended to recurring events datepicker --- src/components/RecurringEvents/RecurringEvents.jsx | 2 ++ src/pages/Dashboard/AddEvent/AddEvent.jsx | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/components/RecurringEvents/RecurringEvents.jsx b/src/components/RecurringEvents/RecurringEvents.jsx index a3780f74..4b5febe8 100644 --- a/src/components/RecurringEvents/RecurringEvents.jsx +++ b/src/components/RecurringEvents/RecurringEvents.jsx @@ -25,6 +25,7 @@ const RecurringEvents = function ({ setFormFields, dateType, disabledDate, + onOpenChange, onCalendarChange, setSubEventCount, subEventCount, @@ -349,6 +350,7 @@ const RecurringEvents = function ({ style={{ width: '423px' }} disabled={(isCustom || formFields?.frequency === 'CUSTOM') && startDateRecur?.length == 2 && true} disabledDate={disabledDate} + onOpenChange={onOpenChange} onCalendarChange={onCalendarChange} suffixIcon={ subEventCount > 0 && ( diff --git a/src/pages/Dashboard/AddEvent/AddEvent.jsx b/src/pages/Dashboard/AddEvent/AddEvent.jsx index 15783be5..1789eff9 100644 --- a/src/pages/Dashboard/AddEvent/AddEvent.jsx +++ b/src/pages/Dashboard/AddEvent/AddEvent.jsx @@ -2726,6 +2726,9 @@ function AddEvent() { setStartDate(dates?.[0]); setEndDate(dates?.[1]); }} + onOpenChange={(open) => { + if (!open && startDate && !endDate) setStartDate(null); + }} disabledDate={(current) => (startDate && current.isSame(startDate, 'day')) || (endDate && current.isSame(endDate, 'day'))