From 8d48e6347ec5dc80d396c7a972ff06b58338db93 Mon Sep 17 00:00:00 2001
From: Spedon <hi@sped0n.com>
Date: Sat, 6 Jul 2024 22:36:50 +0800
Subject: [PATCH] fix keyboard input (#356)

* fix: enhance accessibility with `tabIndex`

- Add `tabIndex="-1"` to the navigation item for accessibility

* refactor: refactor event handling with SolidJS effects

- Import `createEffect` from 'solid-js'
- Add an `AbortController` for managing event listeners
- Use `createEffect` to conditionally add and remove keydown event listener based on component state
- Remove `onKeyDown` and `tabIndex` attributes from the overlay div
---
 assets/ts/desktop/stageNav.tsx | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/assets/ts/desktop/stageNav.tsx b/assets/ts/desktop/stageNav.tsx
index c8a9985..12187e7 100644
--- a/assets/ts/desktop/stageNav.tsx
+++ b/assets/ts/desktop/stageNav.tsx
@@ -1,4 +1,4 @@
-import { For, type Accessor, type JSX, type Setter } from 'solid-js'
+import { For, createEffect, type Accessor, type JSX, type Setter } from 'solid-js'
 
 import { useState } from '../state'
 import { decrement, increment, type Vector } from '../utils'
@@ -24,6 +24,7 @@ export default function StageNav(props: {
   type NavItem = (typeof navItems)[number]
 
   // variables
+  let controller: AbortController | undefined
   // eslint-disable-next-line solid/reactivity
   const navItems = [props.prevText, props.closeText, props.nextText] as const
 
@@ -70,6 +71,19 @@ export default function StageNav(props: {
     else if (e.key === 'ArrowRight') nextImage()
   }
 
+  createEffect(() => {
+    if (props.isOpen()) {
+      controller = new AbortController()
+      const abortSignal = controller.signal
+      window.addEventListener('keydown', handleKey, {
+        passive: true,
+        signal: abortSignal
+      })
+    } else {
+      controller?.abort()
+    }
+  })
+
   return (
     <>
       <div class="navOverlay" classList={{ active: props.active() }}>
@@ -80,7 +94,6 @@ export default function StageNav(props: {
               onClick={() => {
                 handleClick(item)
               }}
-              onKeyDown={handleKey}
               onFocus={() => props.setHoverText(item)}
               onMouseOver={() => props.setHoverText(item)}
               tabIndex="-1"