Fix range selection logic in DatePicker for swapRange functionality

Author: ilchenkoArtem

src/day.tsx

@@ -341,29 +341,41 @@ export default class Day extends Component<DayProps> {
       return false;
     }
 
-    const { day, startDate, selectsStart } = this.props;
+    const { day, startDate, selectsStart, swapRange, selectsRange } = this.props;
     const selectingDate = this.props.selectingDate ?? this.props.preSelection;
 
     if (selectsStart) {
       return isSameDay(day, selectingDate);
-    } else {
-      return isSameDay(day, startDate);
     }
+
+    if (selectsRange && swapRange && startDate && selectingDate) {
+      return isSameDay(day, isBefore(selectingDate, startDate) ? selectingDate : startDate);
+    }
+
+    return isSameDay(day, startDate);
   };
 
   isSelectingRangeEnd = () => {
     if (!this.isInSelectingRange()) {
       return false;
     }
 
-    const { day, endDate, selectsEnd, selectsRange } = this.props;
+    const { day, endDate, selectsEnd, selectsRange, swapRange, startDate } = this.props;
     const selectingDate = this.props.selectingDate ?? this.props.preSelection;
 
-    if (selectsEnd || selectsRange) {
+    if (selectsEnd) {
       return isSameDay(day, selectingDate);
-    } else {
-      return isSameDay(day, endDate);
     }
+
+    if (selectsRange && swapRange && startDate && selectingDate) {
+      return isSameDay(day, isBefore(selectingDate, startDate) ? startDate : selectingDate);
+    }
+
+    if (selectsRange) {
+      return isSameDay(day, selectingDate);
+    }
+
+    return isSameDay(day, endDate);
   };
 
   isRangeStart = () => {

src/month.tsx

@@ -1101,8 +1101,6 @@ export default class Month extends Component<MonthProps> {
       ? ariaLabelPrefix.trim() + " "
       : "";
 
-    console.log('Month render:', this.props.selectingDate);
-
     return (
       <div
         className={this.getClassNames()}

src/test/day_test.test.tsx

@@ -898,7 +898,7 @@ describe("Day", () => {
     });
 
     describe("for a date picker with selectsRange and swapRange prop", () => {
-      it("should select range from startDate to selectingDate if selectingDate mote then startDate", () => {
+      it("should select range from startDate to selectingDate if selectingDate more than startDate", () => {
         const startDate = newDate();
         const dayInRange = addDays(startDate, 1);
         const selectingDate = addDays(startDate, 2);
@@ -916,7 +916,7 @@ describe("Day", () => {
         ).toBe(true);
       })
 
-      it("should select range from selectingDate to startDate if selectingDate less then startDate", () => {
+      it("should select range from selectingDate to startDate if selectingDate less than startDate", () => {
         const startDate = newDate();
         const dayInRange = subDays(startDate, 1);
         const selectingDate = subDays(startDate, 2);