Refactored header title component

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

@@ -24,12 +24,7 @@ import { Observable, OperatorFunction, combineLatest, pipe } from "rxjs"
 import { map, shareReplay, switchMap } from "rxjs/operators"
 
 import { SearchResult } from "integrations/search"
-import {
-  Key,
-  SearchQuery,
-  Viewport,
-  WorkerHandler
-} from "observables"
+import { Key, SearchQuery, WorkerHandler } from "observables"
 import { SearchMessage } from "workers"
 
 import { useComponent } from "../_"
@@ -57,7 +52,6 @@ export interface Search {
  * Mount options
  */
 interface MountOptions {
-  viewport$: Observable<Viewport>      /* Viewport observable */
   keyboard$: Observable<Key>           /* Keyboard observable */
 }
 
@@ -74,7 +68,7 @@ interface MountOptions {
  * @return Search observable
  */
 export function mountSearch(
-  handler: WorkerHandler<SearchMessage>, { viewport$, keyboard$ }: MountOptions
+  handler: WorkerHandler<SearchMessage>, { keyboard$ }: MountOptions
 ): OperatorFunction<HTMLElement, Search> {
   return pipe(
     switchMap(() => {
@@ -88,14 +82,14 @@ export function mountSearch(
       /* Mount search query */
       const query$ = useComponent<HTMLInputElement>("search-query")
         .pipe(
-          mountSearchQuery(handler, { reset$ }),
+          mountSearchQuery(handler),
           shareReplay(1)
         )
 
       /* Mount search result */
       const result$ = useComponent("search-result")
         .pipe(
-          mountSearchResult(handler, { query$, viewport$, keyboard$ })
+          mountSearchResult(handler, { query$, keyboard$ })
         )
 
       /* Combine into a single hot observable */

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

@@ -37,7 +37,6 @@ import { SearchResult } from "integrations/search"
 import {
   Key,
   SearchQuery,
-  Viewport,
   WorkerHandler,
   getActiveElement,
   getElements,
@@ -64,7 +63,6 @@ import { useComponent } from "../../_"
  */
 interface MountOptions {
   query$: Observable<SearchQuery>      /* Search query observable */
-  viewport$: Observable<Viewport>      /* Viewport observable */
   keyboard$: Observable<Key>           /* Keyboard observable */
 }
 
@@ -81,8 +79,7 @@ interface MountOptions {
  * @return Operator function
  */
 export function mountSearchResult(
-  { rx$ }: WorkerHandler<SearchMessage>,
-  { query$, viewport$, keyboard$ }: MountOptions
+  { rx$ }: WorkerHandler<SearchMessage>, { query$, keyboard$ }: MountOptions
 ): OperatorFunction<HTMLElement, SearchResult[]> {
   const toggle$ = useToggle("search")
   return pipe(
@@ -90,7 +87,7 @@ export function mountSearchResult(
       const container = el.parentElement!
 
       /* Compute whether there are more search results to fetch */
-      const fetch$ = watchElementOffset(container, { viewport$ })
+      const fetch$ = watchElementOffset(container)
         .pipe(
           map(({ y }) => {
             return y >= container.scrollHeight - container.offsetHeight - 16