Skip to content

[fix] Added focus on Search component (#199) and translation corruption (#212) #226

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.

Sign up for GitHub

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

Merged
marcpems merged 2 commits into from
Mar 12, 2025
Merged

[fix] Added focus on Search component (#199) and translation corruption (#212) #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4e4feb
[fix] Added focus for PageFind.tsx component (#13)
franfels Mar 10, 2025
d4d038a
[fix] Translation corruption on filter dropdown component (#14)
franfels Mar 11, 2025
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
18 changes: 12 additions & 6 deletions src/components/Search/FilterDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
import type { Filters } from "./PageFind";
import type { CollectionEntry } from "astro:content";
import { APPLICATION_COMPATIBILITY, GAME_AUTO_SR, GAME_COMPATIBILITY } from "../../config/enumerations";
import { t } from "i18next";
import i18next, { t } from "i18next";
import { updateLanguage } from "../../util/updateLanguage";

type FilterKey = "auto_super_resolution.compatibility" | "category" | "compatibility";
Expand Down Expand Up @@ -44,10 +44,10 @@ const FilterDropdown = ({

}) => {
const _ = updateLanguage(window.location);
const filters = type === "applications" ? getApplicationFilters() : getGameFilters();
const [filters, setFilters] = createSignal<{ key: FilterKey; name: string }[]>([]);

const [showFilters, setShowFilters] = createSignal<Record<string, boolean>>(
filters.reduce(
filters().reduce(
(p, f) => ({
...p,
[f.key]: false,
Expand All @@ -70,7 +70,7 @@ const FilterDropdown = ({
const handleClick = (event: MouseEvent) => {
if (!ref.contains(event.target as Node)) {
setShowFilters(
filters.reduce(
filters().reduce(
(p, f) => ({
...p,
[f.key]: false,
Expand All @@ -81,8 +81,14 @@ const FilterDropdown = ({
}
};

onMount(() => {
onMount(async () => {
document.addEventListener("click", handleClick);
let filtersValues = type === "applications" ? getApplicationFilters() : getGameFilters();
if (filtersValues.some(p => p.name.includes("game_filters") || p.name.includes("application_filters"))) {
await i18next.reloadResources();
filtersValues = type === "applications" ? getApplicationFilters() : getGameFilters();
}
setFilters(filtersValues);
});

onCleanup(() => {
Expand All @@ -108,7 +114,7 @@ const FilterDropdown = ({

return (
<div class=" flex " ref={ref!}>
<For each={filters}>
<For each={filters()}>
{(filter) => (
<div class="relative w-36 h-full flex-shrink-0 z-10 inline-flex text-sm font-medium text-center last:rounded-r-full first:rounded-l-full first:md:rounded-l-none border-l focus:ring-4 focus:outline-none bg-neutral-700 hover:bg-neutral-600 focus:ring-neutral-700 text-white border-neutral-600">
<button
Expand Down
1 change: 1 addition & 0 deletions src/components/Search/PageFind.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ const PageFind = ({
? t('applications.search_placeholder')
: t('games.search_placeholder')
}
autofocus
name="project-search"
value={search().query ?? ""}
onInput={(e) =>
Expand Down