@deephaven/iris-grid 0.7.3-beta.4 → 0.8.1

package/dist/IrisGridTableModel.js

@@ -11,11 +11,10 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 /* eslint class-methods-use-this: "off" */
 import memoize from 'memoize-one';
 import throttle from 'lodash.throttle';
-import { GridRange } from '@deephaven/grid';
+import { GridRange, memoizeClear } from '@deephaven/grid';
 import dh from '@deephaven/jsapi-shim';
 import Log from '@deephaven/log';
 import { PromiseUtils } from '@deephaven/utils';
-import memoizeClear from "./memoizeClear.js";
 import TableUtils from "./TableUtils.js";
 import Formatter from "./Formatter.js";
 import { TableColumnFormatter } from "./formatters/index.js";
@@ -42,48 +41,62 @@ class IrisGridTableModel extends IrisGridModel {
     var inputTable = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
     super();
 
-    _defineProperty(this, "getColumnsWithLayoutHints", memoize((columns, hints) => {
-      if (hints) {
-        var _hints$frontColumns$l, _hints$frontColumns, _hints$backColumns$le, _hints$backColumns, _hints$frozenColumns$, _hints$frozenColumns;
+    _defineProperty(this, "getColumnsWithLayoutHints", memoize((columnMap, frontColumns, backColumns, frozenColumns) => {
+      var columns = [...columnMap.values()];
 
-        var columnMap = new Map();
-        columns.forEach(col => columnMap.set(col.name, col));
-        var frontColumns = [];
-        var backColumns = [];
-        var frozenColumns = [];
+      if (frontColumns.length || backColumns.length || frozenColumns.length) {
+        var finalFrontColumns = [];
+        var finalBackColumns = [];
+        var finalFrozenColumns = [];
 
-        if (hints.frontColumns) {
-          frontColumns = hints.frontColumns.map(name => columnMap.get(name)).filter(Boolean);
+        if (frontColumns.length) {
+          finalFrontColumns = frontColumns.map(name => columnMap.get(name)).filter(Boolean);
         }
 
-        if (hints.backColumns) {
-          backColumns = hints.backColumns.map(name => columnMap.get(name)).filter(Boolean);
+        if (backColumns.length) {
+          finalBackColumns = backColumns.map(name => columnMap.get(name)).filter(Boolean);
         }
 
-        if (hints.frozenColumns) {
-          frozenColumns = hints.frozenColumns.map(name => columnMap.get(name)).filter(Boolean);
+        if (frozenColumns.length) {
+          finalFrozenColumns = frozenColumns.map(name => columnMap.get(name)).filter(Boolean);
         }
 
-        if (frontColumns.length !== ((_hints$frontColumns$l = (_hints$frontColumns = hints.frontColumns) === null || _hints$frontColumns === void 0 ? void 0 : _hints$frontColumns.length) !== null && _hints$frontColumns$l !== void 0 ? _hints$frontColumns$l : 0) || backColumns.length !== ((_hints$backColumns$le = (_hints$backColumns = hints.backColumns) === null || _hints$backColumns === void 0 ? void 0 : _hints$backColumns.length) !== null && _hints$backColumns$le !== void 0 ? _hints$backColumns$le : 0) || frozenColumns.length !== ((_hints$frozenColumns$ = (_hints$frozenColumns = hints.frozenColumns) === null || _hints$frozenColumns === void 0 ? void 0 : _hints$frozenColumns.length) !== null && _hints$frozenColumns$ !== void 0 ? _hints$frozenColumns$ : 0)) {
+        if (finalFrontColumns.length !== frontColumns.length || finalBackColumns.length !== backColumns.length || finalFrozenColumns.length !== frozenColumns.length) {
           throw new Error('Layout hints are invalid (contain invalid column names)');
         }
 
-        var frontColumnSet = new Set(frontColumns);
-        var backColumnSet = new Set(backColumns);
-        var frozenColumnSet = new Set(frozenColumns);
+        var frontColumnSet = new Set(finalFrontColumns);
+        var backColumnSet = new Set(finalBackColumns);
+        var frozenColumnSet = new Set(finalFrozenColumns);
         var middleColumns = columns.filter(col => !frontColumnSet.has(col) && !backColumnSet.has(col) && !frozenColumnSet.has(col));
-        return [...frozenColumns, ...frontColumns, ...middleColumns, ...backColumns];
+        return [...finalFrozenColumns, ...finalFrontColumns, ...middleColumns, ...finalBackColumns];
       }
 
       return columns;
     }));
 
+    _defineProperty(this, "getMemoizedColumnMap", memoize(tableColumns => {
+      var columnMap = new Map();
+      tableColumns.forEach(col => columnMap.set(col.name, col));
+      return columnMap;
+    }));
+
+    _defineProperty(this, "getMemoizedFrontColumns", memoize(layoutHintsFrontColumns => layoutHintsFrontColumns !== null && layoutHintsFrontColumns !== void 0 ? layoutHintsFrontColumns : []));
+
+    _defineProperty(this, "getMemoizedBackColumns", memoize(layoutHintsBackColumns => layoutHintsBackColumns !== null && layoutHintsBackColumns !== void 0 ? layoutHintsBackColumns : []));
+
+    _defineProperty(this, "getMemoizedFrozenColumns", memoize((layoutHintsFrozenColumns, userFrozenColumns) => {
+      var _ref;
+
+      return (_ref = userFrozenColumns !== null && userFrozenColumns !== void 0 ? userFrozenColumns : layoutHintsFrozenColumns) !== null && _ref !== void 0 ? _ref : [];
+    }));
+
     _defineProperty(this, "getColumnIndicesByNameMap", memoize(columns => {
       var indices = new Map();
-      columns.forEach((_ref, i) => {
+      columns.forEach((_ref2, i) => {
         var {
           name
-        } = _ref;
+        } = _ref2;
         return indices.set(name, i);
       });
       return indices;
@@ -158,6 +171,7 @@ class IrisGridTableModel extends IrisGridModel {
 
     this.pendingNewDataMap = new Map();
     this.pendingNewRowCount = 0;
+    this.userFrozenColumns = null;
   }
 
   close() {
@@ -515,7 +529,29 @@ class IrisGridTableModel extends IrisGridModel {
   }
 
   get columns() {
-    return this.getColumnsWithLayoutHints(this.table.columns, this.table.layoutHints);
+    return this.getColumnsWithLayoutHints(this.columnMap, this.frontColumns, this.backColumns, this.frozenColumns);
+  }
+
+  get columnMap() {
+    return this.getMemoizedColumnMap(this.table.columns);
+  }
+
+  get frontColumns() {
+    var _this$layoutHints;
+
+    return this.getMemoizedFrontColumns((_this$layoutHints = this.layoutHints) === null || _this$layoutHints === void 0 ? void 0 : _this$layoutHints.frontColumns);
+  }
+
+  get backColumns() {
+    var _this$layoutHints2;
+
+    return this.getMemoizedBackColumns((_this$layoutHints2 = this.layoutHints) === null || _this$layoutHints2 === void 0 ? void 0 : _this$layoutHints2.backColumns);
+  }
+
+  get frozenColumns() {
+    var _this$layoutHints3;
+
+    return this.getMemoizedFrozenColumns((_this$layoutHints3 = this.layoutHints) === null || _this$layoutHints3 === void 0 ? void 0 : _this$layoutHints3.frozenColumns, this.userFrozenColumns);
   }
 
   get layoutHints() {
@@ -523,9 +559,7 @@ class IrisGridTableModel extends IrisGridModel {
   }
 
   get floatingLeftColumnCount() {
-    var _this$layoutHints$fro, _this$layoutHints, _this$layoutHints$fro2;
-
-    return (_this$layoutHints$fro = (_this$layoutHints = this.layoutHints) === null || _this$layoutHints === void 0 ? void 0 : (_this$layoutHints$fro2 = _this$layoutHints.frozenColumns) === null || _this$layoutHints$fro2 === void 0 ? void 0 : _this$layoutHints$fro2.length) !== null && _this$layoutHints$fro !== void 0 ? _this$layoutHints$fro : 0;
+    return this.frozenColumns.length;
   }
 
   get groupedColumns() {
@@ -833,6 +867,11 @@ class IrisGridTableModel extends IrisGridModel {
     this.applyViewport();
   }
 
+  updateFrozenColumns(columns) {
+    this.userFrozenColumns = columns;
+    this.dispatchEvent(new CustomEvent(IrisGridModel.EVENT.TABLE_CHANGED));
+  }
+
   set totalsConfig(totalsConfig) {
     log.debug('set totalsConfig', totalsConfig);
 
@@ -1121,11 +1160,11 @@ class IrisGridTableModel extends IrisGridModel {
   }
 
   isColumnMovable(x) {
-    var _this$layoutHints2, _this$layoutHints2$fr, _this$layoutHints3, _this$layoutHints3$ba, _this$layoutHints4, _this$layoutHints4$fr;
+    var _this$layoutHints4, _this$layoutHints4$fr, _this$layoutHints5, _this$layoutHints5$ba;
 
     var columnName = this.columns[x].name;
 
-    if ((_this$layoutHints2 = this.layoutHints) !== null && _this$layoutHints2 !== void 0 && (_this$layoutHints2$fr = _this$layoutHints2.frontColumns) !== null && _this$layoutHints2$fr !== void 0 && _this$layoutHints2$fr.includes(columnName) || (_this$layoutHints3 = this.layoutHints) !== null && _this$layoutHints3 !== void 0 && (_this$layoutHints3$ba = _this$layoutHints3.backColumns) !== null && _this$layoutHints3$ba !== void 0 && _this$layoutHints3$ba.includes(columnName) || (_this$layoutHints4 = this.layoutHints) !== null && _this$layoutHints4 !== void 0 && (_this$layoutHints4$fr = _this$layoutHints4.frozenColumns) !== null && _this$layoutHints4$fr !== void 0 && _this$layoutHints4$fr.includes(columnName)) {
+    if ((_this$layoutHints4 = this.layoutHints) !== null && _this$layoutHints4 !== void 0 && (_this$layoutHints4$fr = _this$layoutHints4.frontColumns) !== null && _this$layoutHints4$fr !== void 0 && _this$layoutHints4$fr.includes(columnName) || (_this$layoutHints5 = this.layoutHints) !== null && _this$layoutHints5 !== void 0 && (_this$layoutHints5$ba = _this$layoutHints5.backColumns) !== null && _this$layoutHints5$ba !== void 0 && _this$layoutHints5$ba.includes(columnName) || this.frozenColumns.includes(columnName)) {
       return false;
     }
 
@@ -1133,9 +1172,7 @@ class IrisGridTableModel extends IrisGridModel {
   }
 
   isColumnFrozen(x) {
-    var _this$layoutHints$fro3, _this$layoutHints5, _this$layoutHints5$fr;
-
-    return (_this$layoutHints$fro3 = (_this$layoutHints5 = this.layoutHints) === null || _this$layoutHints5 === void 0 ? void 0 : (_this$layoutHints5$fr = _this$layoutHints5.frozenColumns) === null || _this$layoutHints5$fr === void 0 ? void 0 : _this$layoutHints5$fr.includes(this.columns[x].name)) !== null && _this$layoutHints$fro3 !== void 0 ? _this$layoutHints$fro3 : false;
+    return this.frozenColumns.includes(this.columns[x].name);
   }
 
   isKeyColumn(x) {
@@ -1319,7 +1356,11 @@ class IrisGridTableModel extends IrisGridModel {
       var edits = _arguments3.length > 0 && _arguments3[0] !== undefined ? _arguments3[0] : [];
       log.debug('setValues(', edits, ')');
 
-      if (!edits.every(edit => _this8.isEditableRange(GridRange.makeCell(edit.x, edit.y)))) {
+      if (!edits.every(edit => {
+        var _edit$column, _edit$row;
+
+        return _this8.isEditableRange(GridRange.makeCell((_edit$column = edit.column) !== null && _edit$column !== void 0 ? _edit$column : edit.x, (_edit$row = edit.row) !== null && _edit$row !== void 0 ? _edit$row : edit.y));
+      })) {
         throw new Error('Uneditable ranges', edits);
       }
 
@@ -1327,11 +1368,13 @@ class IrisGridTableModel extends IrisGridModel {
         var newDataMap = new Map(_this8.pendingNewDataMap); // Cache the display values
 
         edits.forEach(edit => {
+          var _edit$column2, _edit$row2;
+
           var {
-            x,
-            y,
             text
           } = edit;
+          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 = _this8.columns[x];
           var value = TableUtils.makeValue(column.type, text, _this8.formatter.timeZone);
           var formattedText = value != null ? _this8.displayString(value, column.type, column.name) : null;
@@ -1377,14 +1420,22 @@ class IrisGridTableModel extends IrisGridModel {
 
 
         var rowEditMap = edits.reduce((rowMap, edit) => {
-          if (!rowMap.has(edit.y)) {
-            rowMap.set(edit.y, []);
+          var _edit$row3;
+
+          var y = (_edit$row3 = edit.row) !== null && _edit$row3 !== void 0 ? _edit$row3 : edit.y;
+
+          if (!rowMap.has(y)) {
+            rowMap.set(y, []);
           }
 
-          rowMap.get(edit.y).push(edit);
+          rowMap.get(y).push(edit);
           return rowMap;
         }, new Map());
-        var ranges = GridRange.consolidate(edits.map(edit => GridRange.makeCell(edit.x, edit.y)));
+        var ranges = GridRange.consolidate(edits.map(edit => {
+          var _edit$column3, _edit$row4;
+
+          return GridRange.makeCell((_edit$column3 = edit.column) !== null && _edit$column3 !== void 0 ? _edit$column3 : edit.x, (_edit$row4 = edit.row) !== null && _edit$row4 !== void 0 ? _edit$row4 : edit.y);
+        }));
 
         var tableAreaRange = _this8.getTableAreaRange();
 
@@ -1419,7 +1470,9 @@ class IrisGridTableModel extends IrisGridModel {
 
             if (rowEdits != null) {
               rowEdits.forEach(edit => {
-                var column = _this8.columns[edit.x];
+                var _edit$column4;
+
+                var column = _this8.columns[(_edit$column4 = edit.column) !== null && _edit$column4 !== void 0 ? _edit$column4 : edit.x];
                 newRow[column.name] = TableUtils.makeValue(column.type, edit.text, _this8.formatter.timeZone);
               });
             }
@@ -1436,11 +1489,13 @@ class IrisGridTableModel extends IrisGridModel {
 
 
         edits.forEach(edit => {
+          var _edit$column5, _edit$row5;
+
           var {
-            x,
-            y,
             text
           } = edit;
+          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 = _this8.columns[x];
           var value = TableUtils.makeValue(column.type, text, _this8.formatter.timeZone);
           var formattedText = value != null ? _this8.displayString(value, column.type, column.name) : null;
@@ -1449,7 +1504,7 @@ class IrisGridTableModel extends IrisGridModel {
         });
       } finally {
         edits.forEach(edit => {
-          _this8.clearPendingValue(edit.x, edit.y);
+          _this8.clearPendingValue(edit.column, edit.row);
         });
       }
     })();
@@ -1471,10 +1526,10 @@ class IrisGridTableModel extends IrisGridModel {
 
         _this9.pendingNewDataMap.forEach(row => {
           var newRow = {};
-          row.data.forEach((_ref2, columnIndex) => {
+          row.data.forEach((_ref3, columnIndex) => {
             var {
               value
-            } = _ref2;
+            } = _ref3;
             var column = _this9.columns[columnIndex];
             newRow[column.name] = value;
           });