@deephaven/iris-grid 1.7.1 → 1.7.2-beta.3

package/dist/IrisGrid.js

@@ -9,7 +9,6 @@ import React, { Component } from 'react';
 import memoize from 'memoizee';
 import classNames from 'classnames';
 import { CSSTransition } from 'react-transition-group';
-import PropTypes from 'prop-types';
 import deepEqual from 'fast-deep-equal';
 import Log from '@deephaven/log';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -54,9 +53,7 @@ import AggregationOperation from "./sidebar/aggregations/AggregationOperation.js
 import { IrisGridThemeContext } from "./IrisGridThemeProvider.js";
 import { isMissingPartitionError } from "./MissingPartitionError.js";
 import { NoPastePermissionModal } from "./NoPastePermissionModal.js";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 var log = Log.module('IrisGrid');
 var VIEWPORT_LOADING_DELAY = 500;
 var UPDATE_DOWNLOAD_THROTTLE = 500;
@@ -83,10 +80,8 @@ function isEmptyConfig(_ref) {
   return advancedFilters.size === 0 && aggregationSettings.aggregations.length === 0 && customColumns.length === 0 && quickFilters.size === 0 && !reverse && rollupConfig == null && searchFilter == null && selectDistinctColumns.length === 0 && sorts.length === 0;
 }
 class IrisGrid extends Component {
-  // eslint-disable-next-line react/static-property-placement, react/sort-comp
-
   constructor(props) {
-    var _model$layoutHints, _model$layoutHints$hi, _model$columns$0$name, _model$columns$;
+    var _model$layoutHints, _model$columns$0$name, _model$columns$;
     super(props);
     _defineProperty(this, "grid", void 0);
     _defineProperty(this, "lastFocusedFilterBarColumn", void 0);
@@ -101,6 +96,7 @@ class IrisGrid extends Component {
     _defineProperty(this, "showEmptyStrings", void 0);
     _defineProperty(this, "showNullStrings", void 0);
     _defineProperty(this, "showExtraGroupColumn", void 0);
+    // When the loading scrim started/when it should extend to the end of the screen.
     _defineProperty(this, "loadingScrimStartTime", void 0);
     _defineProperty(this, "loadingScrimFinishTime", void 0);
     _defineProperty(this, "animationFrame", void 0);
@@ -272,6 +268,14 @@ class IrisGrid extends Component {
     _defineProperty(this, "getCachedFormatColumns", memoize((dh, columns, rules) => getFormatColumns(dh, columns, rules), {
       max: 1000
     }));
+    /**
+     * Builds formatColumns array based on the provided formatting rules with optional preview
+     * @param columns Array of columns
+     * @param rulesParam Array of formatting rules
+     * @param preview Optional temporary formatting rule for previewing live changes
+     * @param editIndex Index in the rulesParam array to replace with the preview, null if preview not applicable
+     * @returns Format columns array
+     */
     _defineProperty(this, "getCachedPreviewFormatColumns", memoize((dh, columns, rulesParam, preview, editIndex) => {
       log.debug('getCachedPreviewFormatColumns', rulesParam, preview, editIndex);
       if (preview !== undefined && editIndex !== undefined) {
@@ -288,7 +292,7 @@ class IrisGrid extends Component {
     }));
     _defineProperty(this, "getModelTotalsConfig", memoize((columns, config, aggregationSettings) => {
       var _config$columns$lengt, _config$columns;
-      if (((_config$columns$lengt = config === null || config === void 0 ? void 0 : (_config$columns = config.columns) === null || _config$columns === void 0 ? void 0 : _config$columns.length) !== null && _config$columns$lengt !== void 0 ? _config$columns$lengt : 0) > 0) {
+      if (((_config$columns$lengt = config === null || config === void 0 || (_config$columns = config.columns) === null || _config$columns === void 0 ? void 0 : _config$columns.length) !== null && _config$columns$lengt !== void 0 ? _config$columns$lengt : 0) > 0) {
         // If we've got rollups, then aggregations are applied as part of that...
         return null;
       }
@@ -360,7 +364,7 @@ class IrisGrid extends Component {
     _defineProperty(this, "getCachedKeyHandlers", memoize(keyHandlers => [...keyHandlers, ...this.keyHandlers].sort((a, b) => a.order - b.order), {
       max: 1
     }));
-    _defineProperty(this, "getCachedMouseHandlers", memoize(mouseHandlers => [...mouseHandlers, ...this.mouseHandlers], {
+    _defineProperty(this, "getCachedMouseHandlers", memoize(mouseHandlers => [...mouseHandlers, ...this.mouseHandlers].map(handler => typeof handler === 'function' ? handler(this) : handler), {
       max: 1
     }));
     _defineProperty(this, "getCachedRenderer", memoize(rendererProp => rendererProp !== null && rendererProp !== void 0 ? rendererProp : new IrisGridRenderer(), {
@@ -412,6 +416,7 @@ class IrisGrid extends Component {
       leading: false,
       trailing: true
     }));
+    // Apply live changes
     _defineProperty(this, "handleConditionalFormatEditorUpdate", debounce(conditionalFormatPreview => {
       this.setState({
         conditionalFormatPreview
@@ -681,14 +686,16 @@ class IrisGrid extends Component {
       frozenColumns,
       columnHeaderGroups
     } = props;
+    var {
+      mouseHandlers: mouseHandlersProp
+    } = props;
     var {
       dh: _dh
     } = _model;
     var _keyHandlers = [new CopyCellKeyHandler(this), new ReverseKeyHandler(this), new ClearFilterKeyHandler(this)];
-    var _mouseHandlers = [new IrisGridCellOverflowMouseHandler(this), new IrisGridRowTreeMouseHandler(this), new IrisGridTokenMouseHandler(this), new IrisGridColumnSelectMouseHandler(this), new IrisGridColumnTooltipMouseHandler(this), new IrisGridSortMouseHandler(this), new IrisGridFilterMouseHandler(this), new IrisGridContextMenuHandler(this, _dh), new IrisGridDataSelectMouseHandler(this), new PendingMouseHandler(this), new IrisGridPartitionedTableMouseHandler(this)];
+    var _mouseHandlers = [new IrisGridCellOverflowMouseHandler(this), new IrisGridRowTreeMouseHandler(this), new IrisGridTokenMouseHandler(this), new IrisGridColumnSelectMouseHandler(this), new IrisGridColumnTooltipMouseHandler(this), new IrisGridSortMouseHandler(this), new IrisGridFilterMouseHandler(this), new IrisGridContextMenuHandler(this, _dh), new IrisGridDataSelectMouseHandler(this), new PendingMouseHandler(this), new IrisGridPartitionedTableMouseHandler(this), ...mouseHandlersProp, ...(canCopy ? [new IrisGridCopyCellMouseHandler(this)] : [])];
     if (canCopy) {
       _keyHandlers.push(new CopyKeyHandler(this));
-      _mouseHandlers.push(new IrisGridCopyCellMouseHandler(this));
     }
     var _movedColumns = movedColumnsProp.length > 0 ? movedColumnsProp : _model.initialMovedColumns;
     var movedRows = movedRowsProp.length > 0 ? movedRowsProp : _model.initialMovedRows;
@@ -696,7 +703,7 @@ class IrisGrid extends Component {
       userColumnWidths: new Map(_userColumnWidths),
       userRowHeights: new Map(userRowHeights),
       movedColumns: _movedColumns,
-      initialColumnWidths: new Map(_model === null || _model === void 0 ? void 0 : (_model$layoutHints = _model.layoutHints) === null || _model$layoutHints === void 0 ? void 0 : (_model$layoutHints$hi = _model$layoutHints.hiddenColumns) === null || _model$layoutHints$hi === void 0 ? void 0 : _model$layoutHints$hi.map(name => [_model.getColumnIndexByName(name), 0]))
+      initialColumnWidths: new Map(_model === null || _model === void 0 || (_model$layoutHints = _model.layoutHints) === null || _model$layoutHints === void 0 || (_model$layoutHints = _model$layoutHints.hiddenColumns) === null || _model$layoutHints === void 0 ? void 0 : _model$layoutHints.map(name => [_model.getColumnIndexByName(name), 0]))
     });
     var searchColumns = _selectedSearchColumns !== null && _selectedSearchColumns !== void 0 ? _selectedSearchColumns : [];
     var _searchFilter = CrossColumnSearch.createSearchFilter(_dh, _searchValue, searchColumns, _model.columns, _invertSearchColumns);
@@ -893,23 +900,10 @@ class IrisGrid extends Component {
     }
     this.showViewportLoading.cancel();
   }
-
-  // When the loading scrim started/when it should extend to the end of the screen.
-
   get gridWrapper() {
     var _this$grid$canvasWrap, _this$grid;
     return (_this$grid$canvasWrap = (_this$grid = this.grid) === null || _this$grid === void 0 ? void 0 : _this$grid.canvasWrapper.current) !== null && _this$grid$canvasWrap !== void 0 ? _this$grid$canvasWrap : null;
   }
-
-  /**
-   * Builds formatColumns array based on the provided formatting rules with optional preview
-   * @param columns Array of columns
-   * @param rulesParam Array of formatting rules
-   * @param preview Optional temporary formatting rule for previewing live changes
-   * @param editIndex Index in the rulesParam array to replace with the preview, null if preview not applicable
-   * @returns Format columns array
-   */
-
   getKeyHandlers() {
     var {
       keyHandlers
@@ -962,15 +956,15 @@ class IrisGrid extends Component {
     var modelColumn = this.getModelColumn(columnIndex);
     var modelRow = this.getModelRow(rowIndex);
     if (rawValue && modelColumn != null && modelRow != null) {
-      var _value = model.valueForCell(modelColumn, modelRow);
+      var value = model.valueForCell(modelColumn, modelRow);
       if (TableUtils.isDateType(model.columns[modelColumn].type)) {
         // The returned value is just a long value, we should return the value formatted as a full date string
         var {
           formatter
         } = model;
-        return dh.i18n.DateTimeFormat.format(UNFORMATTED_DATE_PATTERN, _value, dh.i18n.TimeZone.getTimeZone(formatter.timeZone));
+        return dh.i18n.DateTimeFormat.format(UNFORMATTED_DATE_PATTERN, value, dh.i18n.TimeZone.getTimeZone(formatter.timeZone));
       }
-      return _value;
+      return value;
     }
     if (rawValue) {
       return null;
@@ -1213,11 +1207,11 @@ class IrisGrid extends Component {
       resetRanges: true
     });
     var clearRange = Array.isArray(modelRange) ? modelRange : [modelRange, modelRange];
-    this.setState(_ref10 => {
+    this.setState(_ref0 => {
       var {
         advancedFilters,
         quickFilters
-      } = _ref10;
+      } = _ref0;
       var newAdvancedFilters = advancedFilters ? new Map(advancedFilters) : new Map();
       var newQuickFilters = quickFilters ? new Map(quickFilters) : new Map();
       newAdvancedFilters.forEach((_, column) => {
@@ -1240,10 +1234,10 @@ class IrisGrid extends Component {
     this.startLoading('Clearing Filter...', {
       resetRanges: true
     });
-    this.setState(_ref11 => {
+    this.setState(_ref1 => {
       var {
         quickFilters
-      } = _ref11;
+      } = _ref1;
       var newQuickFilters = new Map(quickFilters);
       newQuickFilters.delete(modelColumn);
       return {
@@ -1344,11 +1338,11 @@ class IrisGrid extends Component {
       advancedFilters: newAdvancedFilters
     });
   }
-  setFilters(_ref12) {
+  setFilters(_ref10) {
     var {
       quickFilters,
       advancedFilters
-    } = _ref12;
+    } = _ref10;
     this.setState({
       quickFilters,
       advancedFilters
@@ -1505,14 +1499,14 @@ class IrisGrid extends Component {
       keyTable.addEventListener(dh.Table.EVENT_UPDATED, event => {
         try {
           var {
-            detail: _data
+            detail: data
           } = event;
-          if (_data.rows.length === 0) {
+          if (data.rows.length === 0) {
             // We received an update and the table is still empty. Stop showing the loading spinner so we know
             _this2.stopLoading();
             return;
           }
-          var row = _data.rows[0];
+          var row = data.rows[0];
           var values = keyTable.columns.map(column => row.get(column));
           var newPartition = {
             partitions: values,
@@ -1543,13 +1537,13 @@ class IrisGrid extends Component {
     } = this.props;
     assertNotNull(rowIndex);
     if (isPartitionedGridModel(model)) {
-      var _data2 = this.getRowDataMap(rowIndex);
+      var data = this.getRowDataMap(rowIndex);
       var partitionColumnSet = new Set(model.partitionColumns.map(column => column.name));
-      var values = Object.entries(_data2).filter(_ref13 => {
-        var [key, _] = _ref13;
+      var values = Object.entries(data).filter(_ref11 => {
+        var [key, _] = _ref11;
         return partitionColumnSet.has(key);
-      }).map(_ref14 => {
-        var [key, columnData] = _ref14;
+      }).map(_ref12 => {
+        var [key, columnData] = _ref12;
         return columnData.value;
       });
       var newPartition = {
@@ -1568,8 +1562,8 @@ class IrisGrid extends Component {
       canCopy
     } = this.props;
     if (canCopy) {
-      var _value2 = String(this.getValueForCell(columnIndex, rowIndex, rawValue));
-      copyToClipboard(_value2).catch(e => log.error('Unable to copy cell', e));
+      var value = String(this.getValueForCell(columnIndex, rowIndex, rawValue));
+      copyToClipboard(value).catch(e => log.error('Unable to copy cell', e));
     } else {
       log.error('Attempted to copyCell for user without copy permission.');
     }
@@ -1760,7 +1754,7 @@ class IrisGrid extends Component {
   }
   focus() {
     var _this$grid3;
-    (_this$grid3 = this.grid) === null || _this$grid3 === void 0 ? void 0 : _this$grid3.focus();
+    (_this$grid3 = this.grid) === null || _this$grid3 === void 0 || _this$grid3.focus();
   }
   focusFilterBar(column) {
     var {
@@ -1791,7 +1785,7 @@ class IrisGrid extends Component {
     } = metrics;
     if (column < left) {
       var _this$grid4;
-      (_this$grid4 = this.grid) === null || _this$grid4 === void 0 ? void 0 : _this$grid4.setViewState({
+      (_this$grid4 = this.grid) === null || _this$grid4 === void 0 || _this$grid4.setViewState({
         left: column
       }, true);
     } else if (rightVisible < column) {
@@ -1799,7 +1793,7 @@ class IrisGrid extends Component {
       var metricState = this.getMetricState();
       assertNotNull(metricState);
       var newLeft = metricCalculator.getLastLeft(metricState, column, metricCalculator.getVisibleWidth(metricState));
-      (_this$grid5 = this.grid) === null || _this$grid5 === void 0 ? void 0 : _this$grid5.setViewState({
+      (_this$grid5 = this.grid) === null || _this$grid5 === void 0 || _this$grid5.setViewState({
         left: Math.min(newLeft, lastLeft),
         leftOffset: 0
       }, true);
@@ -1817,7 +1811,7 @@ class IrisGrid extends Component {
       movedColumns
     } = this.state;
     metricCalculator.setColumnWidth(GridUtils.getModelIndex(columnVisibleIndex, movedColumns), 0);
-    (_this$grid6 = this.grid) === null || _this$grid6 === void 0 ? void 0 : _this$grid6.forceUpdate();
+    (_this$grid6 = this.grid) === null || _this$grid6 === void 0 || _this$grid6.forceUpdate();
   }
   freezeColumnByColumnName(columnName) {
     var {
@@ -1861,13 +1855,13 @@ class IrisGrid extends Component {
       movedColumns: newMovedColumns
     });
   }
-  toggleExpandColumn(modelIndex) {
+  toggleExpandColumn(modelIndex, expandDescendants) {
     log.debug2('Toggle expand column', modelIndex);
     var {
       model
     } = this.props;
     if (isExpandableColumnGridModel(model) && model.hasExpandableColumns) {
-      model.setColumnExpanded(modelIndex, !model.isColumnExpanded(modelIndex));
+      model.setColumnExpanded(modelIndex, !model.isColumnExpanded(modelIndex), expandDescendants);
     }
   }
   expandAllColumns() {
@@ -1910,7 +1904,7 @@ class IrisGrid extends Component {
         metricCalculator.setColumnWidth(modelIndex, 0);
       });
     }
-    (_this$grid7 = this.grid) === null || _this$grid7 === void 0 ? void 0 : _this$grid7.forceUpdate();
+    (_this$grid7 = this.grid) === null || _this$grid7 === void 0 || _this$grid7.forceUpdate();
   }
   handleColumnVisibilityReset() {
     var _model$layoutHints$fr, _model$layoutHints2;
@@ -1924,7 +1918,7 @@ class IrisGrid extends Component {
     this.handleMovedColumnsChanged(model.initialMovedColumns);
     this.handleHeaderGroupsChanged(model.initialColumnHeaderGroups);
     this.setState({
-      frozenColumns: (_model$layoutHints$fr = (_model$layoutHints2 = model.layoutHints) === null || _model$layoutHints2 === void 0 ? void 0 : _model$layoutHints2.frozenColumns) !== null && _model$layoutHints$fr !== void 0 ? _model$layoutHints$fr : []
+      frozenColumns: (_model$layoutHints$fr = (_model$layoutHints2 = model.layoutHints) === null || _model$layoutHints2 === void 0 ? void 0 : _model$layoutHints2.frozenColumns) !== null && _model$layoutHints$fr !== void 0 ? _model$layoutHints$fr : EMPTY_ARRAY
     });
   }
   handleCrossColumnSearch(searchValue, selectedSearchColumns, invertSearchColumns) {
@@ -1941,7 +1935,7 @@ class IrisGrid extends Component {
   }
   handleAnimationLoop() {
     var _this$grid8;
-    (_this$grid8 = this.grid) === null || _this$grid8 === void 0 ? void 0 : _this$grid8.updateCanvas();
+    (_this$grid8 = this.grid) === null || _this$grid8 === void 0 || _this$grid8.updateCanvas();
     if (this.isAnimating) {
       this.animationFrame = requestAnimationFrame(this.handleAnimationLoop);
     }
@@ -2007,7 +2001,7 @@ class IrisGrid extends Component {
         metricCalculator.resetColumnWidth(modelIndex);
       }
     }
-    (_this$grid9 = this.grid) === null || _this$grid9 === void 0 ? void 0 : _this$grid9.forceUpdate();
+    (_this$grid9 = this.grid) === null || _this$grid9 === void 0 || _this$grid9.forceUpdate();
   }
 
   /**
@@ -2015,9 +2009,9 @@ class IrisGrid extends Component {
    * to keep Grid and IrisGrid metrics in sync since metrics are stored in both places.
    */
   updateMetrics() {
-    var _this$grid10;
+    var _this$grid0;
     this.setState({
-      metrics: (_this$grid10 = this.grid) === null || _this$grid10 === void 0 ? void 0 : _this$grid10.updateMetrics()
+      metrics: (_this$grid0 = this.grid) === null || _this$grid0 === void 0 ? void 0 : _this$grid0.updateMetrics()
     });
   }
   toggleSort(columnIndex, addToExisting) {
@@ -2038,15 +2032,15 @@ class IrisGrid extends Component {
     }
   }
   updateSorts(sorts) {
-    var _this$grid11;
+    var _this$grid1;
     this.startLoading('Sorting...');
     this.setState({
       sorts
     });
-    (_this$grid11 = this.grid) === null || _this$grid11 === void 0 ? void 0 : _this$grid11.forceUpdate();
+    (_this$grid1 = this.grid) === null || _this$grid1 === void 0 || _this$grid1.forceUpdate();
   }
   sortColumn(modelColumn) {
-    var _this$grid12;
+    var _this$grid10;
     var direction = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : TableUtils.sortDirection.none;
     var isAbs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var addToExisting = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
@@ -2059,15 +2053,15 @@ class IrisGrid extends Component {
     this.setState({
       sorts
     });
-    (_this$grid12 = this.grid) === null || _this$grid12 === void 0 ? void 0 : _this$grid12.forceUpdate();
+    (_this$grid10 = this.grid) === null || _this$grid10 === void 0 || _this$grid10.forceUpdate();
   }
   reverse(reverse) {
-    var _this$grid13;
+    var _this$grid11;
     this.startLoading('Reversing...');
     this.setState({
       reverse
     });
-    (_this$grid13 = this.grid) === null || _this$grid13 === void 0 ? void 0 : _this$grid13.forceUpdate();
+    (_this$grid11 = this.grid) === null || _this$grid11 === void 0 || _this$grid11.forceUpdate();
   }
   isReversible() {
     var {
@@ -2090,16 +2084,16 @@ class IrisGrid extends Component {
       } else {
         var columnIndex = 0;
         var {
-          model: _model2
+          model
         } = this.props;
         var {
           columnCount
-        } = _model2;
+        } = model;
         for (var i = 0; i < columnCount; i += 1) {
           var modelColumn = this.getModelColumn(i);
           if (modelColumn != null) {
-            var _column = _model2.columns[modelColumn];
-            if (_column != null && TableUtils.isTextType(_column.type)) {
+            var column = model.columns[modelColumn];
+            if (column != null && TableUtils.isTextType(column.type)) {
               columnIndex = i;
               break;
             }
@@ -2108,8 +2102,8 @@ class IrisGrid extends Component {
         this.focusFilterBar(columnIndex);
       }
     } else {
-      var _this$grid14;
-      (_this$grid14 = this.grid) === null || _this$grid14 === void 0 ? void 0 : _this$grid14.focus();
+      var _this$grid12;
+      (_this$grid12 = this.grid) === null || _this$grid12 === void 0 || _this$grid12.focus();
     }
   }
   isTableSearchAvailable() {
@@ -2121,7 +2115,7 @@ class IrisGrid extends Component {
     var {
       dh
     } = model;
-    var searchDisplayMode = model === null || model === void 0 ? void 0 : (_model$layoutHints3 = model.layoutHints) === null || _model$layoutHints3 === void 0 ? void 0 : _model$layoutHints3.searchDisplayMode;
+    var searchDisplayMode = model === null || model === void 0 || (_model$layoutHints3 = model.layoutHints) === null || _model$layoutHints3 === void 0 ? void 0 : _model$layoutHints3.searchDisplayMode;
     if (searchDisplayMode === ((_dh$SearchDisplayMode = dh.SearchDisplayMode) === null || _dh$SearchDisplayMode === void 0 ? void 0 : _dh$SearchDisplayMode.SEARCH_DISPLAY_HIDE)) {
       return false;
     }
@@ -2144,15 +2138,15 @@ class IrisGrid extends Component {
       var _this$crossColumnRef;
       if (update && (_this$crossColumnRef = this.crossColumnRef) !== null && _this$crossColumnRef !== void 0 && _this$crossColumnRef.current) {
         var _this$crossColumnRef2;
-        (_this$crossColumnRef2 = this.crossColumnRef) === null || _this$crossColumnRef2 === void 0 ? void 0 : _this$crossColumnRef2.current.focus();
+        (_this$crossColumnRef2 = this.crossColumnRef) === null || _this$crossColumnRef2 === void 0 || _this$crossColumnRef2.current.focus();
       } else {
-        var _this$grid15;
-        (_this$grid15 = this.grid) === null || _this$grid15 === void 0 ? void 0 : _this$grid15.focus();
+        var _this$grid13;
+        (_this$grid13 = this.grid) === null || _this$grid13 === void 0 || _this$grid13.focus();
       }
     });
   }
   toggleGotoRow() {
-    var _this$grid16, _this$grid17;
+    var _this$grid14, _this$grid15;
     var row = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
     var columnName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
@@ -2171,11 +2165,11 @@ class IrisGrid extends Component {
         gotoValueManuallyChanged: false
       });
       this.focusRowInGrid(row);
-      (_this$gotoRowRef$curr = this.gotoRowRef.current) === null || _this$gotoRowRef$curr === void 0 ? void 0 : _this$gotoRowRef$curr.focus();
+      (_this$gotoRowRef$curr = this.gotoRowRef.current) === null || _this$gotoRowRef$curr === void 0 || _this$gotoRowRef$curr.focus();
       return;
     }
-    var cursorRow = (_this$grid16 = this.grid) === null || _this$grid16 === void 0 ? void 0 : _this$grid16.state.cursorRow;
-    var cursorColumn = (_this$grid17 = this.grid) === null || _this$grid17 === void 0 ? void 0 : _this$grid17.state.cursorColumn;
+    var cursorRow = (_this$grid14 = this.grid) === null || _this$grid14 === void 0 ? void 0 : _this$grid14.state.cursorRow;
+    var cursorColumn = (_this$grid15 = this.grid) === null || _this$grid15 === void 0 ? void 0 : _this$grid15.state.cursorColumn;
     if (cursorRow == null || cursorColumn == null) {
       // if a cell is not selected / grid is not rendered
       this.setState({
@@ -2211,7 +2205,7 @@ class IrisGrid extends Component {
   commitPending() {
     var _this3 = this;
     return _asyncToGenerator(function* () {
-      var _document, _document$activeEleme;
+      var _document;
       var {
         model
       } = _this3.props;
@@ -2224,7 +2218,7 @@ class IrisGrid extends Component {
       if (pendingSavePromise != null) {
         throw new Error('Save already in progress');
       }
-      var containsGridCellInputField = (_document = document) === null || _document === void 0 ? void 0 : (_document$activeEleme = _document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.classList.contains('grid-cell-input-field');
+      var containsGridCellInputField = (_document = document) === null || _document === void 0 || (_document = _document.activeElement) === null || _document === void 0 ? void 0 : _document.classList.contains('grid-cell-input-field');
       if (containsGridCellInputField != null && containsGridCellInputField) {
         var _this3$grid;
         if (document.activeElement != null && document.activeElement.classList.contains('error')) {
@@ -2232,7 +2226,7 @@ class IrisGrid extends Component {
         }
 
         // Focus the grid again to commit any pending input changes
-        (_this3$grid = _this3.grid) === null || _this3$grid === void 0 ? void 0 : _this3$grid.focus();
+        (_this3$grid = _this3.grid) === null || _this3$grid === void 0 || _this3$grid.focus();
       }
       var newPendingSavePromise = _this3.pending.add(model.commitPending()).then(() => {
         _this3.setState({
@@ -2342,7 +2336,7 @@ class IrisGrid extends Component {
     this.setAdvancedFilter(index, filter, options);
   }
   handleAdvancedFilterSortChange(column, direction) {
-    var _this$grid18;
+    var _this$grid16;
     var addToExisting = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var {
       model
@@ -2365,11 +2359,11 @@ class IrisGrid extends Component {
     this.setState({
       sorts
     });
-    (_this$grid18 = this.grid) === null || _this$grid18 === void 0 ? void 0 : _this$grid18.forceUpdate();
+    (_this$grid16 = this.grid) === null || _this$grid16 === void 0 || _this$grid16.forceUpdate();
   }
   handleAdvancedFilterDone() {
-    var _this$grid19;
-    (_this$grid19 = this.grid) === null || _this$grid19 === void 0 ? void 0 : _this$grid19.focus();
+    var _this$grid17;
+    (_this$grid17 = this.grid) === null || _this$grid17 === void 0 || _this$grid17.focus();
   }
   handleAdvancedMenuOpened(column) {
     this.setState({
@@ -2396,7 +2390,7 @@ class IrisGrid extends Component {
     } = this.state;
     if (isFilterBarShown && focusedFilterBarColumn === columnIndex && ((_this$filterInputRef = this.filterInputRef) === null || _this$filterInputRef === void 0 ? void 0 : _this$filterInputRef.current) !== null) {
       var _this$filterInputRef2;
-      (_this$filterInputRef2 = this.filterInputRef) === null || _this$filterInputRef2 === void 0 ? void 0 : _this$filterInputRef2.current.focus();
+      (_this$filterInputRef2 = this.filterInputRef) === null || _this$filterInputRef2 === void 0 || _this$filterInputRef2.current.focus();
       this.setState({
         shownAdvancedFilter: null
       });
@@ -2435,11 +2429,11 @@ class IrisGrid extends Component {
     this.startLoading('Filtering...', {
       resetRanges: true
     });
-    this.setState(_ref15 => {
+    this.setState(_ref13 => {
       var {
         focusedFilterBarColumn,
         quickFilters
-      } = _ref15;
+      } = _ref13;
       var newQuickFilters = new Map(quickFilters);
       if (focusedFilterBarColumn != null) {
         var modelIndex = this.getModelColumn(focusedFilterBarColumn);
@@ -2455,8 +2449,8 @@ class IrisGrid extends Component {
     var setGridFocus = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
     var defocusInput = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     if (setGridFocus) {
-      var _this$grid20;
-      (_this$grid20 = this.grid) === null || _this$grid20 === void 0 ? void 0 : _this$grid20.focus();
+      var _this$grid18;
+      (_this$grid18 = this.grid) === null || _this$grid18 === void 0 || _this$grid18.focus();
     }
     if (defocusInput) {
       this.setState({
@@ -2501,10 +2495,10 @@ class IrisGrid extends Component {
       model
     } = this.props;
     var column = model.columns[modelIndex];
-    this.setState(_ref16 => {
+    this.setState(_ref14 => {
       var {
         columnAlignmentMap = EMPTY_MAP
-      } = _ref16;
+      } = _ref14;
       var newColumnAlignmentMap = new Map(columnAlignmentMap);
       if (alignment != null) {
         newColumnAlignmentMap.set(column.name, alignment);
@@ -2529,10 +2523,10 @@ class IrisGrid extends Component {
     });
   }
   handleMenuBack() {
-    this.setState(_ref17 => {
+    this.setState(_ref15 => {
       var {
         openOptions
-      } = _ref17;
+      } = _ref15;
       var newOptions = [...openOptions];
       newOptions.pop();
       return {
@@ -2541,10 +2535,10 @@ class IrisGrid extends Component {
     });
   }
   handleMenuSelect(option) {
-    this.setState(_ref18 => {
+    this.setState(_ref16 => {
       var {
         openOptions
-      } = _ref18;
+      } = _ref16;
       return {
         openOptions: [...openOptions, option]
       };
@@ -2583,7 +2577,7 @@ class IrisGrid extends Component {
     }
   }
   handleUpdate() {
-    var _this$grid21;
+    var _this$grid19;
     log.debug2('Received model update');
     var {
       advancedFilters,
@@ -2612,7 +2606,7 @@ class IrisGrid extends Component {
     } else {
       this.lastLoadedConfig = null;
     }
-    (_this$grid21 = this.grid) === null || _this$grid21 === void 0 ? void 0 : _this$grid21.forceUpdate();
+    (_this$grid19 = this.grid) === null || _this$grid19 === void 0 || _this$grid19.forceUpdate();
     this.stopLoading();
   }
   handleTableChanged() {
@@ -2625,13 +2619,13 @@ class IrisGrid extends Component {
     });
   }
   handleViewChanged(metrics) {
-    var _this$grid$state, _this$grid22;
+    var _this$grid$state, _this$grid20;
     var {
       model
     } = this.props;
     var {
       selectionEndRow = 0
-    } = (_this$grid$state = (_this$grid22 = this.grid) === null || _this$grid22 === void 0 ? void 0 : _this$grid22.state) !== null && _this$grid$state !== void 0 ? _this$grid$state : {};
+    } = (_this$grid$state = (_this$grid20 = this.grid) === null || _this$grid20 === void 0 ? void 0 : _this$grid20.state) !== null && _this$grid$state !== void 0 ? _this$grid$state : {};
     var pendingRowCount = 0;
     if (isEditableGridModel(model) && model.isEditable) {
       assertNotNull(metrics);
@@ -2659,7 +2653,6 @@ class IrisGrid extends Component {
     });
   }
   handleSelectionChanged(selectedRanges) {
-    var _this$grid23;
     assertNotNull(selectedRanges);
     var {
       onSelectionChanged
@@ -2675,9 +2668,14 @@ class IrisGrid extends Component {
         copyOperation: null
       });
     }
-    if (((_this$grid23 = this.grid) === null || _this$grid23 === void 0 ? void 0 : _this$grid23.state.cursorRow) != null) {
+
+    // We get 2 identical ranges here,
+    // but consolidating in `Grid#moveSelection` causes
+    // deselection to break, so just consolidate here.
+    // This will only update the goto row input for row index
+    if (GridRange.rowCount(GridRange.consolidate(selectedRanges)) === 1 && selectedRanges[0].startRow != null) {
       this.setState({
-        gotoRow: "".concat(this.grid.state.cursorRow + 1)
+        gotoRow: "".concat(selectedRanges[0].startRow + 1)
       });
     }
     onSelectionChanged(selectedRanges);
@@ -2694,8 +2692,8 @@ class IrisGrid extends Component {
     this.setState({
       columnHeaderGroups: IrisGridUtils.parseColumnHeaderGroups(model, columnHeaderGroups).groups
     }, () => {
-      var _this$grid24;
-      return (_this$grid24 = this.grid) === null || _this$grid24 === void 0 ? void 0 : _this$grid24.forceUpdate();
+      var _this$grid21;
+      return (_this$grid21 = this.grid) === null || _this$grid21 === void 0 ? void 0 : _this$grid21.forceUpdate();
     });
   }
   handleTooltipRef(tooltip) {
@@ -2743,9 +2741,6 @@ class IrisGrid extends Component {
       conditionalFormatPreview: _objectSpread({}, conditionalFormats[index])
     });
   }
-
-  // Apply live changes
-
   handleConditionalFormatEditorSave(config) {
     log.debug('Save conditional format changes', config);
     this.setState(state => {
@@ -2850,7 +2845,7 @@ class IrisGrid extends Component {
     return this.discardPending();
   }
   handlePendingDataUpdated() {
-    var _this$grid25;
+    var _this$grid22;
     log.debug('pending data updated');
     var {
       model
@@ -2864,10 +2859,10 @@ class IrisGrid extends Component {
       pendingDataErrors,
       pendingSaveError: null
     });
-    (_this$grid25 = this.grid) === null || _this$grid25 === void 0 ? void 0 : _this$grid25.forceUpdate();
+    (_this$grid22 = this.grid) === null || _this$grid22 === void 0 || _this$grid22.forceUpdate();
   }
   handleResizeColumn(modelIndex) {
-    var _this$grid26;
+    var _this$grid23;
     var {
       metrics,
       metricCalculator
@@ -2881,21 +2876,21 @@ class IrisGrid extends Component {
     } else {
       metricCalculator.setColumnWidth(modelIndex, contentWidth);
     }
-    (_this$grid26 = this.grid) === null || _this$grid26 === void 0 ? void 0 : _this$grid26.forceUpdate();
+    (_this$grid23 = this.grid) === null || _this$grid23 === void 0 || _this$grid23.forceUpdate();
   }
   handleResizeAllColumns() {
-    var _this$grid27;
+    var _this$grid24;
     var {
       metrics,
       metricCalculator
     } = this.state;
     if (!metrics) throw new Error('Metrics not set');
     var allColumns = [...metrics.allColumnWidths.entries()];
-    var visibleColumns = allColumns.filter(_ref19 => {
-      var [_, width] = _ref19;
+    var visibleColumns = allColumns.filter(_ref17 => {
+      var [_, width] = _ref17;
       return width !== 0;
-    }).map(_ref20 => {
-      var [modelIndex] = _ref20;
+    }).map(_ref18 => {
+      var [modelIndex] = _ref18;
       return modelIndex;
     });
     var contentWidths = metrics.contentColumnWidths;
@@ -2917,7 +2912,7 @@ class IrisGrid extends Component {
         metricCalculator.setColumnWidth(_modelIndex, _contentWidth);
       }
     }
-    (_this$grid27 = this.grid) === null || _this$grid27 === void 0 ? void 0 : _this$grid27.forceUpdate();
+    (_this$grid24 = this.grid) === null || _this$grid24 === void 0 || _this$grid24.forceUpdate();
   }
 
   /**
@@ -2934,7 +2929,7 @@ class IrisGrid extends Component {
     var {
       rollupConfig
     } = this.state;
-    var isRollup = ((_rollupConfig$columns = rollupConfig === null || rollupConfig === void 0 ? void 0 : (_rollupConfig$columns2 = rollupConfig.columns) === null || _rollupConfig$columns2 === void 0 ? void 0 : _rollupConfig$columns2.length) !== null && _rollupConfig$columns !== void 0 ? _rollupConfig$columns : 0) > 0;
+    var isRollup = ((_rollupConfig$columns = rollupConfig === null || rollupConfig === void 0 || (_rollupConfig$columns2 = rollupConfig.columns) === null || _rollupConfig$columns2 === void 0 ? void 0 : _rollupConfig$columns2.length) !== null && _rollupConfig$columns !== void 0 ? _rollupConfig$columns : 0) > 0;
     // Do not start loading if this is rollup and added / removed aggregations are prohibited for rollups
     var changes = [...added, ...removed];
     var shouldStartLoading = !(isRollup && changes.length > 0 && changes.every(op => AggregationUtils.isRollupProhibited(op)));
@@ -2956,16 +2951,16 @@ class IrisGrid extends Component {
     var {
       rollupConfig
     } = this.state;
-    var isRollup = ((_rollupConfig$columns3 = rollupConfig === null || rollupConfig === void 0 ? void 0 : (_rollupConfig$columns4 = rollupConfig.columns) === null || _rollupConfig$columns4 === void 0 ? void 0 : _rollupConfig$columns4.length) !== null && _rollupConfig$columns3 !== void 0 ? _rollupConfig$columns3 : 0) > 0;
+    var isRollup = ((_rollupConfig$columns3 = rollupConfig === null || rollupConfig === void 0 || (_rollupConfig$columns4 = rollupConfig.columns) === null || _rollupConfig$columns4 === void 0 ? void 0 : _rollupConfig$columns4.length) !== null && _rollupConfig$columns3 !== void 0 ? _rollupConfig$columns3 : 0) > 0;
     // Do not start loading if this is rollup and the aggregation is prohibited for rollups
     var shouldStartLoading = !(isRollup && AggregationUtils.isRollupProhibited(aggregation.operation));
     if (shouldStartLoading) {
       this.startLoading("Aggregating ".concat(aggregation.operation, "..."));
     }
-    this.setState(_ref21 => {
+    this.setState(_ref19 => {
       var {
         aggregationSettings
-      } = _ref21;
+      } = _ref19;
       return {
         selectedAggregation: aggregation,
         aggregationSettings: _objectSpread(_objectSpread({}, aggregationSettings), {}, {
@@ -2998,18 +2993,18 @@ class IrisGrid extends Component {
     this.resetGridViewState();
     this.showAllColumns();
     this.clearAllFilters();
-    this.startLoading("Grouping by columns ".concat((_rollupConfig$columns5 = rollupConfig === null || rollupConfig === void 0 ? void 0 : (_rollupConfig$columns6 = rollupConfig.columns) === null || _rollupConfig$columns6 === void 0 ? void 0 : _rollupConfig$columns6.join(', ')) !== null && _rollupConfig$columns5 !== void 0 ? _rollupConfig$columns5 : '', "..."));
+    this.startLoading("Grouping by columns ".concat((_rollupConfig$columns5 = rollupConfig === null || rollupConfig === void 0 || (_rollupConfig$columns6 = rollupConfig.columns) === null || _rollupConfig$columns6 === void 0 ? void 0 : _rollupConfig$columns6.join(', ')) !== null && _rollupConfig$columns5 !== void 0 ? _rollupConfig$columns5 : '', "..."));
 
     // Have to clear select distinct since rollup uses the original columns, not the current ones.
     // IrisGridProxyModel has a check to prevent model update
     // when selectDistinctModel is cleared and the rollupConfig is set on the model.
     this.setState({
       rollupConfig,
-      movedColumns: [],
-      frozenColumns: [],
-      sorts: [],
+      movedColumns: EMPTY_ARRAY,
+      frozenColumns: EMPTY_ARRAY,
+      sorts: EMPTY_ARRAY,
       reverse: false,
-      selectDistinctColumns: []
+      selectDistinctColumns: EMPTY_ARRAY
     });
   }
   handleSelectDistinctChanged(columnNames) {
@@ -3065,10 +3060,10 @@ class IrisGrid extends Component {
    */
   removeEmptyAggregations() {
     log.debug('removeEmptyAggregations');
-    this.setState(_ref22 => {
+    this.setState(_ref20 => {
       var {
         aggregationSettings
-      } = _ref22;
+      } = _ref20;
       var {
         aggregations
       } = aggregationSettings;
@@ -3160,7 +3155,7 @@ class IrisGrid extends Component {
               rowIndex = yield model.seekRow(searchFromRow, selectedColumn, dh.ValueType.STRING, _this6.tableUtils.makeValue(selectedColumn.type, inputString, formatter.timeZone), undefined, undefined, isBackwards !== null && isBackwards !== void 0 ? isBackwards : false);
             }
         }
-        (_this6$grid2 = _this6.grid) === null || _this6$grid2 === void 0 ? void 0 : _this6$grid2.setFocusRow(rowIndex);
+        (_this6$grid2 = _this6.grid) === null || _this6$grid2 === void 0 || _this6$grid2.setFocusRow(rowIndex);
         _this6.setState({
           gotoValueError: ''
         });
@@ -3173,7 +3168,7 @@ class IrisGrid extends Component {
   }
   handleCancelDownloadTable() {
     var _this$tableSaver;
-    (_this$tableSaver = this.tableSaver) === null || _this$tableSaver === void 0 ? void 0 : _this$tableSaver.cancelDownload();
+    (_this$tableSaver = this.tableSaver) === null || _this$tableSaver === void 0 || _this$tableSaver.cancelDownload();
     this.setState({
       isTableDownloading: false
     });
@@ -3343,22 +3338,22 @@ class IrisGrid extends Component {
         gotoRowError: 'Invalid row index'
       });
     } else if (rowInt === 0) {
-      var _this$grid28;
+      var _this$grid25;
       this.setState({
         gotoRowError: '',
         gotoValueError: ''
       });
-      (_this$grid28 = this.grid) === null || _this$grid28 === void 0 ? void 0 : _this$grid28.setFocusRow(0);
+      (_this$grid25 = this.grid) === null || _this$grid25 === void 0 || _this$grid25.setFocusRow(0);
     } else if (rowInt < 0) {
-      var _this$grid29;
+      var _this$grid26;
       this.setState({
         gotoRowError: '',
         gotoValueError: ''
       });
-      (_this$grid29 = this.grid) === null || _this$grid29 === void 0 ? void 0 : _this$grid29.setFocusRow(rowInt + rowCount);
+      (_this$grid26 = this.grid) === null || _this$grid26 === void 0 || _this$grid26.setFocusRow(rowInt + rowCount);
     } else {
-      var _this$grid30;
-      (_this$grid30 = this.grid) === null || _this$grid30 === void 0 ? void 0 : _this$grid30.setFocusRow(rowInt - 1);
+      var _this$grid27;
+      (_this$grid27 = this.grid) === null || _this$grid27 === void 0 || _this$grid27.setFocusRow(rowInt - 1);
       this.setState({
         gotoRowError: '',
         gotoValueError: ''
@@ -3451,34 +3446,34 @@ class IrisGrid extends Component {
           column: column,
           onStatistics: () => {
             var _this$tooltip;
-            (_this$tooltip = this.tooltip) === null || _this$tooltip === void 0 ? void 0 : _this$tooltip.update();
+            (_this$tooltip = this.tooltip) === null || _this$tooltip === void 0 || _this$tooltip.update();
           }
         })
       }, column.name)
     });
   }
   handleGotoValueSelectedColumnNameChanged(columnName) {
-    var _this$grid31;
+    var _this$grid28;
     var {
       model
     } = this.props;
-    var cursorRow = (_this$grid31 = this.grid) === null || _this$grid31 === void 0 ? void 0 : _this$grid31.state.cursorRow;
+    var cursorRow = (_this$grid28 = this.grid) === null || _this$grid28 === void 0 ? void 0 : _this$grid28.state.cursorRow;
     var {
       gotoValueSelectedColumnName: prevColumnName,
       gotoValueManuallyChanged
     } = this.state;
     if (cursorRow != null) {
-      var _index = model.getColumnIndexByName(columnName);
-      var _column2 = IrisGridUtils.getColumnByName(model.columns, columnName);
+      var index = model.getColumnIndexByName(columnName);
+      var column = IrisGridUtils.getColumnByName(model.columns, columnName);
       var prevColumn = IrisGridUtils.getColumnByName(model.columns, prevColumnName);
-      if (_index == null || _column2 == null) {
+      if (index == null || column == null) {
         return;
       }
-      var _value3 = model.valueForCell(_index, cursorRow);
-      var text = IrisGridUtils.convertValueToText(_value3, _column2.type);
+      var value = model.valueForCell(index, cursorRow);
+      var text = IrisGridUtils.convertValueToText(value, column.type);
 
       // do NOT update value if user manually changed value AND column type remains the same
-      if (gotoValueManuallyChanged && _column2.type === (prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.type)) {
+      if (gotoValueManuallyChanged && column.type === (prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.type)) {
         this.setState({
           gotoValueSelectedColumnName: columnName,
           gotoValueError: ''
@@ -3514,8 +3509,7 @@ class IrisGrid extends Component {
     var _rollupConfig$columns7,
       _rollupConfig$columns8,
       _this7 = this,
-      _this$grid33,
-      _this$grid33$state$dr,
+      _this$grid30,
       _openOptions;
     var {
       children,
@@ -3621,7 +3615,7 @@ class IrisGrid extends Component {
       right = metrics ? metrics.right : 0;
     }
     var isVisible = metrics != null && metrics.width > 0 && metrics.height > 0;
-    var isRollup = ((_rollupConfig$columns7 = rollupConfig === null || rollupConfig === void 0 ? void 0 : (_rollupConfig$columns8 = rollupConfig.columns) === null || _rollupConfig$columns8 === void 0 ? void 0 : _rollupConfig$columns8.length) !== null && _rollupConfig$columns7 !== void 0 ? _rollupConfig$columns7 : 0) > 0;
+    var isRollup = ((_rollupConfig$columns7 = rollupConfig === null || rollupConfig === void 0 || (_rollupConfig$columns8 = rollupConfig.columns) === null || _rollupConfig$columns8 === void 0 ? void 0 : _rollupConfig$columns8.length) !== null && _rollupConfig$columns7 !== void 0 ? _rollupConfig$columns7 : 0) > 0;
     var focusField = null;
     var debounceMs = metrics ? Math.min(Math.max(IrisGrid.minDebounce, Math.round(metrics.rowCount / 200)), IrisGrid.maxDebounce) : IrisGrid.maxDebounce;
     if (isFilterBarShown && focusedFilterBarColumn != null && metrics != null) {
@@ -3635,7 +3629,7 @@ class IrisGrid extends Component {
       var columnX = allColumnXs.get(focusedFilterBarColumn);
       var columnWidth = allColumnWidths.get(focusedFilterBarColumn);
       if (columnX != null && columnWidth != null) {
-        var _theme$filterBarHeigh, _theme$filterBarHeigh2, _this$grid32;
+        var _theme$filterBarHeigh, _theme$filterBarHeigh2, _this$grid29;
         var x = gridX + columnX;
         var y = gridY - ((_theme$filterBarHeigh = theme.filterBarHeight) !== null && _theme$filterBarHeigh !== void 0 ? _theme$filterBarHeigh : 0);
         var fieldWidth = columnWidth + 1; // cover right border
@@ -3647,14 +3641,14 @@ class IrisGrid extends Component {
           // Don't cause overflow
           height: fieldHeight
         };
-        var _value4 = '';
+        var value = '';
         var isValid = true;
         var modelColumn = this.getModelColumn(focusedFilterBarColumn);
         assertNotNull(modelColumn);
         var quickFilter = quickFilters.get(modelColumn);
         var advancedFilter = advancedFilters.get(modelColumn);
         if (quickFilter != null) {
-          _value4 = quickFilter.text;
+          value = quickFilter.text;
           isValid = quickFilter.filter != null;
         }
         var isBarFiltered = quickFilters.size !== 0 || advancedFilters.size !== 0;
@@ -3663,7 +3657,7 @@ class IrisGrid extends Component {
           style: style,
           className: classNames({
             error: !isValid,
-            active: _value4 !== '' || advancedFilter != null,
+            active: value !== '' || advancedFilter != null,
             'iris-grid-has-filter': isBarFiltered
           }),
           isAdvancedFilterSet: advancedFilter != null,
@@ -3675,9 +3669,9 @@ class IrisGrid extends Component {
           onChange: this.handleFilterBarChange,
           onDone: this.handleFilterBarDone,
           onTab: this.handleFilterBarTab,
-          onContextMenu: (_this$grid32 = this.grid) === null || _this$grid32 === void 0 ? void 0 : _this$grid32.handleContextMenu,
+          onContextMenu: (_this$grid29 = this.grid) === null || _this$grid29 === void 0 ? void 0 : _this$grid29.handleContextMenu,
           debounceMs: debounceMs,
-          value: _value4
+          value: value
         }, focusedFilterBarColumn);
       }
     }
@@ -3716,7 +3710,7 @@ class IrisGrid extends Component {
       var _this$tooltip2;
       columnTooltip = this.getColumnTooltip(shownColumnTooltip, metrics, model);
       // #510 We may need to update the position of the tooltip if it's already opened and columns are resized
-      (_this$tooltip2 = this.tooltip) === null || _this$tooltip2 === void 0 ? void 0 : _this$tooltip2.update();
+      (_this$tooltip2 = this.tooltip) === null || _this$tooltip2 === void 0 || _this$tooltip2.update();
     }
     var filterBar = [];
     if (metrics && isFilterBarShown) {
@@ -3765,7 +3759,7 @@ class IrisGrid extends Component {
                 },
                 onContextMenu: event => {
                   var _this7$grid;
-                  (_this7$grid = _this7.grid) === null || _this7$grid === void 0 ? void 0 : _this7$grid.handleContextMenu(event);
+                  (_this7$grid = _this7.grid) === null || _this7$grid === void 0 || _this7$grid.handleContextMenu(event);
                 },
                 onMouseEnter: () => {
                   _this7.setState({
@@ -3828,18 +3822,18 @@ class IrisGrid extends Component {
           };
           var _modelColumn = _this7.getModelColumn(columnIndex);
           if (_modelColumn != null) {
-            var _column3 = model.columns[_modelColumn];
-            if (_column3 == null) {
+            var column = model.columns[_modelColumn];
+            if (column == null) {
               // Grid metrics is likely out of sync with model
               log.warn("Column does not exist at index ".concat(_modelColumn, " for column array of length ").concat(model.columns.length));
               // eslint-disable-next-line no-continue
-              return "continue";
+              return 1; // continue
             }
             var _advancedFilter2 = advancedFilters.get(_modelColumn);
             var {
               options: advancedFilterOptions
             } = _advancedFilter2 || {};
-            var sort = TableUtils.getSortForColumn(model.sort, _column3.name);
+            var sort = TableUtils.getSortForColumn(model.sort, column.name);
             var sortDirection = sort ? sort.direction : null;
             if (!isSortDirection(sortDirection)) {
               throw new Error("Invalid sort direction: ".concat(sortDirection));
@@ -3859,7 +3853,7 @@ class IrisGrid extends Component {
                 options: {
                   positionFixed: true
                 },
-                children: _this7.getCachedAdvancedFilterMenuActions(model, _column3, advancedFilterOptions, sortDirection, formatter)
+                children: _this7.getCachedAdvancedFilterMenuActions(model, column, advancedFilterOptions, sortDirection, formatter)
               })
             }, columnIndex);
             advancedFilterMenus.push(element);
@@ -3867,8 +3861,7 @@ class IrisGrid extends Component {
         }
       };
       for (var _i4 = 0; _i4 < _visibleColumns.length; _i4 += 1) {
-        var _ret = _loop3();
-        if (_ret === "continue") continue;
+        if (_loop3()) continue;
       }
     }
     var optionItems = this.getCachedOptionItems(onCreateChart !== undefined && model.isChartBuilderAvailable, model.isCustomColumnsAvailable, model.isFormatColumnsAvailable, model.isOrganizeColumnsAvailable, model.isRollupAvailable, model.isTotalsAvailable || isRollup, model.isSelectDistinctAvailable, model.isExportAvailable, this.toggleFilterBarAction, this.toggleSearchBarAction, this.toggleGotoRowAction, isFilterBarShown, showSearchBar, canDownloadCsv, this.isTableSearchAvailable(), isGotoShown, advancedSettings.size > 0);
@@ -4053,7 +4046,7 @@ class IrisGrid extends Component {
             movedColumns: movedColumns,
             customColumns: customColumns,
             hiddenColumns: hiddenColumns,
-            alwaysFetchColumns: this.getAlwaysFetchColumns(alwaysFetchColumns, model.columns, movedColumns, model.floatingLeftColumnCount, model.floatingRightColumnCount, (_this$grid33 = this.grid) === null || _this$grid33 === void 0 ? void 0 : (_this$grid33$state$dr = _this$grid33.state.draggingColumn) === null || _this$grid33$state$dr === void 0 ? void 0 : _this$grid33$state$dr.range),
+            alwaysFetchColumns: this.getAlwaysFetchColumns(alwaysFetchColumns, model.columns, movedColumns, model.floatingLeftColumnCount, model.floatingRightColumnCount, (_this$grid30 = this.grid) === null || _this$grid30 === void 0 || (_this$grid30 = _this$grid30.state.draggingColumn) === null || _this$grid30 === void 0 ? void 0 : _this$grid30.range),
             formatColumns: this.getCachedPreviewFormatColumns(model.dh, model.columns, conditionalFormats, conditionalFormatPreview,
             // Disable the preview format when we press Back on the format edit page
             ((_openOptions = openOptions[openOptions.length - 1]) === null || _openOptions === void 0 ? void 0 : _openOptions.type) === OptionType.CONDITIONAL_FORMATTING_EDIT ? conditionalFormatEditIndex !== null && conditionalFormatEditIndex !== void 0 ? conditionalFormatEditIndex : undefined : undefined),
@@ -4182,7 +4175,6 @@ _defineProperty(IrisGrid, "minDebounce", 150);
 _defineProperty(IrisGrid, "maxDebounce", 500);
 _defineProperty(IrisGrid, "loadingSpinnerDelay", 800);
 _defineProperty(IrisGrid, "defaultProps", {
-  children: null,
   advancedFilters: EMPTY_MAP,
   advancedSettings: EMPTY_MAP,
   alwaysFetchColumns: EMPTY_ARRAY,
@@ -4217,7 +4209,6 @@ _defineProperty(IrisGrid, "defaultProps", {
   isSelectingPartition: false,
   isStuckToBottom: false,
   isStuckToRight: false,
-  columnSelectionValidator: null,
   columnAllowedCursor: 'linker',
   columnNotAllowedCursor: 'linker-not-allowed',
   copyCursor: 'copy',
@@ -4225,7 +4216,6 @@ _defineProperty(IrisGrid, "defaultProps", {
   onlyFetchVisibleColumns: true,
   showSearchBar: false,
   searchValue: '',
-  selectedSearchColumns: null,
   invertSearchColumns: true,
   onContextMenu: () => EMPTY_ARRAY,
   pendingDataMap: EMPTY_MAP,
@@ -4239,18 +4229,11 @@ _defineProperty(IrisGrid, "defaultProps", {
     showEmptyStrings: true,
     showNullStrings: true,
     showExtraGroupColumn: true,
-    formatter: EMPTY_ARRAY,
-    decimalFormatOptions: PropTypes.shape({
-      defaultFormatString: PropTypes.string
-    }),
-    integerFormatOptions: PropTypes.shape({
-      defaultFormatString: PropTypes.string
-    })
+    formatter: EMPTY_ARRAY
   },
   canCopy: true,
   canDownloadCsv: true,
-  frozenColumns: null,
-  theme: null,
+  frozenColumns: EMPTY_ARRAY,
   // Do not set a default density prop since we need to know if it overrides the global density setting
   density: undefined,
   canToggleSearch: true,