From 78837663e4036e124d00ae01e1ba3f3acc25ad05 Mon Sep 17 00:00:00 2001
From: Nathawat Chan-iat <nathawat12246@gmail.com>
Date: Thu, 11 Sep 2025 00:56:49 +0700
Subject: [PATCH] fix/bug report

---
 src/components/filter/date-filter.svelte | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/filter/date-filter.svelte b/src/components/filter/date-filter.svelte
index c1b3fc4..49fd45b 100644
--- a/src/components/filter/date-filter.svelte
+++ b/src/components/filter/date-filter.svelte
@@ -24,6 +24,8 @@
 	});
 
 	let startValue: DateValue | undefined = $state(undefined);
+	let isOpen = $state(false);
+	let refDate: DateRange = $state({ start: undefined, end: undefined });
 
 	function resetDate() {
 		filterDate.set({
@@ -36,6 +38,7 @@
 			start: undefined,
 			end: undefined
 		};
+		isOpen = false; // Close popover after reset
 	}
 	function applyDate() {
 		filterDate.set({
@@ -44,11 +47,18 @@
 				end: value.end
 			}
 		});
+		refDate = { ...value };
+		isOpen = false; // Close popover after applying
+	}
+	function closePopover(isOpen: boolean) {		
+		if (isOpen) return;
+		isOpen = false;
+		value = { ...refDate };
 	}
 </script>
 
 <div class="grid gap-2">
-	<Popover.Root>
+	<Popover.Root bind:open={isOpen} onOpenChange={(open) => closePopover(open)}>
 		<Popover.Trigger
 			class={cn(
 				buttonVariants({ variant: 'outline' }),