@deephaven/iris-grid 0.57.2-beta.0 → 0.58.0

package/dist/IrisGridTableModelTemplate.js

@@ -21,7 +21,6 @@ import { isColumnHeaderGroup } from "./ColumnHeaderGroup.js";
 var log = Log.module('IrisGridTableModel');
 var SET_VIEWPORT_THROTTLE = 150;
 var APPLY_VIEWPORT_THROTTLE = 0;
-var EMPTY_ARRAY = [];
 export function isIrisGridTableModelTemplate(model) {
   return model.table !== undefined;
 }
@@ -403,7 +402,10 @@ class IrisGridTableModelTemplate extends IrisGridModel {
   }
   get rowCount() {
     var _this$totals$operatio, _this$totals, _this$totals$operatio2;
-    return this.table.size + this.pendingNewRowCount + ((_this$totals$operatio = (_this$totals = this.totals) === null || _this$totals === void 0 ? void 0 : (_this$totals$operatio2 = _this$totals.operationOrder) === null || _this$totals$operatio2 === void 0 ? void 0 : _this$totals$operatio2.length) !== null && _this$totals$operatio !== void 0 ? _this$totals$operatio : 0);
+    return (
+      // Table size can be negative if the table isn't ready yet
+      Math.max(this.table.size, 0) + this.pendingNewRowCount + ((_this$totals$operatio = (_this$totals = this.totals) === null || _this$totals === void 0 ? void 0 : (_this$totals$operatio2 = _this$totals.operationOrder) === null || _this$totals$operatio2 === void 0 ? void 0 : _this$totals$operatio2.length) !== null && _this$totals$operatio !== void 0 ? _this$totals$operatio : 0)
+    );
   }
   get pendingDataErrors() {
     var _this$inputTable$keyC, _this$inputTable;
@@ -494,7 +496,6 @@ class IrisGridTableModelTemplate extends IrisGridModel {
 
     // Use a separate cache from memoization just for the strings that are currently displayed
     if (((_this$formattedString = this.formattedStringData[x]) === null || _this$formattedString === void 0 ? void 0 : _this$formattedString[y]) === undefined) {
-      var _this$totalsColumn;
       var _value = this.valueForCell(x, y);
       if (_value === null) {
         return null;
@@ -502,7 +503,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
       if (_value === undefined) {
         return undefined;
       }
-      var _column = (_this$totalsColumn = this.totalsColumn(x, y)) !== null && _this$totalsColumn !== void 0 ? _this$totalsColumn : this.columns[x];
+      var _column = this.sourceColumn(x, y);
       var hasCustomColumnFormat = this.getCachedCustomColumnFormatFlag(this.formatter, _column.name, _column.type);
       var formatOverride;
       if (!hasCustomColumnFormat) {
@@ -568,8 +569,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
 
       // Fallback to formatting based on the value/type of the cell
       if (_value2 != null) {
-        var _this$totalsColumn2;
-        var _column2 = (_this$totalsColumn2 = this.totalsColumn(x, y)) !== null && _this$totalsColumn2 !== void 0 ? _this$totalsColumn2 : this.columns[x];
+        var _column2 = this.sourceColumn(x, y);
         if (TableUtils.isDateType(_column2.type) || _column2.name === 'Date') {
           assertNotNull(theme.dateColor);
           return theme.dateColor;
@@ -658,12 +658,13 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     return (format === null || format === void 0 ? void 0 : format.formatDataBar) != null ? 'dataBar' : 'text';
   }
   textForColumnHeader(x) {
+    var _header$displayName;
     var depth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
     var header = this.columnAtDepth(x, depth);
     if (isColumnHeaderGroup(header)) {
       return header.isNew ? '' : header.name;
     }
-    return header === null || header === void 0 ? void 0 : header.name;
+    return (_header$displayName = header === null || header === void 0 ? void 0 : header.displayName) !== null && _header$displayName !== void 0 ? _header$displayName : header === null || header === void 0 ? void 0 : header.name;
   }
   colorForColumnHeader(x) {
     var depth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
@@ -723,13 +724,6 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     var _this$layoutHints2;
     return this.getMemoizedInitialMovedColumns((_this$layoutHints2 = this.layoutHints) !== null && _this$layoutHints2 !== void 0 ? _this$layoutHints2 : undefined);
   }
-
-  /**
-   * Not currently used by anything.
-   */
-  get initialMovedRows() {
-    return EMPTY_ARRAY;
-  }
   get initialColumnHeaderGroups() {
     var _this$layoutHints3;
     return this.getMemoizedInitialColumnHeaderGroups((_this$layoutHints3 = this.layoutHints) !== null && _this$layoutHints3 !== void 0 ? _this$layoutHints3 : undefined);
@@ -765,9 +759,6 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     this.columnHeaderParentMap = parentMap;
     this._columnHeaderGroupMap = groupMap;
   }
-  get groupedColumns() {
-    return [];
-  }
   row(y) {
     var _this$totals$operatio5, _this$totals4, _this$totals4$operati, _this$totals$showOnTo, _this$totals5, _this$viewportData$of, _this$viewportData, _this$viewportData$ro, _this$viewportData2, _this$viewportData2$r;
     var totalsRowCount = (_this$totals$operatio5 = (_this$totals4 = this.totals) === null || _this$totals4 === void 0 ? void 0 : (_this$totals4$operati = _this$totals4.operationOrder) === null || _this$totals4$operati === void 0 ? void 0 : _this$totals4$operati.length) !== null && _this$totals$operatio5 !== void 0 ? _this$totals$operatio5 : 0;
@@ -790,25 +781,35 @@ class IrisGridTableModelTemplate extends IrisGridModel {
   }
 
   /**
-   * Retrieve the totals column if this is a totals row, or null otherwise
-   * @param x Column index to get the totals column from
-   * @param y Row index to get the totals column from
+   * Retrieve the source column for given coordinates.
+   * - Retrieve the totals column if this is a totals row
+   * - Retrieve the source column if it's a proxied column
+   * - Otherwise return the column at the given index
+   * @param column Column index to get the source column from
+   * @param row Row index to get the source column from
    */
-  totalsColumn(x, y) {
-    var _this$totals7, _this$totals$defaultO, _this$totals8, _this$totalsTable;
-    var totalsRow = this.totalsRow(y);
-    if (totalsRow == null) return null;
-    var operation = (_this$totals7 = this.totals) === null || _this$totals7 === void 0 ? void 0 : _this$totals7.operationOrder[totalsRow];
-    var defaultOperation = (_this$totals$defaultO = (_this$totals8 = this.totals) === null || _this$totals8 === void 0 ? void 0 : _this$totals8.defaultOperation) !== null && _this$totals$defaultO !== void 0 ? _this$totals$defaultO : AggregationOperation.SUM;
-    var tableColumn = this.columns[x];
+  sourceColumn(column, row) {
+    var totalsRow = this.totalsRow(row);
+    if (totalsRow != null) {
+      var _this$totals7, _this$totals$defaultO, _this$totals8, _this$totalsTable;
+      var operation = (_this$totals7 = this.totals) === null || _this$totals7 === void 0 ? void 0 : _this$totals7.operationOrder[totalsRow];
+      var defaultOperation = (_this$totals$defaultO = (_this$totals8 = this.totals) === null || _this$totals8 === void 0 ? void 0 : _this$totals8.defaultOperation) !== null && _this$totals$defaultO !== void 0 ? _this$totals$defaultO : AggregationOperation.SUM;
+      var tableColumn = this.columns[column];
 
-    // Find the matching totals table column for the operation
-    // When there are multiple aggregations, the column name will be the original name of the column with the operation appended afterward
-    // When the the operation is the default operation OR there is only one operation, then the totals column name is just the original column name
-    return (_this$totalsTable = this.totalsTable) === null || _this$totalsTable === void 0 ? void 0 : _this$totalsTable.columns.find(column => {
-      var _this$totals9;
-      return column.name === "".concat(tableColumn.name, "__").concat(operation) || (operation === defaultOperation || ((_this$totals9 = this.totals) === null || _this$totals9 === void 0 ? void 0 : _this$totals9.operationOrder.length) === 1) && column.name === tableColumn.name;
-    });
+      // Find the matching totals table column for the operation
+      // When there are multiple aggregations, the column name will be the original name of the column with the operation appended afterward
+      // When the the operation is the default operation OR there is only one operation, then the totals column name is just the original column name
+      var totalsColumn = (_this$totalsTable = this.totalsTable) === null || _this$totalsTable === void 0 ? void 0 : _this$totalsTable.columns.find(col => {
+        var _this$totals9;
+        return col.name === "".concat(tableColumn.name, "__").concat(operation) || (operation === defaultOperation || ((_this$totals9 = this.totals) === null || _this$totals9 === void 0 ? void 0 : _this$totals9.operationOrder.length) === 1) && col.name === tableColumn.name;
+      });
+      if (totalsColumn != null) {
+        return totalsColumn;
+      }
+      // There may be cases were the totals table doesn't have a column, such as when there's a virtual column
+    }
+
+    return this.columns[column];
   }
 
   /**