Moved keyboard handlers to separate module

src/assets/javascripts/components/search/_/index.ts

@@ -20,11 +20,11 @@
  * IN THE SOFTWARE.
  */
 
-import { Observable, OperatorFunction, combineLatest, pipe } from "rxjs"
+import { OperatorFunction, combineLatest, pipe } from "rxjs"
 import { map, shareReplay, switchMap } from "rxjs/operators"
 
 import { SearchResult } from "integrations/search"
-import { Key, SearchQuery, WorkerHandler } from "observables"
+import { SearchQuery, WorkerHandler } from "observables"
 import { SearchMessage } from "workers"
 
 import { useComponent } from "../../_"
@@ -44,17 +44,6 @@ export interface Search {
   result: SearchResult[]               /* Search result list */
 }
 
-/* ----------------------------------------------------------------------------
- * Helper types
- * ------------------------------------------------------------------------- */
-
-/**
- * Mount options
- */
-interface MountOptions {
-  keyboard$: Observable<Key>           /* Keyboard observable */
-}
-
 /* ----------------------------------------------------------------------------
  * Functions
  * ------------------------------------------------------------------------- */
@@ -68,7 +57,7 @@ interface MountOptions {
  * @return Search observable
  */
 export function mountSearch(
-  handler: WorkerHandler<SearchMessage>, { keyboard$ }: MountOptions
+  handler: WorkerHandler<SearchMessage>
 ): OperatorFunction<HTMLElement, Search> {
   return pipe(
     switchMap(() => {
@@ -89,7 +78,7 @@ export function mountSearch(
       /* Mount search result */
       const result$ = useComponent("search-result")
         .pipe(
-          mountSearchResult(handler, { query$, keyboard$ })
+          mountSearchResult(handler, { query$ })
         )
 
       /* Combine into a single hot observable */

src/assets/javascripts/components/search/query/index.ts

@@ -28,10 +28,10 @@ import {
   withLatestFrom
 } from "rxjs/operators"
 
-import { setToggle } from "actions"
 import {
   SearchQuery,
   WorkerHandler,
+  setToggle,
   useToggle,
   watchSearchQuery
 } from "observables"

src/assets/javascripts/components/search/result/index.ts

@@ -28,32 +28,21 @@ import {
   map,
   pluck,
   shareReplay,
-  switchMap,
-  withLatestFrom
+  switchMap
 } from "rxjs/operators"
 
-import { setToggle } from "actions"
 import { SearchResult } from "integrations/search"
 import {
-  Key,
   SearchQuery,
   WorkerHandler,
-  getActiveElement,
-  getElements,
   paintSearchResult,
-  setElementFocus,
-  useToggle,
-  watchElementOffset,
-  watchToggle
+  watchElementOffset
 } from "observables"
-import { takeIf } from "utilities"
 import {
   SearchMessage,
   isSearchResultMessage
 } from "workers"
 
-import { useComponent } from "../../_"
-
 /* ----------------------------------------------------------------------------
  * Helper types
  * ------------------------------------------------------------------------- */
@@ -63,7 +52,6 @@ import { useComponent } from "../../_"
  */
 interface MountOptions {
   query$: Observable<SearchQuery>      /* Search query observable */
-  keyboard$: Observable<Key>           /* Keyboard observable */
 }
 
 /* ----------------------------------------------------------------------------
@@ -79,9 +67,8 @@ interface MountOptions {
  * @return Operator function
  */
 export function mountSearchResult(
-  { rx$ }: WorkerHandler<SearchMessage>, { query$, keyboard$ }: MountOptions
+  { rx$ }: WorkerHandler<SearchMessage>, { query$ }: MountOptions
 ): OperatorFunction<HTMLElement, SearchResult[]> {
-  const toggle$ = useToggle("search")
   return pipe(
     switchMap(el => {
       const container = el.parentElement!
@@ -96,55 +83,6 @@ export function mountSearchResult(
           filter(identity)
         )
 
-      /* Setup keyboard navigation in search mode */
-      keyboard$
-        .pipe(
-          takeIf(toggle$.pipe(switchMap(watchToggle))),
-          withLatestFrom(toggle$, useComponent("search-query"))
-        )
-          .subscribe(([key, toggle, query]) => {
-            const active = getActiveElement()
-            switch (key.type) {
-
-              /* Enter: prevent form submission */
-              case "Enter":
-                if (active === query)
-                  key.claim()
-                break
-
-              /* Escape or Tab: close search */
-              case "Escape":
-              case "Tab":
-                setToggle(toggle, false)
-                setElementFocus(query, false)
-                break
-
-              /* Vertical arrows: select previous or next search result */
-              case "ArrowUp":
-              case "ArrowDown":
-                if (typeof active === "undefined") {
-                  setElementFocus(query)
-                } else {
-                  const els = [query, ...getElements("[href]", el)]
-                  const i = Math.max(0, (
-                    Math.max(0, els.indexOf(active)) + els.length + (
-                      key.type === "ArrowUp" ? -1 : +1
-                    )
-                  ) % els.length)
-                  setElementFocus(els[i])
-                }
-
-                /* Prevent scrolling of page */
-                key.claim()
-                break
-
-              /* All other keys: hand to search query */
-              default:
-                if (query !== getActiveElement())
-                  setElementFocus(query)
-            }
-          })
-
       /* Paint search results */
       return rx$
         .pipe(