@deephaven/iris-grid 0.13.3-beta.2 → 0.13.5

package/dist/IrisGrid.js

@@ -17,15 +17,14 @@ import deepEqual from 'deep-equal';
 import Log from '@deephaven/log';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { ContextActionUtils, ContextActions, DeephavenSpinner, Stack, Menu, Page, Popper, ThemeExport, Tooltip } from '@deephaven/components';
-import { Grid, GridRange, GridUtils, isEditableGridModel } from '@deephaven/grid';
+import { Grid, GridRange, GridUtils } from '@deephaven/grid';
 import { dhEye, dhFilterFilled, dhGraphLineUp, dhTriangleDownSquare, vsCloudDownload, vsEdit, vsFilter, vsMenu, vsRuby, vsSearch, vsSplitHorizontal, vsSymbolOperator, vsTools } from '@deephaven/icons';
-import dh from '@deephaven/jsapi-shim';
+import dh, { PropTypes as APIPropTypes } from '@deephaven/jsapi-shim';
 import { DateUtils, Formatter, FormatterUtils, TableUtils } from '@deephaven/jsapi-utils';
-import { assertNotNull, Pending, PromiseUtils, ValidationError } from '@deephaven/utils';
+import { Pending, PromiseUtils, ValidationError } from '@deephaven/utils';
 import throttle from 'lodash.throttle';
 import debounce from 'lodash.debounce';
 import clamp from 'lodash.clamp';
-import { getFormatColumns } from "./sidebar/conditional-formatting/ConditionalFormattingUtils.js";
 import PendingDataBottomBar from "./PendingDataBottomBar.js";
 import IrisGridCopyHandler from "./IrisGridCopyHandler.js";
 import FilterInputField from "./FilterInputField.js";
@@ -49,6 +48,7 @@ import AdvancedSettingsType from "./sidebar/AdvancedSettingsType.js";
 import AdvancedSettingsMenu from "./sidebar/AdvancedSettingsMenu.js";
 import SHORTCUTS from "./IrisGridShortcuts.js";
 import ConditionalFormattingMenu from "./sidebar/conditional-formatting/ConditionalFormattingMenu.js";
+import { getFormatColumns } from "./sidebar/conditional-formatting/ConditionalFormattingUtils.js";
 import ConditionalFormatEditor from "./sidebar/conditional-formatting/ConditionalFormatEditor.js";
 import IrisGridCellOverflowModal from "./IrisGridCellOverflowModal.js";
 var log = Log.module('IrisGrid');
@@ -89,56 +89,6 @@ export class IrisGrid extends Component {
   constructor(props) {
     super(props);
 
-    _defineProperty(this, "grid", void 0);
-
-    _defineProperty(this, "gridWrapper", void 0);
-
-    _defineProperty(this, "lastFocusedFilterBarColumn", void 0);
-
-    _defineProperty(this, "lastLoadedConfig", void 0);
-
-    _defineProperty(this, "tooltip", void 0);
-
-    _defineProperty(this, "pending", void 0);
-
-    _defineProperty(this, "globalColumnFormats", void 0);
-
-    _defineProperty(this, "dateTimeFormatterOptions", void 0);
-
-    _defineProperty(this, "decimalFormatOptions", void 0);
-
-    _defineProperty(this, "integerFormatOptions", void 0);
-
-    _defineProperty(this, "truncateNumbersWithPound", void 0);
-
-    _defineProperty(this, "loadingScrimStartTime", void 0);
-
-    _defineProperty(this, "loadingScrimFinishTime", void 0);
-
-    _defineProperty(this, "animationFrame", void 0);
-
-    _defineProperty(this, "loadingTimer", void 0);
-
-    _defineProperty(this, "renderer", void 0);
-
-    _defineProperty(this, "tableSaver", void 0);
-
-    _defineProperty(this, "crossColumnRef", void 0);
-
-    _defineProperty(this, "isAnimating", void 0);
-
-    _defineProperty(this, "filterInputRef", void 0);
-
-    _defineProperty(this, "toggleFilterBarAction", void 0);
-
-    _defineProperty(this, "toggleSearchBarAction", void 0);
-
-    _defineProperty(this, "discardAction", void 0);
-
-    _defineProperty(this, "commitAction", void 0);
-
-    _defineProperty(this, "contextActions", void 0);
-
     _defineProperty(this, "getAdvancedMenuOpenedHandler", memoize(column => this.handleAdvancedMenuOpened.bind(this, column), {
       max: 100
     }));
@@ -299,7 +249,7 @@ export class IrisGrid extends Component {
     _defineProperty(this, "getCachedPreviewFormatColumns", memoize((columns, rulesParam, preview, editIndex) => {
       log.debug('getCachedPreviewFormatColumns', rulesParam, preview, editIndex);
 
-      if (preview !== undefined && editIndex !== undefined) {
+      if (preview !== undefined && editIndex !== null) {
         var rules = [...rulesParam];
         rules[editIndex] = preview;
         return this.getCachedFormatColumns(columns, rules);
@@ -345,16 +295,14 @@ export class IrisGrid extends Component {
       max: 1
     }));
 
-    _defineProperty(this, "getCachedFilter", memoize((customFilters, quickFilters, advancedFilters, partitionFilters, searchFilter) => [...(customFilters ? [customFilters] : []), // null check
-    ...(partitionFilters ? [partitionFilters] : []), // null check
-    ...IrisGridUtils.getFiltersFromFilterMap(quickFilters), ...IrisGridUtils.getFiltersFromFilterMap(advancedFilters), ...(searchFilter ? [searchFilter] : []) // null check
+    _defineProperty(this, "getCachedFilter", memoize((customFilters, quickFilters, advancedFilters, partitionFilters, searchFilter) => [...customFilters, ...partitionFilters, ...IrisGridUtils.getFiltersFromFilterMap(quickFilters), ...IrisGridUtils.getFiltersFromFilterMap(advancedFilters), ...(searchFilter ? [searchFilter] : []) // null check
     ], {
       max: 1
     }));
 
-    _defineProperty(this, "getCachedTheme", memoize((theme, isEditable) => _objectSpread(_objectSpread(_objectSpread({}, IrisGridTheme), theme), {}, {
+    _defineProperty(this, "getCachedTheme", memoize((theme, isEditable) => _objectSpread(_objectSpread({}, IrisGridTheme), {}, {
       autoSelectRow: !isEditable
-    }), {
+    }, theme), {
       max: 1
     }));
 
@@ -373,32 +321,6 @@ export class IrisGrid extends Component {
       return [...columnSet];
     }));
 
-    _defineProperty(this, "updateSearchFilter", debounce((searchValue, selectedSearchColumns, columns, invertSearchColumns) => {
-      var searchFilter = CrossColumnSearch.createSearchFilter(searchValue, selectedSearchColumns, columns, invertSearchColumns);
-      this.setState({
-        searchFilter
-      });
-    }, SET_FILTER_DEBOUNCE));
-
-    _defineProperty(this, "handleConditionalFormatEditorUpdate", debounce(conditionalFormatPreview => {
-      this.setState({
-        conditionalFormatPreview
-      });
-    }, SET_CONDITIONAL_FORMAT_DEBOUNCE));
-
-    _defineProperty(this, "handleDownloadProgressUpdate", throttle((tableDownloadProgress, tableDownloadEstimatedTime) => {
-      var {
-        tableDownloadStatus
-      } = this.state;
-
-      if (tableDownloadStatus === TableCsvExporter.DOWNLOAD_STATUS.DOWNLOADING) {
-        this.setState({
-          tableDownloadProgress,
-          tableDownloadEstimatedTime
-        });
-      }
-    }, UPDATE_DOWNLOAD_THROTTLE));
-
     _defineProperty(this, "getOverflowButtonTooltip", memoize(overflowButtonTooltipProps => {
       if (overflowButtonTooltipProps == null) {
         return null;
@@ -460,6 +382,8 @@ export class IrisGrid extends Component {
     this.handleConditionalFormatEdit = this.handleConditionalFormatEdit.bind(this);
     this.handleConditionalFormatsChange = this.handleConditionalFormatsChange.bind(this);
     this.handleConditionalFormatEditorSave = this.handleConditionalFormatEditorSave.bind(this);
+    this.handleConditionalFormatEditorUpdate = debounce(this.handleConditionalFormatEditorUpdate.bind(this), SET_CONDITIONAL_FORMAT_DEBOUNCE);
+    this.handleConditionalFormatEditorCancel = this.handleConditionalFormatEditorCancel.bind(this);
     this.handleUpdateCustomColumns = this.handleUpdateCustomColumns.bind(this);
     this.handleCustomColumnsChanged = this.handleCustomColumnsChanged.bind(this);
     this.handleSelectDistinctChanged = this.handleSelectDistinctChanged.bind(this);
@@ -470,6 +394,7 @@ export class IrisGrid extends Component {
     this.handleDownloadTableStart = this.handleDownloadTableStart.bind(this);
     this.handleCancelDownloadTable = this.handleCancelDownloadTable.bind(this);
     this.handleDownloadCanceled = this.handleDownloadCanceled.bind(this);
+    this.handleDownloadProgressUpdate = throttle(this.handleDownloadProgressUpdate.bind(this), UPDATE_DOWNLOAD_THROTTLE);
     this.handleDownloadCompleted = this.handleDownloadCompleted.bind(this);
     this.handlePartitionAppend = this.handlePartitionAppend.bind(this);
     this.handlePartitionChange = this.handlePartitionChange.bind(this);
@@ -480,9 +405,12 @@ export class IrisGrid extends Component {
     this.handleRollupChange = this.handleRollupChange.bind(this);
     this.handleOverflowClose = this.handleOverflowClose.bind(this);
     this.getColumnBoundingRect = this.getColumnBoundingRect.bind(this);
+    this.updateSearchFilter = debounce(this.updateSearchFilter.bind(this), SET_FILTER_DEBOUNCE);
     this.grid = null;
     this.gridWrapper = null;
+    this.lastFocusedFilterBarColumn = null;
     this.lastLoadedConfig = null;
+    this.tooltip = null;
     this.pending = new Pending();
     this.globalColumnFormats = [];
     this.dateTimeFormatterOptions = {};
@@ -490,10 +418,14 @@ export class IrisGrid extends Component {
     this.integerFormatOptions = {};
     this.truncateNumbersWithPound = false; // When the loading scrim started/when it should extend to the end of the screen.
 
+    this.loadingScrimStartTime = null;
+    this.loadingScrimFinishTime = null;
+    this.loadingTimer = null;
     this.renderer = new IrisGridRenderer();
     this.tableSaver = null;
     this.crossColumnRef = /*#__PURE__*/React.createRef();
     this.isAnimating = false;
+    this.animationFrame = null;
     this.filterInputRef = /*#__PURE__*/React.createRef();
     this.toggleFilterBarAction = {
       action: () => this.toggleFilterBar(),
@@ -509,7 +441,7 @@ export class IrisGrid extends Component {
           model
         } = this.props;
 
-        if (isEditableGridModel(model) && model.isEditable && model.pendingDataMap.size > 0) {
+        if (model.isEditable && model.pendingDataMap.size > 0) {
           this.discardPending().catch(log.error);
         }
       },
@@ -521,7 +453,7 @@ export class IrisGrid extends Component {
           model
         } = this.props;
 
-        if (isEditableGridModel(model) && model.isEditable && model.pendingDataMap.size > 0 && model.pendingDataErrors.size === 0) {
+        if (model.isEditable && model.pendingDataMap.size > 0 && model.pendingDataErrors.size === 0) {
           this.commitPending().catch(log.error);
         }
       },
@@ -543,9 +475,9 @@ export class IrisGrid extends Component {
       userColumnWidths,
       userRowHeights,
       showSearchBar: _showSearchBar,
-      searchValue: _searchValue,
-      selectedSearchColumns: _selectedSearchColumns,
-      invertSearchColumns: _invertSearchColumns,
+      searchValue,
+      selectedSearchColumns,
+      invertSearchColumns,
       advancedFilters: _advancedFilters,
       quickFilters: _quickFilters,
       selectDistinctColumns,
@@ -569,16 +501,16 @@ export class IrisGrid extends Component {
       userRowHeights: new Map(userRowHeights),
       movedColumns: _movedColumns
     });
-    var searchColumns = _selectedSearchColumns !== null && _selectedSearchColumns !== void 0 ? _selectedSearchColumns : [];
+    var searchColumns = selectedSearchColumns !== null && selectedSearchColumns !== void 0 ? selectedSearchColumns : [];
 
-    var _searchFilter = CrossColumnSearch.createSearchFilter(_searchValue, searchColumns, _model.columns, _invertSearchColumns);
+    var _searchFilter = CrossColumnSearch.createSearchFilter(searchValue, searchColumns, _model.columns, invertSearchColumns);
 
     this.state = {
       isFilterBarShown: _isFilterBarShown,
       isSelectingPartition,
       focusedFilterBarColumn: null,
       metricCalculator,
-      metrics: undefined,
+      metrics: null,
       keyHandlers,
       mouseHandlers,
       partition,
@@ -587,10 +519,11 @@ export class IrisGrid extends Component {
       partitionFilters: [],
       // setAdvancedFilter and setQuickFilter mutate the arguments
       // so we want to always use map copies from the state instead of props
-      quickFilters: _quickFilters ? new Map(_quickFilters) : new Map(),
+      quickFilters: new Map(_quickFilters),
       advancedFilters: new Map(_advancedFilters),
       shownAdvancedFilter: null,
       hoverAdvancedFilter: null,
+      filter: [],
       sorts: [],
       reverseType: TableUtils.REVERSE_TYPE.NONE,
       customColumns: [],
@@ -611,7 +544,7 @@ export class IrisGrid extends Component {
       customColumnFormatMap: new Map(customColumnFormatMap),
       conditionalFormats,
       conditionalFormatEditIndex: null,
-      conditionalFormatPreview: null,
+      conditionalFormatPreview: undefined,
       // Column user is hovering over for selection
       hoverSelectColumn: null,
       isTableDownloading: false,
@@ -621,16 +554,16 @@ export class IrisGrid extends Component {
       tableDownloadEstimatedTime: 0,
       showSearchBar: _showSearchBar,
       searchFilter: _searchFilter,
-      searchValue: _searchValue,
+      searchValue,
       selectedSearchColumns: searchColumns,
-      invertSearchColumns: _invertSearchColumns,
+      invertSearchColumns,
       rollupConfig: _rollupConfig,
       rollupSelectedColumns: [],
       aggregationSettings: _aggregationSettings,
       selectedAggregation: null,
       openOptions: [],
       pendingRowCount: 0,
-      pendingDataMap: pendingDataMap !== null && pendingDataMap !== void 0 ? pendingDataMap : new Map(),
+      pendingDataMap,
       pendingDataErrors: new Map(),
       pendingSavePromise: null,
       pendingSaveError: null,
@@ -721,8 +654,8 @@ export class IrisGrid extends Component {
         var loadingScrimProgress = Math.min(currentTime / totalTime, 1);
 
         if (loadingScrimFinishTime < now) {
-          this.loadingScrimStartTime = undefined;
-          this.loadingScrimFinishTime = undefined;
+          this.loadingScrimStartTime = null;
+          this.loadingScrimFinishTime = null;
         }
 
         this.setState(state => {
@@ -754,10 +687,7 @@ export class IrisGrid extends Component {
     }
 
     this.handleDownloadProgressUpdate.cancel();
-
-    if (this.animationFrame) {
-      cancelAnimationFrame(this.animationFrame);
-    }
+    cancelAnimationFrame(this.animationFrame);
   }
 
   getValueForCell(columnIndex, rowIndex) {
@@ -768,61 +698,49 @@ export class IrisGrid extends Component {
     var modelColumn = this.getModelColumn(columnIndex);
     var modelRow = this.getModelRow(rowIndex);
 
-    if (rawValue && modelColumn != null && modelRow != null) {
-      return model.valueForCell(modelColumn, modelRow);
-    }
-
     if (rawValue) {
-      return null;
-    }
-
-    if (modelColumn != null && modelRow != null) {
-      return model.textForCell(modelColumn, modelRow);
+      return model.valueForCell(modelColumn, modelRow);
     }
 
-    return '';
+    return model.textForCell(modelColumn, modelRow);
   }
 
   getModelColumn(columnIndex) {
     var {
       metrics
     } = this.state;
-    assertNotNull(metrics);
     var {
       modelColumns
     } = metrics;
 
-    if (modelColumns == null) {
+    if (!modelColumns) {
       return null;
     }
 
-    return columnIndex != null ? modelColumns.get(columnIndex) : null;
+    return modelColumns.get(columnIndex);
   }
 
   getModelRow(rowIndex) {
     var {
       metrics
     } = this.state;
-    assertNotNull(metrics);
     var {
       modelRows
     } = metrics;
 
-    if (modelRows == null) {
+    if (!modelRows) {
       return null;
     }
 
-    return rowIndex != null ? modelRows.get(rowIndex) : null;
+    return modelRows.get(rowIndex);
   }
 
   getTheme() {
-    var _ref5;
-
     var {
       model,
       theme
     } = this.props;
-    return this.getCachedTheme(theme, (_ref5 = isEditableGridModel(model) && model.isEditable) !== null && _ref5 !== void 0 ? _ref5 : false);
+    return this.getCachedTheme(theme, model.isEditable);
   }
 
   getVisibleColumn(modelIndex) {
@@ -834,8 +752,8 @@ export class IrisGrid extends Component {
   /**
    * Applies the provided input filters as quick filters,
    * and clears any existing quickFilters or advancedFilters on that column
-   * @param inputFilters Array of input filters to apply
-   * @param replaceExisting If true, new filters will replace the existing ones, instead of merging
+   * @param {inputFilter[]} inputFilters Array of input filters to apply
+   * @param {boolean} replaceExisting If true, new filters will replace the existing ones, instead of merging
    */
 
 
@@ -851,17 +769,17 @@ export class IrisGrid extends Component {
     var newAdvancedFilters = replaceExisting ? new Map() : new Map(advancedFilters);
     var newQuickFilters = replaceExisting ? new Map() : new Map(quickFilters);
     var isChanged = replaceExisting && advancedFilters.size > 0;
-    inputFilters.forEach(_ref6 => {
+    inputFilters.forEach(_ref5 => {
       var {
         name,
         type,
         value
-      } = _ref6;
-      var modelIndex = model.columns.findIndex(_ref7 => {
+      } = _ref5;
+      var modelIndex = model.columns.findIndex(_ref6 => {
         var {
           name: columnName,
           type: columnType
-        } = _ref7;
+        } = _ref6;
         return columnName === name && columnType === type;
       });
 
@@ -882,10 +800,10 @@ export class IrisGrid extends Component {
   }
   /**
    * Applies a quick filter
-   * @param modelIndex The index in the model of the column to set
-   * @param value The string value to set to the quick filter
-   * @param quickFilters The quick filters map
-   * @returns True if the filters have changed because this quick filter was applied
+   * @param {number} modelIndex The index in the model of the column to set
+   * @param {string} value The string value to set to the quick filter
+   * @param {Map} quickFilters The quick filters map
+   * @returns {boolean} True if the filters have changed because this quick filter was applied
    */
 
 
@@ -912,15 +830,10 @@ export class IrisGrid extends Component {
         }
       }
 
-      var filter = IrisGrid.makeQuickFilter(column, value, formatter.timeZone);
-
-      if (filter) {
-        quickFilters.set(modelIndex, {
-          text: value,
-          filter
-        });
-      }
-
+      quickFilters.set(modelIndex, {
+        text: value,
+        filter: IrisGrid.makeQuickFilter(column, value, formatter.timeZone)
+      });
       return true;
     }
 
@@ -928,12 +841,17 @@ export class IrisGrid extends Component {
   }
 
   setAdvancedFilter(modelIndex, filter, options) {
+    if (modelIndex == null) {
+      log.error('Invalid model index to filter on');
+      return;
+    }
+
     log.debug('Setting advanced filter', modelIndex, filter);
     this.startLoading('Filtering...', true);
-    this.setState(_ref8 => {
+    this.setState(_ref7 => {
       var {
         advancedFilters
-      } = _ref8;
+      } = _ref7;
       var newAdvancedFilters = new Map(advancedFilters);
 
       if (filter == null) {
@@ -952,19 +870,19 @@ export class IrisGrid extends Component {
   }
   /**
    * Sets a quick filter against the provided column
-   * @param modelIndex The index in the model for the column this filter is applied to
-   * @param filter A filter to apply to the column, or null if there was an error
-   * @param text The original text the filter was created with
+   * @param {Number} modelIndex The index in the model for the column this filter is applied to
+   * @param {dh.FilterCondition} filter A filter to apply to the column, or null if there was an error
+   * @param {String} text The original text the filter was created with
    */
 
 
   setQuickFilter(modelIndex, filter, text) {
     log.debug('Setting quick filter', modelIndex, filter, text);
     this.startLoading('Filtering...', true);
-    this.setState(_ref9 => {
+    this.setState(_ref8 => {
       var {
         quickFilters
-      } = _ref9;
+      } = _ref8;
       var newQuickFilters = new Map(quickFilters);
       newQuickFilters.set(modelIndex, {
         filter,
@@ -977,7 +895,7 @@ export class IrisGrid extends Component {
   }
   /**
    * Set grid filters based on the filter map
-   * @param filterMap Filter map
+   * @param {Map<string, Object>} filterMap Filter map
    */
 
 
@@ -997,12 +915,12 @@ export class IrisGrid extends Component {
     var {
       model
     } = this.props;
-    filterMap.forEach((_ref10, columnName) => {
+    filterMap.forEach((_ref9, columnName) => {
       var {
         columnType,
         text,
         value
-      } = _ref10;
+      } = _ref9;
       var column = model.columns.find(c => c.name === columnName && c.type === columnType);
 
       if (column == null) {
@@ -1010,7 +928,6 @@ export class IrisGrid extends Component {
       }
 
       var columnIndex = model.getColumnIndexByName(column.name);
-      assertNotNull(columnIndex);
 
       if (value === null) {
         this.setQuickFilter(columnIndex, column.filter().isNull(), '=null');
@@ -1023,13 +940,13 @@ export class IrisGrid extends Component {
 
   removeColumnFilter(modelColumn) {
     this.startLoading('Filtering...', true);
-    this.setState(_ref11 => {
+    this.setState(_ref10 => {
       var {
         advancedFilters,
         quickFilters
-      } = _ref11;
-      var newAdvancedFilters = advancedFilters ? new Map(advancedFilters) : new Map();
-      var newQuickFilters = quickFilters ? new Map(quickFilters) : new Map();
+      } = _ref10;
+      var newAdvancedFilters = new Map(advancedFilters);
+      var newQuickFilters = new Map(quickFilters);
       newQuickFilters.delete(modelColumn);
       newAdvancedFilters.delete(modelColumn);
       return {
@@ -1058,7 +975,7 @@ export class IrisGrid extends Component {
       quickFilters: new Map(),
       advancedFilters: new Map(),
       searchValue: '',
-      searchFilter: undefined
+      searchFilter: null
     });
   }
 
@@ -1066,7 +983,7 @@ export class IrisGrid extends Component {
     log.debug('Clearing cross-column search');
     this.setState({
       searchValue: '',
-      searchFilter: undefined
+      searchFilter: null
     });
   }
 
@@ -1123,11 +1040,11 @@ export class IrisGrid extends Component {
     });
   }
 
-  setFilters(_ref12) {
+  setFilters(_ref11) {
     var {
       quickFilters,
       advancedFilters
-    } = _ref12;
+    } = _ref11;
     this.setState({
       quickFilters,
       advancedFilters
@@ -1135,17 +1052,17 @@ export class IrisGrid extends Component {
   }
 
   updateFormatterSettings(settings) {
-    var _settings$defaultDeci, _settings$defaultInte, _settings$truncateNum;
-
     var forceUpdate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     var globalColumnFormats = FormatterUtils.getColumnFormats(settings);
     var dateTimeFormatterOptions = FormatterUtils.getDateTimeFormatterOptions(settings);
-    var defaultDecimalFormatOptions = (_settings$defaultDeci = settings === null || settings === void 0 ? void 0 : settings.defaultDecimalFormatOptions) !== null && _settings$defaultDeci !== void 0 ? _settings$defaultDeci : {};
-    var defaultIntegerFormatOptions = (_settings$defaultInte = settings === null || settings === void 0 ? void 0 : settings.defaultIntegerFormatOptions) !== null && _settings$defaultInte !== void 0 ? _settings$defaultInte : {};
-    var truncateNumbersWithPound = (_settings$truncateNum = settings === null || settings === void 0 ? void 0 : settings.truncateNumbersWithPound) !== null && _settings$truncateNum !== void 0 ? _settings$truncateNum : false;
+    var {
+      defaultDecimalFormatOptions = {},
+      defaultIntegerFormatOptions = {},
+      truncateNumbersWithPound = false
+    } = settings;
     var isColumnFormatChanged = !deepEqual(this.globalColumnFormats, globalColumnFormats);
     var isDateFormattingChanged = !deepEqual(this.dateTimeFormatterOptions, dateTimeFormatterOptions);
-    var isDecimalFormattingChanged = !deepEqual(this.decimalFormatOptions, settings === null || settings === void 0 ? void 0 : settings.defaultDecimalFormatOptions);
+    var isDecimalFormattingChanged = !deepEqual(this.decimalFormatOptions, defaultDecimalFormatOptions);
     var isIntegerFormattingChanged = !deepEqual(this.integerFormatOptions, defaultIntegerFormatOptions);
     var isTruncateNumbersChanged = this.truncateNumbersWithPound !== truncateNumbersWithPound;
 
@@ -1164,8 +1081,6 @@ export class IrisGrid extends Component {
   }
 
   updateFormatter(updatedFormats) {
-    var _this$globalColumnFor;
-
     var forceUpdate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     var {
       customColumnFormatMap
@@ -1175,7 +1090,7 @@ export class IrisGrid extends Component {
       customColumnFormatMap
     }, updatedFormats);
 
-    var mergedColumnFormats = [...((_this$globalColumnFor = this.globalColumnFormats) !== null && _this$globalColumnFor !== void 0 ? _this$globalColumnFor : []), ...update.customColumnFormatMap.values()];
+    var mergedColumnFormats = [...this.globalColumnFormats, ...update.customColumnFormatMap.values()];
     var formatter = new Formatter(mergedColumnFormats, this.dateTimeFormatterOptions, this.decimalFormatOptions, this.integerFormatOptions, this.truncateNumbersWithPound);
     log.debug('updateFormatter', this.globalColumnFormats, mergedColumnFormats);
     this.setState(_objectSpread(_objectSpread({}, update), {}, {
@@ -1240,20 +1155,17 @@ export class IrisGrid extends Component {
 
       try {
         var partitionTable = yield _this.pending.add(model.valuesTable(partitionColumn), resolved => resolved.close());
-        var _column = partitionTable.columns[0];
-
-        var sort = _column.sort().desc();
-
+        var column = partitionTable.columns[0];
+        var sort = column.sort().desc();
         partitionTable.applySort([sort]);
-        partitionTable.setViewport(0, 0, [_column]);
+        partitionTable.setViewport(0, 0, [column]);
         var data = yield _this.pending.add(partitionTable.getViewportData());
 
         if (data.rows.length > 0) {
           var row = data.rows[0];
+          var value = row.get(column);
 
-          var _value = row.get(_column);
-
-          _this.updatePartition(_value, partitionColumn);
+          _this.updatePartition(value, partitionColumn);
 
           _this.setState({
             isSelectingPartition: true
@@ -1296,26 +1208,25 @@ export class IrisGrid extends Component {
     } = this.props;
 
     if (canCopy) {
-      var _value2 = String(this.getValueForCell(columnIndex, rowIndex, rawValue));
-
-      ContextActionUtils.copyToClipboard(_value2).catch(e => log.error('Unable to copy cell', e));
+      var value = this.getValueForCell(columnIndex, rowIndex, rawValue);
+      ContextActionUtils.copyToClipboard(value).catch(e => log.error('Unable to copy cell', e));
     } else {
       log.error('Attempted to copyCell for user without copy permission.');
     }
   }
   /**
    * Copy the provided ranges to the clipboard
-   * @paramranges The ranges to copy
-   * @param includeHeaders Include the headers or not
-   * @param formatValues Whether to format values or not
-   * @param error Error message if one occurred
+   * @param {GridRange[]} ranges The ranges to copy
+   * @param {boolean} includeHeaders Include the headers or not
+   * @param {boolean} formatValues Whether to format values or not
+   * @param {string|null} error Error message if one occurred
    */
 
 
   copyRanges(ranges) {
     var includeHeaders = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var formatValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-    var error = arguments.length > 3 ? arguments[3] : undefined;
+    var error = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
     var {
       model,
       canCopy
@@ -1324,7 +1235,9 @@ export class IrisGrid extends Component {
       metricCalculator,
       movedColumns
     } = this.state;
-    var userColumnWidths = metricCalculator.getUserColumnWidths();
+    var {
+      userColumnWidths
+    } = metricCalculator;
 
     if (canCopy) {
       var copyOperation = {
@@ -1364,8 +1277,6 @@ export class IrisGrid extends Component {
         minScrimTransitionTime,
         maxScrimTransitionTime
       } = theme;
-      assertNotNull(minScrimTransitionTime);
-      assertNotNull(maxScrimTransitionTime);
       var height = (_this$gridWrapper$get = (_this$gridWrapper = this.gridWrapper) === null || _this$gridWrapper === void 0 ? void 0 : _this$gridWrapper.getBoundingClientRect().height) !== null && _this$gridWrapper$get !== void 0 ? _this$gridWrapper$get : 0;
       var scrimTransitionTime = Math.max(minScrimTransitionTime, Math.min(height / 2, maxScrimTransitionTime));
       this.loadingScrimStartTime = Date.now();
@@ -1382,17 +1293,17 @@ export class IrisGrid extends Component {
   }
 
   stopLoading() {
-    this.loadingScrimStartTime = undefined;
-    this.loadingScrimFinishTime = undefined;
+    this.loadingScrimStartTime = null;
+    this.loadingScrimFinishTime = null;
     this.setState({
       loadingText: null,
       loadingScrimProgress: null,
       loadingSpinnerShown: false
     });
 
-    if (this.loadingTimer != null) {
+    if (this.loadingTimer) {
       clearTimeout(this.loadingTimer);
-      this.loadingTimer = undefined;
+      this.loadingTimer = null;
     }
   }
   /**
@@ -1434,7 +1345,7 @@ export class IrisGrid extends Component {
         customColumns: [],
         quickFilters: new Map(),
         reverseType: TableUtils.REVERSE_TYPE.NONE,
-        rollupConfig: undefined,
+        rollupConfig: null,
         selectDistinctColumns: [],
         sorts: []
       });
@@ -1465,9 +1376,7 @@ export class IrisGrid extends Component {
   }
 
   focus() {
-    var _this$grid;
-
-    (_this$grid = this.grid) === null || _this$grid === void 0 ? void 0 : _this$grid.focus();
+    if (this.grid) this.grid.focus();
   }
 
   focusFilterBar(column) {
@@ -1479,7 +1388,7 @@ export class IrisGrid extends Component {
     } = model;
     var modelColumn = this.getModelColumn(column);
 
-    if (column == null || modelColumn == null || column < 0 || columnCount <= column || !model.isFilterable(modelColumn)) {
+    if (column == null || column < 0 || columnCount <= column || !model.isFilterable(modelColumn)) {
       this.setState({
         focusedFilterBarColumn: null
       });
@@ -1490,7 +1399,6 @@ export class IrisGrid extends Component {
       metricCalculator,
       metrics
     } = this.state;
-    assertNotNull(metrics);
     var {
       gridX,
       left,
@@ -1499,18 +1407,13 @@ export class IrisGrid extends Component {
     } = metrics;
 
     if (column < left) {
-      var _this$grid2;
-
-      (_this$grid2 = this.grid) === null || _this$grid2 === void 0 ? void 0 : _this$grid2.setViewState({
+      this.grid.setViewState({
         left: column
       }, true);
     } else if (rightVisible < column) {
-      var _this$grid3, _this$grid4;
-
-      var metricState = (_this$grid3 = this.grid) === null || _this$grid3 === void 0 ? void 0 : _this$grid3.getMetricState();
-      assertNotNull(metricState);
+      var metricState = this.grid.getMetricState();
       var newLeft = metricCalculator.getLastLeft(metricState, column, gridX);
-      (_this$grid4 = this.grid) === null || _this$grid4 === void 0 ? void 0 : _this$grid4.setViewState({
+      this.grid.setViewState({
         left: Math.min(newLeft, lastLeft)
       }, true);
     }
@@ -1523,14 +1426,12 @@ export class IrisGrid extends Component {
   }
 
   hideColumnByVisibleIndex(columnVisibleIndex) {
-    var _this$grid5;
-
     var {
       metricCalculator,
       movedColumns
     } = this.state;
     metricCalculator.setColumnWidth(GridUtils.getModelIndex(columnVisibleIndex, movedColumns), 0);
-    (_this$grid5 = this.grid) === null || _this$grid5 === void 0 ? void 0 : _this$grid5.forceUpdate();
+    this.grid.forceUpdate();
   }
 
   freezeColumnByColumnName(columnName) {
@@ -1545,7 +1446,6 @@ export class IrisGrid extends Component {
     var allFrozenColumns = frozenColumns == null ? new Set(model.frozenColumns) : new Set(frozenColumns);
     allFrozenColumns.add(columnName);
     var modelIndex = model.getColumnIndexByName(columnName);
-    assertNotNull(modelIndex);
     var visibleIndex = GridUtils.getVisibleIndex(modelIndex, movedColumns);
     var newMovedColumns = GridUtils.moveItem(visibleIndex, allFrozenColumns.size - 1, movedColumns);
     this.setState({
@@ -1566,7 +1466,6 @@ export class IrisGrid extends Component {
     var allFrozenColumns = frozenColumns == null ? new Set(model.frozenColumns) : new Set(frozenColumns);
     allFrozenColumns.delete(columnName);
     var modelIndex = model.getColumnIndexByName(columnName);
-    assertNotNull(modelIndex);
     var visibleIndex = GridUtils.getVisibleIndex(modelIndex, movedColumns); // Move to after remaining frozen columns and front columns
 
     var newMovedColumns = GridUtils.moveItem(visibleIndex, allFrozenColumns.size + model.frontColumns.length, movedColumns);
@@ -1577,8 +1476,6 @@ export class IrisGrid extends Component {
   }
 
   handleColumnVisibilityChanged(modelIndexes, visibilityOption) {
-    var _this$grid6;
-
     var {
       metricCalculator
     } = this.state;
@@ -1593,7 +1490,7 @@ export class IrisGrid extends Component {
       });
     }
 
-    (_this$grid6 = this.grid) === null || _this$grid6 === void 0 ? void 0 : _this$grid6.forceUpdate();
+    this.grid.forceUpdate();
   }
 
   handleCrossColumnSearch(searchValue, selectedSearchColumns, invertSearchColumns) {
@@ -1608,11 +1505,16 @@ export class IrisGrid extends Component {
     });
   }
 
-  handleAnimationLoop() {
-    var _this$grid7, _this$grid8;
+  updateSearchFilter(searchValue, selectedSearchColumns, columns, invertSearchColumns) {
+    var searchFilter = CrossColumnSearch.createSearchFilter(searchValue, selectedSearchColumns, columns, invertSearchColumns);
+    this.setState({
+      searchFilter
+    });
+  }
 
-    (_this$grid7 = this.grid) === null || _this$grid7 === void 0 ? void 0 : _this$grid7.updateCanvasScale();
-    (_this$grid8 = this.grid) === null || _this$grid8 === void 0 ? void 0 : _this$grid8.updateCanvas();
+  handleAnimationLoop() {
+    this.grid.updateCanvasScale();
+    this.grid.updateCanvas();
 
     if (this.isAnimating) {
       this.animationFrame = requestAnimationFrame(this.handleAnimationLoop);
@@ -1673,12 +1575,12 @@ export class IrisGrid extends Component {
   }
 
   showAllColumns() {
-    var _this$grid9;
-
     var {
       metricCalculator
     } = this.state;
-    var userColumnWidths = metricCalculator.getUserColumnWidths();
+    var {
+      userColumnWidths
+    } = metricCalculator;
     var entries = [...userColumnWidths.entries()];
 
     for (var i = 0; i < entries.length; i += 1) {
@@ -1689,7 +1591,7 @@ export class IrisGrid extends Component {
       }
     }
 
-    (_this$grid9 = this.grid) === null || _this$grid9 === void 0 ? void 0 : _this$grid9.forceUpdate();
+    this.grid.forceUpdate();
   }
 
   toggleSort(columnIndex, addToExisting) {
@@ -1701,47 +1603,38 @@ export class IrisGrid extends Component {
       sorts: currentSorts
     } = this.state;
     var modelColumn = this.getModelColumn(columnIndex);
-    assertNotNull(modelColumn);
-    var sorts = TableUtils.toggleSortForColumn(currentSorts, model.columns, modelColumn, addToExisting);
+    var sorts = TableUtils.toggleSortForColumn(currentSorts, model.table, modelColumn, addToExisting);
     this.updateSorts(sorts);
   }
 
   updateSorts(sorts) {
-    var _this$grid10;
-
     this.startLoading('Sorting...');
     this.setState({
       sorts
     });
-    (_this$grid10 = this.grid) === null || _this$grid10 === void 0 ? void 0 : _this$grid10.forceUpdate();
+    this.grid.forceUpdate();
   }
 
-  sortColumn(modelColumn) {
-    var _this$grid11;
-
-    var direction = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : TableUtils.sortDirection.none;
+  sortColumn(modelColumn, direction) {
     var isAbs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var addToExisting = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-    assertNotNull(modelColumn);
     var {
       model
     } = this.props;
-    var sorts = TableUtils.sortColumn(model.sort, model.columns, modelColumn, direction, isAbs, addToExisting);
+    var sorts = TableUtils.sortColumn(model.table, modelColumn, direction, isAbs, addToExisting);
     this.startLoading('Sorting...');
     this.setState({
       sorts
     });
-    (_this$grid11 = this.grid) === null || _this$grid11 === void 0 ? void 0 : _this$grid11.forceUpdate();
+    this.grid.forceUpdate();
   }
 
   reverse(reverseType) {
-    var _this$grid12;
-
     this.startLoading('Reversing...');
     this.setState({
       reverseType
     });
-    (_this$grid12 = this.grid) === null || _this$grid12 === void 0 ? void 0 : _this$grid12.forceUpdate();
+    this.grid.forceUpdate();
   }
 
   isReversible() {
@@ -1767,19 +1660,19 @@ export 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 _column2 = _model2.columns[modelColumn];
+            var column = model.columns[modelColumn];
 
-            if (_column2 != null && TableUtils.isTextType(_column2.type)) {
+            if (column != null && TableUtils.isTextType(column.type)) {
               columnIndex = i;
               break;
             }
@@ -1789,9 +1682,7 @@ export class IrisGrid extends Component {
         this.focusFilterBar(columnIndex);
       }
     } else {
-      var _this$grid13;
-
-      (_this$grid13 = this.grid) === null || _this$grid13 === void 0 ? void 0 : _this$grid13.focus();
+      this.grid.focus();
     }
   }
 
@@ -1828,16 +1719,10 @@ export class IrisGrid extends Component {
     this.setState({
       showSearchBar: update
     }, () => {
-      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();
+      if (update && this.crossColumnRef.current) {
+        this.crossColumnRef.current.focus();
       } else {
-        var _this$grid14;
-
-        (_this$grid14 = this.grid) === null || _this$grid14 === void 0 ? void 0 : _this$grid14.focus();
+        this.grid.focus();
       }
     });
   }
@@ -1846,13 +1731,11 @@ export class IrisGrid extends Component {
     var _this2 = this;
 
     return _asyncToGenerator(function* () {
-      var _document, _document$activeEleme;
-
       var {
         model
       } = _this2.props;
 
-      if (!isEditableGridModel(model) || !model.isEditable) {
+      if (!model.isEditable) {
         throw new Error('Cannot save, table is not editable');
       }
 
@@ -1864,15 +1747,13 @@ export class IrisGrid extends Component {
         throw new Error('Save already in progress');
       }
 
-      if ((_document = document) !== null && _document !== void 0 && (_document$activeEleme = _document.activeElement) !== null && _document$activeEleme !== void 0 && _document$activeEleme.classList.contains('grid-cell-input-field')) {
-        var _this2$grid;
-
+      if (document.activeElement.classList.contains('grid-cell-input-field')) {
         if (document.activeElement.classList.contains('error')) {
           throw new ValidationError('Current input is invalid');
         } // Focus the grid again to commit any pending input changes
 
 
-        (_this2$grid = _this2.grid) === null || _this2$grid === void 0 ? void 0 : _this2$grid.focus();
+        _this2.grid.focus();
       }
 
       var newPendingSavePromise = _this2.pending.add(model.commitPending()).then(() => {
@@ -1919,7 +1800,7 @@ export class IrisGrid extends Component {
   }
   /**
    * Select the passed in column and notify listener
-   * @param column The column in this table to link
+   * @param {dh.Column} column The column in this table to link
    */
 
 
@@ -1944,17 +1825,15 @@ export class IrisGrid extends Component {
     var dataMap = {};
 
     for (var i = 0; i < columns.length; i += 1) {
-      var _column3 = columns[i];
+      var column = columns[i];
       var {
         name,
         type
-      } = _column3;
-
-      var _value3 = model.valueForCell(i, rowIndex);
-
+      } = column;
+      var value = model.valueForCell(i, rowIndex);
       var text = model.textForCell(i, rowIndex);
       dataMap[name] = {
-        value: _value3,
+        value,
         text,
         type
       };
@@ -1970,20 +1849,15 @@ export class IrisGrid extends Component {
     var {
       model
     } = this.props;
-    var index = model.getColumnIndexByName(column.name);
-    assertNotNull(index);
-    this.setAdvancedFilter(index, filter, options);
+    this.setAdvancedFilter(model.getColumnIndexByName(column.name), filter, options);
   }
 
   handleAdvancedFilterSortChange(column, direction) {
-    var _this$grid15;
-
     var addToExisting = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var {
       model
     } = this.props;
     var columnIndex = model.getColumnIndexByName(column.name);
-    assertNotNull(columnIndex);
     var oldSort = TableUtils.getSortForColumn(model.sort, columnIndex);
     var newSort = null;
 
@@ -2001,13 +1875,11 @@ export class IrisGrid extends Component {
     this.setState({
       sorts
     });
-    (_this$grid15 = this.grid) === null || _this$grid15 === void 0 ? void 0 : _this$grid15.forceUpdate();
+    this.grid.forceUpdate();
   }
 
   handleAdvancedFilterDone() {
-    var _this$grid16;
-
-    (_this$grid16 = this.grid) === null || _this$grid16 === void 0 ? void 0 : _this$grid16.focus();
+    this.grid.focus();
   }
 
   handleAdvancedMenuOpened(column) {
@@ -2017,17 +1889,13 @@ export class IrisGrid extends Component {
   }
 
   handleAdvancedMenuClosed(columnIndex) {
-    var _this$filterInputRef;
-
     var {
       focusedFilterBarColumn,
       isFilterBarShown
     } = 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();
+    if (isFilterBarShown && focusedFilterBarColumn === columnIndex && this.filterInputRef.current !== null) {
+      this.filterInputRef.current.focus();
       this.setState({
         shownAdvancedFilter: null
       });
@@ -2066,19 +1934,14 @@ export class IrisGrid extends Component {
 
   handleFilterBarChange(value) {
     this.startLoading('Filtering...', true);
-    this.setState(_ref13 => {
+    this.setState(_ref12 => {
       var {
         focusedFilterBarColumn,
         quickFilters
-      } = _ref13;
+      } = _ref12;
       var newQuickFilters = new Map(quickFilters);
-
-      if (focusedFilterBarColumn != null) {
-        var modelIndex = this.getModelColumn(focusedFilterBarColumn);
-        assertNotNull(modelIndex);
-        this.applyQuickFilter(modelIndex, value, newQuickFilters);
-      }
-
+      var modelIndex = this.getModelColumn(focusedFilterBarColumn);
+      this.applyQuickFilter(modelIndex, value, newQuickFilters);
       return {
         quickFilters: newQuickFilters
       };
@@ -2090,9 +1953,7 @@ export class IrisGrid extends Component {
     var defocusInput = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
 
     if (setGridFocus) {
-      var _this$grid17;
-
-      (_this$grid17 = this.grid) === null || _this$grid17 === void 0 ? void 0 : _this$grid17.focus();
+      this.grid.focus();
     }
 
     if (defocusInput) {
@@ -2106,7 +1967,6 @@ export class IrisGrid extends Component {
     var {
       focusedFilterBarColumn
     } = this.state;
-    assertNotNull(focusedFilterBarColumn);
 
     if (backward) {
       this.focusFilterBar(focusedFilterBarColumn - 1);
@@ -2125,9 +1985,8 @@ export class IrisGrid extends Component {
     } = this.state;
     var customColumnFormatMap = new Map(prevCustomColumnFormatMap);
 
-    if (selectedFormat != null) {
+    if (selectedFormat) {
       var normalizedType = TableUtils.getNormalizedType(column.type);
-      assertNotNull(normalizedType);
       var columnFormattingRule = Formatter.makeColumnFormattingRule(normalizedType, column.name, selectedFormat);
       customColumnFormatMap.set(column.name, columnFormattingRule);
     } else {
@@ -2153,10 +2012,10 @@ export class IrisGrid extends Component {
   }
 
   handleMenuBack() {
-    this.setState(_ref14 => {
+    this.setState(_ref13 => {
       var {
         openOptions
-      } = _ref14;
+      } = _ref13;
       var newOptions = [...openOptions];
       newOptions.pop();
       return {
@@ -2166,10 +2025,10 @@ export class IrisGrid extends Component {
   }
 
   handleMenuSelect(option) {
-    this.setState(_ref15 => {
+    this.setState(_ref14 => {
       var {
         openOptions
-      } = _ref15;
+      } = _ref14;
       return {
         openOptions: [...openOptions, option]
       };
@@ -2177,8 +2036,7 @@ export class IrisGrid extends Component {
   }
 
   handleRequestFailed(event) {
-    var customEvent = event;
-    log.error('request failed:', customEvent.detail);
+    log.error('request failed:', event.detail);
     this.stopLoading();
 
     if (this.canRollback()) {
@@ -2189,13 +2047,11 @@ export class IrisGrid extends Component {
       var {
         onError
       } = this.props;
-      onError(new Error("Error displaying table: ".concat(customEvent.detail)));
+      onError(new Error("Error displaying table: ".concat(event.detail)));
     }
   }
 
   handleUpdate() {
-    var _this$grid18;
-
     this.stopLoading();
     log.debug2('Received model update');
     var {
@@ -2227,27 +2083,26 @@ export class IrisGrid extends Component {
       this.lastLoadedConfig = null;
     }
 
-    (_this$grid18 = this.grid) === null || _this$grid18 === void 0 ? void 0 : _this$grid18.forceUpdate();
+    this.grid.forceUpdate();
   }
 
   handleViewChanged(metrics) {
-    var _this$grid$state, _this$grid19;
+    var _this$grid$state, _this$grid;
 
     var {
       model
     } = this.props;
+    var {
+      bottomViewport
+    } = metrics;
     var {
       selectionEndRow = 0
-    } = (_this$grid$state = (_this$grid19 = this.grid) === null || _this$grid19 === void 0 ? void 0 : _this$grid19.state) !== null && _this$grid$state !== void 0 ? _this$grid$state : {};
+    } = (_this$grid$state = (_this$grid = this.grid) === null || _this$grid === void 0 ? void 0 : _this$grid.state) !== null && _this$grid$state !== void 0 ? _this$grid$state : {};
     var pendingRowCount = 0;
 
-    if (isEditableGridModel(model) && model.isEditable) {
-      assertNotNull(metrics);
-      var {
-        bottomViewport
-      } = metrics; // We have an editable table that we can add new rows to
+    if (model.isEditable) {
+      // We have an editable table that we can add new rows to
       // Display empty rows beneath the table rows that user can fill in
-
       var bottomNonFloating = model.rowCount - model.floatingBottomRowCount;
 
       if (selectionEndRow === bottomNonFloating - 1) {
@@ -2269,7 +2124,6 @@ export class IrisGrid extends Component {
   }
 
   handleSelectionChanged(selectedRanges) {
-    assertNotNull(selectedRanges);
     var {
       onSelectionChanged
     } = this.props;
@@ -2290,7 +2144,7 @@ export class IrisGrid extends Component {
   }
 
   handleMovedColumnsChanged(movedColumns) {
-    var onChangeApplied = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : () => null;
+    var onChangeApplied = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : () => {};
     this.setState({
       movedColumns
     }, onChangeApplied);
@@ -2347,6 +2201,12 @@ export class IrisGrid extends Component {
   } // Apply live changes
 
 
+  handleConditionalFormatEditorUpdate(conditionalFormatPreview) {
+    this.setState({
+      conditionalFormatPreview
+    });
+  }
+
   handleConditionalFormatEditorSave(config) {
     log.debug('Save conditional format changes', config);
     this.setState(state => {
@@ -2399,7 +2259,7 @@ export class IrisGrid extends Component {
       var newMovedColumns = IrisGridUtils.removeColumnFromMovedColumns(columns, movedColumns, removedColumnNames);
       var newSelectDistinctColumns = IrisGridUtils.removeColumnsFromSelectDistinctColumns(selectDistinctColumns, removedColumnNames);
 
-      if (newSorts.length !== sorts.length) {
+      if (newSorts.length !== sorts) {
         log.debug('removing sorts from removed custom columns...');
         this.setState({
           sorts: newSorts
@@ -2430,7 +2290,8 @@ export class IrisGrid extends Component {
     }
 
     this.setState({
-      customColumns
+      customColumns,
+      top: 0
     });
     this.startLoading('Applying custom columns...');
   }
@@ -2442,10 +2303,8 @@ export class IrisGrid extends Component {
     } = this.state;
 
     if (isReady) {
-      var _this$grid20;
-
       this.stopLoading();
-      (_this$grid20 = this.grid) === null || _this$grid20 === void 0 ? void 0 : _this$grid20.forceUpdate();
+      this.grid.forceUpdate();
     } else {
       this.initState();
     }
@@ -2460,8 +2319,6 @@ export class IrisGrid extends Component {
   }
 
   handlePendingDataUpdated() {
-    var _this$grid21;
-
     log.debug('pending data updated');
     var {
       model
@@ -2475,11 +2332,11 @@ export class IrisGrid extends Component {
       pendingDataErrors,
       pendingSaveError: null
     });
-    (_this$grid21 = this.grid) === null || _this$grid21 === void 0 ? void 0 : _this$grid21.forceUpdate();
+    this.grid.forceUpdate();
   }
   /**
    * User added, removed, or changed the order of aggregations, or position
-   * @param aggregationSettings The new aggregation settings
+   * @param {AggregationSettings} aggregationSettings The new aggregation settings
    */
 
 
@@ -2492,17 +2349,17 @@ export class IrisGrid extends Component {
   }
   /**
    * A specific aggregation has been modified
-   * @param aggregation The new aggregation
+   * @param {Aggregation} aggregation The new aggregation
    */
 
 
   handleAggregationChange(aggregation) {
     log.debug('handleAggregationChange', aggregation);
     this.startLoading("Aggregating ".concat(aggregation.operation, "..."));
-    this.setState(_ref16 => {
+    this.setState(_ref15 => {
       var {
         aggregationSettings
-      } = _ref16;
+      } = _ref15;
       return {
         selectedAggregation: aggregation,
         aggregationSettings: _objectSpread(_objectSpread({}, aggregationSettings), {}, {
@@ -2513,7 +2370,7 @@ export class IrisGrid extends Component {
   }
   /**
    * An aggregations has been selected for editing
-   * @param aggregation The aggregation to edit
+   * @param {Aggregation} aggregation The aggregation to edit
    */
 
 
@@ -2582,16 +2439,20 @@ export class IrisGrid extends Component {
     }
   }
 
-  handleDownloadTable(fileName, frozenTable, tableSubscription, gridRanges) {
+  handleDownloadTable() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
     var {
       canDownloadCsv
     } = this.props;
 
     if (canDownloadCsv) {
-      log.info('start table downloading', fileName, frozenTable, tableSubscription, gridRanges);
+      log.info('start table downloading', ...args);
       this.setState(() => {
         if (this.tableSaver) {
-          this.tableSaver.startDownload(fileName, frozenTable, tableSubscription, gridRanges);
+          this.tableSaver.startDownload(...args);
         }
 
         return {
@@ -2604,14 +2465,25 @@ export class IrisGrid extends Component {
   }
 
   handleCancelDownloadTable() {
-    var _this$tableSaver;
-
-    (_this$tableSaver = this.tableSaver) === null || _this$tableSaver === void 0 ? void 0 : _this$tableSaver.cancelDownload();
+    this.tableSaver.cancelDownload();
     this.setState({
       isTableDownloading: false
     });
   }
 
+  handleDownloadProgressUpdate(tableDownloadProgress, tableDownloadEstimatedTime) {
+    var {
+      tableDownloadStatus
+    } = this.state;
+
+    if (tableDownloadStatus === TableCsvExporter.DOWNLOAD_STATUS.DOWNLOADING) {
+      this.setState({
+        tableDownloadProgress,
+        tableDownloadEstimatedTime
+      });
+    }
+  }
+
   handleDownloadCompleted() {
     this.setState({
       isTableDownloading: false,
@@ -2629,7 +2501,7 @@ export class IrisGrid extends Component {
   }
   /**
    * Delete the specified ranges from the table.
-   * @param ranges The ranges to delete
+   * @param {GridRange[]} ranges The ranges to delete
    */
 
 
@@ -2662,7 +2534,7 @@ export class IrisGrid extends Component {
       });
     } else {
       this.grid.setState({
-        cursor: null
+        cursor: Grid.CURSOR_TYPE_DEFAULT
       });
       this.setState({
         hoverSelectColumn: null
@@ -2710,17 +2582,12 @@ export class IrisGrid extends Component {
   }
 
   getColumnBoundingRect() {
-    var _this$gridWrapper2;
-
     var {
       metrics,
       shownColumnTooltip
     } = this.state;
-    assertNotNull(metrics);
-    assertNotNull(shownColumnTooltip);
-    var gridRect = (_this$gridWrapper2 = this.gridWrapper) === null || _this$gridWrapper2 === void 0 ? void 0 : _this$gridWrapper2.getBoundingClientRect();
+    var gridRect = this.gridWrapper.getBoundingClientRect();
     var popperMargin = 20;
-    assertNotNull(gridRect);
     var {
       columnHeaderHeight,
       visibleColumnXs,
@@ -2729,21 +2596,13 @@ export class IrisGrid extends Component {
     } = metrics;
     var columnX = visibleColumnXs.get(shownColumnTooltip);
     var columnWidth = visibleColumnWidths.get(shownColumnTooltip);
-    assertNotNull(columnX);
-    assertNotNull(columnWidth);
-    var left = gridRect.left + clamp(columnX + columnWidth / 2, popperMargin, width - popperMargin);
     return {
       top: gridRect.top,
-      left,
+      left: gridRect.left + clamp(columnX + columnWidth / 2, popperMargin, width - popperMargin),
       bottom: gridRect.top + columnHeaderHeight,
       right: gridRect.left + clamp(columnX + columnWidth / 2, popperMargin, width - popperMargin) + 1,
       width: 1,
-      height: columnHeaderHeight,
-      x: left,
-      y: gridRect.top,
-      toJSON: () => {
-        throw new Error('not implemented');
-      }
+      height: columnHeaderHeight
     };
   }
 
@@ -2835,7 +2694,9 @@ export class IrisGrid extends Component {
 
     var theme = this.getTheme();
     var filter = this.getCachedFilter(customFilters, quickFilters, advancedFilters, partitionFilters, searchFilter);
-    var userColumnWidths = metricCalculator.getUserColumnWidths();
+    var {
+      userColumnWidths
+    } = metricCalculator;
     var stateOverride = this.getCachedStateOverride(hoverSelectColumn, isFilterBarShown, isSelectingColumn, loadingScrimProgress, quickFilters, advancedFilters, sorts, reverseType, rollupConfig);
     var top = metrics ? metrics.top : 0;
     var bottom = metrics ? metrics.bottomViewport : 0;
@@ -2863,13 +2724,11 @@ export class IrisGrid extends Component {
       var columnWidth = visibleColumnWidths.get(focusedFilterBarColumn);
 
       if (columnX != null && columnWidth != null) {
-        var _theme$filterBarHeigh, _theme$filterBarHeigh2, _this$grid22;
-
         var x = gridX + columnX;
-        var y = gridY - ((_theme$filterBarHeigh = theme.filterBarHeight) !== null && _theme$filterBarHeigh !== void 0 ? _theme$filterBarHeigh : 0);
+        var y = gridY - theme.filterBarHeight;
         var fieldWidth = columnWidth + 1; // cover right border
 
-        var fieldHeight = ((_theme$filterBarHeigh2 = theme.filterBarHeight) !== null && _theme$filterBarHeigh2 !== void 0 ? _theme$filterBarHeigh2 : 0) - 1; // remove bottom border
+        var fieldHeight = theme.filterBarHeight - 1; // remove bottom border
 
         var style = {
           top: y,
@@ -2877,15 +2736,14 @@ export class IrisGrid extends Component {
           minWidth: fieldWidth,
           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;
         }
 
@@ -2895,7 +2753,7 @@ export 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,
@@ -2908,9 +2766,9 @@ export class IrisGrid extends Component {
           onChange: this.handleFilterBarChange,
           onDone: this.handleFilterBarDone,
           onTab: this.handleFilterBarTab,
-          onContextMenu: (_this$grid22 = this.grid) === null || _this$grid22 === void 0 ? void 0 : _this$grid22.handleContextMenu,
+          onContextMenu: this.grid.handleContextMenu,
           debounceMs: debounceMs,
-          value: _value4
+          value: value
         });
       }
     }
@@ -2955,9 +2813,6 @@ export class IrisGrid extends Component {
       var _columnX = _visibleColumnXs.get(shownColumnTooltip);
 
       var _columnWidth = _visibleColumnWidths.get(shownColumnTooltip);
-
-      assertNotNull(_columnX);
-      assertNotNull(_columnWidth);
       /**
        * Create a wrapper dom element, the size of the column header.
        * The wrapper acts as tooltip parent, the  tooltip component
@@ -2966,6 +2821,7 @@ export class IrisGrid extends Component {
        * so popper only remains triggered while mouse is inside the panel.
        */
 
+
       var boundedLeft = Math.max(0, _columnX);
       var boundedWidth = _columnWidth;
 
@@ -3010,39 +2866,34 @@ export class IrisGrid extends Component {
 
       var _modelColumn = this.getModelColumn(shownColumnTooltip);
 
-      if (_modelColumn != null) {
-        var _this$tooltip2;
-
-        var _column4 = model.columns[_modelColumn];
-
-        if (_column4 != null) {
-          columnTooltip = /*#__PURE__*/React.createElement("div", {
-            style: wrapperStyle
-          }, /*#__PURE__*/React.createElement(Tooltip, {
-            key: _column4.name,
-            timeout: 400,
-            interactive: true,
-            options: popperOptions,
-            ref: this.handleTooltipRef,
-            referenceObject: virtualReference,
-            onExited: () => {
-              this.setState({
-                shownColumnTooltip: null
-              });
-            }
-          }, /*#__PURE__*/React.createElement(ColumnStatistics, {
-            model: model,
-            column: _column4,
-            onStatistics: () => {
-              var _this$tooltip;
-
-              (_this$tooltip = this.tooltip) === null || _this$tooltip === void 0 ? void 0 : _this$tooltip.update();
-            }
-          })));
-        } // #510 We may need to update the position of the tooltip if it's already opened and columns are resized
-
+      var column = model.columns[_modelColumn];
+
+      if (column != null) {
+        var _this$tooltip;
+
+        columnTooltip = /*#__PURE__*/React.createElement("div", {
+          style: wrapperStyle
+        }, /*#__PURE__*/React.createElement(Tooltip, {
+          key: column.name,
+          timeout: 400,
+          interactive: true,
+          options: popperOptions,
+          ref: this.handleTooltipRef,
+          referenceObject: virtualReference,
+          onExited: () => {
+            this.setState({
+              shownColumnTooltip: null
+            });
+          }
+        }, /*#__PURE__*/React.createElement(ColumnStatistics, {
+          model: model,
+          column: column,
+          onStatistics: () => {
+            if (this.tooltip) this.tooltip.update();
+          }
+        }))); // #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$tooltip = this.tooltip) === null || _this$tooltip === void 0 ? void 0 : _this$tooltip.update();
       }
     }
 
@@ -3069,67 +2920,63 @@ export class IrisGrid extends Component {
 
         var modelColumn = _this4.getModelColumn(columnIndex);
 
-        if (modelColumn != null) {
-          var isFilterable = model.isFilterable(modelColumn);
-
-          if (isFilterable && columnX != null && columnWidth != null && columnWidth > 0) {
-            var _x = _gridX + columnX + columnWidth - 24;
-
-            var _y = _gridY2 - (filterBarHeight !== null && filterBarHeight !== void 0 ? filterBarHeight : 0) + 2; // 2 acts as top margin for the button
-
-
-            var _style = {
-              position: 'absolute',
-              top: _y,
-              left: _x
-            };
-
-            var _advancedFilter = advancedFilters.get(modelColumn);
-
-            var isFilterSet = _advancedFilter != null;
-            var isFilterVisible = columnIndex === hoverAdvancedFilter || columnIndex === focusedFilterBarColumn || isFilterSet;
-            var element = /*#__PURE__*/React.createElement("div", {
-              className: classNames('advanced-filter-button-container', {
-                hidden: !isFilterVisible
-              }),
-              key: columnIndex,
-              style: _style
-            }, isFilterVisible && /*#__PURE__*/React.createElement("button", {
-              type: "button",
-              className: classNames('btn btn-link btn-link-icon advanced-filter-button', {
-                'filter-set': isFilterSet
-              }),
-              onClick: () => {
-                _this4.setState({
-                  shownAdvancedFilter: columnIndex
-                });
-              },
-              onContextMenu: event => {
-                var _this4$grid;
-
-                (_this4$grid = _this4.grid) === null || _this4$grid === void 0 ? void 0 : _this4$grid.handleContextMenu(event);
-              },
-              onMouseEnter: () => {
-                _this4.setState({
-                  hoverAdvancedFilter: columnIndex
-                });
-              },
-              onMouseLeave: () => {
-                _this4.setState({
-                  hoverAdvancedFilter: null
-                });
-              }
-            }, /*#__PURE__*/React.createElement("div", {
-              className: "fa-layers"
-            }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
-              icon: dhFilterFilled,
-              className: "filter-solid"
-            }), /*#__PURE__*/React.createElement(FontAwesomeIcon, {
-              icon: vsFilter,
-              className: "filter-light"
-            }))));
-            filterBar.push(element);
-          }
+        var isFilterable = model.isFilterable(modelColumn);
+
+        if (isFilterable && columnX != null && columnWidth != null && columnWidth > 0) {
+          var _x = _gridX + columnX + columnWidth - 24;
+
+          var _y = _gridY2 - filterBarHeight + 2; // 2 acts as top margin for the button
+
+
+          var _style = {
+            position: 'absolute',
+            top: _y,
+            left: _x
+          };
+
+          var _advancedFilter = advancedFilters.get(modelColumn);
+
+          var isFilterSet = _advancedFilter != null;
+          var isFilterVisible = columnIndex === hoverAdvancedFilter || columnIndex === focusedFilterBarColumn || isFilterSet;
+          var element = /*#__PURE__*/React.createElement("div", {
+            className: classNames('advanced-filter-button-container', {
+              hidden: !isFilterVisible
+            }),
+            key: columnIndex,
+            style: _style
+          }, isFilterVisible && /*#__PURE__*/React.createElement("button", {
+            type: "button",
+            className: classNames('btn btn-link btn-link-icon advanced-filter-button', {
+              'filter-set': isFilterSet
+            }),
+            onClick: () => {
+              _this4.setState({
+                shownAdvancedFilter: columnIndex
+              });
+            },
+            onContextMenu: event => {
+              _this4.grid.handleContextMenu(event);
+            },
+            onMouseEnter: () => {
+              _this4.setState({
+                hoverAdvancedFilter: columnIndex
+              });
+            },
+            onMouseLeave: () => {
+              _this4.setState({
+                hoverAdvancedFilter: null
+              });
+            }
+          }, /*#__PURE__*/React.createElement("div", {
+            className: "fa-layers"
+          }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
+            icon: dhFilterFilled,
+            className: "filter-solid"
+          }), /*#__PURE__*/React.createElement(FontAwesomeIcon, {
+            icon: vsFilter,
+            className: "filter-light"
+          }))));
+          filterBar.push(element);
         }
       };
 
@@ -3176,32 +3023,30 @@ export class IrisGrid extends Component {
 
           var _modelColumn2 = _this4.getModelColumn(columnIndex);
 
-          if (_modelColumn2 != null) {
-            var _column5 = model.columns[_modelColumn2];
-
-            var _advancedFilter2 = advancedFilters.get(_modelColumn2);
-
-            var {
-              options: advancedFilterOptions
-            } = _advancedFilter2 || {};
-            var sort = TableUtils.getSortForColumn(model.sort, _modelColumn2);
-            var sortDirection = sort ? sort.direction : null;
-            var element = /*#__PURE__*/React.createElement("div", {
-              key: columnIndex,
-              className: "advanced-filter-menu-container",
-              style: _style2
-            }, /*#__PURE__*/React.createElement(Popper, {
-              className: "advanced-filter-menu-popper",
-              onEntered: _this4.getAdvancedMenuOpenedHandler(columnIndex),
-              onExited: () => {
-                _this4.handleAdvancedMenuClosed(columnIndex);
-              },
-              isShown: shownAdvancedFilter === columnIndex,
-              interactive: true,
-              closeOnBlur: true
-            }, _this4.getCachedAdvancedFilterMenuActions(model, _column5, advancedFilterOptions, sortDirection, formatter)));
-            advancedFilterMenus.push(element);
-          }
+          var _column = model.columns[_modelColumn2];
+
+          var _advancedFilter2 = advancedFilters.get(_modelColumn2);
+
+          var {
+            options: advancedFilterOptions
+          } = _advancedFilter2 || {};
+          var sort = TableUtils.getSortForColumn(model.sort, _modelColumn2);
+          var sortDirection = sort ? sort.direction : null;
+          var element = /*#__PURE__*/React.createElement("div", {
+            key: columnIndex,
+            className: "advanced-filter-menu-container",
+            style: _style2
+          }, /*#__PURE__*/React.createElement(Popper, {
+            className: "advanced-filter-menu-popper",
+            onEntered: _this4.getAdvancedMenuOpenedHandler(columnIndex),
+            onExited: () => {
+              _this4.handleAdvancedMenuClosed(columnIndex);
+            },
+            isShown: shownAdvancedFilter === columnIndex,
+            interactive: true,
+            closeOnBlur: true
+          }, _this4.getCachedAdvancedFilterMenuActions(model, _column, advancedFilterOptions, sortDirection, formatter)));
+          advancedFilterMenus.push(element);
         }
       };
 
@@ -3233,6 +3078,7 @@ export class IrisGrid extends Component {
 
         case OptionType.CONDITIONAL_FORMATTING:
           return /*#__PURE__*/React.createElement(ConditionalFormattingMenu, {
+            columns: model.columns,
             rules: conditionalFormats,
             onChange: this.handleConditionalFormatsChange,
             onCreate: this.handleConditionalFormatCreate,
@@ -3240,9 +3086,6 @@ export class IrisGrid extends Component {
           });
 
         case OptionType.CONDITIONAL_FORMATTING_EDIT:
-          assertNotNull(model.columns);
-          assertNotNull(conditionalFormatPreview);
-          assertNotNull(this.handleConditionalFormatEditorUpdate);
           return /*#__PURE__*/React.createElement(ConditionalFormatEditor, {
             columns: model.columns,
             rule: conditionalFormatPreview,
@@ -3262,6 +3105,7 @@ export class IrisGrid extends Component {
 
         case OptionType.ROLLUP_ROWS:
           return /*#__PURE__*/React.createElement(RollupRows, {
+            metrics: metrics,
             model: model,
             onChange: this.handleRollupChange,
             config: rollupConfig,
@@ -3277,7 +3121,7 @@ export class IrisGrid extends Component {
           });
 
         case OptionType.AGGREGATION_EDIT:
-          return selectedAggregation && /*#__PURE__*/React.createElement(AggregationEdit, {
+          return /*#__PURE__*/React.createElement(AggregationEdit, {
             aggregation: selectedAggregation,
             columns: model.originalColumns,
             onChange: this.handleAggregationChange
@@ -3290,7 +3134,7 @@ export class IrisGrid extends Component {
             isDownloading: isTableDownloading,
             tableDownloadStatus: tableDownloadStatus,
             tableDownloadProgress: tableDownloadProgress,
-            tableDownloadEstimatedTime: tableDownloadEstimatedTime !== null && tableDownloadEstimatedTime !== void 0 ? tableDownloadEstimatedTime : undefined,
+            tableDownloadEstimatedTime: tableDownloadEstimatedTime,
             onDownload: this.handleDownloadTable,
             onDownloadStart: this.handleDownloadTableStart,
             onCancel: this.handleCancelDownloadTable,
@@ -3312,7 +3156,7 @@ export class IrisGrid extends Component {
           });
 
         default:
-          throw Error("Unexpected option type ".concat(option.type));
+          throw Error('Unexpected option type', option.type);
       }
     });
     var hiddenColumns = this.getCachedHiddenColumns(IrisGridUtils.getHiddenColumns(userColumnWidths));
@@ -3337,7 +3181,9 @@ export class IrisGrid extends Component {
       className: "iris-grid-partition-selector-wrapper iris-grid-bar iris-grid-bar-primary"
     }, partitionTable && partitionColumn && /*#__PURE__*/React.createElement(IrisGridPartitionSelector, {
       table: partitionTable,
-      getFormattedString: (value, type, stringName) => model.displayString(value, type, stringName),
+      getFormattedString: function getFormattedString() {
+        return model.displayString(...arguments);
+      },
       columnName: partitionColumn.name,
       partition: partition,
       onChange: this.handlePartitionChange,
@@ -3372,7 +3218,7 @@ export class IrisGrid extends Component {
       ref: grid => {
         this.grid = grid;
       },
-      isStickyBottom: !isEditableGridModel(model) || !model.isEditable,
+      isStickyBottom: !model.isEditable,
       isStuckToBottom: isStuckToBottom,
       isStuckToRight: isStuckToRight,
       metricCalculator: metricCalculator,
@@ -3407,8 +3253,8 @@ export class IrisGrid extends Component {
       customColumns: customColumns,
       hiddenColumns: hiddenColumns,
       alwaysFetchColumns: this.getAlwaysFetchColumns(alwaysFetchColumns, model.columns, movedColumns, model.floatingLeftColumnCount, model.floatingRightColumnCount),
-      formatColumns: this.getCachedPreviewFormatColumns(this.getCachedModelColumns(model, customColumns), conditionalFormats, conditionalFormatPreview === null ? undefined : 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),
+      formatColumns: this.getCachedPreviewFormatColumns(this.getCachedModelColumns(model, customColumns), 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),
       rollupConfig: this.getModelRollupConfig(model.originalColumns, rollupConfig, aggregationSettings),
       totalsConfig: this.getModelTotalsConfig(model.columns, rollupConfig, aggregationSettings),
       selectDistinctColumns: selectDistinctColumns,
@@ -3427,7 +3273,7 @@ export class IrisGrid extends Component {
     }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
       icon: vsMenu,
       transform: "up-1"
-    }))), focusField, loadingElement, filterBar, columnTooltip, advancedFilterMenus, overflowButtonTooltipProps && this.getOverflowButtonTooltip(overflowButtonTooltipProps)), /*#__PURE__*/React.createElement(PendingDataBottomBar, {
+    }))), focusField, loadingElement, filterBar, columnTooltip, advancedFilterMenus, this.getOverflowButtonTooltip(overflowButtonTooltipProps)), /*#__PURE__*/React.createElement(PendingDataBottomBar, {
       error: pendingSaveError,
       isSaving: pendingSavePromise != null,
       saveTooltip: "Commit (".concat(this.commitAction.shortcut.getDisplayText(), ")"),
@@ -3442,7 +3288,7 @@ export class IrisGrid extends Component {
       onDiscard: this.handlePendingDiscardClicked
     }), /*#__PURE__*/React.createElement(ToastBottomBar, null, toastMessage), /*#__PURE__*/React.createElement(IrisGridCopyHandler, {
       model: model,
-      copyOperation: copyOperation !== null && copyOperation !== void 0 ? copyOperation : undefined,
+      copyOperation: copyOperation,
       onEntering: this.handleAnimationStart,
       onEntered: this.handleAnimationEnd,
       onExiting: this.handleAnimationStart,
@@ -3493,7 +3339,97 @@ _defineProperty(IrisGrid, "maxDebounce", 500);
 
 _defineProperty(IrisGrid, "loadingSpinnerDelay", 800);
 
-_defineProperty(IrisGrid, "defaultProps", {
+IrisGrid.propTypes = {
+  children: PropTypes.node,
+  advancedFilters: PropTypes.instanceOf(Map),
+  advancedSettings: PropTypes.instanceOf(Map),
+  alwaysFetchColumns: PropTypes.arrayOf(PropTypes.string),
+  isFilterBarShown: PropTypes.bool,
+  applyInputFiltersOnInit: PropTypes.bool,
+  conditionalFormats: PropTypes.arrayOf(PropTypes.shape({})),
+  customColumnFormatMap: PropTypes.instanceOf(Map),
+  movedColumns: PropTypes.arrayOf(PropTypes.shape({
+    from: PropTypes.number.isRequired,
+    to: PropTypes.number.isRequired
+  })),
+  movedRows: PropTypes.arrayOf(PropTypes.shape({
+    from: PropTypes.number.isRequired,
+    to: PropTypes.number.isRequired
+  })),
+  inputFilters: PropTypes.arrayOf(PropTypes.shape({
+    name: PropTypes.string.isRequired,
+    type: PropTypes.string.isRequired,
+    value: PropTypes.string.isRequired
+  })),
+  customFilters: PropTypes.arrayOf(PropTypes.shape({})),
+  model: PropTypes.instanceOf(IrisGridModel).isRequired,
+  onCreateChart: PropTypes.func,
+  onColumnSelected: PropTypes.func,
+  onError: PropTypes.func,
+  onDataSelected: PropTypes.func,
+  onStateChange: PropTypes.func,
+  onPartitionAppend: PropTypes.func,
+  onAdvancedSettingsChange: PropTypes.func,
+  partition: PropTypes.string,
+  partitionColumn: APIPropTypes.Column,
+  sorts: PropTypes.arrayOf(PropTypes.shape({})),
+  reverseType: PropTypes.string,
+  quickFilters: PropTypes.instanceOf(Map),
+  customColumns: PropTypes.arrayOf(PropTypes.string),
+  selectDistinctColumns: PropTypes.arrayOf(PropTypes.string),
+  // These settings come from the redux store
+  settings: PropTypes.shape({
+    timeZone: PropTypes.string.isRequired,
+    defaultDateTimeFormat: PropTypes.string.isRequired,
+    showTimeZone: PropTypes.bool.isRequired,
+    showTSeparator: PropTypes.bool.isRequired,
+    truncateNumbersWithPound: PropTypes.bool.isRequired,
+    formatter: PropTypes.arrayOf(PropTypes.shape({})).isRequired
+  }),
+  userColumnWidths: PropTypes.instanceOf(Map),
+  userRowHeights: PropTypes.instanceOf(Map),
+  onSelectionChanged: PropTypes.func,
+  rollupConfig: PropTypes.shape({
+    columns: PropTypes.arrayOf(PropTypes.string),
+    showConstituents: PropTypes.bool,
+    showNonAggregatedColumns: PropTypes.bool,
+    includeDescriptions: PropTypes.bool
+  }),
+  aggregationSettings: PropTypes.shape({
+    aggregations: PropTypes.arrayOf(PropTypes.shape({
+      operation: PropTypes.string.isRequired,
+      selected: PropTypes.arrayOf(PropTypes.string).isRequired,
+      invert: PropTypes.bool.isRequired
+    })),
+    showOnTop: PropTypes.bool
+  }),
+  isSelectingColumn: PropTypes.bool,
+  isSelectingPartition: PropTypes.bool,
+  isStuckToBottom: PropTypes.bool,
+  isStuckToRight: PropTypes.bool,
+  // eslint-disable-next-line react/no-unused-prop-types
+  columnSelectionValidator: PropTypes.func,
+  columnAllowedCursor: PropTypes.string,
+  // eslint-disable-next-line react/no-unused-prop-types
+  columnNotAllowedCursor: PropTypes.string,
+  name: PropTypes.string,
+  onlyFetchVisibleColumns: PropTypes.bool,
+  showSearchBar: PropTypes.bool,
+  searchValue: PropTypes.string,
+  selectedSearchColumns: PropTypes.arrayOf(PropTypes.string),
+  invertSearchColumns: PropTypes.bool,
+  // eslint-disable-next-line react/no-unused-prop-types
+  onContextMenu: PropTypes.func,
+  pendingDataMap: PropTypes.instanceOf(Map),
+  getDownloadWorker: PropTypes.func,
+  canCopy: PropTypes.bool,
+  canDownloadCsv: PropTypes.bool,
+  frozenColumns: PropTypes.arrayOf(PropTypes.string),
+  // Theme override for IrisGridTheme
+  theme: PropTypes.shape({}),
+  canToggleSearch: PropTypes.bool
+};
+IrisGrid.defaultProps = {
   children: null,
   advancedFilters: new Map(),
   advancedSettings: new Map(),
@@ -3507,12 +3443,12 @@ _defineProperty(IrisGrid, "defaultProps", {
   inputFilters: [],
   customFilters: [],
   onCreateChart: undefined,
-  onColumnSelected: () => undefined,
-  onDataSelected: () => undefined,
-  onError: () => undefined,
-  onStateChange: () => undefined,
-  onPartitionAppend: () => undefined,
-  onAdvancedSettingsChange: () => undefined,
+  onColumnSelected: () => {},
+  onDataSelected: () => {},
+  onError: () => {},
+  onStateChange: () => {},
+  onPartitionAppend: () => {},
+  onAdvancedSettingsChange: () => {},
   partition: null,
   partitionColumn: null,
   quickFilters: new Map(),
@@ -3521,10 +3457,10 @@ _defineProperty(IrisGrid, "defaultProps", {
   reverseType: TableUtils.REVERSE_TYPE.NONE,
   customColumns: [],
   aggregationSettings: DEFAULT_AGGREGATION_SETTINGS,
-  rollupConfig: undefined,
+  rollupConfig: null,
   userColumnWidths: new Map(),
   userRowHeights: new Map(),
-  onSelectionChanged: () => undefined,
+  onSelectionChanged: () => {},
   isSelectingColumn: false,
   isSelectingPartition: false,
   isStuckToBottom: false,
@@ -3538,7 +3474,7 @@ _defineProperty(IrisGrid, "defaultProps", {
   searchValue: '',
   selectedSearchColumns: null,
   invertSearchColumns: true,
-  onContextMenu: () => undefined,
+  onContextMenu: () => [],
   pendingDataMap: new Map(),
   getDownloadWorker: undefined,
   settings: {
@@ -3560,7 +3496,6 @@ _defineProperty(IrisGrid, "defaultProps", {
   frozenColumns: null,
   theme: {},
   canToggleSearch: true
-});
-
+};
 export default IrisGrid;
 //# sourceMappingURL=IrisGrid.js.map