Merge pull request #803 from sebgroup/develop

next release
seb-oss · Feb 16, 2023 · 7b65e68 · 7b65e68
2 parents 50f09db + 34601ad
commit 7b65e68
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -14,7 +14,7 @@
     },
     "license": "Apache-2.0",
     "dependencies": {
-        "@sebgroup/frontend-tools": "^2.2.1",
+        "@sebgroup/frontend-tools": "^2.2.2",
         "browser-typescript-parser": "^2.6.7",
         "classnames": "^2.3.1",
         "gatsby": "^4.20.0",

diff --git a/lib/package.json b/lib/package.json
@@ -14,7 +14,7 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "@sebgroup/frontend-tools": "^2.2.1",
+        "@sebgroup/frontend-tools": "^2.2.2",
         "@types/body-scroll-lock": "^3.1.0",
         "body-scroll-lock": "^4.0.0-beta.0",
         "classnames": "^2.3.1",

diff --git a/lib/src/Datepicker/Datepicker.test.tsx b/lib/src/Datepicker/Datepicker.test.tsx
@@ -97,8 +97,10 @@ describe("Component: Datepicker", () => {
         expect(props.onChange).toHaveBeenLastCalledWith(null);
         changeDate(`${minYear}-01-01`);
         expect(props.onChange).toHaveBeenCalledTimes(9);
+        expect(props.onChange).not.toHaveBeenLastCalledWith(null);
         changeDate(`${maxYear}-01-01`);
         expect(props.onChange).toHaveBeenCalledTimes(10);
+        expect(props.onChange).not.toHaveBeenLastCalledWith(null);
     });
 
     it("should support fallback custom picker", async () => {

diff --git a/lib/src/Datepicker/Datepicker.tsx b/lib/src/Datepicker/Datepicker.tsx
@@ -1,4 +1,4 @@
-import { isDateAfter } from "@sebgroup/frontend-tools";
+import { isDateAfter, isSameDate } from "@sebgroup/frontend-tools";
 import { isDateBefore } from "@sebgroup/frontend-tools/isDateBefore";
 import { randomId } from "@sebgroup/frontend-tools/randomId";
 import classnames from "classnames";
@@ -456,8 +456,8 @@ function hasModifierKey({ altKey, ctrlKey, metaKey, shiftKey }: React.KeyboardEv
 }
 
 function isDateInRange(d: Date, min: Date, max: Date): boolean {
-    const isAfterMinDate = !min || !isDateBefore(d, min);
-    const isBeforeMaxDate = !max || !isDateAfter(d, max);
+    const isAfterMinDate = !min || isDateAfter(d, min) || isSameDate(d, min);
+    const isBeforeMaxDate = !max || isDateBefore(d, max) || isSameDate(d, max);
     return isAfterMinDate && isBeforeMaxDate;
 }
 

diff --git a/package-lock.json b/package-lock.json