From 091ae1322440d505eb701fe98e5f24a065895429 Mon Sep 17 00:00:00 2001
From: Ioannis Rousochatzakis <ioannis.rousochatzakis@publications.europa.eu>
Date: Sun, 27 Mar 2022 04:05:47 +0200
Subject: [PATCH] Improvements in search filtering

---
 src/css/search.css      |  7 +++++
 src/js/vendor/search.js | 65 +++++++++++++++++++++--------------------
 2 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/src/css/search.css b/src/css/search.css
index 116ce10..c912894 100644
--- a/src/css/search.css
+++ b/src/css/search.css
@@ -94,6 +94,13 @@
 
 .search-filter-component {
   margin: 2px 8px 2px 4px;
+  white-space: nowrap;
+  display: inline-block;
+  vertical-align: middle;
+}
+
+.search-filter-component input {
+  vertical-align: middle;
 }
 
 .search-result-highlight {
diff --git a/src/js/vendor/search.js b/src/js/vendor/search.js
index 8a458e3..9290525 100644
--- a/src/js/vendor/search.js
+++ b/src/js/vendor/search.js
@@ -26,6 +26,7 @@ window.antoraLunr = (function (lunr) {
     var searchFilterSpan
 
     var searchAllSpan = document.createElement('span')
+    searchAllSpan.classList.add('search-filter-component')
     searchAllSpan.innerText="Search in:"
     searchFilterEl.appendChild(searchAllSpan)
 
@@ -41,45 +42,47 @@ window.antoraLunr = (function (lunr) {
       if(!uniqueComponents.some(c => c.name == component.name)) {
         uniqueComponents.push(component)
 
-        searchFilterSpan = document.createElement('span')
-        searchFilterSpan.classList.add('search-filter-component')
-        searchFilterInput = document.createElement('input')
-        searchFilterInput.type = 'checkbox'
-        searchFilterInput.id = 'search_filter_' + component.name
-        searchFilterInput.name = 'search_filter'
-        if(currentComponent.name == component.name || currentComponent.name == 'home') {
-          searchFilterInput.checked = 'checked'
-        }
-        searchFilterSpan.appendChild(searchFilterInput)
-  
-        searchFilterLabel = document.createElement('label')
-        searchFilterLabel.innerText = component.title
-        searchFilterLabel.setAttribute('for', 'search_filter_' + component.name)
-        searchFilterSpan.appendChild(searchFilterLabel)
-        searchFilterEl.appendChild(searchFilterSpan)
+        searchFilterEl.appendChild(createSearchFilterLabel(component.title, 'search_filter_' + component.name, currentComponent.name == component.name || currentComponent.name == 'home'))
       }
     })
 
-    searchFilterSpan = document.createElement('span')
-    searchFilterSpan.classList.add('search-filter-component')
-    searchFilterInput = document.createElement('input')
-    searchFilterInput.type = 'checkbox'
-    searchFilterInput.id = 'search_filter_all'
-    searchFilterInput.name = 'search_filter'
-    if(currentComponent.name == 'home') {
-      searchFilterInput.checked = 'true'
+    searchFilterEl.appendChild(createSearchFilterLabel('Everywhere', 'search_filter_all', currentComponent.name == 'home'))
+
+    return searchFilterEl
+
+    function createSearchFilterInput(id, checked) {
+      var inp = document.createElement('input')
+      inp.type = 'checkbox'
+      inp.id = id
+      inp.name = 'search_filter'
+      inp.checked = checked
+      inp.addEventListener('mousedown', function (e) {
+        e.preventDefault()
+      })
+      return inp
     }
 
-    searchFilterSpan.appendChild(searchFilterInput)
+    function createSearchFilterLabel(text, id, checked) {
 
-    searchFilterLabel = document.createElement('label')
-    searchFilterLabel.innerText = 'Everywhere'
-    searchFilterLabel.setAttribute('for', 'search_filter_all')
-    searchFilterSpan.appendChild(searchFilterLabel)
+      var input = createSearchFilterInput(id, checked);
 
-    searchFilterEl.appendChild(searchFilterSpan)
+      var label = document.createElement('label')
+      label.classList.add('search-filter-component')
+      label.appendChild(input)
+      label.insertAdjacentText('beforeend', text)
+      label.setAttribute('for', id)
+      label.addEventListener('mousedown', function (e) {
+        e.preventDefault()
+      })
+      label.addEventListener('click', function (e) {
+        if (this === e.target) {
+          e.preventDefault(); // prevent focus and click
+          this.control && this.control.click(); // call click on the labeled control
+      }
+      })
 
-    return searchFilterEl
+      return label
+    }
   }
 
   function highlightText (doc, position) {