@deephaven/iris-grid 0.60.1-beta.0 → 0.60.1-beta.5

package/dist/IrisGrid.js

@@ -303,12 +303,14 @@ export class IrisGrid extends Component {
       max: 1
     }));
     _defineProperty(this, "getCachedTheme", memoize((contextTheme, theme, isEditable, floatingRowCount) => {
-      var _ref4, _theme$rowFooterWidth;
-      var defaultTheme = createDefaultIrisGridTheme();
+      var _theme$rowFooterWidth;
+      // If a theme is available via context, use that as the base theme.
+      // If iris-grid is standalone without a context, initialize a default theme.
+      var defaultTheme = contextTheme !== null && contextTheme !== void 0 ? contextTheme : createDefaultIrisGridTheme();
 
       // We only show the row footers when we have floating rows for aggregations
-      var rowFooterWidth = floatingRowCount > 0 ? (_ref4 = (_theme$rowFooterWidth = theme === null || theme === void 0 ? void 0 : theme.rowFooterWidth) !== null && _theme$rowFooterWidth !== void 0 ? _theme$rowFooterWidth : contextTheme === null || contextTheme === void 0 ? void 0 : contextTheme.rowFooterWidth) !== null && _ref4 !== void 0 ? _ref4 : defaultTheme.rowFooterWidth : 0;
-      return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultTheme), contextTheme), theme), {}, {
+      var rowFooterWidth = floatingRowCount > 0 ? (_theme$rowFooterWidth = theme === null || theme === void 0 ? void 0 : theme.rowFooterWidth) !== null && _theme$rowFooterWidth !== void 0 ? _theme$rowFooterWidth : defaultTheme.rowFooterWidth : 0;
+      return _objectSpread(_objectSpread(_objectSpread({}, defaultTheme), theme), {}, {
         autoSelectRow: !isEditable,
         rowFooterWidth
       });
@@ -858,12 +860,12 @@ export class IrisGrid extends Component {
     return rowIndex != null ? modelRows.get(rowIndex) : null;
   }
   getTheme() {
-    var _ref5;
+    var _ref4;
     var {
       model,
       theme
     } = this.props;
-    return this.getCachedTheme(this.context, theme, (_ref5 = isEditableGridModel(model) && model.isEditable) !== null && _ref5 !== void 0 ? _ref5 : false, model.floatingTopRowCount + model.floatingBottomRowCount);
+    return this.getCachedTheme(this.context, theme, (_ref4 = isEditableGridModel(model) && model.isEditable) !== null && _ref4 !== void 0 ? _ref4 : false, model.floatingTopRowCount + model.floatingBottomRowCount);
   }
   getVisibleColumn(modelIndex) {
     var {
@@ -898,17 +900,17 @@ export class IrisGrid extends Component {
     var newAdvancedFilters = replaceExisting ? new Map() : new Map(advancedFilters);
     var newQuickFilters = replaceExisting ? new Map() : new Map(quickFilters);
     var isChanged = replaceExisting && advancedFilters.size > 0;
-    inputFilters.forEach(_ref6 => {
+    inputFilters.forEach(_ref5 => {
       var {
         name,
         type,
         value
-      } = _ref6;
-      var modelIndex = model.columns.findIndex(_ref7 => {
+      } = _ref5;
+      var modelIndex = model.columns.findIndex(_ref6 => {
         var {
           name: columnName,
           type: columnType
-        } = _ref7;
+        } = _ref6;
         return columnName === name && columnType === type;
       });
       if (modelIndex >= 0) {
@@ -968,10 +970,10 @@ export class IrisGrid extends Component {
   setAdvancedFilter(modelIndex, filter, options) {
     log.debug('Setting advanced filter', modelIndex, filter);
     this.startLoading('Filtering...', true);
-    this.setState(_ref8 => {
+    this.setState(_ref7 => {
       var {
         advancedFilters
-      } = _ref8;
+      } = _ref7;
       var newAdvancedFilters = new Map(advancedFilters);
       if (filter == null) {
         newAdvancedFilters.delete(modelIndex);
@@ -996,10 +998,10 @@ export class IrisGrid extends Component {
   setQuickFilter(modelIndex, filter, text) {
     log.debug('Setting quick filter', modelIndex, filter, text);
     this.startLoading('Filtering...', true);
-    this.setState(_ref9 => {
+    this.setState(_ref8 => {
       var {
         quickFilters
-      } = _ref9;
+      } = _ref8;
       var newQuickFilters = new Map(quickFilters);
       newQuickFilters.set(modelIndex, {
         filter,
@@ -1028,11 +1030,11 @@ export class IrisGrid extends Component {
     var {
       model
     } = this.props;
-    filterMap.forEach((_ref10, columnName) => {
+    filterMap.forEach((_ref9, columnName) => {
       var {
         columnType,
         filterList
-      } = _ref10;
+      } = _ref9;
       var column = model.columns.find(c => c.name === columnName && c.type === columnType);
       if (column == null) {
         return;
@@ -1053,11 +1055,11 @@ export class IrisGrid extends Component {
   removeColumnFilter(modelRange) {
     this.startLoading('Filtering...', true);
     var clearRange = Array.isArray(modelRange) ? modelRange : [modelRange, modelRange];
-    this.setState(_ref11 => {
+    this.setState(_ref10 => {
       var {
         advancedFilters,
         quickFilters
-      } = _ref11;
+      } = _ref10;
       var newAdvancedFilters = advancedFilters ? new Map(advancedFilters) : new Map();
       var newQuickFilters = quickFilters ? new Map(quickFilters) : new Map();
       newAdvancedFilters.forEach((_, column) => {
@@ -1078,10 +1080,10 @@ export class IrisGrid extends Component {
   }
   removeQuickFilter(modelColumn) {
     this.startLoading('Clearing Filter...', true);
-    this.setState(_ref12 => {
+    this.setState(_ref11 => {
       var {
         quickFilters
-      } = _ref12;
+      } = _ref11;
       var newQuickFilters = new Map(quickFilters);
       newQuickFilters.delete(modelColumn);
       return {
@@ -1168,11 +1170,11 @@ export class IrisGrid extends Component {
       advancedFilters: newAdvancedFilters
     });
   }
-  setFilters(_ref13) {
+  setFilters(_ref12) {
     var {
       quickFilters,
       advancedFilters
-    } = _ref13;
+    } = _ref12;
     this.setState({
       quickFilters,
       advancedFilters
@@ -2134,11 +2136,11 @@ export class IrisGrid extends Component {
   }
   handleFilterBarChange(value) {
     this.startLoading('Filtering...', true);
-    this.setState(_ref14 => {
+    this.setState(_ref13 => {
       var {
         focusedFilterBarColumn,
         quickFilters
-      } = _ref14;
+      } = _ref13;
       var newQuickFilters = new Map(quickFilters);
       if (focusedFilterBarColumn != null) {
         var modelIndex = this.getModelColumn(focusedFilterBarColumn);
@@ -2208,10 +2210,10 @@ export class IrisGrid extends Component {
     });
   }
   handleMenuBack() {
-    this.setState(_ref15 => {
+    this.setState(_ref14 => {
       var {
         openOptions
-      } = _ref15;
+      } = _ref14;
       var newOptions = [...openOptions];
       newOptions.pop();
       return {
@@ -2220,10 +2222,10 @@ export class IrisGrid extends Component {
     });
   }
   handleMenuSelect(option) {
-    this.setState(_ref16 => {
+    this.setState(_ref15 => {
       var {
         openOptions
-      } = _ref16;
+      } = _ref15;
       return {
         openOptions: [...openOptions, option]
       };
@@ -2550,10 +2552,10 @@ export class IrisGrid extends Component {
   handleAggregationChange(aggregation) {
     log.debug('handleAggregationChange', aggregation);
     this.startLoading("Aggregating ".concat(aggregation.operation, "..."));
-    this.setState(_ref17 => {
+    this.setState(_ref16 => {
       var {
         aggregationSettings
-      } = _ref17;
+      } = _ref16;
       return {
         selectedAggregation: aggregation,
         aggregationSettings: _objectSpread(_objectSpread({}, aggregationSettings), {}, {
@@ -2652,10 +2654,10 @@ export class IrisGrid extends Component {
    */
   removeEmptyAggregations() {
     log.debug('removeEmptyAggregations');
-    this.setState(_ref18 => {
+    this.setState(_ref17 => {
       var {
         aggregationSettings
-      } = _ref18;
+      } = _ref17;
       var {
         aggregations
       } = aggregationSettings;