Merge 6305d05 into 596b94f

navikt · Aug 31, 2023 · 70b9f99 · 70b9f99
2 parents 596b94f + 6305d05
commit 70b9f99
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.changeset/eleven-pumas-jog.md b/.changeset/eleven-pumas-jog.md
@@ -0,0 +1,5 @@
+---
+"@navikt/ds-react": patch
+---
+
+Fix bug in monthpicker, only compare year and month for equality on date object
diff --git a/@navikt/core/react/src/date/monthpicker/MonthButton.tsx b/@navikt/core/react/src/date/monthpicker/MonthButton.tsx
@@ -1,8 +1,7 @@
 import cl from "clsx";
-import compareAsc from "date-fns/compareAsc";
-import compareDesc from "date-fns/compareDesc";
 import format from "date-fns/format";
 import isSameMonth from "date-fns/isSameMonth";
+import isSameYear from  "date-fns/isSameYear";
 import setYear from "date-fns/setYear";
 import React, { useEffect, useRef } from "react";
 import { useDayPicker } from "react-day-picker";
@@ -20,13 +19,12 @@ interface MonthType {
 
 const disableMonth = (month: Date, fromDate?: Date, toDate?: Date) => {
   if (fromDate && toDate) {
-    return (
-      compareAsc(month, fromDate) === -1 || compareDesc(month, toDate) === -1
-    );
+    return (isSameMonth(month, fromDate) && isSameYear(month, fromDate))
+    || (isSameMonth(month, toDate) && isSameYear(month, toDate))
   } else if (fromDate) {
-    return compareAsc(month, fromDate) === -1;
+    return isSameMonth(month, fromDate) && isSameYear(month, fromDate)
   } else if (toDate) {
-    return compareDesc(month, toDate) === -1;
+    return isSameMonth(month, toDate) && isSameYear(month, toDate)
   }
   return false;
 };