From 7d23ca656bcec74b5d5fcb81c7d96be5bc47534b Mon Sep 17 00:00:00 2001
From: Matt Dunn-Rankin <mattdunnrankin@khanacademy.org>
Date: Sat, 25 Apr 2020 20:27:04 -0700
Subject: [PATCH] minor keyboard nav improvements

---
 src/SearchPanel.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/SearchPanel.js b/src/SearchPanel.js
index 695725e..4083c5c 100644
--- a/src/SearchPanel.js
+++ b/src/SearchPanel.js
@@ -15,7 +15,14 @@ function SearchPanel({
   onMoveFocusUpToQuery,
 }) {
   return (
-    <Box color="green.800">
+    <Box
+      color="green.800"
+      onKeyDown={(e) => {
+        if (e.key === "Escape") {
+          onMoveFocusUpToQuery(e);
+        }
+      }}
+    >
       <Heading1 mb="4">Searching for "{query}"</Heading1>
       <SearchResults
         query={query}
@@ -210,12 +217,12 @@ function SearchResults({
               ref={index === 0 ? firstSearchResultRef : null}
               onChange={onChange}
               onKeyDown={(e) => {
-                if (e.key === "ArrowUp") {
+                if (e.key === "Enter") {
+                  e.target.click();
+                } else if (e.key === "ArrowUp") {
                   goToPrevItem(e);
                 } else if (e.key === "ArrowDown") {
                   goToNextItem(e);
-                } else if (e.key === "Escape") {
-                  onMoveFocusUpToQuery(e);
                 }
               }}
             />