fix(use-calendar-picker): simplified control structure

nextui-org · Oct 3, 2024 · b96542a · b96542a
1 parent c3f924b
commit b96542a
Showing 1 changed file with 10 additions and 19 deletions.
diff --git a/packages/components/calendar/src/use-calendar-picker.ts b/packages/components/calendar/src/use-calendar-picker.ts
@@ -213,29 +213,20 @@ export function useCalendarPicker(props: CalendarPickerProps) {
       if (needsDeferredFocus(e)) {
         if (!isKeyDown(e.key)) {
           scrollTo(nextValue, list);
-        } else {
-        }
-      } else {
-        scrollTo(nextValue, list);
-      }
-
-      if (nextItem) {
-        if (needsDeferredFocus(e)) {
-          if (!isKeyDown(e.key)) {
-            if (abortRef.current) {
-              abortRef.current();
-            }
-            handleKeyDown(e.key);
-            onScrollEnd(list === "months" ? monthsListRef.current : yearsListRef.current, () => {
-              nextItem.focus();
-            });
-          }
-        } else {
           if (abortRef.current) {
             abortRef.current();
           }
-          nextItem.focus();
+          handleKeyDown(e.key);
+          onScrollEnd(list === "months" ? monthsListRef.current : yearsListRef.current, () => {
+            nextItem?.focus();
+          });
+        }
+      } else {
+        scrollTo(nextValue, list);
+        if (abortRef.current) {
+          abortRef.current();
         }
+        nextItem?.focus();
       }
     },
     [state, handleKeyDown, isKeyDown],