@polygrid/core 1.0.488 → 1.0.489

package/dist/engine/services/filter/methods/excel-filter/excel-filter-select-all.js

@@ -1,3 +1,4 @@
+import { updateDomForNode } from "./date-tree-selection-changed";
 export function excelFilterSelectAll(e, dataType, grid) {
     const input = e.target;
     if (dataType !== "date") {
@@ -10,6 +11,9 @@ export function excelFilterSelectAll(e, dataType, grid) {
         });
     }
     else {
+        const dateNodes = grid._store.getState().view.currentExcelFilter.dateFilters;
+        grid._services.filter.selectEntireDateTree(dateNodes, input.checked, grid._services.filter);
+        dateNodes.forEach(updateDomForNode);
     }
 }
 //# sourceMappingURL=excel-filter-select-all.js.map

package/dist/engine/services/filter/methods/excel-filter/excel-filter-select-all.js.map

@@ -1 +1 @@
-{"version":3,"file":"excel-filter-select-all.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/excel-filter-select-all.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,oBAAoB,CAClC,CAAQ,EACR,QAAkB,EAClB,IAAc;IAEd,MAAM,KAAK,GAAG,CAAC,CAAC,MAA0B,CAAC;IAC3C,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;QACxB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YAC3B,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC;YAC1D,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,eAAe,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC9D,GAAG,CAAC;gBACJ,OAAO,EAAE,KAAK,CAAC,OAAO;aACvB,CAAC,CAAC,CAAC;QACN,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;IACR,CAAC;AACH,CAAC"}
+{"version":3,"file":"excel-filter-select-all.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/excel-filter-select-all.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,MAAM,UAAU,oBAAoB,CAClC,CAAQ,EACR,QAAkB,EAClB,IAAc;IAEd,MAAM,KAAK,GAAG,CAAC,CAAC,MAA0B,CAAC;IAC3C,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;QACxB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YAC3B,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC;YAC1D,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,eAAe,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC9D,GAAG,CAAC;gBACJ,OAAO,EAAE,KAAK,CAAC,OAAO;aACvB,CAAC,CAAC,CAAC;QACN,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,SAAS,GACb,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,WAAY,CAAC;QAC9D,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,oBAAoB,CACxC,SAAS,EACT,KAAK,CAAC,OAAO,EACb,IAAI,CAAC,SAAS,CAAC,MAAM,CACtB,CAAC;QACF,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACtC,CAAC;AACH,CAAC"}

package/dist/engine/services/filter/methods/excel-filter/excel-filter-show.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"excel-filter-show.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/excel-filter-show.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAI5E,wBAAgB,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,QAqDrE"}
+{"version":3,"file":"excel-filter-show.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/excel-filter-show.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAQ5E,wBAAgB,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,QA+FrE"}

package/dist/engine/services/filter/methods/excel-filter/excel-filter-show.js

@@ -1,5 +1,8 @@
 import { renderExcelFilter } from "../../../renderer/parts/excel-filter/excel-filter";
+import { updateDomForNode } from "./date-tree-selection-changed";
+import { syncSelection } from "./sync-selection";
 import { toggleSelectAllCbx } from "./toggle-select-all-cbx";
+import { updateSelectAllStateDateFilter } from "./update-select-all-state-date-filter";
 export function excelFilterShow(grid, column) {
     const state = grid._store.getState();
     const filterService = grid._services.filter;
@@ -16,10 +19,26 @@ export function excelFilterShow(grid, column) {
         })),
     ];
     const existingFilter = state.view.excelFilters.find((filter) => filter.columnId === column.id);
+    const hasPopupFilter = state.view.excelPopupFilters.filter((f) => f.columnId === column.id)
+        .length > 0;
     if (dataType === "date") {
+        const dateNodes = filterService.groupDateStringsToNodes(Array.from(uniqueData));
+        const dateFilters = filterService.createDateNodeTree(dateNodes);
+        if (existingFilter) {
+            syncSelection(dateFilters, existingFilter.dateFilters);
+        }
+        else {
+            filterService.selectEntireDateTree(dateFilters, true, filterService);
+        }
+        grid._store.update((draft) => {
+            draft.view.currentExcelFilter.columnId = column.id;
+            draft.view.currentExcelFilter.dateFilters = dateFilters;
+            draft.view.currentExcelFilter.originalDateFilters =
+                structuredClone(dateFilters);
+        });
     }
     else {
-        // if we have already an applied filter, set the checkbox values, select all and indeterminate
+        // if we have already an applied filter, set the checkbox values
         if (existingFilter) {
             const checkedValues = new Set(existingFilter.checkBoxFilters
                 .filter((filter) => filter.checked)
@@ -28,6 +47,11 @@ export function excelFilterShow(grid, column) {
                 checkBoxFilters[i].checked = checkedValues.has(checkBoxFilters[i].value);
             }
         }
+        else {
+            if (hasPopupFilter) {
+                checkBoxFilters.forEach((filter) => (filter.checked = false));
+            }
+        }
         grid._store.update((draft) => {
             draft.view.currentExcelFilter.columnId = column.id;
             draft.view.currentExcelFilter.checkBoxFilters = checkBoxFilters;
@@ -37,7 +61,24 @@ export function excelFilterShow(grid, column) {
     }
     renderExcelFilter(grid, column);
     if (existingFilter) {
-        toggleSelectAllCbx(grid._runtime.selectAll, checkBoxFilters);
+        if (dataType !== "date") {
+            toggleSelectAllCbx(grid._runtime.selectAll, checkBoxFilters);
+        }
+        else {
+            const dateFilters = state.view.currentExcelFilter.dateFilters;
+            dateFilters.forEach(updateDomForNode);
+            const selectAllState = updateSelectAllStateDateFilter(existingFilter.dateFilters);
+            grid._runtime.selectAll.checked = selectAllState.selectAll;
+            grid._runtime.selectAll.indeterminate = selectAllState.indeterminate;
+        }
+    }
+    if (hasPopupFilter) {
+        grid._runtime.selectAll.checked = false;
+        if (dataType === "date") {
+            const dateNodes = grid._store.getState().view.currentExcelFilter.dateFilters;
+            filterService.selectEntireDateTree(dateNodes, false, filterService);
+            dateNodes.forEach(updateDomForNode);
+        }
     }
 }
 //# sourceMappingURL=excel-filter-show.js.map

package/dist/engine/services/filter/methods/excel-filter/excel-filter-show.js.map

@@ -1 +1 @@
-{"version":3,"file":"excel-filter-show.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/excel-filter-show.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,MAAM,UAAU,eAAe,CAAC,IAAc,EAAE,MAAsB;IACpE,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;IACrC,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;IAC5C,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CACpD,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,KAAK,MAAM,CAAC,EAAE,CACjC,CAAC,QAAQ,CAAC,UAAU,CAAC;IACvB,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;IACrC,qIAAqI;IACrI,MAAM,YAAY,GAAG,aAAa,CAAC,wBAAwB,CACzD,YAAY,EACZ,IAAI,EACJ,MAAM,CAAC,EAAE,CACV,CAAC;IACF,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAClE,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,eAAe,GAAG;QACtB,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACvC,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,IAAI;SACZ,CAAC,CAAC;KACJ,CAAC;IACF,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CACjD,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,EAAE,CAC1C,CAAC;IAEF,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;IAC1B,CAAC;SAAM,CAAC;QACN,8FAA8F;QAC9F,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,aAAa,GAAG,IAAI,GAAG,CAC3B,cAAc,CAAC,eAAe;iBAC3B,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC;iBAClC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CACjC,CAAC;YACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAChD,eAAe,CAAC,CAAC,CAAE,CAAC,OAAO,GAAG,aAAa,CAAC,GAAG,CAC7C,eAAe,CAAC,CAAC,CAAE,CAAC,KAAK,CAC1B,CAAC;YACJ,CAAC;QACH,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YAC3B,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC;YACnD,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,eAAe,GAAG,eAAe,CAAC;YAChE,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,uBAAuB;gBACnD,eAAe,CAAC,eAAe,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEhC,IAAI,cAAc,EAAE,CAAC;QACnB,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAU,EAAE,eAAe,CAAC,CAAC;IAChE,CAAC;AACH,CAAC"}
+{"version":3,"file":"excel-filter-show.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/excel-filter-show.ts"],"names":[],"mappings":"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"}

package/dist/engine/services/filter/methods/excel-filter/filter-data-excel-excluding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-data-excel-excluding.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/filter-data-excel-excluding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,WAAW,EAAE,EACnB,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,MAAM,GACf,WAAW,EAAE,CAef"}
+{"version":3,"file":"filter-data-excel-excluding.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/filter-data-excel-excluding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,WAAW,EAAE,EACnB,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,MAAM,GACf,WAAW,EAAE,CAgCf"}

package/dist/engine/services/filter/methods/excel-filter/filter-data-excel-excluding.js

@@ -5,7 +5,12 @@ export function filterDataExcelExcluding(rows, grid, columnId) {
         if (filter.columnId === columnId)
             continue;
         const field = columns.filter((col) => col.id === filter.columnId)[0].field;
-        if (filter.dateFilters) {
+        if (filter.dateFilters && filter.dateFilters.length > 0) {
+            const selectedLeafNodes = grid._services.filter
+                .flattenLeafDateNodes(filter.dateFilters)
+                .filter((node) => node.selected)
+                .map((node) => node.node.value.getTime());
+            rows = rows.filter((row) => selectedLeafNodes.includes(new Date(row.data[field]).getTime()));
         }
         else {
             const checkedValues = filter.checkBoxFilters
@@ -14,6 +19,13 @@ export function filterDataExcelExcluding(rows, grid, columnId) {
             rows = rows.filter((row) => checkedValues.includes(row.data[field]));
         }
     }
+    const popupFilters = grid._store.getState().view.excelPopupFilters;
+    if (popupFilters.length > 0) {
+        const excluded = popupFilters.filter((f) => f.columnId !== columnId);
+        const filterGroup = grid._services.filter.createFilterGroups(excluded);
+        const predicate = grid._services.filter.createGroupPredicate(filterGroup, grid);
+        rows = rows.filter(predicate);
+    }
     return rows;
 }
 //# sourceMappingURL=filter-data-excel-excluding.js.map

package/dist/engine/services/filter/methods/excel-filter/filter-data-excel-excluding.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter-data-excel-excluding.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/filter-data-excel-excluding.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,wBAAwB,CACtC,IAAmB,EACnB,IAAc,EACd,QAAgB;IAEhB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC;IACzD,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC;IAC5D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ;YAAE,SAAS;QAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,CAAC,KAAK,CAAC;QAC5E,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QACzB,CAAC;aAAM,CAAC;YACN,MAAM,aAAa,GAAG,MAAM,CAAC,eAAe;iBACzC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;iBACxB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACvB,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"filter-data-excel-excluding.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/filter-data-excel-excluding.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,wBAAwB,CACtC,IAAmB,EACnB,IAAc,EACd,QAAgB;IAEhB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC;IACzD,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC;IAC5D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ;YAAE,SAAS;QAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,CAAC,KAAK,CAAC;QAC5E,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxD,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM;iBAC5C,oBAAoB,CAAC,MAAM,CAAC,WAAW,CAAC;iBACxC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;iBAC/B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5C,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CACzB,iBAAiB,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAChE,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,aAAa,GAAG,MAAM,CAAC,eAAe;iBACzC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;iBACxB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACvB,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IACD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC;IACnE,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;QACrE,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACvE,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,oBAAoB,CAC1D,WAAW,EACX,IAAI,CACL,CAAC;QACF,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/engine/services/filter/methods/excel-filter/find-date-node-by-id.d.ts

@@ -0,0 +1,3 @@
+import { DateNodeModel } from "../../interfaces/date-node-model";
+export declare function findDateNodeById(nodes: DateNodeModel[], id: string): DateNodeModel | null;
+//# sourceMappingURL=find-date-node-by-id.d.ts.map

package/dist/engine/services/filter/methods/excel-filter/find-date-node-by-id.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"find-date-node-by-id.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/find-date-node-by-id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,aAAa,EAAE,EACtB,EAAE,EAAE,MAAM,GACT,aAAa,GAAG,IAAI,CAStB"}

package/dist/engine/services/filter/methods/excel-filter/find-date-node-by-id.js

@@ -0,0 +1,13 @@
+export function findDateNodeById(nodes, id) {
+    for (const node of nodes) {
+        if (node.id === id)
+            return node;
+        if (node.children) {
+            const found = findDateNodeById(node.children, id);
+            if (found)
+                return found;
+        }
+    }
+    return null;
+}
+//# sourceMappingURL=find-date-node-by-id.js.map

package/dist/engine/services/filter/methods/excel-filter/find-date-node-by-id.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"find-date-node-by-id.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/find-date-node-by-id.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,gBAAgB,CAC9B,KAAsB,EACtB,EAAU;IAEV,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,EAAE,KAAK,EAAE;YAAE,OAAO,IAAI,CAAC;QAChC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAClD,IAAI,KAAK;gBAAE,OAAO,KAAK,CAAC;QAC1B,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/engine/services/filter/methods/excel-filter/flatten-leaf-date-nodes.d.ts

@@ -0,0 +1,3 @@
+import { DateNodeModel } from "../../interfaces/date-node-model";
+export declare function flattenLeafDateNodes(nodes: DateNodeModel[]): DateNodeModel[];
+//# sourceMappingURL=flatten-leaf-date-nodes.d.ts.map

package/dist/engine/services/filter/methods/excel-filter/flatten-leaf-date-nodes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"flatten-leaf-date-nodes.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/flatten-leaf-date-nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,aAAa,EAAE,mBAU1D"}

package/dist/engine/services/filter/methods/excel-filter/flatten-leaf-date-nodes.js

@@ -0,0 +1,13 @@
+export function flattenLeafDateNodes(nodes) {
+    const result = [];
+    for (const node of nodes) {
+        if (!node.children?.length) {
+            result.push(node);
+        }
+        else {
+            result.push(...flattenLeafDateNodes(node.children));
+        }
+    }
+    return result;
+}
+//# sourceMappingURL=flatten-leaf-date-nodes.js.map

package/dist/engine/services/filter/methods/excel-filter/flatten-leaf-date-nodes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"flatten-leaf-date-nodes.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/flatten-leaf-date-nodes.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,oBAAoB,CAAC,KAAsB;IACzD,MAAM,MAAM,GAAoB,EAAE,CAAC;IACnC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;YAC3B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/engine/services/filter/methods/excel-filter/group-date-string-to-nodes.d.ts

@@ -0,0 +1,3 @@
+import { DateNode } from "../../interfaces/date-node";
+export declare function groupDateStringsToNodes(dateStrings: string[]): DateNode[];
+//# sourceMappingURL=group-date-string-to-nodes.d.ts.map

package/dist/engine/services/filter/methods/excel-filter/group-date-string-to-nodes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"group-date-string-to-nodes.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/group-date-string-to-nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAEtD,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,CAmCzE"}

package/dist/engine/services/filter/methods/excel-filter/group-date-string-to-nodes.js

@@ -0,0 +1,34 @@
+export function groupDateStringsToNodes(dateStrings) {
+    const map = new Map();
+    for (const str of dateStrings) {
+        const date = new Date(str);
+        const year = date.getFullYear();
+        const month = date.getMonth(); // 0-indexed
+        const day = date.getDate();
+        if (!map.has(year))
+            map.set(year, new Map());
+        const monthMap = map.get(year);
+        if (!monthMap.has(month))
+            monthMap.set(month, []);
+        monthMap.get(month).push({
+            label: String(day),
+            value: date,
+        });
+    }
+    return Array.from(map.entries())
+        .sort(([a], [b]) => a - b) // Sort years ascending
+        .map(([year, monthMap]) => ({
+        label: String(year),
+        value: new Date(`${year}-01-01`),
+        children: Array.from(monthMap.entries())
+            .sort(([a], [b]) => a - b) // Sort months ascending
+            .map(([month, dayNodes]) => ({
+            label: new Date(2000, month).toLocaleString("default", {
+                month: "long",
+            }),
+            value: new Date(`${year}-${month + 1}-01`),
+            children: dayNodes.sort((a, b) => a.value.getDate() - b.value.getDate()),
+        })),
+    }));
+}
+//# sourceMappingURL=group-date-string-to-nodes.js.map

package/dist/engine/services/filter/methods/excel-filter/group-date-string-to-nodes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"group-date-string-to-nodes.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/group-date-string-to-nodes.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,uBAAuB,CAAC,WAAqB;IAC3D,MAAM,GAAG,GAAG,IAAI,GAAG,EAAmC,CAAC;IAEvD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAChC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,YAAY;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAE3B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;QAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAClD,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,IAAI,CAAC;YACxB,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC;YAClB,KAAK,EAAE,IAAI;SACZ,CAAC,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SAC7B,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,uBAAuB;SACjD,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1B,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC;QACnB,KAAK,EAAE,IAAI,IAAI,CAAC,GAAG,IAAI,QAAQ,CAAC;QAChC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;aACrC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,wBAAwB;aAClD,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3B,KAAK,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,cAAc,CAAC,SAAS,EAAE;gBACrD,KAAK,EAAE,MAAM;aACd,CAAC;YACF,KAAK,EAAE,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,KAAK,GAAG,CAAC,KAAK,CAAC;YAC1C,QAAQ,EAAE,QAAQ,CAAC,IAAI,CACrB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAChD;SACF,CAAC,CAAC;KACN,CAAC,CAAC,CAAC;AACR,CAAC"}

package/dist/engine/services/filter/methods/excel-filter/operators-list-hover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operators-list-hover.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/operators-list-hover.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAE5E,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,OAAO,EACnB,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,cAAc,QAUvB"}
+{"version":3,"file":"operators-list-hover.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/operators-list-hover.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAE5E,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,OAAO,EACnB,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,cAAc,QAevB"}

package/dist/engine/services/filter/methods/excel-filter/operators-list-hover.js

@@ -1,10 +1,16 @@
+import { cleanupElementDeep } from "../../../../core/methods";
 export function operatorsListHover(isHovering, grid, column) {
     if (isHovering) {
         clearTimeout(grid._runtime.excelOperatorsHideTimeout);
     }
     else {
         grid._runtime.excelOperatorsHideTimeout = setTimeout(() => {
-            grid._runtime.excelOperators?.remove();
+            const excelOperators = grid._runtime
+                .excelOperators;
+            if (excelOperators) {
+                cleanupElementDeep(excelOperators);
+                excelOperators.remove();
+            }
             grid._runtime.excelOperators = null;
         }, 150);
     }

package/dist/engine/services/filter/methods/excel-filter/operators-list-hover.js.map

@@ -1 +1 @@
-{"version":3,"file":"operators-list-hover.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/operators-list-hover.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,kBAAkB,CAChC,UAAmB,EACnB,IAAc,EACd,MAAsB;IAEtB,IAAI,UAAU,EAAE,CAAC;QACf,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC;IACxD,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,QAAQ,CAAC,yBAAyB,GAAG,UAAU,CAAC,GAAG,EAAE;YACxD,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;YACvC,IAAI,CAAC,QAAQ,CAAC,cAAc,GAAG,IAAI,CAAC;QACtC,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC;AACH,CAAC"}
+{"version":3,"file":"operators-list-hover.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/operators-list-hover.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAG9D,MAAM,UAAU,kBAAkB,CAChC,UAAmB,EACnB,IAAc,EACd,MAAsB;IAEtB,IAAI,UAAU,EAAE,CAAC;QACf,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC;IACxD,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,QAAQ,CAAC,yBAAyB,GAAG,UAAU,CAAC,GAAG,EAAE;YACxD,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ;iBACjC,cAAwC,CAAC;YAC5C,IAAI,cAAc,EAAE,CAAC;gBACnB,kBAAkB,CAAC,cAAc,CAAC,CAAC;gBACnC,cAAc,CAAC,MAAM,EAAE,CAAC;YAC1B,CAAC;YACD,IAAI,CAAC,QAAQ,CAAC,cAAc,GAAG,IAAI,CAAC;QACtC,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC;AACH,CAAC"}

package/dist/engine/services/filter/methods/excel-filter/popup-filter-apply.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"popup-filter-apply.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/popup-filter-apply.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAG5E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,QAsCtE"}
+{"version":3,"file":"popup-filter-apply.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/popup-filter-apply.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAG5E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,QA0CtE"}

package/dist/engine/services/filter/methods/excel-filter/popup-filter-apply.js

@@ -1,3 +1,4 @@
+import { cleanupElementDeep } from "../../../../core/methods";
 import { createFilterGroups } from "../create-filter-groups";
 export function popupFilterApply(grid, column) {
     const state = grid._store.getState();
@@ -21,7 +22,11 @@ export function popupFilterApply(grid, column) {
         draft.view.filterGroup = filterGroup;
     });
     grid._services.data.applySortAndFilter(grid);
-    grid._runtime.excelFilterPopup.remove();
+    const popup = grid._runtime.excelFilterPopup;
+    if (popup) {
+        cleanupElementDeep(popup);
+        popup.remove();
+    }
     grid._runtime.excelFilterPopup = null;
     grid._runtime.overlay.remove();
     grid._runtime.overlay = null;

package/dist/engine/services/filter/methods/excel-filter/popup-filter-apply.js.map

@@ -1 +1 @@
-{"version":3,"file":"popup-filter-apply.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/popup-filter-apply.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,MAAM,UAAU,gBAAgB,CAAC,IAAc,EAAE,MAAsB;IACrE,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;IACrC,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CACjD,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,EAAE,CAC1C,CAAC;IACF,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAC3D,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,EAAE,CAC1C,CAAC;IACF,MAAM,wBAAwB,GAAG,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC;IACrE,iBAAiB,CAAC,IAAI,CAAC,GAAG,wBAAwB,CAAC,CAAC;IAEpD,MAAM,0BAA0B,GAAG,KAAK,CAAC,IAAI,CAAC,6BAA6B,CAAC;IAC5E,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,0BAA0B,CAAC,CAAC;IAC3D,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAE9B,MAAM,+BAA+B,GACnC,KAAK,CAAC,IAAI,CAAC,kCAAkC,CAAC;IAChD,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,+BAA+B,CAAC,CAAC;IAChE,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAE9B,MAAM,WAAW,GAAG,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;IAE1D,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QAC3B,KAAK,CAAC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACvC,KAAK,CAAC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QACjD,KAAK,CAAC,IAAI,CAAC,6BAA6B,GAAG,cAAc,CAAC;QAC1D,KAAK,CAAC,IAAI,CAAC,kCAAkC,GAAG,cAAc,CAAC;QAC/D,KAAK,CAAC,IAAI,CAAC,wBAAwB,GAAG,EAAE,CAAC;QACzC,KAAK,CAAC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAE7C,IAAI,CAAC,QAAQ,CAAC,gBAAiB,CAAC,MAAM,EAAE,CAAC;IACzC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAEtC,IAAI,CAAC,QAAQ,CAAC,OAAQ,CAAC,MAAM,EAAE,CAAC;IAChC,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC;AAC/B,CAAC"}
+{"version":3,"file":"popup-filter-apply.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/popup-filter-apply.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,MAAM,UAAU,gBAAgB,CAAC,IAAc,EAAE,MAAsB;IACrE,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;IACrC,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CACjD,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,EAAE,CAC1C,CAAC;IACF,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAC3D,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC,EAAE,CAC1C,CAAC;IACF,MAAM,wBAAwB,GAAG,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC;IACrE,iBAAiB,CAAC,IAAI,CAAC,GAAG,wBAAwB,CAAC,CAAC;IAEpD,MAAM,0BAA0B,GAAG,KAAK,CAAC,IAAI,CAAC,6BAA6B,CAAC;IAC5E,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,0BAA0B,CAAC,CAAC;IAC3D,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAE9B,MAAM,+BAA+B,GACnC,KAAK,CAAC,IAAI,CAAC,kCAAkC,CAAC;IAChD,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,+BAA+B,CAAC,CAAC;IAChE,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAE9B,MAAM,WAAW,GAAG,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;IAE1D,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QAC3B,KAAK,CAAC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACvC,KAAK,CAAC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QACjD,KAAK,CAAC,IAAI,CAAC,6BAA6B,GAAG,cAAc,CAAC;QAC1D,KAAK,CAAC,IAAI,CAAC,kCAAkC,GAAG,cAAc,CAAC;QAC/D,KAAK,CAAC,IAAI,CAAC,wBAAwB,GAAG,EAAE,CAAC;QACzC,KAAK,CAAC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAE7C,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,gBAA0C,CAAC;IACvE,IAAI,KAAK,EAAE,CAAC;QACV,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAC1B,KAAK,CAAC,MAAM,EAAE,CAAC;IACjB,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAEtC,IAAI,CAAC,QAAQ,CAAC,OAAQ,CAAC,MAAM,EAAE,CAAC;IAChC,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC;AAC/B,CAAC"}

package/dist/engine/services/filter/methods/excel-filter/remove-excel-filter-elements.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-excel-filter-elements.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/remove-excel-filter-elements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,QAAQ,QAQvD"}
+{"version":3,"file":"remove-excel-filter-elements.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/remove-excel-filter-elements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAGjD,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,QAAQ,QAgBvD"}

package/dist/engine/services/filter/methods/excel-filter/remove-excel-filter-elements.js

@@ -1,7 +1,16 @@
+import { cleanupElementDeep } from "../../../../core/methods";
 export function removeExcelFilterElements(grid) {
-    grid._runtime.excelFilter.remove();
+    const excelFilter = grid._runtime.excelFilter;
+    if (excelFilter) {
+        cleanupElementDeep(excelFilter);
+        excelFilter.remove();
+    }
     grid._runtime.excelFilter = null;
-    grid._runtime.excelOperators?.remove();
+    const excelOperators = grid._runtime.excelOperators;
+    if (excelOperators) {
+        cleanupElementDeep(excelOperators);
+        excelOperators.remove();
+    }
     grid._runtime.excelOperators = null;
     grid._runtime.excelFilterUnsub?.();
     grid._runtime.excelFilterUnsub = undefined;

package/dist/engine/services/filter/methods/excel-filter/remove-excel-filter-elements.js.map

@@ -1 +1 @@
-{"version":3,"file":"remove-excel-filter-elements.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/remove-excel-filter-elements.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,yBAAyB,CAAC,IAAc;IACtD,IAAI,CAAC,QAAQ,CAAC,WAAY,CAAC,MAAM,EAAE,CAAC;IACpC,IAAI,CAAC,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC;IACjC,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IACvC,IAAI,CAAC,QAAQ,CAAC,cAAc,GAAG,IAAI,CAAC;IACpC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,EAAE,CAAC;IACnC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAC3C,IAAI,CAAC,QAAQ,CAAC,yBAAyB,GAAG,IAAI,CAAC;AACjD,CAAC"}
+{"version":3,"file":"remove-excel-filter-elements.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/remove-excel-filter-elements.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,UAAU,yBAAyB,CAAC,IAAc;IACtD,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAqC,CAAC;IACxE,IAAI,WAAW,EAAE,CAAC;QAChB,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAChC,WAAW,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC;IACjC,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAwC,CAAC;IAC9E,IAAI,cAAc,EAAE,CAAC;QACnB,kBAAkB,CAAC,cAAc,CAAC,CAAC;QACnC,cAAc,CAAC,MAAM,EAAE,CAAC;IAC1B,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,cAAc,GAAG,IAAI,CAAC;IACpC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,EAAE,CAAC;IACnC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAC3C,IAAI,CAAC,QAAQ,CAAC,yBAAyB,GAAG,IAAI,CAAC;AACjD,CAAC"}

package/dist/engine/services/filter/methods/excel-filter/select-dates-down.d.ts

@@ -0,0 +1,3 @@
+import { DateNodeModel } from "../../interfaces/date-node-model";
+export declare function selectDatesDown(node: DateNodeModel, value: boolean): void;
+//# sourceMappingURL=select-dates-down.d.ts.map

package/dist/engine/services/filter/methods/excel-filter/select-dates-down.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"select-dates-down.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/select-dates-down.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAIzE"}

package/dist/engine/services/filter/methods/excel-filter/select-dates-down.js

@@ -0,0 +1,6 @@
+export function selectDatesDown(node, value) {
+    node.selected = value;
+    node.indeterminate = false;
+    node.children?.forEach((child) => selectDatesDown(child, value));
+}
+//# sourceMappingURL=select-dates-down.js.map

package/dist/engine/services/filter/methods/excel-filter/select-dates-down.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"select-dates-down.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/select-dates-down.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,eAAe,CAAC,IAAmB,EAAE,KAAc;IACjE,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IACtB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAC3B,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;AACnE,CAAC"}

package/dist/engine/services/filter/methods/excel-filter/select-entire-date-tree.d.ts

@@ -0,0 +1,4 @@
+import { FilterService } from "../../filter";
+import { DateNodeModel } from "../../interfaces/date-node-model";
+export declare function selectEntireDateTree(nodes: DateNodeModel[], value: boolean, filterService: FilterService): void;
+//# sourceMappingURL=select-entire-date-tree.d.ts.map

package/dist/engine/services/filter/methods/excel-filter/select-entire-date-tree.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"select-entire-date-tree.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/select-entire-date-tree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,aAAa,EAAE,EACtB,KAAK,EAAE,OAAO,EACd,aAAa,EAAE,aAAa,GAC3B,IAAI,CAIN"}

package/dist/engine/services/filter/methods/excel-filter/select-entire-date-tree.js

@@ -0,0 +1,6 @@
+export function selectEntireDateTree(nodes, value, filterService) {
+    for (const node of nodes) {
+        filterService.selectDatesDown(node, value);
+    }
+}
+//# sourceMappingURL=select-entire-date-tree.js.map

package/dist/engine/services/filter/methods/excel-filter/select-entire-date-tree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"select-entire-date-tree.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/select-entire-date-tree.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,oBAAoB,CAClC,KAAsB,EACtB,KAAc,EACd,aAA4B;IAE5B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;AACH,CAAC"}

package/dist/engine/services/filter/methods/excel-filter/show-operators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"show-operators.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/show-operators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAG5E,wBAAgB,aAAa,CAC3B,CAAC,EAAE,UAAU,EACb,UAAU,EAAE,OAAO,EACnB,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,cAAc,QAWvB"}
+{"version":3,"file":"show-operators.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/show-operators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAG5E,wBAAgB,aAAa,CAC3B,CAAC,EAAE,UAAU,EACb,UAAU,EAAE,OAAO,EACnB,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,cAAc,QAgBvB"}

package/dist/engine/services/filter/methods/excel-filter/show-operators.js

@@ -1,3 +1,4 @@
+import { cleanupElementDeep } from "../../../../core/methods";
 import { renderOperators } from "../../../renderer/parts/excel-filter/operators";
 export function showOperators(e, isHovering, grid, column) {
     if (isHovering) {
@@ -7,7 +8,12 @@ export function showOperators(e, isHovering, grid, column) {
     }
     else {
         grid._runtime.excelOperatorsHideTimeout = setTimeout(() => {
-            grid._runtime.excelOperators?.remove();
+            const excelOperators = grid._runtime
+                .excelOperators;
+            if (excelOperators) {
+                cleanupElementDeep(excelOperators);
+                excelOperators.remove();
+            }
             grid._runtime.excelOperators = null;
         }, 150); // delay allows time to move into popup
     }

package/dist/engine/services/filter/methods/excel-filter/show-operators.js.map

@@ -1 +1 @@
-{"version":3,"file":"show-operators.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/show-operators.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AAEjF,MAAM,UAAU,aAAa,CAC3B,CAAa,EACb,UAAmB,EACnB,IAAc,EACd,MAAsB;IAEtB,IAAI,UAAU,EAAE,CAAC;QACf,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC;QACtD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc;YAAE,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,QAAQ,CAAC,yBAAyB,GAAG,UAAU,CAAC,GAAG,EAAE;YACxD,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;YACvC,IAAI,CAAC,QAAQ,CAAC,cAAc,GAAG,IAAI,CAAC;QACtC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,uCAAuC;IAClD,CAAC;AACH,CAAC"}
+{"version":3,"file":"show-operators.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/show-operators.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AAEjF,MAAM,UAAU,aAAa,CAC3B,CAAa,EACb,UAAmB,EACnB,IAAc,EACd,MAAsB;IAEtB,IAAI,UAAU,EAAE,CAAC;QACf,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC;QACtD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc;YAAE,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,QAAQ,CAAC,yBAAyB,GAAG,UAAU,CAAC,GAAG,EAAE;YACxD,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ;iBACjC,cAAwC,CAAC;YAC5C,IAAI,cAAc,EAAE,CAAC;gBACnB,kBAAkB,CAAC,cAAc,CAAC,CAAC;gBACnC,cAAc,CAAC,MAAM,EAAE,CAAC;YAC1B,CAAC;YACD,IAAI,CAAC,QAAQ,CAAC,cAAc,GAAG,IAAI,CAAC;QACtC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,uCAAuC;IAClD,CAAC;AACH,CAAC"}

package/dist/engine/services/filter/methods/excel-filter/sync-selection.d.ts

@@ -0,0 +1,3 @@
+import { DateNodeModel } from "../../interfaces/date-node-model";
+export declare function syncSelection(target: DateNodeModel[], source: DateNodeModel[]): void;
+//# sourceMappingURL=sync-selection.d.ts.map

package/dist/engine/services/filter/methods/excel-filter/sync-selection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-selection.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/sync-selection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,wBAAgB,aAAa,CAC3B,MAAM,EAAE,aAAa,EAAE,EACvB,MAAM,EAAE,aAAa,EAAE,QAaxB"}

package/dist/engine/services/filter/methods/excel-filter/sync-selection.js

@@ -0,0 +1,12 @@
+export function syncSelection(target, source) {
+    for (let i = 0; i < target.length; i++) {
+        const t = target[i];
+        const s = source[i];
+        t.selected = s.selected;
+        t.indeterminate = s.indeterminate;
+        if (t.children && s.children) {
+            syncSelection(t.children, s.children);
+        }
+    }
+}
+//# sourceMappingURL=sync-selection.js.map

package/dist/engine/services/filter/methods/excel-filter/sync-selection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-selection.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/sync-selection.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,aAAa,CAC3B,MAAuB,EACvB,MAAuB;IAEvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC;QACrB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC;QAErB,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;QACxB,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,aAAa,CAAC;QAElC,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC7B,aAAa,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/engine/services/filter/methods/excel-filter/update-select-all-state-date-filter.d.ts

@@ -0,0 +1,6 @@
+import { DateNodeModel } from "../../interfaces/date-node-model";
+export declare function updateSelectAllStateDateFilter(dateNodes: DateNodeModel[]): {
+    selectAll: boolean;
+    indeterminate: boolean;
+};
+//# sourceMappingURL=update-select-all-state-date-filter.d.ts.map

package/dist/engine/services/filter/methods/excel-filter/update-select-all-state-date-filter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-select-all-state-date-filter.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/update-select-all-state-date-filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAGjE,wBAAgB,8BAA8B,CAAC,SAAS,EAAE,aAAa,EAAE;;;EASxE"}

package/dist/engine/services/filter/methods/excel-filter/update-select-all-state-date-filter.js

@@ -0,0 +1,11 @@
+import { flattenLeafDateNodes } from "./flatten-leaf-date-nodes";
+export function updateSelectAllStateDateFilter(dateNodes) {
+    const leafNodes = flattenLeafDateNodes(dateNodes);
+    const total = leafNodes.length;
+    const selectedCount = leafNodes.filter((n) => n.selected).length;
+    return {
+        selectAll: selectedCount === total,
+        indeterminate: selectedCount > 0 && selectedCount < total,
+    };
+}
+//# sourceMappingURL=update-select-all-state-date-filter.js.map

package/dist/engine/services/filter/methods/excel-filter/update-select-all-state-date-filter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-select-all-state-date-filter.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/excel-filter/update-select-all-state-date-filter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,UAAU,8BAA8B,CAAC,SAA0B;IACvE,MAAM,SAAS,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAClD,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC;IAC/B,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;IAEjE,OAAO;QACL,SAAS,EAAE,aAAa,KAAK,KAAK;QAClC,aAAa,EAAE,aAAa,GAAG,CAAC,IAAI,aAAa,GAAG,KAAK;KAC1D,CAAC;AACJ,CAAC"}

package/dist/engine/services/filter/methods/index.d.ts

@@ -42,4 +42,14 @@ export * from "./excel-filter/excel-filter-operator-click";
 export * from "./excel-filter/is-excel-filter-operator-selected";
 export * from "./excel-filter/popup-filter-show";
 export * from "./excel-filter/popup-filter-apply";
+export * from "./excel-filter/group-date-string-to-nodes";
+export * from "./excel-filter/create-date-node-tree";
+export * from "./excel-filter/select-entire-date-tree";
+export * from "./excel-filter/select-dates-down";
+export * from "./excel-filter/find-date-node-by-id";
+export * from "./excel-filter/date-node-toggle-click";
+export * from "./excel-filter/date-tree-selection-changed";
+export * from "./excel-filter/flatten-leaf-date-nodes";
+export * from "./excel-filter/update-select-all-state-date-filter";
+export * from "./excel-filter/sync-selection";
 //# sourceMappingURL=index.d.ts.map

package/dist/engine/services/filter/methods/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/engine/services/filter/methods/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,yCAAyC,CAAC;AACxD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sCAAsC,CAAC;AACrD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gDAAgD,CAAC;AAC/D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AACrD,cAAc,iCAAiC,CAAC;AAChD,cAAc,qCAAqC,CAAC;AACpD,cAAc,wBAAwB,CAAC;AACvC,cAAc,wCAAwC,CAAC;AACvD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,0BAA0B,CAAC;AACzC,cAAc,wCAAwC,CAAC;AACvD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAClD,cAAc,mCAAmC,CAAC;AAClD,cAAc,kCAAkC,CAAC;AACjD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,wCAAwC,CAAC;AACvD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6CAA6C,CAAC;AAC5D,cAAc,qCAAqC,CAAC;AACpD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,kDAAkD,CAAC;AACjE,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/engine/services/filter/methods/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,yCAAyC,CAAC;AACxD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sCAAsC,CAAC;AACrD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gDAAgD,CAAC;AAC/D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AACrD,cAAc,iCAAiC,CAAC;AAChD,cAAc,qCAAqC,CAAC;AACpD,cAAc,wBAAwB,CAAC;AACvC,cAAc,wCAAwC,CAAC;AACvD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,0BAA0B,CAAC;AACzC,cAAc,wCAAwC,CAAC;AACvD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAClD,cAAc,mCAAmC,CAAC;AAClD,cAAc,kCAAkC,CAAC;AACjD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,wCAAwC,CAAC;AACvD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6CAA6C,CAAC;AAC5D,cAAc,qCAAqC,CAAC;AACpD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,kDAAkD,CAAC;AACjE,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAClD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,sCAAsC,CAAC;AACrD,cAAc,wCAAwC,CAAC;AACvD,cAAc,kCAAkC,CAAC;AACjD,cAAc,qCAAqC,CAAC;AACpD,cAAc,uCAAuC,CAAC;AACtD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,wCAAwC,CAAC;AACvD,cAAc,oDAAoD,CAAC;AACnE,cAAc,+BAA+B,CAAC"}

package/dist/engine/services/filter/methods/index.js

@@ -42,4 +42,14 @@ export * from "./excel-filter/excel-filter-operator-click";
 export * from "./excel-filter/is-excel-filter-operator-selected";
 export * from "./excel-filter/popup-filter-show";
 export * from "./excel-filter/popup-filter-apply";
+export * from "./excel-filter/group-date-string-to-nodes";
+export * from "./excel-filter/create-date-node-tree";
+export * from "./excel-filter/select-entire-date-tree";
+export * from "./excel-filter/select-dates-down";
+export * from "./excel-filter/find-date-node-by-id";
+export * from "./excel-filter/date-node-toggle-click";
+export * from "./excel-filter/date-tree-selection-changed";
+export * from "./excel-filter/flatten-leaf-date-nodes";
+export * from "./excel-filter/update-select-all-state-date-filter";
+export * from "./excel-filter/sync-selection";
 //# sourceMappingURL=index.js.map

package/dist/engine/services/filter/methods/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/engine/services/filter/methods/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,yCAAyC,CAAC;AACxD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sCAAsC,CAAC;AACrD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gDAAgD,CAAC;AAC/D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AACrD,cAAc,iCAAiC,CAAC;AAChD,cAAc,qCAAqC,CAAC;AACpD,cAAc,wBAAwB,CAAC;AACvC,cAAc,wCAAwC,CAAC;AACvD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,0BAA0B,CAAC;AACzC,cAAc,wCAAwC,CAAC;AACvD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAClD,cAAc,mCAAmC,CAAC;AAClD,cAAc,kCAAkC,CAAC;AACjD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,wCAAwC,CAAC;AACvD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6CAA6C,CAAC;AAC5D,cAAc,qCAAqC,CAAC;AACpD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,kDAAkD,CAAC;AACjE,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/engine/services/filter/methods/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,yCAAyC,CAAC;AACxD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sCAAsC,CAAC;AACrD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gDAAgD,CAAC;AAC/D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AACrD,cAAc,iCAAiC,CAAC;AAChD,cAAc,qCAAqC,CAAC;AACpD,cAAc,wBAAwB,CAAC;AACvC,cAAc,wCAAwC,CAAC;AACvD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,0BAA0B,CAAC;AACzC,cAAc,wCAAwC,CAAC;AACvD,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAClD,cAAc,mCAAmC,CAAC;AAClD,cAAc,kCAAkC,CAAC;AACjD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,wCAAwC,CAAC;AACvD,cAAc,sCAAsC,CAAC;AACrD,cAAc,mCAAmC,CAAC;AAClD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6CAA6C,CAAC;AAC5D,cAAc,qCAAqC,CAAC;AACpD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,kDAAkD,CAAC;AACjE,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAClD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,sCAAsC,CAAC;AACrD,cAAc,wCAAwC,CAAC;AACvD,cAAc,kCAAkC,CAAC;AACjD,cAAc,qCAAqC,CAAC;AACpD,cAAc,uCAAuC,CAAC;AACtD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,wCAAwC,CAAC;AACvD,cAAc,oDAAoD,CAAC;AACnE,cAAc,+BAA+B,CAAC"}

package/dist/engine/services/filter/methods/menu-filter/add-new-menu-filter-row.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-new-menu-filter-row.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/menu-filter/add-new-menu-filter-row.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAM5E,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,QAiBzE"}
+{"version":3,"file":"add-new-menu-filter-row.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/menu-filter/add-new-menu-filter-row.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAM5E,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,QAqBzE"}

package/dist/engine/services/filter/methods/menu-filter/add-new-menu-filter-row.js

@@ -1,3 +1,4 @@
+import { cleanupElementDeep } from "../../../../core/methods";
 import { renderMenuFilter } from "../../../renderer/parts/menu-filter/menu-filter";
 import { LOGICAL_COMBINATOR } from "../../const/logical-combinator";
 import { getDefaultOperator } from "../get-default-operator";
@@ -15,7 +16,11 @@ export function addNewMenuFilterRow(grid, column) {
     const newFilters = [...filters, newFilter];
     grid._store.update((draft) => (draft.view.currentMenuFilters = newFilters));
     // rerender
-    grid._gridDom.root.removeChild(grid._runtime.menuFilter);
+    const menuFilter = grid._runtime.menuFilter;
+    if (menuFilter) {
+        cleanupElementDeep(menuFilter);
+        menuFilter.remove();
+    }
     grid._runtime.menuFilter = null;
     renderMenuFilter(grid, column);
 }

package/dist/engine/services/filter/methods/menu-filter/add-new-menu-filter-row.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-new-menu-filter-row.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/menu-filter/add-new-menu-filter-row.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AACnF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,MAAM,UAAU,mBAAmB,CAAC,IAAc,EAAE,MAAsB;IACxE,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;IACrC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC;IAC9C,MAAM,SAAS,GAAe;QAC5B,QAAQ,EAAE,MAAM,CAAC,EAAE;QACnB,KAAK,EAAE,EAAE;QACT,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAE,CAAC,QAAQ;QAC9B,QAAQ,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,QAAQ,CAAC;QAClD,gBAAgB,EAAE,KAAK;QACvB,UAAU,EAAE,kBAAkB,CAAC,GAAG;KACnC,CAAC;IACF,MAAM,UAAU,GAAG,CAAC,GAAG,OAAO,EAAE,SAAS,CAAC,CAAC;IAC3C,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,GAAG,UAAU,CAAC,CAAC,CAAC;IAC5E,WAAW;IACX,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAW,CAAC,CAAC;IAC1D,IAAI,CAAC,QAAQ,CAAC,UAAU,GAAG,IAAI,CAAC;IAChC,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC"}
+{"version":3,"file":"add-new-menu-filter-row.js","sourceRoot":"","sources":["../../../../../../src/engine/services/filter/methods/menu-filter/add-new-menu-filter-row.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AACnF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,MAAM,UAAU,mBAAmB,CAAC,IAAc,EAAE,MAAsB;IACxE,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;IACrC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC;IAC9C,MAAM,SAAS,GAAe;QAC5B,QAAQ,EAAE,MAAM,CAAC,EAAE;QACnB,KAAK,EAAE,EAAE;QACT,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAE,CAAC,QAAQ;QAC9B,QAAQ,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,QAAQ,CAAC;QAClD,gBAAgB,EAAE,KAAK;QACvB,UAAU,EAAE,kBAAkB,CAAC,GAAG;KACnC,CAAC;IACF,MAAM,UAAU,GAAG,CAAC,GAAG,OAAO,EAAE,SAAS,CAAC,CAAC;IAC3C,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,GAAG,UAAU,CAAC,CAAC,CAAC;IAC5E,WAAW;IACX,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAoC,CAAC;IACtE,IAAI,UAAU,EAAE,CAAC;QACf,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC/B,UAAU,CAAC,MAAM,EAAE,CAAC;IACtB,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,UAAU,GAAG,IAAI,CAAC;IAChC,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACjC,CAAC"}