Skip to content

Commit

Permalink
Merge pull request #1375 from culturecreates/bugfix/issue-1340
Browse files Browse the repository at this point in the history
fix: fixed issue start date getting disabled in rangepicker after a p…
  • Loading branch information
AbhishekPAnil authored Oct 1, 2024
2 parents b2a52cf + ceb05e5 commit 8d14144
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/components/RecurringEvents/RecurringEvents.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const RecurringEvents = function ({
setFormFields,
dateType,
disabledDate,
onOpenChange,
onCalendarChange,
setSubEventCount,
subEventCount,
Expand Down Expand Up @@ -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 && (
Expand Down
6 changes: 6 additions & 0 deletions src/pages/Dashboard/AddEvent/AddEvent.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand All @@ -2723,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'))
Expand Down

0 comments on commit 8d14144

Please sign in to comment.