@adaptabletools/adaptable 18.0.11 → 18.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "18.0.11",
+  "version": "18.0.12",
   "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/AdaptableAgGrid.js

@@ -1791,10 +1791,7 @@ export class AdaptableAgGrid {
         if (!this.hasAutogeneratedPrimaryKey) {
             // support both AG Grid pre & post v31.3.x
             // TODO remove this with the next major Adaptable version
-            result =
-                typeof agGridApi.getCellValue === 'function'
-                    ? agGridApi.getCellValue({ colKey: this.adaptableOptions.primaryKey, rowNode })
-                    : agGridApi.getValue(this.adaptableOptions.primaryKey, rowNode);
+            result = this.agGridAdapter._agGridApi_getValue(this.adaptableOptions.primaryKey, rowNode, agGridApi);
         }
         if (result == undefined && rowNode.data) {
             result = rowNode.data[this.adaptableOptions.primaryKey];
@@ -1805,7 +1802,7 @@ export class AdaptableAgGrid {
         if (rowNode == null) {
             return undefined;
         }
-        return this.agGridAdapter.getAgGridApi().getValue(columnId, rowNode);
+        return this.agGridAdapter._agGridApi_getValue(columnId, rowNode);
     }
     getDisplayValueFromRowNode(rowNode, columnId) {
         if (rowNode == null) {

package/src/agGrid/AgGridAdapter.d.ts

@@ -61,4 +61,6 @@ export declare class AgGridAdapter {
      */
     assignColumnIdsToColDefs(colDefs?: (ColDef | ColGroupDef)[]): void;
     getDefaultColumnDefinition(): GridOptions['defaultColDef'];
+    _agGridApi_getValue(colKey: string | Column, rowNode: IRowNode, gridApi?: GridApi): any;
 }
+export declare const _agGridApi_getValue: (colKey: string | Column, rowNode: IRowNode, gridApi: GridApi) => any;

package/src/agGrid/AgGridAdapter.js

@@ -342,7 +342,7 @@ export class AgGridAdapter {
             }
             row = childNodes[0];
         }
-        const value = this.getAgGridApi().getValue(column, row);
+        const value = this._agGridApi_getValue(column, row);
         if (value instanceof Date) {
             dataType = 'Date';
         }
@@ -586,4 +586,13 @@ export class AgGridAdapter {
         // for early init phase, gridApi might not be ready yet
         return (_b = (_a = this.getAgGridApi(true)) === null || _a === void 0 ? void 0 : _a.getGridOption('defaultColDef')) !== null && _b !== void 0 ? _b : {};
     }
+    _agGridApi_getValue(colKey, rowNode, gridApi) {
+        return _agGridApi_getValue(colKey, rowNode, gridApi || this.getAgGridApi());
+    }
 }
+// FIXME remove this once we support only AG Grid >=30.3.x
+export const _agGridApi_getValue = (colKey, rowNode, gridApi) => {
+    return typeof gridApi.getCellValue === 'function'
+        ? gridApi.getCellValue({ colKey, rowNode })
+        : gridApi.getValue(colKey, rowNode);
+};

package/src/agGrid/weightedAverage.js

@@ -1,4 +1,5 @@
 import toNumber from 'lodash/toNumber';
+import { _agGridApi_getValue } from './AgGridAdapter';
 export const getNumericValue = (input) => {
     if (typeof input === 'number') {
         return input;
@@ -13,9 +14,9 @@ export const weightedAverage = (params, columnId, weightColumnId) => {
     // TODO AFL: improve performance by using the intermediary aggregated values (for nested groups)
     groupRowNode.allLeafChildren.forEach((rowNode) => {
         // when editing values might be converted to strings
-        const rawColumnValue = gridApi.getValue(columnId, rowNode);
+        const rawColumnValue = _agGridApi_getValue(columnId, rowNode, gridApi);
         const columnValue = getNumericValue(rawColumnValue);
-        const rawWeightedColumnValue = gridApi.getValue(weightColumnId, rowNode);
+        const rawWeightedColumnValue = _agGridApi_getValue(weightColumnId, rowNode, gridApi);
         const weightedColumnValue = getNumericValue(rawWeightedColumnValue);
         if (weightedColumnValue !== null) {
             weightedColumnValueSum += weightedColumnValue;

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     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: 1716176906473 || Date.now(),
-    VERSION: "18.0.11" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1716379103965 || Date.now(),
+    VERSION: "18.0.12" || '--current-version--',
 };