From 93754e1b95f7b82718fc6ef589a8acdd50043b07 Mon Sep 17 00:00:00 2001 From: mertsincan Date: Sat, 6 Nov 2021 23:37:44 +0300 Subject: [PATCH] Fixed #2279 - Date gets deselected in Calendar with selection mode range --- src/components/calendar/Calendar.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/calendar/Calendar.js b/src/components/calendar/Calendar.js index b03c573cf4..1aad9d3bd1 100644 --- a/src/components/calendar/Calendar.js +++ b/src/components/calendar/Calendar.js @@ -1526,8 +1526,14 @@ export class Calendar extends Component { let startDate = this.props.value[0]; let endDate = this.props.value[1]; - if (!endDate && date.getTime() >= startDate.getTime()) { - endDate = date; + if (!endDate) { + if (date.getTime() >= startDate.getTime()) { + endDate = date; + } + else { + endDate = startDate; + startDate = date; + } } else { startDate = date;