@linzjs/step-ag-grid 30.2.0 → 30.3.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "@linzjs/step-ag-grid",
   "repository": "github:linz/step-ag-grid.git",
   "license": "MIT",
-  "version": "30.2.0",
+  "version": "30.3.0",
   "keywords": [
     "aggrid",
     "ag-grid",

package/src/components/gridFilter/GridFilterColumnsMultiSelect.tsx

@@ -26,6 +26,8 @@ interface FilterUIProps {
 
 const EMPTY_KEY = '__EMPTY__';
 const DEFAULT_EMPTY_LABEL = '-';
+const filterStateMap = new Map<string, boolean>();
+const filterClickCountMap = new Map<string, number>();
 
 const FilterUI: React.FC<FilterUIProps> = ({
   allValues,
@@ -76,7 +78,6 @@ export class GridFilterColumnsMultiSelect implements IFilterComp {
   private reactRoot: Root | null = null;
   private filterButtonClickListener: ((e: Event) => void) | null = null;
   private filterButton: Element | null = null;
-  private hasOpened = false;
 
   private normalizeCellValue(value: unknown): string {
     if (typeof value === 'string') return value.trim() === '' ? EMPTY_KEY : value;
@@ -134,13 +135,25 @@ export class GridFilterColumnsMultiSelect implements IFilterComp {
 
     if (this.filterButton) {
       this.filterButtonClickListener = (e: Event) => {
-        if (this.hasOpened) {
-          e.stopPropagation();
+        const clickCount = filterClickCountMap.get(columnId) || 0;
+        filterClickCountMap.set(columnId, clickCount + 1);
+
+        if (clickCount === 0) {
+          e.stopImmediatePropagation();
+          e.preventDefault();
+          this.params.api.hidePopupMenu();
+          filterStateMap.set(columnId, false);
+          return;
+        }
+
+        const isOpen = filterStateMap.get(columnId) || false;
+        if (isOpen) {
+          e.stopImmediatePropagation();
           e.preventDefault();
           this.params.api.hidePopupMenu();
-          this.hasOpened = false;
+          filterStateMap.set(columnId, false);
         } else {
-          this.hasOpened = true;
+          filterStateMap.set(columnId, true);
         }
       };