@deephaven/iris-grid 0.24.1-hierarchical-table.0 → 0.25.0

package/dist/IrisGrid.js

@@ -133,7 +133,7 @@ export class IrisGrid extends Component {
       }
       optionItems.push({
         type: OptionType.VISIBILITY_ORDERING_BUILDER,
-        title: 'Column Visibility & Ordering',
+        title: 'Hide, Group, and Order Columns',
         icon: dhEye
       });
       if (isFormatColumnsAvailable) {
@@ -395,6 +395,7 @@ export class IrisGrid extends Component {
     this.handleRequestFailed = this.handleRequestFailed.bind(this);
     this.handleSelectionChanged = this.handleSelectionChanged.bind(this);
     this.handleMovedColumnsChanged = this.handleMovedColumnsChanged.bind(this);
+    this.handleHeaderGroupsChanged = this.handleHeaderGroupsChanged.bind(this);
     this.handleUpdate = this.handleUpdate.bind(this);
     this.handleTooltipRef = this.handleTooltipRef.bind(this);
     this.handleViewChanged = this.handleViewChanged.bind(this);
@@ -500,15 +501,16 @@ export class IrisGrid extends Component {
       selectDistinctColumns,
       pendingDataMap,
       canCopy,
-      frozenColumns
+      frozenColumns,
+      columnHeaderGroups
     } = props;
     var keyHandlers = [new ReverseKeyHandler(this), new ClearFilterKeyHandler(this)];
     if (canCopy) {
       keyHandlers.push(new CopyKeyHandler(this));
     }
     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 _movedColumns = movedColumnsProp.length > 0 ? movedColumnsProp : _model.initialMovedColumns;
+    var movedRows = movedRowsProp.length > 0 ? movedRowsProp : _model.initialMovedRows;
     var metricCalculator = new IrisGridMetricCalculator({
       userColumnWidths: new Map(userColumnWidths),
       userRowHeights: new Map(userRowHeights),
@@ -584,7 +586,8 @@ export class IrisGrid extends Component {
       overflowButtonTooltipProps: null,
       isGotoRowShown: false,
       gotoRow: '',
-      gotoRowError: ''
+      gotoRowError: '',
+      columnHeaderGroups: columnHeaderGroups !== null && columnHeaderGroups !== void 0 ? columnHeaderGroups : _model.initialColumnHeaderGroups
     };
   }
   componentDidMount() {
@@ -1429,12 +1432,12 @@ export class IrisGrid extends Component {
       movedColumns: newMovedColumns
     });
   }
-  handleColumnVisibilityChanged(modelIndexes, visibilityOption) {
+  handleColumnVisibilityChanged(modelIndexes, isVisible) {
     var _this$grid6;
     var {
       metricCalculator
     } = this.state;
-    if (visibilityOption === VisibilityOrderingBuilder.VISIBILITY_OPTIONS.SHOW) {
+    if (isVisible) {
       modelIndexes.forEach(modelIndex => {
         metricCalculator.resetColumnWidth(modelIndex);
       });
@@ -2080,12 +2083,22 @@ export class IrisGrid extends Component {
     }
     onSelectionChanged(selectedRanges);
   }
-  handleMovedColumnsChanged(movedColumns) {
-    var onChangeApplied = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : () => null;
+  handleMovedColumnsChanged(movedColumns, onChangeApplied) {
     this.setState({
       movedColumns
     }, onChangeApplied);
   }
+  handleHeaderGroupsChanged(columnHeaderGroups) {
+    var {
+      model
+    } = this.props;
+    this.setState({
+      columnHeaderGroups: IrisGridUtils.parseColumnHeaderGroups(model, columnHeaderGroups).groups
+    }, () => {
+      var _this$grid20;
+      return (_this$grid20 = this.grid) === null || _this$grid20 === void 0 ? void 0 : _this$grid20.forceUpdate();
+    });
+  }
   handleTooltipRef(tooltip) {
     // Need to start the timer right away, since we're creating the tooltip when we want the timer to start
     if (tooltip != null) {
@@ -2218,9 +2231,9 @@ export class IrisGrid extends Component {
       isReady
     } = this.state;
     if (isReady) {
-      var _this$grid20;
+      var _this$grid21;
       this.stopLoading();
-      (_this$grid20 = this.grid) === null || _this$grid20 === void 0 ? void 0 : _this$grid20.forceUpdate();
+      (_this$grid21 = this.grid) === null || _this$grid21 === void 0 ? void 0 : _this$grid21.forceUpdate();
     } else {
       this.initState();
     }
@@ -2232,7 +2245,7 @@ export class IrisGrid extends Component {
     return this.discardPending();
   }
   handlePendingDataUpdated() {
-    var _this$grid21;
+    var _this$grid22;
     log.debug('pending data updated');
     var {
       model
@@ -2246,7 +2259,7 @@ export class IrisGrid extends Component {
       pendingDataErrors,
       pendingSaveError: null
     });
-    (_this$grid21 = this.grid) === null || _this$grid21 === void 0 ? void 0 : _this$grid21.forceUpdate();
+    (_this$grid22 = this.grid) === null || _this$grid22 === void 0 ? void 0 : _this$grid22.forceUpdate();
   }
 
   /**
@@ -2520,20 +2533,20 @@ export class IrisGrid extends Component {
         gotoRowError: 'Invalid row index'
       });
     } else if (rowInt === 0) {
-      var _this$grid22;
+      var _this$grid23;
       this.setState({
         gotoRowError: ''
       });
-      (_this$grid22 = this.grid) === null || _this$grid22 === void 0 ? void 0 : _this$grid22.setFocusRow(0);
+      (_this$grid23 = this.grid) === null || _this$grid23 === void 0 ? void 0 : _this$grid23.setFocusRow(0);
     } else if (rowInt < 0) {
-      var _this$grid23;
+      var _this$grid24;
       this.setState({
         gotoRowError: ''
       });
-      (_this$grid23 = this.grid) === null || _this$grid23 === void 0 ? void 0 : _this$grid23.setFocusRow(rowInt + rowCount);
+      (_this$grid24 = this.grid) === null || _this$grid24 === void 0 ? void 0 : _this$grid24.setFocusRow(rowInt + rowCount);
     } else {
-      var _this$grid24;
-      (_this$grid24 = this.grid) === null || _this$grid24 === void 0 ? void 0 : _this$grid24.setFocusRow(rowInt - 1);
+      var _this$grid25;
+      (_this$grid25 = this.grid) === null || _this$grid25 === void 0 ? void 0 : _this$grid25.setFocusRow(rowInt - 1);
       this.setState({
         gotoRowError: ''
       });
@@ -2634,8 +2647,8 @@ export class IrisGrid extends Component {
     var _rollupConfig$columns3,
       _rollupConfig$columns4,
       _this5 = this,
-      _this$grid26,
-      _this$grid26$state$dr,
+      _this$grid27,
+      _this$grid27$state$dr,
       _openOptions;
     var {
       children,
@@ -2708,6 +2721,7 @@ export class IrisGrid extends Component {
       pendingDataMap,
       toastMessage,
       frozenColumns,
+      columnHeaderGroups,
       showOverflowModal,
       overflowText,
       overflowButtonTooltipProps,
@@ -2745,7 +2759,7 @@ export class IrisGrid extends Component {
       var columnX = visibleColumnXs.get(focusedFilterBarColumn);
       var columnWidth = visibleColumnWidths.get(focusedFilterBarColumn);
       if (columnX != null && columnWidth != null) {
-        var _theme$filterBarHeigh, _theme$filterBarHeigh2, _this$grid25;
+        var _theme$filterBarHeigh, _theme$filterBarHeigh2, _this$grid26;
         var x = gridX + columnX;
         var y = gridY - ((_theme$filterBarHeigh = theme.filterBarHeight) !== null && _theme$filterBarHeigh !== void 0 ? _theme$filterBarHeigh : 0);
         var fieldWidth = columnWidth + 1; // cover right border
@@ -2786,7 +2800,7 @@ export class IrisGrid extends Component {
           onChange: this.handleFilterBarChange,
           onDone: this.handleFilterBarDone,
           onTab: this.handleFilterBarTab,
-          onContextMenu: (_this$grid25 = this.grid) === null || _this$grid25 === void 0 ? void 0 : _this$grid25.handleContextMenu,
+          onContextMenu: (_this$grid26 = this.grid) === null || _this$grid26 === void 0 ? void 0 : _this$grid26.handleContextMenu,
           debounceMs: debounceMs,
           value: _value4
         });
@@ -2980,8 +2994,10 @@ export class IrisGrid extends Component {
             model: model,
             movedColumns: movedColumns,
             userColumnWidths: userColumnWidths,
+            columnHeaderGroups: columnHeaderGroups,
             onColumnVisibilityChanged: this.handleColumnVisibilityChanged,
             onMovedColumnsChanged: this.handleMovedColumnsChanged,
+            onColumnHeaderGroupChanged: this.handleHeaderGroupsChanged,
             key: OptionType.VISIBILITY_ORDERING_BUILDER
           });
         case OptionType.CONDITIONAL_FORMATTING:
@@ -3151,7 +3167,7 @@ export class IrisGrid extends Component {
       movedColumns: movedColumns,
       customColumns: customColumns,
       hiddenColumns: hiddenColumns,
-      alwaysFetchColumns: this.getAlwaysFetchColumns(alwaysFetchColumns, model.columns, movedColumns, model.floatingLeftColumnCount, model.floatingRightColumnCount, (_this$grid26 = this.grid) === null || _this$grid26 === void 0 ? void 0 : (_this$grid26$state$dr = _this$grid26.state.draggingColumn) === null || _this$grid26$state$dr === void 0 ? void 0 : _this$grid26$state$dr.range),
+      alwaysFetchColumns: this.getAlwaysFetchColumns(alwaysFetchColumns, model.columns, movedColumns, model.floatingLeftColumnCount, model.floatingRightColumnCount, (_this$grid27 = this.grid) === null || _this$grid27 === void 0 ? void 0 : (_this$grid27$state$dr = _this$grid27.state.draggingColumn) === null || _this$grid27$state$dr === void 0 ? void 0 : _this$grid27$state$dr.range),
       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 && conditionalFormatEditIndex !== void 0 ? conditionalFormatEditIndex : undefined : undefined),
@@ -3160,7 +3176,8 @@ export class IrisGrid extends Component {
       selectDistinctColumns: selectDistinctColumns,
       pendingRowCount: pendingRowCount,
       pendingDataMap: pendingDataMap,
-      frozenColumns: frozenColumns
+      frozenColumns: frozenColumns,
+      columnHeaderGroups: columnHeaderGroups
     }), !isMenuShown && /*#__PURE__*/React.createElement("div", {
       className: "grid-settings-button"
     }, /*#__PURE__*/React.createElement(Button, {