Add keyboard support to catalog search

When searching through the catalog support keyboard navigation with up
and down arrows as well as selection with enter and indexed selection
with ; followed by an index number. This mirrors the functionality of
the Finder.

Author: hojberg

src/Env.elm

@@ -1,6 +1,7 @@
 module Env exposing (..)
 
 import Api exposing (ApiBasePath(..))
+import Browser.Navigation as Nav
 import Env.AppContext as AppContext exposing (AppContext)
 import Perspective exposing (Perspective)
 
@@ -19,6 +20,7 @@ type alias Env =
     , basePath : String
     , apiBasePath : ApiBasePath
     , appContext : AppContext
+    , navKey : Nav.Key
     , perspective : Perspective
     }
 
@@ -31,12 +33,13 @@ type alias Flags =
     }
 
 
-init : Flags -> Perspective -> Env
-init flags perspective =
+init : Flags -> Nav.Key -> Perspective -> Env
+init flags navKey perspective =
     { operatingSystem = operatingSystemFromString flags.operatingSystem
     , basePath = flags.basePath
     , apiBasePath = ApiBasePath flags.apiBasePath
     , appContext = AppContext.fromString flags.appContext
+    , navKey = navKey
     , perspective = perspective
     }
 

src/SearchResults.elm

@@ -1,6 +1,7 @@
 module SearchResults exposing
     ( Matches
     , SearchResults(..)
+    , empty
     , focus
     , focusOn
     , from
@@ -32,6 +33,11 @@ type SearchResults a
     | SearchResults (Matches a)
 
 
+empty : SearchResults a
+empty =
+    Empty
+
+
 isEmpty : SearchResults a -> Bool
 isEmpty results =
     case results of

src/UnisonShare/App.elm

@@ -40,8 +40,7 @@ import Workspace.WorkspaceItems as WorkspaceItems
 
 
 type alias Model =
-    { navKey : Nav.Key
-    , route : Route
+    { route : Route
     , codebaseTree : CodebaseTree.Model
     , workspace : Workspace.Model
     , perspectiveLanding : PerspectiveLanding.Model
@@ -56,8 +55,8 @@ type alias Model =
     }
 
 
-init : Env -> Route -> Nav.Key -> ( Model, Cmd Msg )
-init env route navKey =
+init : Env -> Route -> ( Model, Cmd Msg )
+init env route =
     let
         -- TODO: This whole thing should be route driven
         ( workspace, workspaceCmd ) =
@@ -81,8 +80,7 @@ init env route navKey =
             Catalog.init env
 
         model =
-            { navKey = navKey
-            , route = route
+            { route = route
             , workspace = workspace
             , perspectiveLanding = PerspectiveLanding.init
             , codebaseTree = codebaseTree
@@ -131,7 +129,7 @@ update msg ({ env } as model) =
         ( _, LinkClicked urlRequest ) ->
             case urlRequest of
                 Browser.Internal url ->
-                    ( model, Nav.pushUrl model.navKey (Url.toString url) )
+                    ( model, Nav.pushUrl env.navKey (Url.toString url) )
 
                 -- External links are handled via target blank and never end up
                 -- here
@@ -230,7 +228,7 @@ update msg ({ env } as model) =
         ( Route.Catalog, CatalogMsg cMsg ) ->
             let
                 ( catalog, cmd ) =
-                    Catalog.update cMsg model.catalog
+                    Catalog.update env cMsg model.catalog
             in
             ( { model | catalog = catalog }, Cmd.map CatalogMsg cmd )
 
@@ -310,7 +308,7 @@ update msg ({ env } as model) =
 
 navigateToDefinition : Model -> Reference -> ( Model, Cmd Msg )
 navigateToDefinition model ref =
-    ( model, Route.navigateToDefinition model.navKey model.route ref )
+    ( model, Route.navigateToDefinition model.env.navKey model.route ref )
 
 
 navigateToPerspective : Model -> Perspective -> ( Model, Cmd Msg )
@@ -330,7 +328,7 @@ navigateToPerspective model perspective =
                 |> Maybe.withDefault model.route
 
         changeRouteCmd =
-            Route.replacePerspective model.navKey (Perspective.toParams perspective) focusedReferenceRoute
+            Route.replacePerspective model.env.navKey (Perspective.toParams perspective) focusedReferenceRoute
     in
     ( { model | workspace = workspace }, changeRouteCmd )
 
@@ -363,7 +361,7 @@ fetchPerspectiveAndCodebaseTree oldPerspective ({ env } as model) =
 
 
 handleWorkspaceOutMsg : Model -> Workspace.OutMsg -> ( Model, Cmd Msg )
-handleWorkspaceOutMsg model out =
+handleWorkspaceOutMsg ({ env } as model) out =
     case out of
         Workspace.None ->
             ( model, Cmd.none )
@@ -372,14 +370,14 @@ handleWorkspaceOutMsg model out =
             showFinder model withinNamespace
 
         Workspace.Focused ref ->
-            ( model, Route.navigateToDefinition model.navKey model.route ref )
+            ( model, Route.navigateToDefinition env.navKey model.route ref )
 
         Workspace.Emptied ->
-            ( model, Route.navigateToCurrentPerspective model.navKey model.route )
+            ( model, Route.navigateToCurrentPerspective env.navKey model.route )
 
         Workspace.ChangePerspectiveToNamespace fqn ->
             fqn
-                |> Perspective.toNamespacePerspective model.env.perspective
+                |> Perspective.toNamespacePerspective env.perspective
                 |> navigateToPerspective model