remove nested conditional in key handler

simularium · Nov 1, 2024 · 82b4b7c · 82b4b7c
1 parent 414e7a4
commit 82b4b7c
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/src/components/CustomDropdown/index.tsx b/src/components/CustomDropdown/index.tsx
@@ -62,22 +62,21 @@ const CustomDropdown: React.FC<CustomDropdownProps> = ({
      * Manually handling keydown and hover behavior because
      * our focus management overrides the defaults of the antd components.
      */
+    const openTriggers = new Set(["Enter", " ", "ArrowDown"]);
+
     const handleKeyDown: KeyboardEventHandler<any> = (event) => {
-        if (dropdownState === DropdownState.CLOSED) {
-            if (
-                (event.key === "Enter" ||
-                    event.key === " " ||
-                    event.key === "ArrowDown") &&
-                !event.defaultPrevented
-            ) {
-                event.preventDefault();
-                setDropdownState(DropdownState.FORCED_OPEN); // Opened by keyboard
-            }
-        } else if (event.key === "Escape") {
+        if (event.key === "Escape") {
             event.preventDefault();
             setDropdownState(DropdownState.CLOSED);
             triggerRef.current?.focus();
         }
+        if (
+            openTriggers.has(event.key) &&
+            dropdownState === DropdownState.CLOSED
+        ) {
+            event.preventDefault();
+            setDropdownState(DropdownState.FORCED_OPEN); // Opened by keyboard
+        }
     };
 
     const handleMouseEnter = () => {