@deephaven/iris-grid 0.38.1 → 0.39.0

package/dist/IrisGridTableModelTemplate.js

@@ -10,7 +10,6 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
 import memoize from 'memoize-one';
 import throttle from 'lodash.throttle';
 import { GridRange, GridUtils, memoizeClear } from '@deephaven/grid';
-import dh from '@deephaven/jsapi-shim';
 import Log from '@deephaven/log';
 import { EventShimCustomEvent, PromiseUtils, assertNotNull } from '@deephaven/utils';
 import { TableUtils, Formatter, FormatterUtils } from '@deephaven/jsapi-utils';
@@ -77,15 +76,19 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     return this.table.columns;
   }
   /**
+   * @param dh JSAPI instance
    * @param table Iris data table to be used in the model
    * @param formatter The formatter to use when getting formats
    * @param inputTable Iris input table associated with this table
    */
-  constructor(table) {
+  constructor(dh, table) {
     var _this$layoutHints$col, _this$layoutHints;
-    var _formatter = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new Formatter();
-    var inputTable = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-    super();
+    var _formatter = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new Formatter(dh);
+    var inputTable = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+    super(dh);
+    _defineProperty(this, "dh", void 0);
+    _defineProperty(this, "irisGridUtils", void 0);
+    _defineProperty(this, "tableUtils", void 0);
     _defineProperty(this, "irisFormatter", void 0);
     _defineProperty(this, "inputTable", void 0);
     _defineProperty(this, "subscription", void 0);
@@ -294,10 +297,13 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     this.handleTotalsUpdate = this.handleTotalsUpdate.bind(this);
     this.handleRequestFailed = this.handleRequestFailed.bind(this);
     this.handleCustomColumnsChanged = this.handleCustomColumnsChanged.bind(this);
+    this.dh = dh;
     this.irisFormatter = _formatter;
+    this.irisGridUtils = new IrisGridUtils(dh);
     this.inputTable = inputTable;
     this.subscription = null;
     this.table = table;
+    this.tableUtils = new TableUtils(dh);
     this.viewport = null;
     this.viewportData = null;
     this.formattedStringData = [];
@@ -326,6 +332,9 @@ class IrisGridTableModelTemplate extends IrisGridModel {
   }
   startListening() {
     super.startListening();
+    var {
+      dh
+    } = this;
     this.table.addEventListener(dh.Table.EVENT_DISCONNECT, this.handleTableDisconnect);
     this.table.addEventListener(dh.Table.EVENT_RECONNECT, this.handleTableReconnect);
     this.table.addEventListener(dh.Table.EVENT_UPDATED, this.handleTableUpdate);
@@ -338,6 +347,9 @@ class IrisGridTableModelTemplate extends IrisGridModel {
   }
   stopListening() {
     super.stopListening();
+    var {
+      dh
+    } = this;
     this.table.removeEventListener(dh.Table.EVENT_DISCONNECT, this.handleTableDisconnect);
     this.table.removeEventListener(dh.Table.EVENT_RECONNECT, this.handleTableReconnect);
     this.table.removeEventListener(dh.Table.EVENT_UPDATED, this.handleTableUpdate);
@@ -349,12 +361,18 @@ class IrisGridTableModelTemplate extends IrisGridModel {
     this.closeSubscription();
   }
   addTotalsListeners(totalsTable) {
+    var {
+      dh
+    } = this;
     totalsTable.addEventListener(dh.Table.EVENT_UPDATED, this.handleTotalsUpdate);
 
     // Totals table only has one row of data
     totalsTable.setViewport(0, 0);
   }
   removeTotalsListeners(totalsTable) {
+    var {
+      dh
+    } = this;
     totalsTable.removeEventListener(dh.Table.EVENT_UPDATED, this.handleTotalsUpdate);
   }
   handleTableDisconnect() {
@@ -1047,7 +1065,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
         yield* _loop2();
       }
       if (tableRanges.length > 0) {
-        var rangeSet = IrisGridUtils.rangeSetFromRanges(tableRanges);
+        var rangeSet = _this2.irisGridUtils.rangeSetFromRanges(tableRanges);
         var snapshot = yield _this2.subscription.snapshot(rangeSet, columns);
         result.push(...snapshot.rows.map(rowData => columns.map(column => formatValue(rowData.get(column), column))));
       }
@@ -1210,7 +1228,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
           var column = _this6.columns[x];
           columnSet.add(column);
           if (formattedText[x] === undefined) {
-            var _value3 = TableUtils.makeValue(column.type, text, _this6.formatter.timeZone);
+            var _value3 = _this6.tableUtils.makeValue(column.type, text, _this6.formatter.timeZone);
             formattedText[x] = _value3 != null ? _this6.displayString(_value3, column.type, column.name) : null;
           }
           _this6.cachePendingValue(x, y, formattedText[x]);
@@ -1237,7 +1255,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
               data: rowData
             } = row;
             var newRowData = new Map(rowData);
-            var value = TableUtils.makeValue(column.type, text, _this6.formatter.timeZone);
+            var value = _this6.tableUtils.makeValue(column.type, text, _this6.formatter.timeZone);
             if (value != null) {
               newRowData.set(columnIndex, {
                 value
@@ -1271,7 +1289,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
               newRow[_this6.columns[c].name] = row[c];
             }
             columnSet.forEach(column => {
-              newRow[column.name] = TableUtils.makeValue(column.type, text, _this6.formatter.timeZone);
+              newRow[column.name] = _this6.tableUtils.makeValue(column.type, text, _this6.formatter.timeZone);
             });
             return newRow;
           });
@@ -1320,7 +1338,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
           var x = (_edit$column2 = edit.column) !== null && _edit$column2 !== void 0 ? _edit$column2 : edit.x;
           var y = (_edit$row2 = edit.row) !== null && _edit$row2 !== void 0 ? _edit$row2 : edit.y;
           var column = _this7.columns[x];
-          var value = TableUtils.makeValue(column.type, text, _this7.formatter.timeZone);
+          var value = _this7.tableUtils.makeValue(column.type, text, _this7.formatter.timeZone);
           var formattedText = value != null ? _this7.displayString(value, column.type, column.name) : null;
           _this7.cachePendingValue(x, y, formattedText);
 
@@ -1406,7 +1424,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
               rowEdits.forEach(edit => {
                 var _edit$column4;
                 var column = _this7.columns[(_edit$column4 = edit.column) !== null && _edit$column4 !== void 0 ? _edit$column4 : edit.x];
-                newRow[column.name] = TableUtils.makeValue(column.type, edit.text, _this7.formatter.timeZone);
+                newRow[column.name] = _this7.tableUtils.makeValue(column.type, edit.text, _this7.formatter.timeZone);
               });
             }
             return newRow;
@@ -1428,7 +1446,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
           var x = (_edit$column5 = edit.column) !== null && _edit$column5 !== void 0 ? _edit$column5 : edit.x;
           var y = (_edit$row5 = edit.row) !== null && _edit$row5 !== void 0 ? _edit$row5 : edit.y;
           var column = _this7.columns[x];
-          var value = TableUtils.makeValue(column.type, text, _this7.formatter.timeZone);
+          var value = _this7.tableUtils.makeValue(column.type, text, _this7.formatter.timeZone);
           var formattedText = value != null ? _this7.displayString(value, column.type, column.name) : null;
           _this7.cacheFormattedValue(x, y, formattedText);
         });
@@ -1525,7 +1543,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
         for (var c = 0; c < keyColumns.length; c += 1) {
           var _column4 = keyColumns[c];
           var _value4 = row[c];
-          var filterValue = TableUtils.makeFilterRawValue(_column4.type, _value4);
+          var filterValue = _this9.tableUtils.makeFilterRawValue(_column4.type, _value4);
           var _filter = _column4.filter().eq(filterValue);
           columnFilters.push(_filter);
         }
@@ -1547,7 +1565,7 @@ class IrisGridTableModelTemplate extends IrisGridModel {
   isValidForCell(x, y, value) {
     try {
       var _column5 = this.columns[x];
-      TableUtils.makeValue(_column5.type, value, this.formatter.timeZone);
+      this.tableUtils.makeValue(_column5.type, value, this.formatter.timeZone);
       return true;
     } catch (e) {
       return false;