PR suggestions

patternfly · Mar 14, 2024 · 8587f7a · 8587f7a
1 parent 8e93f0a
commit 8587f7a
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx b/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx
@@ -225,24 +225,25 @@ export const CalendarMonth = ({
   const MIN_YEAR = 1900;
   const MAX_YEAR = 2100;
 
-  const handleYearInputChange = (event: React.FormEvent<HTMLInputElement>) => {
-    const yearStr = event.currentTarget.value;
-
-    if (/^\d{0,4}$/.test(yearStr)) {
-      setYearInput(yearStr);
-
-      if (yearStr.length === 4) {
-        const yearNum = Number(yearStr);
-        if (yearNum >= MIN_YEAR && yearNum <= MAX_YEAR) {
-          const newDate = changeYear(yearNum);
-          setFocusedDate(newDate);
-          setHoveredDate(newDate);
-          setShouldFocus(false);
-          onMonthChange(event, newDate);
-        } else {
-          // If the year is not valid, reset the year input to the last valid year.
-          setYearInput(yearFormatted.toString());
-        }
+  const handleYearInputChange = (event: React.FormEvent<HTMLInputElement>, yearStr: string) => {
+    if (!/^\d{0,4}$/.test(yearStr)) {
+      return;
+    }
+
+    setYearInput(yearStr);
+
+    if (yearStr.length === 4) {
+      const yearNum = Number(yearStr);
+
+      if (yearNum >= MIN_YEAR && yearNum <= MAX_YEAR) {
+        const newDate = changeYear(yearNum);
+        setFocusedDate(newDate);
+        setHoveredDate(newDate);
+        setShouldFocus(false);
+        focusRef.current?.blur();
+        onMonthChange(event, newDate);
+      } else {
+        setYearInput(yearFormatted.toString());
       }
     }
   };