Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: searchbar focus on Esc key press #393

Merged
merged 3 commits into from Dec 26, 2022
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 15 additions & 12 deletions src/assets/js/search.js
Expand Up @@ -108,7 +108,7 @@ function maintainScrollVisibility(activeElement, scrollParent) {
else if (isBelow) {
scrollParent.scrollTo(0, offsetTop - parentOffsetHeight + offsetHeight);
}

}
function debounce(callback, delay) {
let timerId;
Expand All @@ -134,16 +134,16 @@ const debouncedFetchSearchResults = debounce((query) => {
searchInput.addEventListener('keyup', function (e) {
const query = searchInput.value;

if(query === searchQuery) return;
if (query === searchQuery) return;

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();
Expand All @@ -152,28 +152,31 @@ searchInput.addEventListener('keyup', function (e) {
searchQuery = query
});

searchClearBtn.addEventListener('click', function(e) {
searchClearBtn.addEventListener('click', function (e) {
searchInput.value = '';
searchInput.focus();
clearSearchResults();
searchClearBtn.setAttribute('hidden', '');
});

document.addEventListener('keydown', function(e) {
document.addEventListener('keydown', function (e) {

const searchResults = Array.from(document.querySelectorAll('.search-results__item'));

if(e.key === 'Escape'){
if (e.key === 'Escape') {
e.preventDefault();
clearSearchResults();
searchInput.focus();
if (searchResults.length) {
clearSearchResults();
searchInput.focus();
}
}

if((e.metaKey || e.ctrlKey) && e.key === 'k'){
if ((e.metaKey || e.ctrlKey) && e.key === 'k') {
e.preventDefault();
searchInput.focus();
document.querySelector('.search').scrollIntoView({behaviour:"smooth",block: "start"});
document.querySelector('.search').scrollIntoView({ behaviour: "smooth", block: "start" });
}

const searchResults = Array.from(document.querySelectorAll('.search-results__item'));
if (!searchResults.length) return;

switch (e.key) {
Expand Down