fix(ui): fix keyboard navigation through popper items

ZeynalliZeynal · Jan 18, 2025 · cae536f · cae536f
1 parent ac0f709
commit cae536f
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/components/ui/primitives/popper/popper-content.tsx b/components/ui/primitives/popper/popper-content.tsx
@@ -43,19 +43,21 @@ export function PopperContent(props: PopperContentProps) {
       switch (direction) {
         case 'next':
           nextIndex =
-            highlightedIndex === undefined ||
-            highlightedIndex === menuItems.length - 1
-              ? menuItems.indexOf(menuItems[menuItems.length - 1])
-              : highlightedIndex + 1;
+            highlightedIndex === undefined
+              ? 0
+              : highlightedIndex === menuItems.length - 1
+                ? menuItems.length - 1
+                : highlightedIndex + 1;
           break;
         default:
           nextIndex =
-            highlightedIndex === undefined || highlightedIndex === 0
-              ? 0
-              : highlightedIndex - 1;
+            highlightedIndex === undefined
+              ? menuItems.length - 1
+              : highlightedIndex === 0
+                ? 0
+                : highlightedIndex - 1;
           break;
       }
-      console.log(highlightedIndex);
       setHighlightedIndex(nextIndex);
       highlight(menuItems[nextIndex] as HTMLElement);
     }