From ec4f9c8d099ff1c0ed6b4f3dd812243fc8c8d998 Mon Sep 17 00:00:00 2001
From: David Tanner <darthtanner@gmail.com>
Date: Thu, 12 Mar 2026 10:29:17 -0600
Subject: [PATCH] Add onDismiss handler to handle Escape button click

---
 package/DataTableHeaderCellFilter.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/DataTableHeaderCellFilter.tsx b/package/DataTableHeaderCellFilter.tsx
index 7a5b2aad..7b377426 100644
--- a/package/DataTableHeaderCellFilter.tsx
+++ b/package/DataTableHeaderCellFilter.tsx
@@ -23,8 +23,8 @@ export function DataTableHeaderCellFilter<T>({
   let ref: RefObject<HTMLDivElement | null> | undefined = useClickOutside(close);
   if (filterPopoverDisableClickOutside) ref = undefined;
 
-  return (
-    <Popover withArrow shadow="md" opened={isOpen} onClose={close} trapFocus {...filterPopoverProps}>
+  return ( // Keep the expanded props before the open/close, or they could be overridden by the client
+    <Popover withArrow shadow="md" trapFocus {...filterPopoverProps} opened={isOpen} onClose={close} onDismiss={close}>
       <PopoverTarget>
         <ActionIcon
           className="mantine-datatable-header-cell-filter-action-icon"