From 0de29667732e9c2945d47d32419ca8109aa8e0e1 Mon Sep 17 00:00:00 2001
From: adamviktora <viktora.adam@gmail.com>
Date: Mon, 9 Oct 2023 10:56:00 -0400
Subject: [PATCH] fix(CalendarMonth): unfocus date on year change

---
 .../src/components/CalendarMonth/CalendarMonth.tsx    | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx b/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx
index 2f8679f7011..3ac473ac20b 100644
--- a/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx
+++ b/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx
@@ -213,14 +213,8 @@ export const CalendarMonth = ({
 
   const changeYear = (newYear: number) => changeMonth(focusedDate.getMonth(), newYear);
 
-  const changeMonth = (newMonth: number, newYear?: number) => {
-    const year = newYear ?? focusedDate.getFullYear();
-    const daysInNewMonth = new Date(year, (newMonth + 1) % 12, 0).getDate(); // Setting day 0 of the next month returns the last day of current month
-    const desiredDay = initialDate.getDate();
-    const day = desiredDay <= daysInNewMonth ? desiredDay : daysInNewMonth;
-
-    return new Date(year, newMonth, day);
-  };
+  const changeMonth = (newMonth: number, newYear?: number) =>
+    new Date(newYear ?? focusedDate.getFullYear(), newMonth, 1);
 
   const addMonth = (toAdd: -1 | 1) => {
     let newMonth = focusedDate.getMonth() + toAdd;
@@ -332,6 +326,7 @@ export const CalendarMonth = ({
                   setFocusedDate(newDate);
                   setHoveredDate(newDate);
                   setShouldFocus(false);
+                  focusRef.current.blur(); // will unfocus a date when changing year via up/down arrows
                   onMonthChange(ev, newDate);
                 }}
               />