@adaptabletools/adaptable-cjs 22.0.0 → 22.0.1-canary.0

package/package.json

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

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -143,6 +143,7 @@ export interface IAdaptable {
     refreshCells(rowNode: IRowNode, columns: (string | any)[], forceUpdate: boolean, suppressFlash?: boolean): void;
     refreshAllCells(forceUpdate?: boolean): void;
     refreshColumns(columns: (string | Column)[], forceUpdate: boolean, suppressFlash?: boolean): void;
+    refreshGridHeader(): void;
     refreshSelectedCellsState(): SelectedCellInfo | undefined;
     refreshSelectedRowsState(): SelectedRowInfo | undefined;
     selectColumn(columnId: string, config?: {

package/src/Api/GridApi.d.ts

@@ -537,6 +537,10 @@ export interface GridApi {
      * @param rowNodes AG Grid rows
      */
     refreshRowNodes(rowNodes?: IRowNode[]): void;
+    /**
+     * Forces a re-render of the Grid Header
+     */
+    refreshGridHeader(): void;
     /**
      * Forces a re-render of all Group Rows (including aggregations)
      */

package/src/Api/Implementation/GridApiImpl.d.ts

@@ -138,6 +138,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     refreshRowNode(rowNode: IRowNode): void;
     refreshRowNodes(rowNodes?: IRowNode[]): void;
     refreshGroupRowNodes(): void;
+    refreshGridHeader(): void;
     isCellEditable(gridCell: GridCell): boolean;
     isCellEdited(gridCell: GridCell): boolean;
     isEveryCellEditable(gridCells: GridCell[]): boolean;

package/src/Api/Implementation/GridApiImpl.js

@@ -551,6 +551,9 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.getAgGridApi().refreshClientSideRowModel('group');
         this._adaptable.updateRowGroupsAndColumnGroupsExpandedState();
     }
+    refreshGridHeader() {
+        this._adaptable.refreshGridHeader();
+    }
     isCellEditable(gridCell) {
         // If not Grid Cell or Column then return false - GridCell.column may be undefined for cells from synthetic columns created by AG Grid (ex. autoGroup columns)
         if (!gridCell || !gridCell.column || !gridCell.rowNode) {

package/src/Api/Implementation/RowFormApiImpl.d.ts

@@ -8,4 +8,5 @@ export declare class RowFormApiImpl extends ApiBase implements RowFormApi {
     displayEditRowForm(primaryKey: any): void;
     displayCreateRowForm(): void;
     displayCloneRowForm(primaryKey?: any): void;
+    displayDeleteRowForm(primaryKey?: any): void;
 }

package/src/Api/Implementation/RowFormApiImpl.js

@@ -47,5 +47,18 @@ class RowFormApiImpl extends ApiBase_1.ApiBase {
             },
         }));
     }
+    displayDeleteRowForm(primaryKey) {
+        const rowNode = this.getGridApi().getRowNodeForPrimaryKey(primaryKey);
+        if (!rowNode) {
+            this.logWarn(`Can NOT delete row: rowNode not found for primaryKey ${primaryKey}`);
+        }
+        const eventInfo = {
+            type: 'rowDeleted',
+            rowNode: rowNode,
+            ...this.getAdaptableInternalApi().buildBaseContext(),
+        };
+        this.getEventApi().internalApi.fireRowFormSubmittedEvent(eventInfo);
+        this.getRowFormOptions().onRowFormSubmit?.(eventInfo);
+    }
 }
 exports.RowFormApiImpl = RowFormApiImpl;

package/src/Api/Internal/ActionColumnInternalApi.js

@@ -112,27 +112,10 @@ class ActionColumnInternalApi extends ApiBase_1.ApiBase {
                 break;
             case 'delete':
                 button.onClick = (button, context) => {
-                    const eventInfo = {
-                        type: 'rowDeleted',
-                        rowNode: context.rowNode,
-                        ...this.getAdaptableInternalApi().buildBaseContext(),
-                    };
-                    this.getEventApi().internalApi.fireRowFormSubmittedEvent(eventInfo);
-                    this.getRowFormOptions().onRowFormSubmit?.(eventInfo);
+                    this.getRowFormApi().displayDeleteRowForm(context.primaryKeyValue);
                 };
                 button.tooltip = button.tooltip ? button.tooltip : 'Delete Row';
-                button.icon = button.icon ?? {
-                    name: 'delete',
-                };
-                break;
-            case 'edit':
-                button.onClick = (button, context) => {
-                    this.getRowFormApi().displayEditRowForm(context.primaryKeyValue);
-                };
-                button.tooltip = button.tooltip ? button.tooltip : 'Edit Row';
-                button.icon = button.icon ?? {
-                    name: 'edit',
-                };
+                button.icon = button.icon ?? { name: 'delete' };
                 break;
         }
     }

package/src/Api/Internal/ExportInternalApi.js

@@ -45,7 +45,7 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
                 }
                 break;
             case 'VisibleColumns':
-                //  hope that visibile column property is updated whenever the layout changes... (need to check!)
+                //  hope that visible column property is updated whenever the layout changes... (need to check!)
                 if (!cellDataChangedInfo.column.visible) {
                     return false;
                 }

package/src/Api/RowFormApi.d.ts

@@ -16,4 +16,9 @@ export interface RowFormApi {
      * @param primaryKey - Primary Key of the duplicated row
      */
     displayCloneRowForm(primaryKey?: any): void;
+    /**
+     * Deletes row from grid (with event fired) - note: no visible Row Form is displayed
+     * @param primaryKey - Primary Key of the deleted row
+     */
+    displayDeleteRowForm(primaryKey?: any): void;
 }

package/src/Strategy/CellSummaryModule.d.ts

@@ -18,6 +18,7 @@ export type WeightedAverageConfig = {
 export declare class CellSummaryModule extends AdaptableModuleBase implements ICellSummaryModule {
     cachedCellSummary: WeakMap<SelectedCellInfo<any>, CellSummmaryInfo>;
     constructor(api: AdaptableApi);
+    isModuleAvailable(): boolean;
     getViewAccessLevel(): AccessLevel;
     createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
     createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];

package/src/Strategy/CellSummaryModule.js

@@ -16,6 +16,9 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.CellSummaryModuleId, ModuleConstants.CellSummaryFriendlyName, 'cells', 'CellSummaryPopup', 'See summary information on a group of numeric cells using multiple summary operations', api);
     }
+    isModuleAvailable() {
+        return super.isModuleAvailable() && this.api.gridApi.isGridRangeSelectable();
+    }
     getViewAccessLevel() {
         return 'Full';
     }

package/src/Strategy/LayoutModule.js

@@ -147,24 +147,26 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     this.api.columnApi.hideColumn(column.columnId);
                 }));
             }
-            const hasExistingSelection = this.api.gridApi.getSelectedCellInfo()?.gridCells?.length;
-            if (hasExistingSelection) {
-                returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-select-preserve', 'Select Column (Preserve Selection)', 'select-fwd', () => {
-                    this.api.columnApi.addColumnToSelection(column.columnId);
-                }));
-                returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-select-reset', 'Select Column (Reset Selection)', 'tab-unselected', () => {
-                    this.api.columnApi.selectColumn(column.columnId);
-                }));
-            }
-            else {
-                returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-select', 'Select Column', 'tab-unselected', () => {
-                    this.api.columnApi.selectColumn(column.columnId);
+            if (this.api.gridApi.isGridRangeSelectable()) {
+                const hasExistingSelection = this.api.gridApi.getSelectedCellInfo()?.gridCells?.length;
+                if (hasExistingSelection) {
+                    returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-select-preserve', 'Select Column (Preserve Selection)', 'select-fwd', () => {
+                        this.api.columnApi.addColumnToSelection(column.columnId);
+                    }));
+                    returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-select-reset', 'Select Column (Reset Selection)', 'tab-unselected', () => {
+                        this.api.columnApi.selectColumn(column.columnId);
+                    }));
+                }
+                else {
+                    returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-select', 'Select Column', 'tab-unselected', () => {
+                        this.api.columnApi.selectColumn(column.columnId);
+                    }));
+                }
+                returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-grid-select', 'Select Grid', 'select-all', () => {
+                    this.api.gridApi.selectAll();
                 }));
             }
         }
-        returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-grid-select', 'Select Grid', 'select-all', () => {
-            this.api.gridApi.selectAll();
-        }));
         return returnColumnMenuItems;
     }
     createContextMenuItems(menuContext) {
@@ -183,9 +185,11 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 this.api.gridApi.deselectAll();
             }));
         }
-        returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-select-all', 'Select Grid', 'select-all', () => {
-            this.api.gridApi.selectAll();
-        }));
+        if (this.api.gridApi.isGridRangeSelectable()) {
+            returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-select-all', 'Select Grid', 'select-all', () => {
+                this.api.gridApi.selectAll();
+            }));
+        }
         returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-auto-size', 'Auto Size', 'arrow-expand', () => {
             this.api.columnApi.autosizeAllColumns();
         }));

package/src/Strategy/PlusMinusModule.d.ts

@@ -12,6 +12,7 @@ export declare class PlusMinusModule extends AdaptableModuleBase implements IPlu
     private shouldHandleKeyDown;
     private adaptable;
     constructor(api: AdaptableApi);
+    isModuleAvailable(): boolean;
     getModuleAdaptableObjects(config?: LayoutExtendedConfig): AdaptableObject[];
     getExplicitlyReferencedColumnIds(plusMinusNudge: PlusMinusNudge): string[];
     getReferencedNamedQueryNames(plusMinusNudge: PlusMinusNudge): string[];

package/src/Strategy/PlusMinusModule.js

@@ -22,6 +22,9 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.shouldHandleKeyDown = false;
         this.adaptable = api.internalApi.getAdaptableInstance();
     }
+    isModuleAvailable() {
+        return super.isModuleAvailable() && this.api.gridApi.isGridRangeSelectable();
+    }
     getModuleAdaptableObjects(config) {
         return this.api.plusMinusApi.getAllPlusMinus(config);
     }
@@ -40,11 +43,14 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(plusMinusNudge.Rule?.BooleanExpression);
     }
     onAdaptableReady() {
-        let plusMinusNudges = this.api.plusMinusApi.getAllPlusMinus();
-        this.shouldHandleKeyDown = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(plusMinusNudges);
+        const hasPlusMinusNudges = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(this.api.plusMinusApi.getAllPlusMinus());
+        this.shouldHandleKeyDown = this.isModuleAvailable() && hasPlusMinusNudges;
         if (this.shouldHandleKeyDown) {
             this.setupKeyDownListener();
         }
+        else if (hasPlusMinusNudges && !this.api.gridApi.isGridRangeSelectable()) {
+            this.api.consoleWarn('Plus/Minus module is not available because AG Grid is not selectable');
+        }
     }
     setupKeyDownListener() {
         this.adaptable._on('KeyDown', (keyDownEvent) => {

package/src/Utilities/only.d.ts

@@ -8,8 +8,11 @@ interface OnlyAggResult {
  * AG Grid aggFunc that returns the column value only when all rows in the group
  * share the same value. Returns null when values differ (or when there are no values).
  *
- * Supports multiple group levels: leaf groups aggregate raw cell values while
- * parent groups merge the metadata objects returned by child groups.
+ * params.values already respects suppressAggFilteredOnly, containing either:
+ * - Raw cell values (string | number) for leaf children
+ * - OnlyAggResult objects for sub-group children (with pre-computed distinct values)
+ *
+ * Bails out early as soon as two distinct values are found.
  */
-export declare const only: (params: IAggFuncParams, columnId: string) => OnlyAggResult;
+export declare const only: (params: IAggFuncParams) => OnlyAggResult;
 export {};

package/src/Utilities/only.js

@@ -15,44 +15,30 @@ function createOnlyResult(distinctValues) {
  * AG Grid aggFunc that returns the column value only when all rows in the group
  * share the same value. Returns null when values differ (or when there are no values).
  *
- * Supports multiple group levels: leaf groups aggregate raw cell values while
- * parent groups merge the metadata objects returned by child groups.
+ * params.values already respects suppressAggFilteredOnly, containing either:
+ * - Raw cell values (string | number) for leaf children
+ * - OnlyAggResult objects for sub-group children (with pre-computed distinct values)
+ *
+ * Bails out early as soon as two distinct values are found.
  */
-const only = (params, columnId) => {
-    const { api: gridApi, rowNode: groupRowNode, values } = params;
-    // Leaf group: the lowest-level group whose children are actual data rows.
-    // We read raw cell values and collect distinct ones, bailing out early
-    // as soon as we see a second distinct value (the result would be null anyway).
-    if (groupRowNode.leafGroup) {
-        const filteredOnly = !gridApi.getGridOption('suppressAggFilteredOnly');
-        const childNodes = (filteredOnly ? groupRowNode.childrenAfterFilter : groupRowNode.childrenAfterGroup) ?? [];
-        const distinctValues = new Set();
-        for (const rowNode of childNodes) {
-            const rawValue = gridApi.getCellValue({ colKey: columnId, rowNode });
-            if (typeof rawValue === 'number' || typeof rawValue === 'string') {
-                distinctValues.add(rawValue);
-                if (distinctValues.size > 1) {
-                    return createOnlyResult(distinctValues);
-                }
-            }
+const only = (params) => {
+    const { values } = params;
+    const distinctValues = new Set();
+    for (let i = 0; i < values.length; i++) {
+        const value = values[i];
+        if (typeof value === 'number' || typeof value === 'string') {
+            distinctValues.add(value);
         }
-        return createOnlyResult(distinctValues);
-    }
-    // Non-leaf group: children are other groups, not data rows.
-    // AG Grid has already called this aggFunc on each child group, so
-    // `params.values` contains the OnlyAggResult objects they returned.
-    // We merge their distinctValues sets instead of re-traversing leaf rows.
-    const mergedDistinctValues = new Set();
-    for (const childResult of values) {
-        if (childResult && typeof childResult === 'object' && 'distinctValues' in childResult) {
-            for (const val of childResult.distinctValues) {
-                mergedDistinctValues.add(val);
-                if (mergedDistinctValues.size > 1) {
-                    return createOnlyResult(mergedDistinctValues);
-                }
+        else if (value != null && typeof value === 'object' && 'distinctValues' in value) {
+            // sub-group: merge pre-computed distinct values (set has at most 2 elements)
+            for (const v of value.distinctValues) {
+                distinctValues.add(v);
             }
         }
+        if (distinctValues.size > 1) {
+            return createOnlyResult(distinctValues);
+        }
     }
-    return createOnlyResult(mergedDistinctValues);
+    return createOnlyResult(distinctValues);
 };
 exports.only = only;

package/src/Utilities/weightedAverage.d.ts

@@ -1,5 +1,16 @@
 import { IAggFuncParams } from 'ag-grid-enterprise';
 export declare const getNumericValue: (input: unknown) => number | null;
+/**
+ * Computes a weighted average aggregation: Σ(value × weight) / Σ(weight)
+ *
+ * AG Grid calls agg functions bottom-up through the group hierarchy. For each group:
+ * - Leaf children contribute their raw value × weight
+ * - Sub-group children already have partial sums from a previous pass,
+ *   so we combine those directly instead of re-traversing to leaves
+ *
+ * The returned object stores partial sums ([columnId] and [weightColumnId])
+ * so parent groups can combine sub-group results correctly.
+ */
 export declare const weightedAverage: (params: IAggFuncParams, columnId: string, weightColumnId: string) => {
     [x: string]: number | (() => string) | (() => number);
     toString: () => string;

package/src/Utilities/weightedAverage.js

@@ -11,56 +11,70 @@ const getNumericValue = (input) => {
     return isNaN(numericValue) ? null : numericValue;
 };
 exports.getNumericValue = getNumericValue;
-function getWeightedAverageLeafNodes(gridApi, groupRowNode, filteredOnly) {
-    const nodeList = (filteredOnly ? groupRowNode.childrenAfterFilter : groupRowNode.childrenAfterGroup) ?? [];
-    let leafNodes = [];
-    nodeList.forEach((rowNode) => {
-        if (rowNode.group === true) {
-            // Recursively extract leaf nodes from group
-            leafNodes = leafNodes.concat(getWeightedAverageLeafNodes(gridApi, rowNode, filteredOnly));
-        }
-        else {
-            leafNodes.push(rowNode);
-        }
-    });
-    return leafNodes;
-}
+/**
+ * Computes a weighted average aggregation: Σ(value × weight) / Σ(weight)
+ *
+ * AG Grid calls agg functions bottom-up through the group hierarchy. For each group:
+ * - Leaf children contribute their raw value × weight
+ * - Sub-group children already have partial sums from a previous pass,
+ *   so we combine those directly instead of re-traversing to leaves
+ *
+ * The returned object stores partial sums ([columnId] and [weightColumnId])
+ * so parent groups can combine sub-group results correctly.
+ */
 const weightedAverage = (params, columnId, weightColumnId) => {
-    const { api: gridApi, rowNode: groupRowNode } = params;
-    let weightedColumnValueSum = 0;
-    let columnValueSum = 0;
-    const filteredOnly = !gridApi.getGridOption('suppressAggFilteredOnly');
-    const leafNodes = getWeightedAverageLeafNodes(gridApi, groupRowNode, filteredOnly);
-    leafNodes.forEach((rowNode) => {
-        // when editing values might be converted to strings
-        const rawColumnValue = gridApi.getCellValue({ colKey: columnId, rowNode });
-        const columnValue = (0, exports.getNumericValue)(rawColumnValue);
-        const rawWeightedColumnValue = gridApi.getCellValue({ colKey: weightColumnId, rowNode });
-        const weightedColumnValue = (0, exports.getNumericValue)(rawWeightedColumnValue);
-        if (weightedColumnValue !== null) {
-            weightedColumnValueSum += weightedColumnValue;
+    const { api: gridApi, rowNode: groupRowNode, values } = params;
+    // numerator: Σ(value × weight)
+    let weightedValueSum = 0;
+    // denominator: Σ(weight)
+    let totalWeight = 0;
+    // params.values already respects suppressAggFilteredOnly.
+    // We need the matching child nodes only for leaf rows (to look up weight column values).
+    const childNodes = getMatchingChildNodes(groupRowNode, values.length);
+    for (let i = 0; i < values.length; i++) {
+        const value = values[i];
+        if (value != null && typeof value === 'object') {
+            // sub-group: partial sums already computed by a previous aggregation pass
+            weightedValueSum += value[columnId] ?? 0;
+            totalWeight += value[weightColumnId] ?? 0;
         }
-        if (columnValue !== null) {
-            columnValueSum += columnValue * weightedColumnValue;
+        else {
+            // leaf row: compute value × weight from cell data
+            const childNode = childNodes[i];
+            if (!childNode) {
+                continue;
+            }
+            // values might be strings during editing
+            const columnValue = (0, exports.getNumericValue)(value);
+            const weightValue = (0, exports.getNumericValue)(gridApi.getCellValue({ colKey: weightColumnId, rowNode: childNode }));
+            if (weightValue !== null) {
+                totalWeight += weightValue;
+            }
+            if (columnValue !== null && weightValue !== null) {
+                weightedValueSum += columnValue * weightValue;
+            }
         }
-    });
-    let result = columnValueSum / weightedColumnValueSum;
-    // 0 / 0 = NaN
-    if (isNaN(result)) {
-        result = 0;
     }
+    const result = totalWeight !== 0 ? weightedValueSum / totalWeight : 0;
     return {
-        // the grid by default uses toString to render values for an object, so this
-        // is a trick to get the default cellRenderer to display the avg value
-        toString: () => {
-            return String(result);
-        },
-        // used for sorting
-        toNumber: function () {
-            return result;
-        },
-        [columnId]: columnValueSum,
-        [weightColumnId]: weightedColumnValueSum,
+        // toString/toNumber let AG Grid's default cell renderer display and sort the value
+        toString: () => String(result),
+        toNumber: () => result,
+        // partial sums stored so parent groups can combine sub-group results
+        [columnId]: weightedValueSum,
+        [weightColumnId]: totalWeight,
     };
 };
 exports.weightedAverage = weightedAverage;
+/**
+ * Returns the child node list that corresponds to params.values.
+ * When suppressAggFilteredOnly is false, params.values comes from childrenAfterFilter.
+ * When true, it comes from childrenAfterGroup (all children).
+ * We match by length to pick the right list without checking the grid option directly.
+ */
+function getMatchingChildNodes(groupRowNode, valueCount) {
+    if (groupRowNode.childrenAfterFilter?.length === valueCount) {
+        return groupRowNode.childrenAfterFilter;
+    }
+    return groupRowNode.childrenAfterGroup ?? [];
+}

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -223,6 +223,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     redrawBody(): void;
     refreshHeader(): void;
     redrawRows(rowNodes?: IRowNode[]): void;
+    refreshGridHeader(): void;
     redrawRow(rowNode: IRowNode): void;
     refreshCell(rowNode: IRowNode, column: string | any, forceUpdate: boolean, suppressFlash?: boolean): void;
     refreshCells(rowNode: IRowNode, columns: (string | Column)[], forceUpdate: boolean, suppressFlash?: boolean): void;

package/src/agGrid/AdaptableAgGrid.js

@@ -1086,7 +1086,7 @@ class AdaptableAgGrid {
         this.agGridOptionsService.setGridOptionsProperty(gridOptions, 'aggFuncs', (original_aggFuncs) => {
             const aggregationFunctions = original_aggFuncs || {};
             aggregationFunctions[AggregationColumns_1.ONLY_AGG_FN_NAME] = (params) => {
-                return (0, only_1.only)(params, params.column.getColId());
+                return (0, only_1.only)(params);
             };
             aggregationFunctions[AggregationColumns_1.WEIGHTED_AVERAGE_AGG_FN_NAME] = (params) => {
                 const columnId = params.column.getColId();
@@ -2264,6 +2264,9 @@ class AdaptableAgGrid {
             this.logger.consoleError('AG Grid redrawRows failed to locate some row nodes.', rowNodes, ex);
         }
     }
+    refreshGridHeader() {
+        this.agGridAdapter.getAgGridApi().refreshHeader();
+    }
     redrawRow(rowNode) {
         this.redrawRows([rowNode]);
     }

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.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: 1771927501120 || Date.now(),
-    VERSION: "22.0.0" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1772037269052 || Date.now(),
+    VERSION: "22.0.1-canary.0" || '--current-version--',
 };