From 0542d754940f5b88e326c606b89275a07ad36f61 Mon Sep 17 00:00:00 2001
From: NanoAim <65581271+NanoAim@users.noreply.github.com>
Date: Sat, 9 Aug 2025 17:31:27 +0800
Subject: [PATCH] Update SearchBar.tsx

---
 src/components/navigation/SearchBar.tsx | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/components/navigation/SearchBar.tsx b/src/components/navigation/SearchBar.tsx
index 83048d68..df32643d 100644
--- a/src/components/navigation/SearchBar.tsx
+++ b/src/components/navigation/SearchBar.tsx
@@ -350,6 +350,17 @@ export function SearchBar() {
         
         setQuery(value);
         
+        // Clear user mappings and date range when query becomes empty
+        if (value.trim() === "") {
+            setUserMappings({});
+            setActiveDateRange(null);
+            // Reset search state and close sidebar when input is completely cleared
+            if (isSearching) {
+                setIsSearching(false);
+                internalEmit("RightSidebar", "close");
+            }
+        }
+        
         // Check for filters
         const beforeCursor = value.slice(0, cursorPos);
         
@@ -807,10 +818,17 @@ export function SearchBar() {
         } else if (e.key === "Escape") {
             if (query) {
                 setQuery("");
+                setUserMappings({});
+                setActiveDateRange(null);
+                // Reset search state and close sidebar when query is cleared
+                if (isSearching) {
+                    setIsSearching(false);
+                    internalEmit("RightSidebar", "close");
+                }
             } else {
                 inputRef.current?.blur();
             }
-            if (isSearching) {
+            if (isSearching && !query) {
                 internalEmit("RightSidebar", "close");
                 setIsSearching(false);
             }
@@ -820,6 +838,8 @@ export function SearchBar() {
     const handleClear = () => {
         setQuery("");
         setIsSearching(false);
+        setUserMappings({});
+        setActiveDateRange(null);
         inputRef.current?.focus();
         internalEmit("RightSidebar", "close");
     };