Fix Global Search flashing "No results" when it's searching

This commit is contained in:
Kalle 2026-04-27 08:52:16 +03:00
parent b26f4ab254
commit 2e8ff8d034
17 changed files with 37 additions and 6 deletions

View File

@ -231,7 +231,10 @@ function GlobalSearchContent({
);
const hasQuery = query.length >= 3;
const fetchedQuery = fetcher.data?.query ?? null;
const fetchedType = fetcher.data?.type ?? null;
const isCurrentFetch =
hasQuery && fetchedQuery === query && fetchedType === searchType;
const results =
hasQuery && fetchedType === searchType ? (fetcher.data?.results ?? []) : [];
@ -388,15 +391,27 @@ function GlobalSearchContent({
className={clsx(styles.listBox, "scrollbar")}
aria-label={t("common:search")}
onAction={handleSelect}
renderEmptyState={() =>
hasQuery ? (
renderEmptyState={() => {
if (!hasQuery) {
return (
<div className={styles.emptyState}>
{t("common:search.hint")}
</div>
);
}
if (!isCurrentFetch) {
return (
<div className={styles.emptyState}>
{t("common:search.searching")}
</div>
);
}
return (
<div className={styles.emptyState}>
{t("common:search.noResults")}
</div>
) : (
<div className={styles.emptyState}>{t("common:search.hint")}</div>
)
}
);
}}
>
{results.map((result) => (
<ListBoxItem

View File

@ -390,6 +390,7 @@
"search.type.weapons": "",
"search.noResults": "",
"search.hint": "",
"search.searching": "",
"dataCredit.lean": "",
"header.parameter": "",
"weaponArt.title": "",

View File

@ -390,6 +390,7 @@
"search.type.weapons": "",
"search.noResults": "",
"search.hint": "",
"search.searching": "",
"dataCredit.lean": "",
"header.parameter": "",
"weaponArt.title": "",

View File

@ -390,6 +390,7 @@
"search.type.weapons": "Weapons",
"search.noResults": "No results found",
"search.hint": "Start typing to search",
"search.searching": "Searching...",
"dataCredit.lean": "Data credit: Lean",
"header.parameter": "Parameter",
"weaponArt.title": "Community Art",

View File

@ -392,6 +392,7 @@
"search.type.weapons": "",
"search.noResults": "",
"search.hint": "",
"search.searching": "",
"dataCredit.lean": "",
"header.parameter": "",
"weaponArt.title": "",

View File

@ -392,6 +392,7 @@
"search.type.weapons": "",
"search.noResults": "",
"search.hint": "",
"search.searching": "",
"dataCredit.lean": "",
"header.parameter": "",
"weaponArt.title": "",

View File

@ -392,6 +392,7 @@
"search.type.weapons": "",
"search.noResults": "",
"search.hint": "",
"search.searching": "",
"dataCredit.lean": "",
"header.parameter": "",
"weaponArt.title": "",

View File

@ -392,6 +392,7 @@
"search.type.weapons": "",
"search.noResults": "",
"search.hint": "",
"search.searching": "",
"dataCredit.lean": "",
"header.parameter": "",
"weaponArt.title": "",

View File

@ -391,6 +391,7 @@
"search.type.weapons": "",
"search.noResults": "",
"search.hint": "",
"search.searching": "",
"dataCredit.lean": "",
"header.parameter": "",
"weaponArt.title": "",

View File

@ -392,6 +392,7 @@
"search.type.weapons": "",
"search.noResults": "",
"search.hint": "",
"search.searching": "",
"dataCredit.lean": "",
"header.parameter": "",
"weaponArt.title": "",

View File

@ -386,6 +386,7 @@
"search.type.weapons": "",
"search.noResults": "",
"search.hint": "",
"search.searching": "",
"dataCredit.lean": "",
"header.parameter": "",
"weaponArt.title": "",

View File

@ -386,6 +386,7 @@
"search.type.weapons": "",
"search.noResults": "",
"search.hint": "",
"search.searching": "",
"dataCredit.lean": "",
"header.parameter": "",
"weaponArt.title": "",

View File

@ -390,6 +390,7 @@
"search.type.weapons": "",
"search.noResults": "",
"search.hint": "",
"search.searching": "",
"dataCredit.lean": "",
"header.parameter": "",
"weaponArt.title": "",

View File

@ -393,6 +393,7 @@
"search.type.weapons": "",
"search.noResults": "",
"search.hint": "",
"search.searching": "",
"dataCredit.lean": "",
"header.parameter": "",
"weaponArt.title": "",

View File

@ -392,6 +392,7 @@
"search.type.weapons": "",
"search.noResults": "",
"search.hint": "",
"search.searching": "",
"dataCredit.lean": "",
"header.parameter": "",
"weaponArt.title": "",

View File

@ -393,6 +393,7 @@
"search.type.weapons": "",
"search.noResults": "",
"search.hint": "",
"search.searching": "",
"dataCredit.lean": "",
"header.parameter": "",
"weaponArt.title": "",

View File

@ -386,6 +386,7 @@
"search.type.weapons": "",
"search.noResults": "",
"search.hint": "",
"search.searching": "",
"dataCredit.lean": "",
"header.parameter": "",
"weaponArt.title": "",