From 4e06d7757bf61a6576b87b31718d574f3a977ff8 Mon Sep 17 00:00:00 2001
From: Yunus M <myounis.ar@live.com>
Date: Sat, 14 Jun 2025 22:34:40 +0530
Subject: [PATCH] feat: handle close on blur

---
 .../QueryV2/QueryAddOns/HavingFilter/HavingFilter.tsx       | 5 ++++-
 .../QueryV2/QueryAggregation/QueryAggregationSelect.tsx     | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/HavingFilter/HavingFilter.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/HavingFilter/HavingFilter.tsx
index de2769fea1a4..07e89688460a 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/HavingFilter/HavingFilter.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/HavingFilter/HavingFilter.tsx
@@ -225,7 +225,7 @@ function HavingFilter({ onClose }: { onClose: () => void }): JSX.Element {
 					},
 				],
 				defaultKeymap: true,
-				closeOnBlur: false,
+				closeOnBlur: true,
 				maxRenderedOptions: 200,
 				activateOnTyping: true,
 			}),
@@ -269,6 +269,9 @@ function HavingFilter({ onClose }: { onClose: () => void }): JSX.Element {
 					}}
 					onBlur={(): void => {
 						setIsFocused(false);
+						if (editorRef.current) {
+							closeCompletion(editorRef.current);
+						}
 					}}
 				/>
 				<Button
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAggregation/QueryAggregationSelect.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAggregation/QueryAggregationSelect.tsx
index 6e6c6fdfb859..20b8d759016c 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAggregation/QueryAggregationSelect.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAggregation/QueryAggregationSelect.tsx
@@ -405,7 +405,7 @@ function QueryAggregationSelect(): JSX.Element {
 					},
 				],
 				defaultKeymap: true,
-				closeOnBlur: false,
+				closeOnBlur: true,
 				maxRenderedOptions: 50,
 				activateOnTyping: true,
 			}),
@@ -447,6 +447,10 @@ function QueryAggregationSelect(): JSX.Element {
 				}}
 				onBlur={(): void => {
 					setIsFocused(false);
+
+					if (editorRef.current) {
+						closeCompletion(editorRef.current);
+					}
 				}}
 			/>
 		</div>