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/search no results #1900

Open
wants to merge 9 commits into
base: v2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 55 additions & 26 deletions src/components/CardGridSearch.astro
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ interface Props {
placeholder?: string;
}
const { placeholder = 'Search features and community resources...' } = Astro.props;
const { notFound = 'No results found.' } = Astro.props;

// TODO: Expose placeholder and title to i18n
---
Expand Down Expand Up @@ -36,6 +37,7 @@ const { placeholder = 'Search features and community resources...' } = Astro.pro
<button class="pagefind-ui__search-clear pagefind-ui__suppressed">clear</button>
</form>
</div>
<span class="not-found-text hidden">{notFound}</span>
<slot />
</card-search>

Expand All @@ -44,35 +46,20 @@ const { placeholder = 'Search features and community resources...' } = Astro.pro
constructor() {
super();
window.addEventListener('DOMContentLoaded', () => {
const urlSearch = new URLSearchParams(window.location.search);
const form = this.querySelector<HTMLFormElement>('form.pagefind-ui__form')!;
const searchBar = this.querySelector<HTMLInputElement>('input.pagefind-ui__search-input')!;
const clear = this.querySelector<HTMLButtonElement>('button.pagefind-ui__search-clear')!;
const notFound = this.querySelector<HTMLButtonElement>('span.not-found-text')!;
const inputs = Array.from(this.children).filter((el) => el.classList.contains('card-grid'));
const headings = Array.from(this.children).filter(
(el) =>
(el instanceof HTMLHeadingElement || el instanceof HTMLParagraphElement) &&
!(el.nextSibling instanceof HTMLHeadingElement)
);
const ignoreHeadings = Array.from(this.children).filter(
(el) => el instanceof HTMLHeadingElement || el instanceof HTMLParagraphElement
);
// Create "nothing found" for each heading
headings.forEach((heading, i) => {
const wrn = document.createElement('p');
wrn.classList.add('hidden', 'warning');
wrn.id = `warn-${i}`;
wrn.innerHTML = `
<style>
.warning {
font-style: italic;
color: var(--sl-color-text);
font-size: larger;
}
.hidden {
display: none;
}
</style>
<span>No results found in ${heading.textContent}</span>
`;
heading.insertAdjacentElement('afterend', wrn);
});
// Select all "nothing found" created before
const warnings = document.querySelectorAll('[id^="warn-"]');

// Prevent page reload
form.addEventListener('submit', (e) => {
Expand Down Expand Up @@ -110,7 +97,29 @@ const { placeholder = 'Search features and community resources...' } = Astro.pro
*/
function searchFilter() {
const query = searchBar.value.toUpperCase();
urlSearch.set('search', searchBar.value);
if (query) {
for (const header of ignoreHeadings) {
header.classList.add('hidden');
}
} else {
for (const header of ignoreHeadings) {
header.classList.remove('hidden');
}
}
if (history.pushState) {
const newUrl = query
? window.location.protocol +
'//' +
window.location.host +
window.location.pathname +
'?' +
urlSearch.toString()
: window.location.protocol + '//' + window.location.host + window.location.pathname;
window.history.pushState({ path: newUrl }, '', newUrl);
}

let hiddenInputs = 0;
inputs.forEach((elements, i) => {
const cards = Array.from(elements.children);
let total = cards.length;
Expand All @@ -129,15 +138,27 @@ const { placeholder = 'Search features and community resources...' } = Astro.pro
total--;
htmlElement.style.display = 'none';
}

// Show warning if none found
if (total === 0) {
warnings[i].classList.remove('hidden');
hiddenInputs += 1;
inputs[i].classList.add('hidden');
headings[i].classList.add('hidden');
} else {
warnings[i].classList.add('hidden');
inputs[i].classList.remove('hidden');
headings[i].classList.remove('hidden');
}
});
});
if (hiddenInputs === inputs.length) {
notFound.classList.remove('hidden');
} else {
notFound.classList.add('hidden');
}
}
// Get search value from URL
if (urlSearch.get('search')) {
clear.classList.remove('pagefind-ui__suppressed');
searchBar.value = urlSearch.get('search');
searchFilter();
}
});
}
Expand Down Expand Up @@ -235,4 +256,12 @@ const { placeholder = 'Search features and community resources...' } = Astro.pro
opacity: 0;
pointer-events: none;
}
.not-found-text {
font-style: italic;
color: var(--sl-color-text);
font-size: larger;
text-align: center;
width: 100%;
display: block;
}
</style>
13 changes: 8 additions & 5 deletions src/styles/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
--tauri-transition-speed: 200ms;
}

.hidden {
display: none !important;
}

.content details {
padding: 0 1rem;
}
Expand Down Expand Up @@ -118,12 +122,12 @@
}

/* Tauri logo on index page */
.hero > img {
.hero>img {
animation: 3s intro;
opacity: 0.4;
}

html[data-theme='light'] .hero > img {
html[data-theme='light'] .hero>img {
filter: invert(1);
}

Expand All @@ -137,12 +141,11 @@ html[data-theme='light'] .hero > img {
scale: 0.9;
}

100% {
}
100% {}
}

@media (prefers-reduced-motion) {
* {
transition: none !important;
}
}
}
Loading