@deephaven/iris-grid 0.38.1 → 0.39.0

package/dist/IrisGrid.js

@@ -16,7 +16,6 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { ContextActions, Stack, Menu, Page, Popper, ThemeExport, Tooltip, Button, ContextActionUtils } from '@deephaven/components';
 import { Grid, GridRange, GridUtils, isEditableGridModel, isExpandableGridModel } from '@deephaven/grid';
 import { dhEye, dhFilterFilled, dhGraphLineUp, dhTriangleDownSquare, vsClose, vsCloudDownload, vsEdit, vsFilter, vsMenu, vsReply, vsRuby, vsSearch, vsSplitHorizontal, vsSymbolOperator, vsTools } from '@deephaven/icons';
-import dh from '@deephaven/jsapi-shim';
 import { DateUtils, Formatter, FormatterUtils, TableUtils } from '@deephaven/jsapi-utils';
 import { assertNotNull, copyToClipboard, EMPTY_ARRAY, EMPTY_MAP, Pending, PromiseUtils, ValidationError, getOrThrow } from '@deephaven/utils';
 import { Type as FilterType } from '@deephaven/filters';
@@ -75,14 +74,6 @@ function isEmptyConfig(_ref) {
   return advancedFilters.size === 0 && aggregationSettings.aggregations.length === 0 && customColumns.length === 0 && quickFilters.size === 0 && reverseType === TableUtils.REVERSE_TYPE.NONE && rollupConfig == null && searchFilter == null && selectDistinctColumns.length === 0 && sorts.length === 0;
 }
 export class IrisGrid extends Component {
-  static makeQuickFilter(column, text, timeZone) {
-    try {
-      return TableUtils.makeQuickFilter(column, text, timeZone);
-    } catch (err) {
-      log.error('Error creating quick filter', err);
-    }
-    return null;
-  }
   constructor(props) {
     var _model$layoutHints, _model$layoutHints$hi, _model$columns$0$name, _model$columns$;
     super(props);
@@ -112,6 +103,7 @@ export class IrisGrid extends Component {
     _defineProperty(this, "discardAction", void 0);
     _defineProperty(this, "commitAction", void 0);
     _defineProperty(this, "contextActions", void 0);
+    _defineProperty(this, "tableUtils", void 0);
     _defineProperty(this, "getAdvancedMenuOpenedHandler", memoize(column => this.handleAdvancedMenuOpened.bind(this, column), {
       max: 100
     }));
@@ -123,7 +115,8 @@ export class IrisGrid extends Component {
       onDone: this.handleAdvancedFilterDone,
       options: advancedFilterOptions,
       sortDirection: sortDirection,
-      formatter: formatter
+      formatter: formatter,
+      tableUtils: this.tableUtils
     }), {
       max: 50
     }));
@@ -252,15 +245,15 @@ export class IrisGrid extends Component {
       return operationMap;
     }));
     _defineProperty(this, "getOperationOrder", memoize(aggregations => aggregations.map(a => a.operation).filter(o => !AggregationUtils.isRollupOperation(o))));
-    _defineProperty(this, "getCachedFormatColumns", memoize((columns, rules) => getFormatColumns(columns, rules)));
-    _defineProperty(this, "getCachedPreviewFormatColumns", memoize((columns, rulesParam, preview, editIndex) => {
+    _defineProperty(this, "getCachedFormatColumns", memoize((dh, columns, rules) => getFormatColumns(dh, columns, rules)));
+    _defineProperty(this, "getCachedPreviewFormatColumns", memoize((dh, columns, rulesParam, preview, editIndex) => {
       log.debug('getCachedPreviewFormatColumns', rulesParam, preview, editIndex);
       if (preview !== undefined && editIndex !== undefined) {
         var rules = [...rulesParam];
         rules[editIndex] = preview;
-        return this.getCachedFormatColumns(columns, rules);
+        return this.getCachedFormatColumns(dh, columns, rules);
       }
-      return this.getCachedFormatColumns(columns, rulesParam);
+      return this.getCachedFormatColumns(dh, columns, rulesParam);
     }));
     _defineProperty(this, "getModelRollupConfig", memoize((originalColumns, config, aggregationSettings) => IrisGridUtils.getModelRollupConfig(originalColumns, config, aggregationSettings)));
     _defineProperty(this, "getModelTotalsConfig", memoize((columns, config, aggregationSettings) => {
@@ -322,7 +315,10 @@ export class IrisGrid extends Component {
       return Object.freeze([...columnSet]);
     }));
     _defineProperty(this, "updateSearchFilter", debounce((searchValue, selectedSearchColumns, columns, invertSearchColumns) => {
-      var searchFilter = CrossColumnSearch.createSearchFilter(searchValue, selectedSearchColumns, columns, invertSearchColumns);
+      var {
+        model
+      } = this.props;
+      var searchFilter = CrossColumnSearch.createSearchFilter(model.dh, searchValue, selectedSearchColumns, columns, invertSearchColumns);
       this.setState({
         searchFilter
       });
@@ -573,7 +569,10 @@ export class IrisGrid extends Component {
     if (canCopy) {
       keyHandlers.push(new CopyKeyHandler(this));
     }
-    var mouseHandlers = [new IrisGridCellOverflowMouseHandler(this), new IrisGridRowTreeMouseHandler(this), new IrisGridTokenMouseHandler(this), new IrisGridColumnSelectMouseHandler(this), new IrisGridColumnTooltipMouseHandler(this), new IrisGridSortMouseHandler(this), new IrisGridFilterMouseHandler(this), new IrisGridContextMenuHandler(this), new IrisGridDataSelectMouseHandler(this), new PendingMouseHandler(this)];
+    var {
+      dh: _dh
+    } = _model;
+    var mouseHandlers = [new IrisGridCellOverflowMouseHandler(this), new IrisGridRowTreeMouseHandler(this), new IrisGridTokenMouseHandler(this), new IrisGridColumnSelectMouseHandler(this), new IrisGridColumnTooltipMouseHandler(this), new IrisGridSortMouseHandler(this), new IrisGridFilterMouseHandler(this), new IrisGridContextMenuHandler(this, _dh), new IrisGridDataSelectMouseHandler(this), new PendingMouseHandler(this)];
     var _movedColumns = movedColumnsProp.length > 0 ? movedColumnsProp : _model.initialMovedColumns;
     var movedRows = movedRowsProp.length > 0 ? movedRowsProp : _model.initialMovedRows;
     var _metricCalculator = new IrisGridMetricCalculator({
@@ -583,7 +582,8 @@ export class IrisGrid extends Component {
       initialColumnWidths: new Map(_model === null || _model === void 0 ? void 0 : (_model$layoutHints = _model.layoutHints) === null || _model$layoutHints === void 0 ? void 0 : (_model$layoutHints$hi = _model$layoutHints.hiddenColumns) === null || _model$layoutHints$hi === void 0 ? void 0 : _model$layoutHints$hi.map(name => [_model.getColumnIndexByName(name), 0]))
     });
     var searchColumns = _selectedSearchColumns !== null && _selectedSearchColumns !== void 0 ? _selectedSearchColumns : [];
-    var _searchFilter = CrossColumnSearch.createSearchFilter(_searchValue, searchColumns, _model.columns, _invertSearchColumns);
+    var _searchFilter = CrossColumnSearch.createSearchFilter(_dh, _searchValue, searchColumns, _model.columns, _invertSearchColumns);
+    this.tableUtils = new TableUtils(_dh);
     this.state = {
       isFilterBarShown: _isFilterBarShown,
       isSelectingPartition,
@@ -617,7 +617,7 @@ export class IrisGrid extends Component {
       movedColumns: _movedColumns,
       movedRows,
       shownColumnTooltip: null,
-      formatter: new Formatter(),
+      formatter: new Formatter(_dh),
       isMenuShown: false,
       customColumnFormatMap: new Map(customColumnFormatMap),
       conditionalFormats,
@@ -763,6 +763,9 @@ export class IrisGrid extends Component {
     var {
       model
     } = this.props;
+    var {
+      dh
+    } = model;
     var modelColumn = this.getModelColumn(columnIndex);
     var modelRow = this.getModelRow(rowIndex);
     if (rawValue && modelColumn != null && modelRow != null) {
@@ -824,6 +827,14 @@ export class IrisGrid extends Component {
     } = this.state;
     return GridUtils.getVisibleIndex(modelIndex, movedColumns);
   }
+  makeQuickFilter(column, text, timeZone) {
+    try {
+      return this.tableUtils.makeQuickFilter(column, text, timeZone);
+    } catch (err) {
+      log.error('Error creating quick filter', err);
+    }
+    return null;
+  }
 
   /**
    * Applies the provided input filters as quick filters,
@@ -899,7 +910,7 @@ export class IrisGrid extends Component {
       }
       quickFilters.set(modelIndex, {
         text: value,
-        filter: IrisGrid.makeQuickFilter(column, value, formatter.timeZone)
+        filter: this.makeQuickFilter(column, value, formatter.timeZone)
       });
       return true;
     }
@@ -991,7 +1002,7 @@ export class IrisGrid extends Component {
         var {
           formatter
         } = model;
-        this.setQuickFilter(columnIndex, IrisGrid.makeQuickFilter(column, combinedText, formatter.timeZone), "".concat(combinedText));
+        this.setQuickFilter(columnIndex, this.makeQuickFilter(column, combinedText, formatter.timeZone), "".concat(combinedText));
       }
     });
   }
@@ -1082,7 +1093,7 @@ export class IrisGrid extends Component {
         options
       } = value;
       var column = columns[key];
-      var filter = TableUtils.makeAdvancedFilter(column, options, formatter.timeZone);
+      var filter = this.tableUtils.makeAdvancedFilter(column, options, formatter.timeZone);
       newAdvancedFilters.set(key, {
         options,
         filter
@@ -1095,7 +1106,7 @@ export class IrisGrid extends Component {
       var column = columns[key];
       newQuickFilters.set(key, {
         text,
-        filter: IrisGrid.makeQuickFilter(column, text, formatter.timeZone)
+        filter: this.makeQuickFilter(column, text, formatter.timeZone)
       });
     });
     this.startLoading('Rebuilding filters...', true);
@@ -1145,11 +1156,14 @@ export class IrisGrid extends Component {
     var {
       customColumnFormatMap
     } = this.state;
+    var {
+      model
+    } = this.props;
     var update = _objectSpread({
       customColumnFormatMap
     }, updatedFormats);
     var mergedColumnFormats = [...((_this$globalColumnFor = this.globalColumnFormats) !== null && _this$globalColumnFor !== void 0 ? _this$globalColumnFor : []), ...update.customColumnFormatMap.values()];
-    var formatter = new Formatter(mergedColumnFormats, this.dateTimeFormatterOptions, this.decimalFormatOptions, this.integerFormatOptions, this.truncateNumbersWithPound);
+    var formatter = new Formatter(model.dh, mergedColumnFormats, this.dateTimeFormatterOptions, this.decimalFormatOptions, this.integerFormatOptions, this.truncateNumbersWithPound);
     log.debug('updateFormatter', this.globalColumnFormats, mergedColumnFormats);
     this.setState(_objectSpread(_objectSpread({}, update), {}, {
       formatter
@@ -1178,7 +1192,7 @@ export class IrisGrid extends Component {
       invertSearchColumns
     } = this.props;
     var searchColumns = selectedSearchColumns !== null && selectedSearchColumns !== void 0 ? selectedSearchColumns : [];
-    var searchFilter = CrossColumnSearch.createSearchFilter(searchValue, searchColumns, model.columns, invertSearchColumns);
+    var searchFilter = CrossColumnSearch.createSearchFilter(model.dh, searchValue, searchColumns, model.columns, invertSearchColumns);
     if (applyInputFiltersOnInit) {
       // There may be more than one input filter on the same column with value === '' applied last
       // We don't want to skip it here, so only excluding the ones that were never applied (null)
@@ -1236,7 +1250,10 @@ export class IrisGrid extends Component {
     })();
   }
   updatePartition(partition, partitionColumn) {
-    var partitionFilter = partitionColumn.filter().eq(dh.FilterValue.ofString(partition));
+    var {
+      model
+    } = this.props;
+    var partitionFilter = partitionColumn.filter().eq(model.dh.FilterValue.ofString(partition));
     var partitionFilters = [partitionFilter];
     this.setState({
       partition,
@@ -1727,6 +1744,9 @@ export class IrisGrid extends Component {
       model,
       canToggleSearch
     } = this.props;
+    var {
+      dh
+    } = model;
     var searchDisplayMode = model === null || model === void 0 ? 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)) {
       return false;
@@ -2528,6 +2548,9 @@ export class IrisGrid extends Component {
       var {
         model
       } = _this5.props;
+      var {
+        dh
+      } = model;
       if (!model.isSeekRowAvailable) {
         return;
       }
@@ -2560,7 +2583,7 @@ export class IrisGrid extends Component {
             }
           case TableUtils.dataType.DATETIME:
             {
-              var [startDate] = DateUtils.parseDateRange(inputString, formatter.timeZone);
+              var [startDate] = DateUtils.parseDateRange(dh, inputString, formatter.timeZone);
               rowIndex = yield model.seekRow(searchFromRow, selectedColumn, dh.ValueType.DATETIME, startDate, undefined, undefined, isBackwards !== null && isBackwards !== void 0 ? isBackwards : false);
               break;
             }
@@ -2582,7 +2605,7 @@ export class IrisGrid extends Component {
             }
           default:
             {
-              rowIndex = yield model.seekRow(searchFromRow, selectedColumn, dh.ValueType.STRING, 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, _this5.tableUtils.makeValue(selectedColumn.type, inputString, formatter.timeZone), undefined, undefined, isBackwards !== null && isBackwards !== void 0 ? isBackwards : false);
             }
         }
         (_this5$grid2 = _this5.grid) === null || _this5$grid2 === void 0 ? void 0 : _this5$grid2.setFocusRow(rowIndex);
@@ -3287,6 +3310,7 @@ export class IrisGrid extends Component {
           assertNotNull(model.columns);
           assertNotNull(this.handleConditionalFormatEditorUpdate);
           return /*#__PURE__*/React.createElement(ConditionalFormatEditor, {
+            dh: model.dh,
             columns: model.columns,
             rule: conditionalFormatPreview,
             onUpdate: this.handleConditionalFormatEditorUpdate,
@@ -3372,6 +3396,7 @@ export class IrisGrid extends Component {
     }, /*#__PURE__*/React.createElement("div", {
       className: "iris-grid-partition-selector-wrapper iris-grid-bar iris-grid-bar-primary"
     }, partitionTable && partitionColumn && partition != null && /*#__PURE__*/React.createElement(IrisGridPartitionSelector, {
+      dh: model.dh,
       table: partitionTable,
       getFormattedString: (value, type, stringName) => model.displayString(value, type, stringName),
       columnName: partitionColumn.name,
@@ -3443,7 +3468,7 @@ export class IrisGrid extends Component {
       customColumns: customColumns,
       hiddenColumns: hiddenColumns,
       alwaysFetchColumns: this.getAlwaysFetchColumns(alwaysFetchColumns, model.columns, movedColumns, model.floatingLeftColumnCount, model.floatingRightColumnCount, (_this$grid29 = this.grid) === null || _this$grid29 === void 0 ? void 0 : (_this$grid29$state$dr = _this$grid29.state.draggingColumn) === null || _this$grid29$state$dr === void 0 ? void 0 : _this$grid29$state$dr.range),
-      formatColumns: this.getCachedPreviewFormatColumns(model.columns, conditionalFormats, conditionalFormatPreview,
+      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),
       rollupConfig: this.getModelRollupConfig(model.originalColumns, rollupConfig, aggregationSettings),
@@ -3508,6 +3533,7 @@ export class IrisGrid extends Component {
       onExiting: this.handleAnimationStart,
       onExited: this.handleAnimationEnd
     }), /*#__PURE__*/React.createElement(TableSaver, {
+      dh: model.dh,
       ref: tableSaver => {
         this.tableSaver = tableSaver;
       },