Added global search input debounce and loading indicator

diff --git a/resources/js/components/global-search.js b/resources/js/components/global-search.js
index 52c76764250ae39cce98abf4deca41fa2b6e0520..b3719c8fd02a86c0fe0d14dcc01fd20342509c31 100644 (file)
--- a/resources/js/components/global-search.js
+++ b/resources/js/components/global-search.js
@@ -1,8 +1,9 @@
+import {htmlToDom} from "../services/dom";
+import {debounce} from "../services/util";
+

 /**
  * @extends {Component}
  */
 /**
  * @extends {Component}
  */

-import {htmlToDom} from "../services/dom";
-

 class GlobalSearch {
 
     setup() {
 class GlobalSearch {
 
     setup() {


@@ -10,23 +11,43 @@ class GlobalSearch {
         this.input = this.$refs.input;
         this.suggestions = this.$refs.suggestions;
         this.suggestionResultsWrap = this.$refs.suggestionResults;
         this.input = this.$refs.input;
         this.suggestions = this.$refs.suggestions;
         this.suggestionResultsWrap = this.$refs.suggestionResults;

+        this.loadingWrap = this.$refs.loading;

 
         this.setupListeners();
     }
 
     setupListeners() {
 
         this.setupListeners();
     }
 
     setupListeners() {

+        const updateSuggestionsDebounced = debounce(this.updateSuggestions.bind(this), 200, false);
+
+        // Handle search input changes

         this.input.addEventListener('input', () => {
             const value = this.input.value;
             if (value.length > 0) {
         this.input.addEventListener('input', () => {
             const value = this.input.value;
             if (value.length > 0) {

-                this.updateSuggestions(value);
+                this.loadingWrap.style.display = 'block';
+                this.suggestionResultsWrap.style.opacity = '0.5';
+                updateSuggestionsDebounced(value);

             }  else {
                 this.hideSuggestions();
             }
         });
             }  else {
                 this.hideSuggestions();
             }
         });

+
+        // Allow double click to show auto-click suggestions
+        this.input.addEventListener('dblclick', () => {
+            this.input.setAttribute('autocomplete', 'on');
+            this.input.blur();
+            this.input.focus();
+        })

     }
 
     }
 

+    /**
+     * @param {String} search
+     */

     async updateSuggestions(search) {
         const {data: results} = await window.$http.get('/ajax/search/entities', {term: search, count: 5});
     async updateSuggestions(search) {
         const {data: results} = await window.$http.get('/ajax/search/entities', {term: search, count: 5});

+        if (!this.input.value) {
+            return;
+        }
+        

         const resultDom = htmlToDom(results);
 
         const childrenToTrim = Array.from(resultDom.children).slice(9);
         const resultDom = htmlToDom(results);
 
         const childrenToTrim = Array.from(resultDom.children).slice(9);


@@ -35,6 +56,8 @@ class GlobalSearch {
         }
 
         this.suggestionResultsWrap.innerHTML = '';
         }
 
         this.suggestionResultsWrap.innerHTML = '';

+        this.suggestionResultsWrap.style.opacity = '1';
+        this.loadingWrap.style.display = 'none';

         this.suggestionResultsWrap.append(resultDom);
         if (!this.container.classList.contains('search-active')) {
             this.showSuggestions();
         this.suggestionResultsWrap.append(resultDom);
         if (!this.container.classList.contains('search-active')) {
             this.showSuggestions();

diff --git a/resources/js/services/util.js b/resources/js/services/util.js
index de2ca20c13eb934b00a475b817489e9fa29d9670..1a56ebf6ce8595a29cab4f48fbd9422f9a9649a2 100644 (file)
--- a/resources/js/services/util.js
+++ b/resources/js/services/util.js
@@ -6,9 +6,9 @@
  * N milliseconds. If `immediate` is passed, trigger the function on the
  * leading edge, instead of the trailing.
  * @attribution https://davidwalsh.name/javascript-debounce-function
  * N milliseconds. If `immediate` is passed, trigger the function on the
  * leading edge, instead of the trailing.
  * @attribution https://davidwalsh.name/javascript-debounce-function

- * @param func
- * @param wait
- * @param immediate
+ * @param {Function} func
+ * @param {Number} wait
+ * @param {Boolean} immediate

  * @returns {Function}
  */
 export function debounce(func, wait, immediate) {
  * @returns {Function}
  */
 export function debounce(func, wait, immediate) {

diff --git a/resources/sass/_header.scss b/resources/sass/_header.scss
index 522855b2e47bc4b84f04426666b85244784b8d0b..ca2ab83a4774411588a17de3ec990e8d29cf9fc9 100644 (file)
--- a/resources/sass/_header.scss
+++ b/resources/sass/_header.scss
@@ -131,7 +131,7 @@ header .search-box {
     right: 16px;
   }
   svg {
     right: 16px;
   }
   svg {

-    margin-block-end: 0;
+    margin-inline-end: 0;

   }
 }
 
   }
 }
 


@@ -163,17 +163,23 @@ header .search-box {
     -webkit-line-clamp: 2;
     overflow: hidden;
   }
     -webkit-line-clamp: 2;
     overflow: hidden;
   }

+  .global-search-loading {
+    position: absolute;
+    width: 100%;
+  }

 }
 }

-.search-active:focus-within .global-search-suggestions {
-  display: block;
-}
-header .search-box.search-active input {
-  background-color: #EEE;
-  color: #444;
-  border-color: #DDD;
-}
-header .search-box.search-active #header-search-box-button {
-  color: #444;
+header .search-box.search-active:focus-within {
+  .global-search-suggestions {
+    display: block;
+  }
+  input {
+    background-color: #EEE;
+    color: #444;
+    border-color: #DDD;
+  }
+  #header-search-box-button {
+    color: #444;
+  }

 }
 
 .logo {
 }
 
 .logo {

diff --git a/resources/views/common/header.blade.php b/resources/views/common/header.blade.php
index 5d94deee78f6caa2402291f6b7d8ed310a44a954..d5f4fa224deee23b6753f5b355cc15c3307f21a3 100644 (file)
--- a/resources/views/common/header.blade.php
+++ b/resources/views/common/header.blade.php
@@ -30,6 +30,7 @@
                        aria-label="{{ trans('common.search') }}" placeholder="{{ trans('common.search') }}"
                        value="{{ $searchTerm ?? '' }}">
                 <div refs="global-search@suggestions" class="global-search-suggestions card">
                        aria-label="{{ trans('common.search') }}" placeholder="{{ trans('common.search') }}"
                        value="{{ $searchTerm ?? '' }}">
                 <div refs="global-search@suggestions" class="global-search-suggestions card">

+                    <div refs="global-search@loading" class="text-center px-m global-search-loading">@include('common.loading-icon')</div>

                     <div refs="global-search@suggestion-results" class="px-m"></div>
                     <button class="text-button card-footer-link" type="submit">{{ trans('common.view_all') }}</button>
                 </div>
                     <div refs="global-search@suggestion-results" class="px-m"></div>
                     <button class="text-button card-footer-link" type="submit">{{ trans('common.view_all') }}</button>
                 </div>