Merge branch 'Hacker0x01:main' into main

Author: yykcool

package.json

@@ -2,7 +2,7 @@
   "author": "HackerOne",
   "name": "react-datepicker",
   "description": "A simple and reusable datepicker component for React",
-  "version": "6.7.0",
+  "version": "6.7.1",
   "license": "MIT",
   "homepage": "https://github.com/Hacker0x01/react-datepicker",
   "main": "dist/index.js",

src/index.jsx

@@ -602,7 +602,11 @@ export default class DatePicker extends React.Component {
 
       const { startDate, endDate } = this.props;
 
-      if (startDate && !endDate && !isDateBefore(date, startDate)) {
+      if (
+        startDate &&
+        !endDate &&
+        (this.props.swapRange || !isDateBefore(date, startDate))
+      ) {
         this.setOpen(false);
       }
     }

test/datepicker_test.test.js

@@ -2301,6 +2301,25 @@ describe("DatePicker", () => {
       expect(container.querySelector(".react-datepicker")).toBeNull();
     });
 
+    it("should be closed after clicking day when startDate has a value (endDate is being selected) and swapRange prop was passed", () => {
+      const startDate = new Date("2021-01-01 00:00:00");
+      const endDate = null;
+      const { container } = render(
+        <DatePicker
+          swapRange
+          selectsRange
+          startDate={startDate}
+          endDate={endDate}
+        />,
+      );
+      fireEvent.click(container.querySelector("input"));
+
+      const days = container.querySelectorAll(".react-datepicker__day");
+      const day = days[Math.floor(days.length / 2)];
+      fireEvent.click(day);
+      expect(container.querySelector(".react-datepicker")).toBeNull();
+    });
+
     it("has clear button rendered when isClearable is true and startDate has value", () => {
       const startDate = new Date("2021-01-01 00:00:00");
       const endDate = new Date("2021-01-21 00:00:00");