@adaptabletools/adaptable 24.0.1 → 24.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "24.0.1",
+  "version": "24.0.2",
   "description": "Powerful AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/Api/Internal/FormatColumnInternalApi.d.ts

@@ -118,8 +118,9 @@ export declare class FormatColumnInternalApi extends ApiBase {
     getFormatColumnsWithExpression(): FormatColumn[];
     getFormatColumnsDependentOnColumns(columnSet: Set<string>): FormatColumn[];
     /**
-     * Retrieves the columns that need rerendering based on format column predicates.
+     * Retrieves the columns that need rerendering based on format column predicates,
+     * for a batch of changed columns.
      */
-    getFormatColumnColumnsDependentOnColumnChange(column: AdaptableColumn): string[];
+    getFormatColumnColumnsDependentOnColumnChanges(columns: AdaptableColumn[]): string[];
     formatColumnHeaderName(headerName: string, params: HeaderValueGetterParams): string;
 }

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -232,14 +232,22 @@ export class FormatColumnInternalApi extends ApiBase {
             .getColumnsFromExpression(fc.Rule)
             .some((columnId) => columnSet.has(columnId)));
     }
-    getFormatColumnColumnsDependentOnColumnChange(column) {
+    getFormatColumnColumnsDependentOnColumnChanges(columns) {
         const impactedColumnIds = new Set();
-        impactedColumnIds.add(column.columnId);
-        this.getCalculatedColumnApi()
-            .internalApi.getCalculatedColumnsDependentOnColumn(column)
-            .forEach((calculatedColumnId) => {
-            impactedColumnIds.add(calculatedColumnId);
-        });
+        const visitedColumnIds = new Set();
+        const calculatedColumnInternalApi = this.getCalculatedColumnApi().internalApi;
+        for (const column of columns) {
+            if (visitedColumnIds.has(column.columnId)) {
+                continue;
+            }
+            visitedColumnIds.add(column.columnId);
+            impactedColumnIds.add(column.columnId);
+            calculatedColumnInternalApi
+                .getCalculatedColumnsDependentOnColumn(column)
+                .forEach((calculatedColumnId) => {
+                impactedColumnIds.add(calculatedColumnId);
+            });
+        }
         const columnsThatNeedRefresh = new Set();
         this.getFormatColumnsDependentOnColumns(impactedColumnIds).forEach((formatColumn) => {
             this.getAdaptableApi()

package/src/Utilities/Services/QueryLanguageService.js

@@ -11,7 +11,7 @@ import { PROTECTED_CORE_EXPRESSION_FUNCTIONS } from '../../aql/resolveCustomExpr
 import { resolveCustomExpressionFunctions } from '../../aql/resolveCustomExpressionFunctions';
 import { getTypedKeys } from '../Extensions/TypeExtensions';
 const VALID = { isValid: true, errorMessage: '' };
-const ROW_EVALUATOR_CACHE_SIZE = 64;
+const ROW_EVALUATOR_CACHE_SIZE = 150;
 const CANONICAL_TEXT_CACHE_SIZE = 1024;
 const DEFAULT_MAX_WINDOW_MS = 28_800_000;
 const DEFAULT_MAX_HISTORY_PER_CELL = 1000;

package/src/agGrid/AdaptableAgGrid.js

@@ -3995,7 +3995,7 @@ export class AdaptableAgGrid {
             allRowsColumnIds: new Set(),
         };
         const isVisible = this.agGridAdapter.isVisibleNode(rowNode);
-        if (isVisible) {
+        if (isVisible && cellDataChangedInfos.length > 0) {
             this.checkFormatColumnExpressionStyleChanges(scope, cellDataChangedInfos);
             if (!scope.wholeRow) {
                 this.checkFormatColumnPredicateStyleChanges(scope, cellDataChangedInfos);
@@ -4065,12 +4065,10 @@ export class AdaptableAgGrid {
         });
     }
     checkFormatColumnPredicateStyleChanges(dataChangedScope, cellDataChangedInfos) {
-        cellDataChangedInfos.forEach((cellDataChangeInfo) => {
-            const dependentColumns = this.api.formatColumnApi.internalApi.getFormatColumnColumnsDependentOnColumnChange(cellDataChangeInfo.column);
-            for (let colId of dependentColumns) {
-                dataChangedScope.columnIds.add(colId);
-            }
-        });
+        const dependentColumns = this.api.formatColumnApi.internalApi.getFormatColumnColumnsDependentOnColumnChanges(cellDataChangedInfos.map((cellDataChangeInfo) => cellDataChangeInfo.column));
+        for (const colId of dependentColumns) {
+            dataChangedScope.columnIds.add(colId);
+        }
     }
     checkFreeTextColumnChanges(dataChangedScope, cellDataChangedInfos) {
         cellDataChangedInfos.forEach((cellDataChangedInfo) => {
@@ -4087,34 +4085,27 @@ export class AdaptableAgGrid {
         });
     }
     checkFormatColumnExpressionStyleChanges(dataChangedScope, cellDataChangedInfos) {
-        const formatColumnsWithExpression = [];
-        formatColumnsWithExpression.push(...this.api.formatColumnApi.internalApi.getFormatColumnsWithExpression());
+        if (dataChangedScope.wholeRow) {
+            return;
+        }
+        const formatColumnsWithExpression = this.api.formatColumnApi.internalApi.getFormatColumnsWithExpression();
         if (ArrayExtensions.IsNullOrEmpty(formatColumnsWithExpression)) {
             return;
         }
-        cellDataChangedInfos.forEach((cellDataChangedInfo) => {
-            if (!dataChangedScope.wholeRow) {
-                formatColumnsWithExpression.forEach((formatColumn) => {
-                    if (!dataChangedScope.wholeRow) {
-                        const columnIds = this.api.expressionApi.getColumnsFromExpression(formatColumn.Rule);
-                        if (columnIds.includes(cellDataChangedInfo.column.columnId)) {
-                            if (this.api.columnScopeApi.scopeIsAll(formatColumn.Scope)) {
-                                dataChangedScope.wholeRow = true;
-                                return;
-                            }
-                            else {
-                                this.api.columnScopeApi
-                                    .getColumnsInScope(formatColumn.Scope)
-                                    .map((c) => c.columnId)
-                                    .forEach((colId) => {
-                                    dataChangedScope.columnIds.add(colId);
-                                });
-                            }
-                        }
-                    }
-                });
+        const changedColumnIds = new Set(cellDataChangedInfos.map((cellDataChangedInfo) => cellDataChangedInfo.column.columnId));
+        for (const formatColumn of formatColumnsWithExpression) {
+            const columnIds = this.api.expressionApi.getColumnsFromExpression(formatColumn.Rule);
+            if (!columnIds.some((columnId) => changedColumnIds.has(columnId))) {
+                continue;
             }
-        });
+            if (this.api.columnScopeApi.scopeIsAll(formatColumn.Scope)) {
+                dataChangedScope.wholeRow = true;
+                return;
+            }
+            this.api.columnScopeApi.getColumnsInScope(formatColumn.Scope).forEach((column) => {
+                dataChangedScope.columnIds.add(column.columnId);
+            });
+        }
     }
     checkIfChangedCellCurrentlySelected(cellDataChangedInfo) {
         let selectedCellInfo = this.api.gridApi.getSelectedCellInfo();

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: 1793697750309 || Date.now(),
-    VERSION: "24.0.1" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1793805399874 || Date.now(),
+    VERSION: "24.0.2" || '--current-version--',
 };