@adaptabletools/adaptable 20.0.4-canary.0 → 20.0.4-canary.1

package/package.json

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

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: 1744377437477 || Date.now(),
-    VERSION: "20.0.4-canary.0" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1744398186764 || Date.now(),
+    VERSION: "20.0.4-canary.1" || '--current-version--',
 };

package/src/layout-manager/src/index.d.ts

@@ -73,6 +73,7 @@ export declare class LayoutManager<DATA_TYPE = any> extends LMEmitter {
     applyPivotExpandLevel(layout: PivotLayoutModel): void;
     private withSuppressColumnAnimation;
     private setupPivotTotals;
+    private isPivotRowTotalColDef;
     private patchGrandTotalColumn;
     private patchPivotTotalColumn;
     private getPivotTotalColumnConfig;

package/src/layout-manager/src/index.js

@@ -1112,11 +1112,14 @@ export class LayoutManager extends LMEmitter {
             this.patchPivotTotalColumn(colGroupDef);
         });
     }
+    isPivotRowTotalColDef(colDef) {
+        return colDef.colId?.startsWith('PivotRowTotal_');
+    }
     patchGrandTotalColumn(resultColDef) {
         if (!isPivotLayoutModel(this.currentLayout) || !this.currentLayout.GrandTotalColumn) {
             return;
         }
-        if (resultColDef.colId?.startsWith('PivotRowTotal_')) {
+        if (this.isPivotRowTotalColDef(resultColDef)) {
             resultColDef.headerName = `Grand Total ${resultColDef.headerName}`;
         }
     }
@@ -1130,10 +1133,20 @@ export class LayoutManager extends LMEmitter {
         if (!isPivotLayoutModel(this.currentLayout) || !hasPivotTotalCols(this.currentLayout)) {
             return;
         }
+        const pivotRowTotalColDefsBefore = [];
+        const pivotRowTotalColDefsAfter = [];
         const pivotTotalColDefsBefore = [];
         const pivotTotalColDefsAfter = [];
         const normalColDefs = [];
         colGroupDef.children.forEach((colDef) => {
+            if (this.isPivotRowTotalColDef(colDef)) {
+                if (this.gridApi.getGridOption('pivotRowTotals') === 'after') {
+                    pivotRowTotalColDefsAfter.push(colDef);
+                }
+                else {
+                    pivotRowTotalColDefsBefore.push(colDef);
+                }
+            }
             if (isPivotTotalColDef(colDef)) {
                 if (!colDef.colId.startsWith('pivot_')) {
                     this.warn(`Pivot total column ${colDef.colId} is not prefixed with 'pivot_', skipping...`);
@@ -1160,9 +1173,11 @@ export class LayoutManager extends LMEmitter {
             }
         });
         colGroupDef.children = [
+            ...pivotRowTotalColDefsBefore,
             ...pivotTotalColDefsBefore,
             ...normalColDefs,
             ...pivotTotalColDefsAfter,
+            ...pivotRowTotalColDefsAfter,
         ];
     }
     getPivotTotalColumnConfig(colDef, currentPivotLayout) {