Clicking search results preserves the page history

Author: achan1989

lib/docs/main.js

@@ -79,7 +79,9 @@
     };
     var curNavSearch = "";
     var curSearchIndex = -1;
-    var imFeelingLucky = false;
+    // When true: load the search result indicated by `curSearchIndex`, or the first result if
+    // `curSearchIndex` isn't valid.
+    var loadSearchResult = false;
 
     // names of modules in the same order as wasm
     const moduleList = [];
@@ -696,12 +698,25 @@
           domSearch.value = curNavSearch;
       }
       render();
-      if (imFeelingLucky) {
-          imFeelingLucky = false;
+      if (loadSearchResult) {
+          loadSearchResult = false;
           activateSelectedResult();
       }
     }
 
+    function doLoadSearchResult() {
+      clearAsyncSearch();
+      loadSearchResult = true;
+      const old_hash = location.hash;
+      location.hash = computeSearchHash();
+      if (location.hash === old_hash) {
+        // With certain sequences of history navigation and input, setting location.hash here
+        // causes no change, and the enter key isn't acted on until another modification is made
+        // to the search text. Force navigation to work around this.
+        navigate(location.hash);
+      }
+    }
+
     function activateSelectedResult() {
         if (domSectSearchResults.classList.contains("hidden")) {
             return;
@@ -720,19 +735,22 @@
         domSearch.blur();
     }
 
+    function onSearchResultClick(ev) {
+      const liDom = ev.target.parentElement;
+      const search_index = Array.from(domListSearchResults.children).indexOf(liDom);
+      curSearchIndex = search_index;
+      doLoadSearchResult();
+
+      ev.preventDefault();
+      ev.stopPropagation();
+    }
+
     function onSearchKeyDown(ev) {
       switch (ev.code) {
         case "Enter":
           if (ev.shiftKey || ev.ctrlKey || ev.altKey) return;
 
-          clearAsyncSearch();
-          imFeelingLucky = true;
-          location.hash = computeSearchHash();
-          // With certain sequences of history navigation and input, setting location.hash here
-          // causes no change, and the enter key isn't acted on until another modification is made
-          // to the search text. Force navigation to work around this.
-          navigate(location.hash);
-
+          doLoadSearchResult();
           ev.preventDefault();
           ev.stopPropagation();
           return;
@@ -879,6 +897,7 @@
                 const full_name = fullyQualifiedName(match);
                 aDom.textContent = full_name;
                 aDom.setAttribute('href', navLinkFqn(full_name));
+                aDom.addEventListener("click", onSearchResultClick);
             }
             renderSearchCursor();