From 55a426fc85e6ae47a85f0ed6d8d80ccc84ccdaa4 Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Mon, 10 Jun 2024 23:16:37 -0700 Subject: [PATCH] Don't arrow-nav to hidden dropdown items --- src-web/components/core/Dropdown.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-web/components/core/Dropdown.tsx b/src-web/components/core/Dropdown.tsx index a8ce81f7..0cbb9b0b 100644 --- a/src-web/components/core/Dropdown.tsx +++ b/src-web/components/core/Dropdown.tsx @@ -274,7 +274,7 @@ const Menu = forwardRef, MenuPro let nextIndex = (currIndex ?? 0) - 1; const maxTries = items.length; for (let i = 0; i < maxTries; i++) { - if (items[nextIndex]?.type === 'separator') { + if (items[nextIndex]?.hidden || items[nextIndex]?.type === 'separator') { nextIndex--; } else if (nextIndex < 0) { nextIndex = items.length - 1; @@ -291,7 +291,7 @@ const Menu = forwardRef, MenuPro let nextIndex = (currIndex ?? -1) + 1; const maxTries = items.length; for (let i = 0; i < maxTries; i++) { - if (items[nextIndex]?.type === 'separator') { + if (items[nextIndex]?.hidden || items[nextIndex]?.type === 'separator') { nextIndex++; } else if (nextIndex >= items.length) { nextIndex = 0;