@deephaven/iris-grid 0.13.9 → 0.13.10

package/dist/IrisGrid.d.ts

@@ -243,6 +243,7 @@ export class IrisGrid extends React.Component<any, any, any> {
      */
     setFilterMap(filterMap: Map<string, Object>): void;
     removeColumnFilter(modelColumn: any): void;
+    removeQuickFilter(modelColumn: any): void;
     clearAllFilters(): void;
     clearCrossColumSearch(): void;
     clearGridInputField(): 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

@@ -17,7 +17,7 @@ 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 } from '@deephaven/grid';
+import { Grid, GridRange, GridUtils, isExpandableGridModel } from '@deephaven/grid';
 import { dhEye, dhFilterFilled, dhGraphLineUp, dhTriangleDownSquare, vsCloudDownload, vsEdit, vsFilter, vsMenu, vsRuby, vsSearch, vsSplitHorizontal, vsSymbolOperator, vsTools } from '@deephaven/icons';
 import dh, { PropTypes as APIPropTypes } from '@deephaven/jsapi-shim';
 import { DateUtils, Formatter, FormatterUtils, TableUtils } from '@deephaven/jsapi-utils';
@@ -929,7 +929,9 @@ export class IrisGrid extends Component {
 
       var columnIndex = model.getColumnIndexByName(column.name);
 
-      if (value === null) {
+      if (value === undefined) {
+        this.removeQuickFilter(columnIndex);
+      } else if (value === null) {
         this.setQuickFilter(columnIndex, column.filter().isNull(), '=null');
       } else {
         var filterValue = TableUtils.isTextType(columnType) ? dh.FilterValue.ofString(value) : dh.FilterValue.ofNumber(value);
@@ -956,6 +958,20 @@ export class IrisGrid extends Component {
     });
   }
 
+  removeQuickFilter(modelColumn) {
+    this.startLoading('Clearing Filter...', true);
+    this.setState(_ref11 => {
+      var {
+        quickFilters
+      } = _ref11;
+      var newQuickFilters = new Map(quickFilters);
+      newQuickFilters.delete(modelColumn);
+      return {
+        quickFilters: newQuickFilters
+      };
+    });
+  }
+
   clearAllFilters() {
     log.debug('Clearing all filters');
     var {
@@ -1040,11 +1056,11 @@ export class IrisGrid extends Component {
     });
   }
 
-  setFilters(_ref11) {
+  setFilters(_ref12) {
     var {
       quickFilters,
       advancedFilters
-    } = _ref11;
+    } = _ref12;
     this.setState({
       quickFilters,
       advancedFilters
@@ -1820,11 +1836,12 @@ export class IrisGrid extends Component {
       model
     } = this.props;
     var {
-      columns
+      columns,
+      groupedColumns
     } = model;
     var dataMap = {};
 
-    for (var i = 0; i < columns.length; i += 1) {
+    var _loop = function _loop(i) {
       var column = columns[i];
       var {
         name,
@@ -1832,11 +1849,19 @@ export class IrisGrid extends Component {
       } = column;
       var value = model.valueForCell(i, rowIndex);
       var text = model.textForCell(i, rowIndex);
+      var isExpandable = isExpandableGridModel(model) && model.isRowExpandable(rowIndex);
+      var isGrouped = groupedColumns.find(c => c.name === name) != null;
       dataMap[name] = {
         value,
         text,
-        type
+        type,
+        isGrouped,
+        isExpandable
       };
+    };
+
+    for (var i = 0; i < columns.length; i += 1) {
+      _loop(i);
     }
 
     var {
@@ -1934,11 +1959,11 @@ export class IrisGrid extends Component {
 
   handleFilterBarChange(value) {
     this.startLoading('Filtering...', true);
-    this.setState(_ref12 => {
+    this.setState(_ref13 => {
       var {
         focusedFilterBarColumn,
         quickFilters
-      } = _ref12;
+      } = _ref13;
       var newQuickFilters = new Map(quickFilters);
       var modelIndex = this.getModelColumn(focusedFilterBarColumn);
       this.applyQuickFilter(modelIndex, value, newQuickFilters);
@@ -2012,10 +2037,10 @@ export class IrisGrid extends Component {
   }
 
   handleMenuBack() {
-    this.setState(_ref13 => {
+    this.setState(_ref14 => {
       var {
         openOptions
-      } = _ref13;
+      } = _ref14;
       var newOptions = [...openOptions];
       newOptions.pop();
       return {
@@ -2025,10 +2050,10 @@ export class IrisGrid extends Component {
   }
 
   handleMenuSelect(option) {
-    this.setState(_ref14 => {
+    this.setState(_ref15 => {
       var {
         openOptions
-      } = _ref14;
+      } = _ref15;
       return {
         openOptions: [...openOptions, option]
       };
@@ -2356,10 +2381,10 @@ export class IrisGrid extends Component {
   handleAggregationChange(aggregation) {
     log.debug('handleAggregationChange', aggregation);
     this.startLoading("Aggregating ".concat(aggregation.operation, "..."));
-    this.setState(_ref15 => {
+    this.setState(_ref16 => {
       var {
         aggregationSettings
-      } = _ref15;
+      } = _ref16;
       return {
         selectedAggregation: aggregation,
         aggregationSettings: _objectSpread(_objectSpread({}, aggregationSettings), {}, {
@@ -2911,7 +2936,7 @@ export class IrisGrid extends Component {
         filterBarHeight
       } = theme;
 
-      var _loop = function _loop(i) {
+      var _loop2 = function _loop2(i) {
         var columnIndex = visibleColumns[i];
 
         var columnX = _visibleColumnXs2.get(columnIndex);
@@ -2981,7 +3006,7 @@ export class IrisGrid extends Component {
       };
 
       for (var i = 0; i < visibleColumns.length; i += 1) {
-        _loop(i);
+        _loop2(i);
       }
     }
 
@@ -2996,7 +3021,7 @@ export class IrisGrid extends Component {
         columnHeaderHeight: _columnHeaderHeight
       } = metrics;
 
-      var _loop2 = function _loop2(_i2) {
+      var _loop3 = function _loop3(_i2) {
         var columnIndex = _visibleColumns[_i2];
 
         var columnX = _visibleColumnXs3.get(columnIndex);
@@ -3051,7 +3076,7 @@ export class IrisGrid extends Component {
       };
 
       for (var _i2 = 0; _i2 < _visibleColumns.length; _i2 += 1) {
-        _loop2(_i2);
+        _loop3(_i2);
       }
     }