From 1a6453818dcb75b9c3be01d99deb85569ed31e34 Mon Sep 17 00:00:00 2001 From: Shanmughapriyan S Date: Sat, 24 Dec 2022 18:41:14 +0530 Subject: [PATCH 1/2] fix: search bar focus on `Esc` --- docs/src/assets/js/search.js | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/docs/src/assets/js/search.js b/docs/src/assets/js/search.js index 780e3dee107..bc56e2b2f79 100644 --- a/docs/src/assets/js/search.js +++ b/docs/src/assets/js/search.js @@ -136,33 +136,33 @@ const debouncedFetchSearchResults = debounce((query) => { //----------------------------------------------------------------------------- // listen for input changes -if(searchInput) +if (searchInput) searchInput.addEventListener('keyup', function (e) { const query = searchInput.value; - if(query === searchQuery) return; + if (query === searchQuery) return; - if(query.length) searchClearBtn.removeAttribute('hidden'); + if (query.length) searchClearBtn.removeAttribute('hidden'); else searchClearBtn.setAttribute('hidden', ''); if (query.length > 2) { debouncedFetchSearchResults(query); - document.addEventListener('click', function(e) { - if(e.target !== resultsElement) clearSearchResults(); + document.addEventListener('click', function (e) { + if (e.target !== resultsElement) clearSearchResults(); }); } else { clearSearchResults(); } - searchQuery = query + searchQuery = query }); -if(searchClearBtn) - searchClearBtn.addEventListener('click', function(e) { +if (searchClearBtn) + searchClearBtn.addEventListener('click', function (e) { searchInput.value = ''; searchInput.focus(); clearSearchResults(); @@ -171,10 +171,15 @@ if(searchClearBtn) document.addEventListener('keydown', function (e) { + const searchResults = Array.from(document.querySelectorAll('.search-results__item')); + if (e.key === 'Escape') { e.preventDefault(); - clearSearchResults(); - searchInput.focus(); + + if (searchResults.length) { + clearSearchResults(); + searchInput.focus(); + } } if ((e.metaKey || e.ctrlKey) && e.key === 'k') { @@ -183,7 +188,6 @@ document.addEventListener('keydown', function (e) { document.querySelector('.search').scrollIntoView({ behavior: "smooth", block: "start" }); } - const searchResults = Array.from(document.querySelectorAll('.search-results__item')); if (!searchResults.length) return; switch (e.key) { From 5582a900d513d238aaded01c33e92b68b52efca2 Mon Sep 17 00:00:00 2001 From: Shanmughapriyan S Date: Sat, 24 Dec 2022 19:45:00 +0530 Subject: [PATCH 2/2] chore: remove new line --- docs/src/assets/js/search.js | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/src/assets/js/search.js b/docs/src/assets/js/search.js index bc56e2b2f79..6d8eaa7b1b2 100644 --- a/docs/src/assets/js/search.js +++ b/docs/src/assets/js/search.js @@ -175,7 +175,6 @@ document.addEventListener('keydown', function (e) { if (e.key === 'Escape') { e.preventDefault(); - if (searchResults.length) { clearSearchResults(); searchInput.focus();