X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/c617190905fe74cae33bcbd1e90ec2340f68d9b7..refs/pull/5429/head:/resources/js/components/global-search.js

diff --git a/resources/js/components/global-search.js b/resources/js/components/global-search.js
index b3719c8fd..2cdaf591a 100644
--- a/resources/js/components/global-search.js
+++ b/resources/js/components/global-search.js
@@ -1,10 +1,13 @@
-import {htmlToDom} from "../services/dom";
-import {debounce} from "../services/util";
+import {htmlToDom} from '../services/dom.ts';
+import {debounce} from '../services/util.ts';
+import {KeyboardNavigationHandler} from '../services/keyboard-navigation.ts';
+import {Component} from './component';
 
 /**
- * @extends {Component}
+ * Global (header) search box handling.
+ * Mainly to show live results preview.
  */
-class GlobalSearch {
+export class GlobalSearch extends Component {
 
     setup() {
         this.container = this.$el;
@@ -12,6 +15,7 @@ class GlobalSearch {
         this.suggestions = this.$refs.suggestions;
         this.suggestionResultsWrap = this.$refs.suggestionResults;
         this.loadingWrap = this.$refs.loading;
+        this.button = this.$refs.button;
 
         this.setupListeners();
     }
@@ -21,12 +25,12 @@ class GlobalSearch {
 
         // Handle search input changes
         this.input.addEventListener('input', () => {
-            const value = this.input.value;
+            const {value} = this.input;
             if (value.length > 0) {
                 this.loadingWrap.style.display = 'block';
                 this.suggestionResultsWrap.style.opacity = '0.5';
                 updateSuggestionsDebounced(value);
-            }  else {
+            } else {
                 this.hideSuggestions();
             }
         });
@@ -34,26 +38,25 @@ class GlobalSearch {
         // Allow double click to show auto-click suggestions
         this.input.addEventListener('dblclick', () => {
             this.input.setAttribute('autocomplete', 'on');
-            this.input.blur();
+            this.button.focus();
             this.input.focus();
-        })
+        });
+
+        new KeyboardNavigationHandler(this.container, () => {
+            this.hideSuggestions();
+        });
     }
 
     /**
      * @param {String} search
      */
     async updateSuggestions(search) {
-        const {data: results} = await window.$http.get('/ajax/search/entities', {term: search, count: 5});
+        const {data: results} = await window.$http.get('/search/suggest', {term: search});
         if (!this.input.value) {
             return;
         }
-        
-        const resultDom = htmlToDom(results);
 
-        const childrenToTrim = Array.from(resultDom.children).slice(9);
-        for (const child of childrenToTrim) {
-            child.remove();
-        }
+        const resultDom = htmlToDom(results);
 
         this.suggestionResultsWrap.innerHTML = '';
         this.suggestionResultsWrap.style.opacity = '1';
@@ -68,7 +71,7 @@ class GlobalSearch {
         this.container.classList.add('search-active');
         window.requestAnimationFrame(() => {
             this.suggestions.classList.add('search-suggestions-animation');
-        })
+        });
     }
 
     hideSuggestions() {
@@ -76,6 +79,5 @@ class GlobalSearch {
         this.suggestions.classList.remove('search-suggestions-animation');
         this.suggestionResultsWrap.innerHTML = '';
     }
-}
 
-export default GlobalSearch;
\ No newline at end of file
+}