@deephaven/iris-grid 1.28.1 → 1.29.0

package/dist/IrisGrid.js

@@ -19,7 +19,7 @@ import deepEqual from 'fast-deep-equal';
 import Log from '@deephaven/log';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { ContextActions, Stack, Menu, Page, Popper, ThemeExport, Tooltip, Button, ContextActionUtils, SlideTransition } from '@deephaven/components';
-import { Grid, GridRange, GridUtils, isEditableGridModel, isExpandableGridModel, isDeletableGridModel, isExpandableColumnGridModel } from '@deephaven/grid';
+import { Grid, GridRange, GridUtils, isEditableGridModel, isExpandableGridModel, isDeletableGridModel, isExpandableColumnGridModel, RangedSelection } from '@deephaven/grid';
 import { dhEye, dhFilterFilled, dhGraphLineUp, dhTriangleDownSquare, vsClose, vsCloudDownload, vsEdit, vsFilter, vsMenu, vsReply, vsRuby, vsSearch, vsSplitHorizontal, vsSymbolOperator, vsTools } from '@deephaven/icons';
 import { DateUtils, Formatter, FormatterUtils, TableUtils, isSortDirection } from '@deephaven/jsapi-utils';
 import { assertNotNull, copyToClipboard, EMPTY_ARRAY, EMPTY_MAP, Pending, PromiseUtils, ValidationError, getOrThrow } from '@deephaven/utils';
@@ -44,6 +44,8 @@ import AdvancedFilterCreator from "./AdvancedFilterCreator.js";
 import { Aggregations, AggregationEdit, AggregationUtils, ChartBuilder, CustomColumnBuilder, OptionType, RollupRows, TableCsvExporter, TableSaver, VisibilityOrderingBuilder, DownloadServiceWorkerUtils } from "./sidebar/index.js";
 import { DEFAULT_REGISTRY, IrisGridContext } from "./IrisGridContextProvider.js";
 import IrisGridModel from "./IrisGridModel.js";
+import { isKeyedGridModel } from "./KeyedGridModel.js";
+import { KeyedSelection } from "./KeyedSelection.js";
 import IrisGridUtils from "./IrisGridUtils.js";
 import CrossColumnSearch from "./CrossColumnSearch.js";
 import { isPartitionedGridModel } from "./PartitionedGridModel.js";
@@ -135,6 +137,13 @@ class IrisGrid extends Component {
     _defineProperty(this, "getAdvancedMenuToggleMaximizeHandler", memoize(column => this.handleAdvancedFilterToggleMaximize.bind(this, column), {
       max: 100
     }));
+    /**
+     * For keyed models, return a function that creates an empty keyed selection.
+     * For non-keyed models, return `undefined` to use the Grid default.
+     */
+    _defineProperty(this, "getCachedCreateEmptySelection", memoize(isKeyed => isKeyed ? getModel => KeyedSelection.empty(getModel) : undefined, {
+      max: 1
+    }));
     _defineProperty(this, "getCachedAdvancedFilterMenuActions", memoize((model, column, advancedFilterOptions, sortDirection, formatter, isMaximized, onToggleMaximize) => /*#__PURE__*/_jsx(AdvancedFilterCreator, {
       model: model,
       column: column,
@@ -418,7 +427,7 @@ class IrisGrid extends Component {
     _defineProperty(this, "getCachedRenderer", memoize(rendererProp => rendererProp !== null && rendererProp !== void 0 ? rendererProp : new IrisGridRenderer(), {
       max: 1
     }));
-    _defineProperty(this, "getAlwaysFetchColumns", memoize((alwaysFetchColumns, columns, movedColumns, floatingLeftColumnCount, floatingRightColumnCount, draggingRange) => {
+    _defineProperty(this, "getAlwaysFetchColumns", memoize((alwaysFetchColumns, columns, movedColumns, floatingLeftColumnCount, floatingRightColumnCount, model, draggingRange) => {
       var floatingColumns = [];
       for (var i = 0; i < floatingLeftColumnCount; i += 1) {
         floatingColumns.push(columns[GridUtils.getModelIndex(i, movedColumns)].name);
@@ -431,7 +440,12 @@ class IrisGrid extends Component {
           floatingColumns.push(columns[GridUtils.getModelIndex(_i2, movedColumns)].name);
         }
       }
-      var columnSet = new Set([...alwaysFetchColumns, ...floatingColumns]);
+      var keyColumnIndices = isKeyedGridModel(model) ? model.selectionKeyColumnIndices : EMPTY_ARRAY;
+      var keyColumns = keyColumnIndices.map(i => {
+        var _columns$i;
+        return (_columns$i = columns[i]) === null || _columns$i === void 0 ? void 0 : _columns$i.name;
+      }).filter(n => n != null);
+      var columnSet = new Set([...alwaysFetchColumns, ...floatingColumns, ...keyColumns]);
       return Object.freeze([...columnSet]);
     }, {
       max: 1
@@ -601,6 +615,7 @@ class IrisGrid extends Component {
     this.handlePending = this.handlePending.bind(this);
     this.handlePendingCleared = this.handlePendingCleared.bind(this);
     this.handleSelectionChanged = this.handleSelectionChanged.bind(this);
+    this.handleGridSelectionChange = this.handleGridSelectionChange.bind(this);
     this.handleMovedColumnsChanged = this.handleMovedColumnsChanged.bind(this);
     this.handleHeaderGroupsChanged = this.handleHeaderGroupsChanged.bind(this);
     this.handleUpdate = this.handleUpdate.bind(this);
@@ -768,8 +783,7 @@ class IrisGrid extends Component {
       reverse: false,
       customColumns: [],
       selectDistinctColumns,
-      // selected range in table
-      selectedRanges: [],
+      gridSelection: null,
       // Current ongoing copy operation
       copyOperation: null,
       // The filter that is currently being applied. Reset after update is received
@@ -1595,16 +1609,27 @@ class IrisGrid extends Component {
     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 _this$props5 = this.props,
-      model = _this$props5.model,
-      canCopy = _this$props5.canCopy;
+    var model = this.props.model;
+    var bounded = GridRange.boundedRanges(ranges, model.columnCount, model.rowCount);
+    var selection = new RangedSelection(bounded, () => model);
+    this.copySelection(selection, includeHeaders, formatValues, error);
+  }
+  copySelection(selection) {
+    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 canCopy = this.props.canCopy;
     var _this$state6 = this.state,
       metricCalculator = _this$state6.metricCalculator,
       movedColumns = _this$state6.movedColumns;
     var userColumnWidths = metricCalculator.getUserColumnWidths();
     if (canCopy) {
+      // Skip copy while keyed selection is still resolving — selectedKeyValues is empty.
+      if (selection instanceof KeyedSelection && selection.pendingRanges.length > 0) {
+        return;
+      }
       var copyOperation = {
-        ranges: GridRange.boundedRanges(ranges, model.columnCount, model.rowCount),
+        selection,
         includeHeaders,
         formatValues,
         movedColumns,
@@ -1615,7 +1640,7 @@ class IrisGrid extends Component {
         copyOperation
       });
     } else {
-      log.error('Attempted copyRanges for user without copy permission.');
+      log.error('Attempted copySelection for user without copy permission.');
     }
   }
   startLoading(loadingText) {
@@ -2010,9 +2035,9 @@ class IrisGrid extends Component {
     (_this$grid0 = this.grid) === null || _this$grid0 === void 0 || _this$grid0.forceUpdate();
   }
   requestSortsChange(sorts) {
-    var _this$props6 = this.props,
-      isSortsControlled = _this$props6.isSortsControlled,
-      onSortsChange = _this$props6.onSortsChange;
+    var _this$props5 = this.props,
+      isSortsControlled = _this$props5.isSortsControlled,
+      onSortsChange = _this$props5.onSortsChange;
     onSortsChange === null || onSortsChange === void 0 || onSortsChange(sorts);
     if (!isSortsControlled) {
       this.updateSorts(sorts);
@@ -2037,9 +2062,9 @@ class IrisGrid extends Component {
     (_this$grid1 = this.grid) === null || _this$grid1 === void 0 || _this$grid1.forceUpdate();
   }
   requestQuickFiltersChange(quickFilters) {
-    var _this$props7 = this.props,
-      isQuickFiltersControlled = _this$props7.isQuickFiltersControlled,
-      onQuickFiltersChange = _this$props7.onQuickFiltersChange;
+    var _this$props6 = this.props,
+      isQuickFiltersControlled = _this$props6.isQuickFiltersControlled,
+      onQuickFiltersChange = _this$props6.onQuickFiltersChange;
     onQuickFiltersChange === null || onQuickFiltersChange === void 0 || onQuickFiltersChange(quickFilters);
     if (!isQuickFiltersControlled) {
       this.updateQuickFilters(quickFilters);
@@ -2099,9 +2124,9 @@ class IrisGrid extends Component {
   }
   isTableSearchAvailable() {
     var _model$layoutHints3, _dh$SearchDisplayMode, _dh$SearchDisplayMode2;
-    var _this$props8 = this.props,
-      model = _this$props8.model,
-      canToggleSearch = _this$props8.canToggleSearch;
+    var _this$props7 = this.props,
+      model = _this$props7.model,
+      canToggleSearch = _this$props7.canToggleSearch;
     var dh = model.dh;
     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)) {
@@ -2152,8 +2177,8 @@ class IrisGrid extends Component {
       (_this$gotoRowRef$curr = this.gotoRowRef.current) === null || _this$gotoRowRef$curr === void 0 || _this$gotoRowRef$curr.focus();
       return;
     }
-    var cursorRow = (_this$grid13 = this.grid) === null || _this$grid13 === void 0 ? void 0 : _this$grid13.state.cursorRow;
-    var cursorColumn = (_this$grid14 = this.grid) === null || _this$grid14 === void 0 ? void 0 : _this$grid14.state.cursorColumn;
+    var cursorRow = (_this$grid13 = this.grid) === null || _this$grid13 === void 0 ? void 0 : _this$grid13.state.selection.cursorRow;
+    var cursorColumn = (_this$grid14 = this.grid) === null || _this$grid14 === void 0 ? void 0 : _this$grid14.state.selection.cursorColumn;
     if (cursorRow == null || cursorColumn == null) {
       // if a cell is not selected / grid is not rendered
       this.setState({
@@ -2375,9 +2400,9 @@ class IrisGrid extends Component {
     // TODO: IDS-4242 Update Chart Preview
   }
   handleChartCreate(settings) {
-    var _this$props9 = this.props,
-      model = _this$props9.model,
-      onCreateChart = _this$props9.onCreateChart;
+    var _this$props8 = this.props,
+      model = _this$props8.model,
+      onCreateChart = _this$props8.onCreateChart;
     onCreateChart(settings, model);
   }
   handleGridError(error) {
@@ -2620,17 +2645,26 @@ class IrisGrid extends Component {
    * reconciles against the grid's current `movedColumns` at draw time.
    */
   handleSchemaChanged() {
+    var _this$grid18;
     var model = this.props.model;
     this.setState({
       movedColumns: model.initialMovedColumns
     });
+
+    // Clear the selection if the model type changed (keyed vs non-keyed)
+    var currentSelection = (_this$grid18 = this.grid) === null || _this$grid18 === void 0 ? void 0 : _this$grid18.state.selection;
+    if (currentSelection == null) return;
+    var modelIsKeyed = isKeyedGridModel(model);
+    var selectionIsKeyed = currentSelection instanceof KeyedSelection;
+    if (modelIsKeyed !== selectionIsKeyed) {
+      var _this$grid19;
+      (_this$grid19 = this.grid) === null || _this$grid19 === void 0 || _this$grid19.clearSelectedRanges();
+    }
   }
   handleViewChanged(metrics) {
-    var _this$grid$state, _this$grid18;
+    var _this$grid$state$sele, _this$grid20;
     var model = this.props.model;
-    var _ref19 = (_this$grid$state = (_this$grid18 = this.grid) === null || _this$grid18 === void 0 ? void 0 : _this$grid18.state) !== null && _this$grid$state !== void 0 ? _this$grid$state : {},
-      _ref19$selectionEndRo = _ref19.selectionEndRow,
-      selectionEndRow = _ref19$selectionEndRo === void 0 ? 0 : _ref19$selectionEndRo;
+    var selectionEndRow = (_this$grid$state$sele = (_this$grid20 = this.grid) === null || _this$grid20 === void 0 ? void 0 : _this$grid20.state.selection.selectionEndRow) !== null && _this$grid$state$sele !== void 0 ? _this$grid$state$sele : 0;
     var pendingRowCount = 0;
     if (isEditableGridModel(model) && model.isEditable) {
       assertNotNull(metrics);
@@ -2655,29 +2689,64 @@ class IrisGrid extends Component {
       pendingRowCount
     });
   }
+
+  /** @deprecated Use `handleGridSelectionChange` instead. */
   handleSelectionChanged(selectedRanges) {
     assertNotNull(selectedRanges);
     var onSelectionChanged = this.props.onSelectionChanged;
+    onSelectionChanged === null || onSelectionChanged === void 0 || onSelectionChanged(selectedRanges);
+  }
+  handleGridSelectionChange(selection) {
+    var onSelectionChange = this.props.onSelectionChange;
     var copyOperation = this.state.copyOperation;
     this.setState({
-      selectedRanges
+      gridSelection: selection
     });
     if (copyOperation != null) {
       this.setState({
         copyOperation: 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) {
+    var cursorRow = selection.cursorRow;
+    if (cursorRow != null) {
       this.setState({
-        gotoRow: "".concat(selectedRanges[0].startRow + 1)
+        gotoRow: "".concat(cursorRow + 1)
       });
     }
-    onSelectionChanged(selectedRanges);
+    onSelectionChange === null || onSelectionChange === void 0 || onSelectionChange(selection);
+    if (selection instanceof KeyedSelection && selection.pendingRanges.length > 0) {
+      this.resolveKeyedSelection(selection);
+    }
+  }
+
+  /**
+   * Resolves a KeyedSelection with ranges outside the current viewport by
+   * fetching the missing key values from the server. Triggered by
+   * `Grid.setSelectedRanges` (plugin-driven programmatic selection) and by
+   * shift+click/drag that spans a scrolled-away region.
+   */
+  resolveKeyedSelection(pending) {
+    var _this6 = this;
+    return _asyncToGenerator(function* () {
+      var model = _this6.props.model;
+      if (!isKeyedGridModel(model)) return;
+      var pendingRanges = pending.pendingRanges;
+      if (pendingRanges.length === 0) return;
+      try {
+        var _this6$grid;
+        var keyValues = yield model.fetchKeyValuesForRowRanges(pendingRanges);
+        // Bail if the user changed the selection while we were fetching.
+        if (((_this6$grid = _this6.grid) === null || _this6$grid === void 0 ? void 0 : _this6$grid.getSelection()) !== pending) return;
+        _this6.grid.setSelection(pending.resolve(keyValues));
+      } catch (e) {
+        var _this6$grid2;
+        log.error('resolveKeyedSelection failed', e);
+        // Prevent the unusable pending selection from remaining installed indefinitely.
+        if (((_this6$grid2 = _this6.grid) === null || _this6$grid2 === void 0 ? void 0 : _this6$grid2.getSelection()) === pending) {
+          _this6.grid.setSelection(pending.clear());
+        }
+      }
+    })();
   }
   handleMovedColumnsChanged(movedColumns, onChangeApplied) {
     this.setState({
@@ -2695,8 +2764,8 @@ class IrisGrid extends Component {
       // Parsing them again causes a loop with undo/redo that makes it unusable
       columnHeaderGroups: columnHeaderGroups.every(group => isColumnHeaderGroup(group) && group.isValid()) ? columnHeaderGroups : IrisGridUtils.parseColumnHeaderGroups(model, columnHeaderGroups).groups
     }, () => {
-      var _this$grid19;
-      return (_this$grid19 = this.grid) === null || _this$grid19 === void 0 ? void 0 : _this$grid19.forceUpdate();
+      var _this$grid21;
+      return (_this$grid21 = this.grid) === null || _this$grid21 === void 0 ? void 0 : _this$grid21.forceUpdate();
     });
   }
   handleTooltipRef(tooltip) {
@@ -2885,7 +2954,7 @@ class IrisGrid extends Component {
     return this.discardPending();
   }
   handlePendingDataUpdated() {
-    var _this$grid20;
+    var _this$grid22;
     log.debug('pending data updated');
     var model = this.props.model;
     var pendingDataMap = model.pendingDataMap,
@@ -2895,10 +2964,10 @@ class IrisGrid extends Component {
       pendingDataErrors,
       pendingSaveError: null
     });
-    (_this$grid20 = this.grid) === null || _this$grid20 === void 0 || _this$grid20.forceUpdate();
+    (_this$grid22 = this.grid) === null || _this$grid22 === void 0 || _this$grid22.forceUpdate();
   }
   handleResizeColumn(modelIndex) {
-    var _this$grid21;
+    var _this$grid23;
     var _this$state18 = this.state,
       metrics = _this$state18.metrics,
       metricCalculator = _this$state18.metricCalculator;
@@ -2911,23 +2980,23 @@ class IrisGrid extends Component {
     } else {
       metricCalculator.setColumnWidth(modelIndex, contentWidth);
     }
-    (_this$grid21 = this.grid) === null || _this$grid21 === void 0 || _this$grid21.forceUpdate();
+    (_this$grid23 = this.grid) === null || _this$grid23 === void 0 || _this$grid23.forceUpdate();
   }
   handleResizeAllColumns() {
-    var _this$grid22;
+    var _this$grid24;
     var _this$state19 = this.state,
       metrics = _this$state19.metrics,
       metricCalculator = _this$state19.metricCalculator;
     if (!metrics) throw new Error('Metrics not set');
     var allColumns = [...metrics.allColumnWidths.entries()];
-    var visibleColumns = allColumns.filter(_ref20 => {
-      var _ref21 = _slicedToArray(_ref20, 2),
-        _ = _ref21[0],
-        width = _ref21[1];
+    var visibleColumns = allColumns.filter(_ref19 => {
+      var _ref20 = _slicedToArray(_ref19, 2),
+        _ = _ref20[0],
+        width = _ref20[1];
       return width !== 0;
-    }).map(_ref22 => {
-      var _ref23 = _slicedToArray(_ref22, 1),
-        modelIndex = _ref23[0];
+    }).map(_ref21 => {
+      var _ref22 = _slicedToArray(_ref21, 1),
+        modelIndex = _ref22[0];
       return modelIndex;
     });
     var contentWidths = metrics.contentColumnWidths;
@@ -2949,7 +3018,7 @@ class IrisGrid extends Component {
         metricCalculator.setColumnWidth(_modelIndex, _contentWidth);
       }
     }
-    (_this$grid22 = this.grid) === null || _this$grid22 === void 0 || _this$grid22.forceUpdate();
+    (_this$grid24 = this.grid) === null || _this$grid24 === void 0 || _this$grid24.forceUpdate();
   }
 
   /**
@@ -2990,8 +3059,8 @@ class IrisGrid extends Component {
     if (shouldStartLoading) {
       this.startLoading("Aggregating ".concat(aggregation.operation, "..."));
     }
-    this.setState(_ref24 => {
-      var aggregationSettings = _ref24.aggregationSettings;
+    this.setState(_ref23 => {
+      var aggregationSettings = _ref23.aggregationSettings;
       return {
         selectedAggregation: aggregation,
         aggregationSettings: _objectSpread(_objectSpread({}, aggregationSettings), {}, {
@@ -3095,8 +3164,8 @@ class IrisGrid extends Component {
    */
   removeEmptyAggregations() {
     log.debug('removeEmptyAggregations');
-    this.setState(_ref25 => {
-      var aggregationSettings = _ref25.aggregationSettings;
+    this.setState(_ref24 => {
+      var aggregationSettings = _ref24.aggregationSettings;
       var aggregations = aggregationSettings.aggregations;
       var newAggregations = aggregations.filter(a => a.selected.length > 0 || a.invert);
       if (newAggregations.length !== aggregations.length) {
@@ -3115,14 +3184,14 @@ class IrisGrid extends Component {
   }
   seekRow(inputString) {
     var _arguments = arguments,
-      _this6 = this;
+      _this7 = this;
     return _asyncToGenerator(function* () {
-      var _this6$grid;
+      var _this7$grid;
       var isBackwards = _arguments.length > 1 && _arguments[1] !== undefined ? _arguments[1] : false;
-      var _this6$state = _this6.state,
-        selectedColumnName = _this6$state.gotoValueSelectedColumnName,
-        gotoValueSelectedFilter = _this6$state.gotoValueSelectedFilter;
-      var model = _this6.props.model;
+      var _this7$state = _this7.state,
+        selectedColumnName = _this7$state.gotoValueSelectedColumnName,
+        gotoValueSelectedFilter = _this7$state.gotoValueSelectedFilter;
+      var model = _this7.props.model;
       var dh = model.dh;
       if (!model.isSeekRowAvailable) {
         return;
@@ -3134,14 +3203,14 @@ class IrisGrid extends Component {
       if (selectedColumn === undefined) {
         return;
       }
-      var searchFromRow = (_this6$grid = _this6.grid) === null || _this6$grid === void 0 ? void 0 : _this6$grid.state.cursorRow;
+      var searchFromRow = (_this7$grid = _this7.grid) === null || _this7$grid === void 0 ? void 0 : _this7$grid.state.selection.cursorRow;
       if (searchFromRow == null) {
         searchFromRow = 0;
       }
       var isContains = gotoValueSelectedFilter === FilterType.contains || gotoValueSelectedFilter === FilterType.containsIgnoreCase;
       var isIgnoreCase = gotoValueSelectedFilter === FilterType.eqIgnoreCase || gotoValueSelectedFilter === FilterType.containsIgnoreCase;
       try {
-        var _this6$grid2;
+        var _this7$grid2;
         var formatter = model.formatter;
         var columnDataType = TableUtils.getNormalizedType(selectedColumn.type);
         var rowIndex;
@@ -3178,15 +3247,15 @@ class IrisGrid extends Component {
             }
           default:
             {
-              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);
+              rowIndex = yield model.seekRow(searchFromRow, selectedColumn, dh.ValueType.STRING, _this7.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 || _this6$grid2.setFocusRow(rowIndex);
-        _this6.setState({
+        (_this7$grid2 = _this7.grid) === null || _this7$grid2 === void 0 || _this7$grid2.setFocusRow(rowIndex);
+        _this7.setState({
           gotoValueError: ''
         });
       } catch (e) {
-        _this6.setState({
+        _this7.setState({
           gotoValueError: 'invalid input'
         });
       }
@@ -3271,11 +3340,11 @@ class IrisGrid extends Component {
     onStateChange(irisGridState, gridState);
   }
   handleOverflowClose() {
-    var _this$grid23;
+    var _this$grid25;
     this.setState({
       showOverflowModal: false
     });
-    (_this$grid23 = this.grid) === null || _this$grid23 === void 0 || _this$grid23.focus(); // Focus on the grid after closing the overflow modal
+    (_this$grid25 = this.grid) === null || _this$grid25 === void 0 || _this$grid25.focus(); // Focus on the grid after closing the overflow modal
   }
   handleOpenNoPastePermissionModal(errorMessage) {
     this.setState({
@@ -3345,22 +3414,22 @@ class IrisGrid extends Component {
         gotoRowError: 'Invalid row index'
       });
     } else if (rowInt === 0) {
-      var _this$grid24;
+      var _this$grid26;
       this.setState({
         gotoRowError: '',
         gotoValueError: ''
       });
-      (_this$grid24 = this.grid) === null || _this$grid24 === void 0 || _this$grid24.setFocusRow(0);
+      (_this$grid26 = this.grid) === null || _this$grid26 === void 0 || _this$grid26.setFocusRow(0);
     } else if (rowInt < 0) {
-      var _this$grid25;
+      var _this$grid27;
       this.setState({
         gotoRowError: '',
         gotoValueError: ''
       });
-      (_this$grid25 = this.grid) === null || _this$grid25 === void 0 || _this$grid25.setFocusRow(rowInt + rowCount);
+      (_this$grid27 = this.grid) === null || _this$grid27 === void 0 || _this$grid27.setFocusRow(rowInt + rowCount);
     } else {
-      var _this$grid26;
-      (_this$grid26 = this.grid) === null || _this$grid26 === void 0 || _this$grid26.setFocusRow(rowInt - 1);
+      var _this$grid28;
+      (_this$grid28 = this.grid) === null || _this$grid28 === void 0 || _this$grid28.setFocusRow(rowInt - 1);
       this.setState({
         gotoRowError: '',
         gotoValueError: ''
@@ -3458,9 +3527,9 @@ class IrisGrid extends Component {
     });
   }
   handleGotoValueSelectedColumnNameChanged(columnName) {
-    var _this$grid27;
+    var _this$grid29;
     var model = this.props.model;
-    var cursorRow = (_this$grid27 = this.grid) === null || _this$grid27 === void 0 ? void 0 : _this$grid27.state.cursorRow;
+    var cursorRow = (_this$grid29 = this.grid) === null || _this$grid29 === void 0 ? void 0 : _this$grid29.state.selection.cursorRow;
     var _this$state21 = this.state,
       prevColumnName = _this$state21.gotoValueSelectedColumnName,
       gotoValueManuallyChanged = _this$state21.gotoValueManuallyChanged;
@@ -3516,7 +3585,7 @@ class IrisGrid extends Component {
    * @returns The filter input field element or null if not applicable
    */
   getFilterBarInput(metrics, metricCalculator, focusedFilterBarColumn, quickFilters, advancedFilters) {
-    var _this$grid28;
+    var _this$grid30;
     if (metrics == null || focusedFilterBarColumn == null) {
       return null;
     }
@@ -3571,7 +3640,7 @@ class IrisGrid extends Component {
       onChange: this.handleFilterBarChange,
       onDone: this.handleFilterBarDone,
       onTab: this.handleFilterBarTab,
-      onContextMenu: (_this$grid28 = this.grid) === null || _this$grid28 === void 0 ? void 0 : _this$grid28.handleContextMenu,
+      onContextMenu: (_this$grid30 = this.grid) === null || _this$grid30 === void 0 ? void 0 : _this$grid30.handleContextMenu,
       debounceMs: debounceMs,
       value: value
     }, focusedFilterBarColumn);
@@ -3579,25 +3648,25 @@ class IrisGrid extends Component {
   render() {
     var _rollupConfig$columns7,
       _rollupConfig$columns8,
-      _this7 = this,
-      _this$grid29,
+      _this8 = this,
+      _this$grid31,
       _openOptions;
-    var _this$props0 = this.props,
-      children = _this$props0.children,
-      customFilters = _this$props0.customFilters,
-      getDownloadWorker = _this$props0.getDownloadWorker,
-      isSelectingColumn = _this$props0.isSelectingColumn,
-      isStuckToBottom = _this$props0.isStuckToBottom,
-      isStuckToRight = _this$props0.isStuckToRight,
-      model = _this$props0.model,
-      name = _this$props0.name,
-      onlyFetchVisibleColumns = _this$props0.onlyFetchVisibleColumns,
-      alwaysFetchColumns = _this$props0.alwaysFetchColumns,
-      advancedSettings = _this$props0.advancedSettings,
-      onAdvancedSettingsChange = _this$props0.onAdvancedSettingsChange,
-      canDownloadCsv = _this$props0.canDownloadCsv,
-      onCreateChart = _this$props0.onCreateChart,
-      transformTableOptions = _this$props0.transformTableOptions;
+    var _this$props9 = this.props,
+      children = _this$props9.children,
+      customFilters = _this$props9.customFilters,
+      getDownloadWorker = _this$props9.getDownloadWorker,
+      isSelectingColumn = _this$props9.isSelectingColumn,
+      isStuckToBottom = _this$props9.isStuckToBottom,
+      isStuckToRight = _this$props9.isStuckToRight,
+      model = _this$props9.model,
+      name = _this$props9.name,
+      onlyFetchVisibleColumns = _this$props9.onlyFetchVisibleColumns,
+      alwaysFetchColumns = _this$props9.alwaysFetchColumns,
+      advancedSettings = _this$props9.advancedSettings,
+      onAdvancedSettingsChange = _this$props9.onAdvancedSettingsChange,
+      canDownloadCsv = _this$props9.canDownloadCsv,
+      onCreateChart = _this$props9.onCreateChart,
+      transformTableOptions = _this$props9.transformTableOptions;
     var cellInputRendererRegistry = this.context.cellInputRendererRegistry;
     var _this$state22 = this.state,
       metricCalculator = _this$state22.metricCalculator,
@@ -3633,7 +3702,7 @@ class IrisGrid extends Component {
       sorts = _this$state22.sorts,
       reverse = _this$state22.reverse,
       customColumns = _this$state22.customColumns,
-      selectedRanges = _this$state22.selectedRanges,
+      gridSelection = _this$state22.gridSelection,
       isTableDownloading = _this$state22.isTableDownloading,
       tableDownloadStatus = _this$state22.tableDownloadStatus,
       tableDownloadProgress = _this$state22.tableDownloadProgress,
@@ -3733,7 +3802,7 @@ class IrisGrid extends Component {
       var visibleColumns = metrics.visibleColumns;
       var _loop2 = function _loop2() {
         var columnIndex = visibleColumns[i];
-        var modelColumn = _this7.getModelColumn(columnIndex);
+        var modelColumn = _this8.getModelColumn(columnIndex);
         if (modelColumn != null) {
           var isFilterable = model.isFilterable(modelColumn);
           var buttonCoordinates = isFilterable && metricState ? metricCalculator.getAdvancedFilterButtonCoordinates(columnIndex, metricState, metrics) : null;
@@ -3759,22 +3828,22 @@ class IrisGrid extends Component {
                   'filter-set': isFilterSet
                 }),
                 onClick: () => {
-                  _this7.setState({
+                  _this8.setState({
                     shownAdvancedFilter: columnIndex,
                     maximizedAdvancedFilter: null
                   });
                 },
                 onContextMenu: event => {
-                  var _this7$grid;
-                  (_this7$grid = _this7.grid) === null || _this7$grid === void 0 || _this7$grid.handleContextMenu(event);
+                  var _this8$grid;
+                  (_this8$grid = _this8.grid) === null || _this8$grid === void 0 || _this8$grid.handleContextMenu(event);
                 },
                 onMouseEnter: () => {
-                  _this7.setState({
+                  _this8.setState({
                     hoverAdvancedFilter: columnIndex
                   });
                 },
                 onMouseLeave: () => {
-                  _this7.setState({
+                  _this8.setState({
                     hoverAdvancedFilter: null
                   });
                 },
@@ -3825,7 +3894,7 @@ class IrisGrid extends Component {
             width: columnWidth,
             height: columnHeaderHeight
           };
-          var modelColumn = _this7.getModelColumn(columnIndex);
+          var modelColumn = _this8.getModelColumn(columnIndex);
           if (modelColumn != null) {
             var column = model.columns[modelColumn];
             if (column == null) {
@@ -3835,8 +3904,8 @@ class IrisGrid extends Component {
               return 1; // continue
             }
             var advancedFilter = advancedFilters.get(modelColumn);
-            var _ref26 = advancedFilter || {},
-              advancedFilterOptions = _ref26.options;
+            var _ref25 = advancedFilter || {},
+              advancedFilterOptions = _ref25.options;
             var sort = TableUtils.getSortForColumn(model.sort, column.name);
             var sortDirection = sort ? sort.direction : null;
             if (!isSortDirection(sortDirection)) {
@@ -3848,9 +3917,9 @@ class IrisGrid extends Component {
               children: /*#__PURE__*/_jsx(Popper, {
                 className: "advanced-filter-menu-popper",
                 isMaximized: shownAdvancedFilter === columnIndex && maximizedAdvancedFilter === columnIndex,
-                onEntered: _this7.getAdvancedMenuOpenedHandler(columnIndex),
+                onEntered: _this8.getAdvancedMenuOpenedHandler(columnIndex),
                 onExited: () => {
-                  _this7.handleAdvancedMenuClosed(columnIndex);
+                  _this8.handleAdvancedMenuClosed(columnIndex);
                 },
                 isShown: shownAdvancedFilter === columnIndex,
                 interactive: true,
@@ -3858,7 +3927,7 @@ class IrisGrid extends Component {
                 options: {
                   positionFixed: true
                 },
-                children: _this7.getCachedAdvancedFilterMenuActions(model, column, advancedFilterOptions, sortDirection, formatter, shownAdvancedFilter === columnIndex && maximizedAdvancedFilter === columnIndex, _this7.getAdvancedMenuToggleMaximizeHandler(columnIndex))
+                children: _this8.getCachedAdvancedFilterMenuActions(model, column, advancedFilterOptions, sortDirection, formatter, shownAdvancedFilter === columnIndex && maximizedAdvancedFilter === columnIndex, _this8.getAdvancedMenuToggleMaximizeHandler(columnIndex))
               })
             }, columnIndex);
             advancedFilterMenus.push(element);
@@ -3952,7 +4021,7 @@ class IrisGrid extends Component {
             onDownload: this.handleDownloadTable,
             onDownloadStart: this.handleDownloadTableStart,
             onCancel: this.handleCancelDownloadTable,
-            selectedRanges: selectedRanges
+            selection: gridSelection
           }, OptionType.TABLE_EXPORTER);
         case OptionType.SELECT_DISTINCT:
           return /*#__PURE__*/_jsx(SelectDistinctBuilder, {
@@ -4043,6 +4112,7 @@ class IrisGrid extends Component {
             this.grid = grid;
           },
           isStickyBottom: !isEditableGridModel(model) || !model.isEditable,
+          createEmptySelection: this.getCachedCreateEmptySelection(isKeyedGridModel(model)),
           isStuckToBottom: isStuckToBottom,
           isStuckToRight: isStuckToRight,
           metricCalculator: metricCalculator,
@@ -4054,6 +4124,7 @@ class IrisGrid extends Component {
           onError: this.handleGridError,
           onViewChanged: this.handleViewChanged,
           onSelectionChanged: this.handleSelectionChanged,
+          onSelectionChange: this.handleGridSelectionChange,
           onMovedColumnsChanged: this.handleMovedColumnsChanged,
           renderer: this.renderer,
           cellInputRendererRegistry: cellInputRendererRegistry !== null && cellInputRendererRegistry !== void 0 ? cellInputRendererRegistry : DEFAULT_REGISTRY,
@@ -4077,7 +4148,7 @@ class IrisGrid extends Component {
             movedColumns: movedColumns,
             customColumns: customColumns,
             hiddenColumns: hiddenColumns,
-            alwaysFetchColumns: this.getAlwaysFetchColumns(alwaysFetchColumns, model.columns, movedColumns, model.floatingLeftColumnCount, model.floatingRightColumnCount, (_this$grid29 = this.grid) === null || _this$grid29 === void 0 || (_this$grid29 = _this$grid29.state.draggingColumn) === null || _this$grid29 === void 0 ? void 0 : _this$grid29.range),
+            alwaysFetchColumns: this.getAlwaysFetchColumns(alwaysFetchColumns, model.columns, movedColumns, model.floatingLeftColumnCount, model.floatingRightColumnCount, model, (_this$grid31 = this.grid) === null || _this$grid31 === void 0 || (_this$grid31 = _this$grid31.state.draggingColumn) === null || _this$grid31 === void 0 ? void 0 : _this$grid31.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),
@@ -4241,6 +4312,7 @@ _defineProperty(IrisGrid, "defaultProps", {
   userColumnWidthsByName: undefined,
   userRowHeights: EMPTY_MAP,
   onSelectionChanged: () => undefined,
+  onSelectionChange: () => undefined,
   isSelectingColumn: false,
   isSelectingPartition: false,
   isStuckToBottom: false,