fix: score filter

kurozenzen · Feb 10, 2024 · 636a1e5 · 636a1e5
1 parent c8da0cc
commit 636a1e5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 26 deletions.
diff --git a/src/lib/components/kurosearch/dialog-sort-filter/NumberInput.svelte b/src/lib/components/kurosearch/dialog-sort-filter/NumberInput.svelte
@@ -6,21 +6,22 @@
 	export let max: number;
 	export let step: number;
 
-	let internalValue: number;
+	let internalValue: string;
 
 	const blurOnEnter = (event: KeyboardEvent) =>
 		isEnter(event) && (event.target as HTMLElement)?.blur();
 
-	$: {
-		if (internalValue === undefined) {
-			internalValue = value;
+	const parseNumber = (str: string) => {
+		let n = Number(str);
+		if (!isNaN(n)) {
+			value = n;
 		}
+	};
 
-		let newValue = Number(internalValue);
-		if (!isNaN(newValue)) {
-			value = newValue;
-		}
-	}
+	const toString = (n: number) => (internalValue = `${n}`);
+
+	$: parseNumber(internalValue);
+	$: toString(value);
 </script>
 
 <input type="number" {min} {max} {step} bind:value={internalValue} on:keyup={blurOnEnter} />

diff --git a/src/lib/components/kurosearch/dialog-sort-filter/SortFilterDialog.svelte b/src/lib/components/kurosearch/dialog-sort-filter/SortFilterDialog.svelte
@@ -13,7 +13,6 @@
 	import RotatingIconSelect from '$lib/components/pure/rotating-select/RotatingIconSelect.svelte';
 	import Select from '$lib/components/pure/select/Select.svelte';
 	import RotatingTextSelect from '$lib/components/pure/rotating-select/RotatingTextSelect.svelte';
-	import { isEnter } from '$lib/logic/keyboard-utils';
 	import {
 		LABELS_RATING,
 		LABELS_SCORE_COMPARATOR,
@@ -23,26 +22,10 @@
 
 	export let dialog: HTMLDialogElement;
 
-	let internalScoreValue: number;
-
-	const blurOnEnter = (event: KeyboardEvent) =>
-		isEnter(event) && (event.target as HTMLElement)?.blur();
 	const reset = () => {
 		sort.reset();
 		filter.reset();
-		internalScoreValue = $filter.scoreValue;
 	};
-
-	$: {
-		if (internalScoreValue === undefined) {
-			internalScoreValue = $filter.scoreValue;
-		}
-
-		let scoreValue = Number(internalScoreValue);
-		if (!isNaN(scoreValue)) {
-			$filter.scoreValue = scoreValue;
-		}
-	}
 </script>
 
 <Dialog bind:dialog on:close>

diff --git a/src/lib/store/filter-store.ts b/src/lib/store/filter-store.ts
@@ -19,12 +19,15 @@ const createFilterStore = () => {
 	return {
 		subscribe,
 		set(value: FilterStoreData) {
+			console.log('set store', value);
 			set({
 				...value,
 				scoreValue: value.scoreValue ?? 0
 			});
 		},
 		update(value: Partial<FilterStoreData>) {
+			console.log('update store', value);
+
 			update((previous) => ({
 				...previous,
 				...value