@deephaven/js-plugin-pivot 0.3.0 → 0.3.2

package/dist/index.js

@@ -10996,11 +10996,11 @@ class IrisGridPivotModel extends irisGrid.IrisGridModel {
   }
   expandAllColumns() {
     log$4.debug("expandAllColumns");
-    this.setColumnExpanded(this.keyColumns.length, true, true);
+    this.setColumnExpanded(this.getGrandTotalsColumnIndex(), true, true);
   }
   collapseAllColumns() {
     log$4.debug("collapseAllColumns");
-    this.setColumnExpanded(this.keyColumns.length, false, true);
+    this.setColumnExpanded(this.getGrandTotalsColumnIndex(), false, true);
   }
   isColumnExpandable(x, depth) {
     var _a;
@@ -11012,8 +11012,15 @@ class IrisGridPivotModel extends irisGrid.IrisGridModel {
     }
     return ((_a = this.columns[x]) == null ? void 0 : _a.hasChildren) ?? false;
   }
+  /**
+   * Get the index of the first grand totals column.
+   * This is the column index that represents the root of the column hierarchy.
+   */
+  getGrandTotalsColumnIndex() {
+    return this.keyColumns.length + (this.groupColumn == null ? 0 : 1);
+  }
   isGrandTotalsColumn(x) {
-    const totalsStartIndex = this.keyColumns.length + (this.groupColumn == null ? 0 : 1);
+    const totalsStartIndex = this.getGrandTotalsColumnIndex();
     return x >= totalsStartIndex && x < this.virtualColumns.length;
   }
   isColumnExpanded(x) {
@@ -11043,7 +11050,7 @@ class IrisGridPivotModel extends irisGrid.IrisGridModel {
     return depth;
   }
   textValueForCell(x, y) {
-    var _a;
+    var _a, _b;
     if (((_a = this.formattedStringData[x]) == null ? void 0 : _a[y]) === void 0) {
       const value2 = this.valueForCell(x, y);
       if (value2 === null) {
@@ -11053,10 +11060,22 @@ class IrisGridPivotModel extends irisGrid.IrisGridModel {
         return void 0;
       }
       const column = this.columns[x];
+      let columnType = column.type;
+      let columnName = column.name;
+      const groupOffset = this.groupColumn == null ? 0 : 1;
+      if (groupOffset === 1 && x === 0 && y !== 0) {
+        const rowDepth = ((_b = this.row(y)) == null ? void 0 : _b.depth) ?? 2;
+        const keyCount = this.keyColumns.length;
+        if (rowDepth > 0 && rowDepth < keyCount) {
+          const sourceKeyColumn = this.keyColumns[rowDepth - 1];
+          columnType = sourceKeyColumn.type;
+          columnName = sourceKeyColumn.name;
+        }
+      }
       const hasCustomColumnFormat = this.getCachedCustomColumnFormatFlag(
         this.formatter,
-        column.name,
-        column.type
+        columnName,
+        columnType
       );
       let formatOverride;
       if (!hasCustomColumnFormat) {
@@ -11067,8 +11086,8 @@ class IrisGridPivotModel extends irisGrid.IrisGridModel {
       }
       const text = this.displayString(
         value2,
-        column.type,
-        column.name,
+        columnType,
+        columnName,
         formatOverride
       );
       this.cacheFormattedValue(x, y, text);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deephaven/js-plugin-pivot",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Pivot plugin for Deephaven",
   "keywords": [
     "Deephaven",
@@ -58,5 +58,5 @@
   "files": [
     "dist/index.js"
   ],
-  "gitHead": "aa57501928427c83086811d7700bfcc4e6962265"
+  "gitHead": "a90120783141bad37e4499a8870349181b4fc93c"
 }