astro-accelerator 0.3.25 → 0.3.26

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.25",
+  "version": "0.3.26",
   "author": "Steve Fenton",
   "name": "astro-accelerator",
   "description": "A super-lightweight, accessible, SEO-friendly starter project for Astro",

package/public/js/modules/search-dialog.js

@@ -41,13 +41,25 @@ function enhanceSearchIcon() {
                     document.body.appendChild(dialog);
                     document.body.appendChild(scr);
 
-                    icon.addEventListener('click', (e) => {
+                    function openSearch(e) {
                         e.preventDefault();
                         dialog.showModal();
                         icon.setAttribute('aria-expanded', 'true');
                         return false;
-                    });
+                    }
+
+                    // Open search on CTRL + SPACE
+                    window.onkeydown = function(e) {
+                        if (e.ctrlKey && e.key == ' ') {
+                            return openSearch(e);
+                        }
+                        if (e.ctrlKey) return false;
+                    };
+
+                    // Open search on click
+                    icon.addEventListener('click', openSearch);
 
+                    // Close dialog
                     close.addEventListener('click', () => dialog.close());
                     dialog.addEventListener('close', () => icon.setAttribute('aria-expanded', 'false'));
                 });

package/public/js/search.js

@@ -323,8 +323,7 @@ async function search(s, r) {
 
     cleanQuery.length > 0 && haystack.forEach( (item) => {
 
-        let foundWords = 0;
-        let isPhraseFound = false;
+        item.foundWords = 0;
         item.score = 0;
         item.matchedHeadings = [];
 
@@ -335,7 +334,8 @@ async function search(s, r) {
         // Title
         if (contains(item.safeTitle, currentQuery)) {
             item.score = item.score + scoring.phraseTitle;
-            isPhraseFound = true;
+            item.foundWords++;
+            item.foundWords++;
         }
 
         // Headings
@@ -343,21 +343,19 @@ async function search(s, r) {
             if (contains(c.safeText, currentQuery)) {
                 item.score = item.score + scoring.phraseHeading;
                 item.matchedHeadings.push(c);
-                isPhraseFound = true;
+                item.foundWords++;
             }
         });
 
         // Description
         if (contains(item.description, currentQuery)) {
             item.score = item.score + scoring.phraseDescription;
-            isPhraseFound = true;
-        }
-
-        if (isPhraseFound) {
-            foundWords++;
+            item.foundWords++;
         }
 
         // Part 2 - Term Matches, i.e. "Kitchen" or "Sink"
+
+        let foundWords = 0;
         
         allTerms.forEach(term => {
             let isTermFound = false;
@@ -405,7 +403,7 @@ async function search(s, r) {
             }
         });
 
-        item.foundWords = foundWords;
+        item.foundWords += foundWords;
 
         if (item.score > 0) {
             needles.push(item);