@deephaven/iris-grid 0.12.1-beta.3 → 0.12.1-beta.5

package/dist/IrisGrid.d.ts

@@ -255,7 +255,7 @@ export class IrisGrid extends React.Component<any, any, any> {
         advancedFilters: any;
     }): void;
     updateFormatterSettings(settings: any, forceUpdate?: boolean): void;
-    getAlwaysFetchColumns: ((alwaysFetchColumns: any, columns: any, floatingLeftColumnCount: any, floatingRightColumnCount: any) => any[]) & memoize.Memoized<(alwaysFetchColumns: any, columns: any, floatingLeftColumnCount: any, floatingRightColumnCount: any) => any[]>;
+    getAlwaysFetchColumns: ((alwaysFetchColumns: any, columns: any, movedColumns: any, floatingLeftColumnCount: any, floatingRightColumnCount: any) => any[]) & memoize.Memoized<(alwaysFetchColumns: any, columns: any, movedColumns: any, floatingLeftColumnCount: any, floatingRightColumnCount: any) => any[]>;
     updateFormatter(updatedFormats: any, forceUpdate?: boolean): void;
     initFormatter(): void;
     initState(): void;

package/dist/IrisGrid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IrisGrid.d.ts","sourceRoot":"","sources":["../src/IrisGrid.jsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"IrisGrid.d.ts","sourceRoot":"","sources":["../src/IrisGrid.jsx"],"names":[],"mappings":"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"}

package/dist/IrisGrid.js

@@ -309,19 +309,18 @@ export class IrisGrid extends Component {
       max: 1
     }));
 
-    _defineProperty(this, "getAlwaysFetchColumns", memoize((alwaysFetchColumns, columns, floatingLeftColumnCount, floatingRightColumnCount) => {
-      var floatingLeftColumns = [];
-      var floatingRightColumns = [];
+    _defineProperty(this, "getAlwaysFetchColumns", memoize((alwaysFetchColumns, columns, movedColumns, floatingLeftColumnCount, floatingRightColumnCount) => {
+      var floatingColumns = [];
 
-      if (floatingLeftColumnCount) {
-        floatingLeftColumns = columns.slice(0, floatingLeftColumnCount).map(col => col.name);
+      for (var i = 0; i < floatingLeftColumnCount; i += 1) {
+        floatingColumns.push(columns[GridUtils.getModelIndex(i, movedColumns)].name);
       }
 
-      if (floatingRightColumnCount) {
-        floatingRightColumns = columns.slice(-floatingRightColumnCount).map(col => col.name);
+      for (var _i = 0; _i < floatingRightColumnCount; _i += 1) {
+        floatingColumns.push(columns[GridUtils.getModelIndex(columns.length - 1 - _i, movedColumns)].name);
       }
 
-      var columnSet = new Set([...alwaysFetchColumns, ...floatingLeftColumns, ...floatingRightColumns]);
+      var columnSet = new Set([...alwaysFetchColumns, ...floatingColumns]);
       return [...columnSet];
     }));
 
@@ -471,8 +470,8 @@ export class IrisGrid extends Component {
       isFilterBarShown: _isFilterBarShown,
       isSelectingPartition,
       model: _model,
-      movedColumns,
-      movedRows,
+      movedColumns: movedColumnsProp,
+      movedRows: movedRowsProp,
       partition,
       partitionColumn,
       rollupConfig: _rollupConfig,
@@ -496,9 +495,14 @@ export class IrisGrid extends Component {
     }
 
     var mouseHandlers = [new IrisGridCellOverflowMouseHandler(this), new IrisGridColumnSelectMouseHandler(this), new IrisGridColumnTooltipMouseHandler(this), new IrisGridSortMouseHandler(this), new IrisGridFilterMouseHandler(this), new IrisGridContextMenuHandler(this), new IrisGridDataSelectMouseHandler(this), new PendingMouseHandler(this)];
+
+    var _movedColumns = movedColumnsProp.length > 0 ? movedColumnsProp : _model.movedColumns;
+
+    var movedRows = movedRowsProp.length > 0 ? movedRowsProp : _model.movedRows;
     var metricCalculator = new IrisGridMetricCalculator({
       userColumnWidths: new Map(userColumnWidths),
-      userRowHeights: new Map(userRowHeights)
+      userRowHeights: new Map(userRowHeights),
+      movedColumns: _movedColumns
     });
     var searchColumns = selectedSearchColumns !== null && selectedSearchColumns !== void 0 ? selectedSearchColumns : [];
 
@@ -535,7 +539,7 @@ export class IrisGrid extends Component {
       loadingText: null,
       loadingScrimProgress: null,
       loadingSpinnerShown: false,
-      movedColumns,
+      movedColumns: _movedColumns,
       movedRows,
       shownColumnTooltip: null,
       formatter: new Formatter(),
@@ -1435,49 +1439,42 @@ export class IrisGrid extends Component {
 
   freezeColumnByColumnName(columnName) {
     var {
-      frozenColumns
+      frozenColumns,
+      movedColumns
     } = this.state;
     var {
       model
     } = this.props;
     log.debug2('freezing column', columnName);
-    var allFrozenColumns;
-
-    if (frozenColumns == null) {
-      var _model$layoutHints$fr, _model$layoutHints;
-
-      allFrozenColumns = new Set((_model$layoutHints$fr = (_model$layoutHints = model.layoutHints) === null || _model$layoutHints === void 0 ? void 0 : _model$layoutHints.frozenColumns) !== null && _model$layoutHints$fr !== void 0 ? _model$layoutHints$fr : []);
-      allFrozenColumns.add(columnName);
-    } else {
-      allFrozenColumns = new Set([...frozenColumns, columnName]);
-    }
-
+    var allFrozenColumns = frozenColumns == null ? new Set(model.frozenColumns) : new Set(frozenColumns);
+    allFrozenColumns.add(columnName);
+    var modelIndex = model.getColumnIndexByName(columnName);
+    var visibleIndex = GridUtils.getVisibleIndex(modelIndex, movedColumns);
+    var newMovedColumns = GridUtils.moveItem(visibleIndex, allFrozenColumns.size - 1, movedColumns);
     this.setState({
-      frozenColumns: [...allFrozenColumns]
+      frozenColumns: [...allFrozenColumns],
+      movedColumns: newMovedColumns
     });
   }
 
   unFreezeColumnByColumnName(columnName) {
     var {
-      frozenColumns
+      frozenColumns,
+      movedColumns
     } = this.state;
     var {
       model
     } = this.props;
     log.debug2('unfreezing column', columnName);
-    var allFrozenColumns;
-
-    if (frozenColumns == null) {
-      var _model$layoutHints$fr2, _model$layoutHints2;
-
-      allFrozenColumns = new Set((_model$layoutHints$fr2 = (_model$layoutHints2 = model.layoutHints) === null || _model$layoutHints2 === void 0 ? void 0 : _model$layoutHints2.frozenColumns) !== null && _model$layoutHints$fr2 !== void 0 ? _model$layoutHints$fr2 : []);
-      allFrozenColumns.delete(columnName);
-    } else {
-      allFrozenColumns = new Set(frozenColumns.filter(col => col !== columnName));
-    }
+    var allFrozenColumns = frozenColumns == null ? new Set(model.frozenColumns) : new Set(frozenColumns);
+    allFrozenColumns.delete(columnName);
+    var modelIndex = model.getColumnIndexByName(columnName);
+    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);
     this.setState({
-      frozenColumns: [...allFrozenColumns]
+      frozenColumns: [...allFrozenColumns],
+      movedColumns: newMovedColumns
     });
   }
 
@@ -1693,13 +1690,13 @@ export class IrisGrid extends Component {
   }
 
   isTableSearchAvailable() {
-    var _model$layoutHints3, _dh$SearchDisplayMode, _dh$SearchDisplayMode2;
+    var _model$layoutHints, _dh$SearchDisplayMode, _dh$SearchDisplayMode2;
 
     var {
       model,
       canToggleSearch
     } = this.props;
-    var searchDisplayMode = model === null || model === void 0 ? void 0 : (_model$layoutHints3 = model.layoutHints) === null || _model$layoutHints3 === void 0 ? void 0 : _model$layoutHints3.searchDisplayMode;
+    var searchDisplayMode = model === null || model === void 0 ? void 0 : (_model$layoutHints = model.layoutHints) === null || _model$layoutHints === void 0 ? void 0 : _model$layoutHints.searchDisplayMode;
 
     if (searchDisplayMode === ((_dh$SearchDisplayMode = dh.SearchDisplayMode) === null || _dh$SearchDisplayMode === void 0 ? void 0 : _dh$SearchDisplayMode.SEARCH_DISPLAY_HIDE)) {
       return false;
@@ -3002,8 +2999,8 @@ export class IrisGrid extends Component {
         columnHeaderHeight: _columnHeaderHeight
       } = metrics;
 
-      var _loop2 = function _loop2(_i) {
-        var columnIndex = _visibleColumns[_i];
+      var _loop2 = function _loop2(_i2) {
+        var columnIndex = _visibleColumns[_i2];
 
         var columnX = _visibleColumnXs3.get(columnIndex);
 
@@ -3056,8 +3053,8 @@ export class IrisGrid extends Component {
         }
       };
 
-      for (var _i = 0; _i < _visibleColumns.length; _i += 1) {
-        _loop2(_i);
+      for (var _i2 = 0; _i2 < _visibleColumns.length; _i2 += 1) {
+        _loop2(_i2);
       }
     }
 
@@ -3258,7 +3255,7 @@ export class IrisGrid extends Component {
       movedColumns: movedColumns,
       customColumns: customColumns,
       hiddenColumns: hiddenColumns,
-      alwaysFetchColumns: this.getAlwaysFetchColumns(alwaysFetchColumns, model.columns, model.floatingLeftColumnCount, model.floatingRightColumnCount),
+      alwaysFetchColumns: this.getAlwaysFetchColumns(alwaysFetchColumns, model.columns, movedColumns, model.floatingLeftColumnCount, model.floatingRightColumnCount),
       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),