make use of new search function in other components

atomicptr · Dec 10, 2024 · fb8981e · fb8981e
1 parent 6e6798d
commit fb8981e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/lib/build/filters.ts b/src/lib/build/filters.ts
@@ -9,6 +9,7 @@ import type {
     Weapon,
     WeaponType,
 } from "$lib/data/phalanx-types";
+import { searchInTranslatableStrings } from "$lib/utils/search";
 import { translatableString } from "$lib/utils/translatable-string";
 
 export interface GenericItem {
@@ -24,8 +25,7 @@ export type FilterFunc = (item: FilterItem) => boolean;
 export const applyAll = (items: FilterItem[], funcs: FilterFunc[]) =>
     items.filter((item) => funcs.every((f) => f(item)));
 
-export const filterName = (search: string) => (item: FilterItem) =>
-    translatableString(item.name).toLowerCase().indexOf(search.toLowerCase()) > -1;
+export const filterName = (search: string) => (item: FilterItem) => searchInTranslatableStrings(search, [item.name]);
 
 export const filterWeaponType = (weaponType: WeaponType) => (item: FilterItem) => (item as Weapon).type === weaponType;
 

diff --git a/src/lib/components/FinderItemFilter.svelte b/src/lib/components/FinderItemFilter.svelte
@@ -10,6 +10,7 @@ import CloseIcon from "./icons/CloseIcon.svelte";
 import CheckCircle from "./icons/CheckCircle.svelte";
 import { filterItemCompare } from "$lib/build/filters";
 import type { WhitelistedItems } from "$lib/finder/finder.svelte";
+import { searchInTranslatableStrings } from "$lib/utils/search";
 
 interface Props {
     heads: number[];
@@ -169,7 +170,7 @@ onMount(() => {
                 </div>
 
                 {#each armoursByType[armourType]?.toSorted(filterItemCompare) ?? [] as armour}
-                    <div class="form-control" class:hidden={translatableString(armour.name).toLowerCase().indexOf(filtersSearch.toLowerCase()) === -1}>
+                    <div class="form-control" class:hidden={!searchInTranslatableStrings(filtersSearch, [armour.name])}>
                         <label class="label cursor-pointer h-12">
                             <input type="checkbox" checked={isWhitelisted(armourType, armour.id)} class="checkbox" onchange={() => toggleWhitelisted(armourType, armour.id)} />
                             <div class="flex flex-row gap-2 grow ml-4 items-center">