@adaptabletools/adaptable 21.1.0-canary.1 → 21.1.0-canary.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "21.1.0-canary.1",
+  "version": "21.1.0-canary.3",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/agGrid/AgGridAdapter.js

@@ -95,6 +95,22 @@ export class AgGridAdapter {
                         colDef.hide = !allDisplayedColIds.includes(colDef.colId);
                     }
                 });
+                // for pre-existing ColDefs, keep the filter property from the previous one
+                if (self.adaptableApi.optionsApi.getFilterOptions().useAdaptableFiltering) {
+                    const hasActiveFilters = self.adaptableApi.filterApi.columnFilterApi.getActiveColumnFilters().length;
+                    // theoretically we should always update the filter property
+                    // practically, only do it if there are active filters to avoid unnecessary processing
+                    if (hasActiveFilters) {
+                        self.patchColDefs(colDefsWithSpecialColumns, (colDef) => {
+                            if (colDef.filter !== false) {
+                                const originalColDef = self.getAgGridApi().getColumnDef(colDef.colId);
+                                if (originalColDef) {
+                                    colDef.filter = originalColDef.filter;
+                                }
+                            }
+                        });
+                    }
+                }
                 options['columnDefs'] = colDefsWithSpecialColumns;
                 self.logger.info(`Added SpecialColumns on GridOptions.columnDefs update (source=${source})`);
             }

package/src/components/Tree/TreeList/index.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { TreeDataSource, TreeGrid, } from '../../InfiniteTable';
 import { Flex } from 'rebass';
-import join from '../../../../../adaptable-react-aggrid/src/utils/join';
+import join from '../../utils/join';
 const columns = {
     label: {
         field: 'label',

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1763374295002 || Date.now(),
-    VERSION: "21.1.0-canary.1" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1763413188526 || Date.now(),
+    VERSION: "21.1.0-canary.3" || '--current-version--',
 };