feat: Improve search experience by syncing URL with search query

tools/daux.io/src/js/search/index.js

@@ -8,7 +8,7 @@ const originalTitle = document.title;
 
 function getURLP(name) {
     const elements = new RegExp(`[?|&]${name}=([^&;]+?)(&|#|;|$)`).exec(
-        window.location.search,
+        window.location.search
     );
 
     return (
@@ -39,8 +39,6 @@ class SearchEngine {
 
     loadData() {
         if (!this.loadingPromise) {
-            // We do this as jsonp instead of an XHR or fetch request
-            // to be compatible with usage from filesystem
             const po = document.createElement("script");
             po.type = "text/javascript";
             po.async = true;
@@ -62,11 +60,10 @@ class SearchEngine {
 
                 let pages = json.pages;
 
-                // Only keep the pages related to the current language
                 if (window.searchLanguage) {
                     const pagePrefix = `${window.searchLanguage}/`;
                     pages = pages.filter(
-                        (item) => item.url.indexOf(pagePrefix) === 0,
+                        (item) => item.url.indexOf(pagePrefix) === 0
                     );
                 }
 
@@ -80,36 +77,61 @@ class SearchEngine {
     }
 
     run() {
-        if (getURLP("q")) {
+        const query = getURLP("q");
-            this.settings.field.value = getURLP("q");
+        if (query) {
+            this.settings.field.value = query;
 
             this.loadData().then(() => {
                 this.displaySearch();
             });
         }
 
-        this.settings.field.addEventListener("keyup", (event) => {
+        window.addEventListener("popstate", () => {
-            // Start loading index once the user types text in the field, not before
+            const query = getURLP("q");
-            this.loadData();
+            if (query) {
+                this.settings.field.value = query;
 
-            if (parseInt(event.keyCode, 10) === 13) {
                 this.loadData().then(() => {
                     this.displaySearch();
                 });
+            } else {
+                this.handleClose();
+            }
+        });
+
+        this.settings.field.addEventListener("keyup", (event) => {
+            this.loadData();
+
+            if (parseInt(event.keyCode, 10) === 13) {
+                const query = this.settings.field.value.trim();
+                if (query.length >= this.settings.minimumLength) {
+                    history.pushState(
+                        null,
+                        "",
+                        `?q=${encodeURIComponent(query)}`
+                    );
+                    this.loadData().then(() => {
+                        this.displaySearch();
+                    });
+                }
             }
         });
 
         this.settings.form.addEventListener("submit", (event) => {
             event.preventDefault();
-            this.loadData().then(() => {
+
-                this.displaySearch();
+            const query = this.settings.field.value.trim();
-            });
+            if (query.length >= this.settings.minimumLength) {
+                history.pushState(null, "", `?q=${encodeURIComponent(query)}`);
+                this.loadData().then(() => {
+                    this.displaySearch();
+                });
+            }
         });
     }
 
     keyUpHandler = (e) => {
         if (e.which === 27) {
-            //escape
             this.handleClose();
         }
     };
@@ -122,6 +144,9 @@ class SearchEngine {
         document.body.classList.remove("with-search");
         preact.render(null, this.resultContainer);
         this.resultContainer = null;
+
+        this.settings.field.value = "";
+        history.pushState(null, "", window.location.pathname);
     };
 
     displaySearch() {
@@ -132,6 +157,8 @@ class SearchEngine {
 
         document.addEventListener("keyup", this.keyUpHandler);
 
+        const searchTerm = this.settings.field.value;
+
         preact.render(
             <Search
                 onSearch={(term) =>
@@ -142,8 +169,9 @@ class SearchEngine {
                     document.title = `${title} ${originalTitle}`;
                 }}
                 settings={this.settings}
+                searchTerm={searchTerm}
             />,
-            this.resultContainer,
+            this.resultContainer
         );
 
         document.body.classList.add("with-search");
@@ -151,12 +179,9 @@ class SearchEngine {
     }
 }
 
-// Main containers
-
 function search(options) {
     const instance = new SearchEngine(options);
     instance.run();
 }
 
-// Declare globally
 window.search = search;