@deephaven/iris-grid 0.13.3-beta.2 → 0.13.5

package/dist/IrisGridRenderer.d.ts

@@ -1,69 +1,41 @@
-import { IconDefinition } from '@deephaven/icons';
-import { BoxCoordinates, Coordinate, GridMetrics, GridRangeIndex, GridRenderer, GridRenderState, GridThemeType, VisibleIndex } from '@deephaven/grid';
-import { Sort } from '@deephaven/jsapi-shim';
-import { ReverseType } from '@deephaven/jsapi-utils';
-import { AdvancedFilterMap, QuickFilterMap, AdvancedFilter, QuickFilter } from './CommonTypes';
-import { IrisGridThemeType } from './IrisGridTheme';
-import IrisGridModel from './IrisGridModel';
-export declare type IrisGridRenderState = GridRenderState & {
-    model: IrisGridModel;
-    theme: IrisGridThemeType;
-    hoverSelectColumn: GridRangeIndex;
-    isSelectingColumn: boolean;
-    loadingScrimProgress: number;
-    reverseType: ReverseType;
-    isFilterBarShown: boolean;
-    advancedFilters: AdvancedFilterMap;
-    quickFilters: QuickFilterMap;
-};
+export default IrisGridRenderer;
 /**
  * Handles rendering some of the Iris specific features, such as sorting icons, sort bar display
  * */
 declare class IrisGridRenderer extends GridRenderer {
-    static isFilterValid(advancedFilter: AdvancedFilter | undefined | null, quickFilter: QuickFilter | undefined | null): boolean;
-    constructor();
-    icons: Record<string, Path2D>;
+    static isFilterValid(advancedFilter: any, quickFilter: any): boolean;
     initIcons(): void;
-    setIcon(name: string, faIcon: IconDefinition): void;
-    getIcon(name: string): Path2D;
-    getSortIcon(sort: Sort | null): Path2D | null;
-    drawCanvas(state: IrisGridRenderState): void;
-    drawGrid(context: CanvasRenderingContext2D, state: IrisGridRenderState): void;
-    drawGridLines(context: CanvasRenderingContext2D, state: IrisGridRenderState): void;
-    drawCellContent(context: CanvasRenderingContext2D, state: IrisGridRenderState, column: VisibleIndex, row: VisibleIndex): void;
-    drawGroupedColumnLine(context: CanvasRenderingContext2D, state: IrisGridRenderState): void;
-    drawPendingRowLine(context: CanvasRenderingContext2D, state: IrisGridRenderState): void;
-    drawMouseColumnHover(context: CanvasRenderingContext2D, state: IrisGridRenderState): void;
-    drawMouseRowHover(context: CanvasRenderingContext2D, state: IrisGridRenderState): void;
-    drawScrim(state: IrisGridRenderState): void;
-    drawColumnHeaders(context: CanvasRenderingContext2D, state: IrisGridRenderState): void;
-    drawHeaderBar(context: CanvasRenderingContext2D, state: IrisGridRenderState, color: string | CanvasGradient | CanvasPattern, barHeight: number, interior?: boolean): void;
-    drawColumnHeader(context: CanvasRenderingContext2D, state: IrisGridRenderState, column: VisibleIndex, columnX: Coordinate, columnWidth: number): void;
-    drawFilterHeaders(context: CanvasRenderingContext2D, state: IrisGridRenderState): void;
-    drawExpandedFilterHeaders(context: CanvasRenderingContext2D, state: IrisGridRenderState): void;
-    drawExpandedFilterHeader(context: CanvasRenderingContext2D, state: IrisGridRenderState, column: VisibleIndex, columnX: Coordinate, columnWidth: number): void;
-    drawCollapsedFilterHeaders(context: CanvasRenderingContext2D, state: IrisGridRenderState): void;
-    drawCollapsedFilterHeader(context: CanvasRenderingContext2D, state: IrisGridRenderState, column: VisibleIndex, columnX: Coordinate, columnWidth: number): void;
-    drawTreeMarker(context: CanvasRenderingContext2D, state: IrisGridRenderState, columnX: Coordinate, rowY: Coordinate, treeBox: BoxCoordinates, color: string, isExpanded: boolean): void;
-    drawRowFooters(context: CanvasRenderingContext2D, state: IrisGridRenderState): void;
-    getTextRenderMetrics(context: CanvasRenderingContext2D, state: IrisGridRenderState, column: VisibleIndex, row: VisibleIndex): {
-        width: number;
-        x: Coordinate;
-        y: Coordinate;
-    };
-    shouldRenderOverflowButton(state: IrisGridRenderState): boolean;
-    getCellOverflowButtonPosition({ mouseX, mouseY, metrics, theme, }: {
-        mouseX: Coordinate | null;
-        mouseY: Coordinate | null;
-        metrics: GridMetrics | undefined;
-        theme: GridThemeType;
+    icons: {} | undefined;
+    setIcon(name: any, faIcon: any): void;
+    getIcon(name: any): any;
+    getSortIcon(sort: any): any;
+    drawGroupedColumnLine(context: any, state: any): void;
+    drawPendingRowLine(context: any, state: any): void;
+    drawScrim(state: any): void;
+    drawHeaderBar(context: any, state: any, color: any, barHeight: any, interior?: boolean): void;
+    drawFilterHeaders(context: any, state: any): void;
+    drawExpandedFilterHeaders(context: any, state: any): void;
+    drawExpandedFilterHeader(context: any, state: any, column: any, columnX: any, columnWidth: any): void;
+    drawCollapsedFilterHeaders(context: any, state: any): void;
+    drawCollapsedFilterHeader(context: any, state: any, column: any, columnX: any, columnWidth: any): void;
+    shouldRenderOverflowButton(state: any): boolean;
+    getCellOverflowButtonPosition({ mouseX, mouseY, metrics, theme }: {
+        mouseX: any;
+        mouseY: any;
+        metrics: any;
+        theme: any;
     }): {
-        left: Coordinate | null;
-        top: Coordinate | null;
-        width: number | null;
+        left: null;
+        top: null;
+        width: null;
+        height: null;
+    } | {
+        left: number;
+        top: any;
+        width: number;
         height: number | null;
     };
-    drawCellOverflowButton(state: IrisGridRenderState): void;
+    drawCellOverflowButton(state: any): void;
 }
-export default IrisGridRenderer;
+import { GridRenderer } from "packages/grid/src/GridRenderer";
 //# sourceMappingURL=IrisGridRenderer.d.ts.map

package/dist/IrisGridRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IrisGridRenderer.d.ts","sourceRoot":"","sources":["../src/IrisGridRenderer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"IrisGridRenderer.d.ts","sourceRoot":"","sources":["../src/IrisGridRenderer.js"],"names":[],"mappings":";AAuBA;;KAEK;AACL;IACE,qEAMC;IAQD,kBAQC;IAPC,sBAAe;IAUjB,sCASC;IAED,wBAEC;IAED,4BAWC;IAwCD,sDA0BC;IAED,mDAyBC;IAwBD,4BA8BC;IAgDD,8FAwBC;IAgDD,kDAWC;IAED,0DAsEC;IAED,sGAuFC;IAED,2DAiCC;IAED,uGAwCC;IAqID,gDA6CC;IAED;;;;;;;;;;;;;;;MAyBC;IAED,yCAqCC;CACF"}

package/dist/IrisGridRenderer.js

@@ -1,14 +1,11 @@
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 /* eslint react/destructuring-assignment: "off" */
 
 /* eslint class-methods-use-this: "off" */
 
 /* eslint no-param-reassign: "off" */
 import { dhSortDown, dhSortUp, vsTriangleDown, vsTriangleRight, vsLinkExternal } from '@deephaven/icons';
-import { getOrThrow, GridRenderer, GridUtils } from '@deephaven/grid';
 import { TableUtils } from '@deephaven/jsapi-utils';
-import { assertNotNull } from '@deephaven/utils';
+import { GridRenderer, GridUtils } from '@deephaven/grid';
 var ICON_NAMES = Object.freeze({
   SORT_UP: 'sortUp',
   SORT_DOWN: 'sortDown',
@@ -17,10 +14,10 @@ var ICON_NAMES = Object.freeze({
   CELL_OVERFLOW: 'cellOverflow'
 });
 var ICON_SIZE = 16;
-
 /**
  * Handles rendering some of the Iris specific features, such as sorting icons, sort bar display
  * */
+
 class IrisGridRenderer extends GridRenderer {
   static isFilterValid(advancedFilter, quickFilter) {
     var isAdvancedFilterValid = advancedFilter == null || advancedFilter.filter != null;
@@ -30,14 +27,11 @@ class IrisGridRenderer extends GridRenderer {
 
   constructor() {
     super();
-
-    _defineProperty(this, "icons", void 0);
-
-    this.icons = {};
     this.initIcons();
   }
 
   initIcons() {
+    this.icons = {};
     this.setIcon(ICON_NAMES.SORT_UP, dhSortUp);
     this.setIcon(ICON_NAMES.SORT_DOWN, dhSortDown);
     this.setIcon(ICON_NAMES.CARET_DOWN, vsTriangleDown);
@@ -47,8 +41,7 @@ class IrisGridRenderer extends GridRenderer {
 
 
   setIcon(name, faIcon) {
-    var path = Array.isArray(faIcon.icon[4]) ? faIcon.icon[4][0] : faIcon.icon[4];
-    var icon = new Path2D(path);
+    var icon = new Path2D(faIcon.icon[4]);
     var scaledIcon = new Path2D();
     var scaleMatrix = {
       a: ICON_SIZE / faIcon.icon[0],
@@ -103,8 +96,8 @@ class IrisGridRenderer extends GridRenderer {
       modelColumns,
       modelRows
     } = metrics;
-    var modelRow = getOrThrow(modelRows, row);
-    var modelColumn = getOrThrow(modelColumns, column);
+    var modelRow = modelRows.get(row);
+    var modelColumn = modelColumns.get(column);
     var value = model.valueForCell(modelColumn, modelRow);
 
     if (TableUtils.isTextType(model.columns[modelColumn].type)) {
@@ -214,8 +207,6 @@ class IrisGridRenderer extends GridRenderer {
     } = metrics;
     var x = visibleColumnXs.get(hoverSelectColumn);
     var columnWidth = visibleColumnWidths.get(hoverSelectColumn);
-    assertNotNull(x);
-    assertNotNull(columnWidth);
     context.fillStyle = theme.linkerColumnHoverBackgroundColor;
     context.fillRect(x, 0, columnWidth, maxY);
   }
@@ -255,11 +246,7 @@ class IrisGridRenderer extends GridRenderer {
 
     context.globalCompositeOperation = 'color';
     context.filter = "blur(".concat(scrimBlurSize, "px)");
-
-    if (scrimColor) {
-      context.fillStyle = scrimColor;
-    } // Clip the path so the top edge is hard edge, bottom edge is soft/blurry
-
+    context.fillStyle = scrimColor; // Clip the path so the top edge is hard edge, bottom edge is soft/blurry
 
     context.beginPath();
     context.rect(0, gridY, width, height - gridY);
@@ -292,15 +279,7 @@ class IrisGridRenderer extends GridRenderer {
 
     if (sort.length === 1) {
       var hasReverse = reverseType !== TableUtils.REVERSE_TYPE.NONE;
-      var color;
-
-      if (hasReverse) {
-        color = theme.headerReverseBarColor;
-      } else {
-        color = theme.headerSortBarColor;
-      }
-
-      this.drawHeaderBar(context, state, color, hasReverse ? theme.reverseHeaderBarHeight : theme.sortHeaderBarHeight);
+      this.drawHeaderBar(context, state, hasReverse ? theme.headerReverseBarColor : theme.headerSortBarColor, hasReverse ? theme.reverseHeaderBarHeight : theme.sortHeaderBarHeight);
     } else if (sort.length > 1) {
       // if there's multiple bars, the sort is interior to header
       // and the reverse claims space in the table
@@ -348,13 +327,8 @@ class IrisGridRenderer extends GridRenderer {
     var {
       modelColumns
     } = metrics;
-    var modelColumn = getOrThrow(modelColumns, column);
+    var modelColumn = modelColumns.get(column);
     var sort = TableUtils.getSortForColumn(model.sort, modelColumn);
-
-    if (!sort) {
-      return;
-    }
-
     var icon = this.getSortIcon(sort);
 
     if (!icon) {
@@ -443,32 +417,32 @@ class IrisGridRenderer extends GridRenderer {
     context.fillStyle = theme.headerBarCasingColor;
     context.fillRect(gridX, columnHeaderHeight + filterBarHeight - 1, maxX, 1); // Draw the filter input boxes
 
-    var y1 = columnHeaderHeight;
-    context.strokeStyle = theme.filterBarSeparatorColor;
-    context.beginPath();
+    if (theme.filterBarSeparatorColor) {
+      var y1 = columnHeaderHeight;
+      context.strokeStyle = theme.filterBarSeparatorColor;
+      context.beginPath();
 
-    for (var i = 0; i < visibleColumns.length; i += 1) {
-      var column = visibleColumns[i];
-      var modelColumn = getOrThrow(modelColumns, column);
-      var columnX = getOrThrow(visibleColumnXs, column);
-      var columnWidth = getOrThrow(visibleColumnWidths, column);
+      for (var i = 0; i < visibleColumns.length; i += 1) {
+        var column = visibleColumns[i];
+        var modelColumn = modelColumns.get(column);
+        var columnX = visibleColumnXs.get(column);
+        var columnWidth = visibleColumnWidths.get(column);
 
-      if (model.isFilterable(modelColumn) && columnWidth > 0) {
-        var x1 = gridX + (columnX !== null && columnX !== void 0 ? columnX : 0);
-        context.rect(x1 + 0.5, y1 + 0.5, columnWidth, filterBarHeight - 2); // 1 for the border, 1 for the casing
+        if (model.isFilterable(modelColumn) && columnWidth > 0) {
+          var x1 = gridX + columnX;
+          context.rect(x1 + 0.5, y1 + 0.5, columnWidth, filterBarHeight - 2); // 1 for the border, 1 for the casing
+        }
       }
-    }
 
-    context.stroke();
+      context.stroke();
+    }
 
     for (var _i = 0; _i < visibleColumns.length; _i += 1) {
       var _column = visibleColumns[_i];
 
-      var _columnWidth = getOrThrow(visibleColumnWidths, _column);
-
-      var _columnX = getOrThrow(visibleColumnXs, _column);
+      var _columnWidth = visibleColumnWidths.get(_column);
 
-      var x = _columnX + gridX;
+      var x = visibleColumnXs.get(_column) + gridX;
       this.drawExpandedFilterHeader(context, state, _column, x, _columnWidth);
     }
 
@@ -499,7 +473,6 @@ class IrisGridRenderer extends GridRenderer {
     } = theme;
     var columnHeaderHeight = gridY - filterBarHeight;
     var modelColumn = modelColumns.get(column);
-    if (!modelColumn) return;
     var quickFilter = quickFilters.get(modelColumn);
     var advancedFilter = advancedFilters.get(modelColumn);
 
@@ -526,7 +499,7 @@ class IrisGridRenderer extends GridRenderer {
         var fontWidth = fontWidths.get(context.font);
 
         if (!fontWidth) {
-          fontWidth = context.measureText('8').width;
+          fontWidth = context.measureText('8');
 
           if (!fontWidth) {
             fontWidth = 10;
@@ -546,7 +519,7 @@ class IrisGridRenderer extends GridRenderer {
     context.save();
     var isFilterValid = IrisGridRenderer.isFilterValid(advancedFilter, quickFilter);
 
-    if (isFilterValid && filterBarExpandedActiveCellBackgroundColor) {
+    if (isFilterValid) {
       // draw active filter background inside cell
       context.fillStyle = filterBarExpandedActiveCellBackgroundColor;
       context.fillRect(columnX + 1, // +1 left border
@@ -554,7 +527,7 @@ class IrisGridRenderer extends GridRenderer {
       columnWidth - 1, // -1 right border
       filterBarHeight - 3 // -3 top, bottom border and bottom casing
       );
-    } else if (filterBarErrorColor) {
+    } else {
       // draw error box inside cell
       context.fillStyle = filterBarErrorColor;
       context.lineWidth = 2;
@@ -614,13 +587,9 @@ class IrisGridRenderer extends GridRenderer {
     for (var i = 0; i < visibleColumns.length; i += 1) {
       var column = visibleColumns[i];
       var columnWidth = visibleColumnWidths.get(column);
-      var columnX = visibleColumnXs.get(column);
+      var x = visibleColumnXs.get(column) + gridX; // draw the collapsed cells
 
-      if (columnX != null && columnWidth != null) {
-        var x = columnX + gridX; // draw the collapsed cells
-
-        this.drawCollapsedFilterHeader(context, state, column, x, columnWidth);
-      }
+      this.drawCollapsedFilterHeader(context, state, column, x, columnWidth);
     }
 
     context.restore();
@@ -642,8 +611,8 @@ class IrisGridRenderer extends GridRenderer {
       gridY
     } = metrics;
     var modelColumn = modelColumns.get(column);
-    var quickFilter = modelColumn ? quickFilters.get(modelColumn) : null;
-    var advancedFilter = modelColumn ? advancedFilters.get(modelColumn) : null;
+    var quickFilter = quickFilters.get(modelColumn);
+    var advancedFilter = advancedFilters.get(modelColumn);
     var {
       filterBarCollapsedHeight,
       filterBarActiveColor,
@@ -653,11 +622,11 @@ class IrisGridRenderer extends GridRenderer {
     context.save();
     var isFilterValid = IrisGridRenderer.isFilterValid(advancedFilter, quickFilter);
 
-    if (filterBarActiveBackgroundColor && quickFilter == null && advancedFilter == null) {
+    if (quickFilter == null && advancedFilter == null) {
       context.fillStyle = filterBarActiveBackgroundColor;
-    } else if (filterBarActiveColor && isFilterValid) {
+    } else if (isFilterValid) {
       context.fillStyle = filterBarActiveColor;
-    } else if (filterBarErrorColor) {
+    } else {
       context.fillStyle = filterBarErrorColor;
     }
 
@@ -738,22 +707,17 @@ class IrisGridRenderer extends GridRenderer {
     }
 
     context.fill();
-    var mouseRow = mouseX && mouseY && mouseX >= gridX && mouseX <= maxX + rowFooterWidth ? GridUtils.getRowAtY(mouseY, metrics) : null;
+    var mouseRow = mouseX >= gridX && mouseX <= maxX + rowFooterWidth ? GridUtils.getRowAtY(mouseY, metrics) : null;
 
-    if (rowHoverBackgroundColor && mouseRow !== null && floatingRows.includes(mouseRow)) {
+    if (mouseRow !== null && floatingRows.includes(mouseRow)) {
       context.fillStyle = rowHoverBackgroundColor;
       var y = visibleRowYs.get(mouseRow);
       var rowHeight = visibleRowHeights.get(mouseRow);
-      assertNotNull(y);
-      assertNotNull(rowHeight);
       context.fillRect(x, y, rowFooterWidth, rowHeight);
     }
 
     context.beginPath();
-
-    if (floatingGridRowColor) {
-      context.strokeStyle = floatingGridRowColor;
-    }
+    context.strokeStyle = floatingGridRowColor;
 
     if (floatingTopHeight > 0) {
       context.moveTo(x + 0.5, 0.5);
@@ -779,11 +743,8 @@ class IrisGridRenderer extends GridRenderer {
 
       var rowY = visibleRowYs.get(row);
       var modelRow = modelRows.get(row);
-
-      if (rowY != null && _rowHeight != null && modelRow != null) {
-        var textY = rowY + _rowHeight * 0.5;
-        context.fillText(model.textForRowFooter(modelRow), textX, textY);
-      }
+      var textY = rowY + _rowHeight * 0.5;
+      context.fillText(model.textForRowFooter(modelRow), textX, textY);
     }
 
     context.translate(-gridX, -gridY);
@@ -813,7 +774,7 @@ class IrisGridRenderer extends GridRenderer {
         left
       } = this.getCellOverflowButtonPosition(state);
 
-      if (this.shouldRenderOverflowButton(state) && left) {
+      if (this.shouldRenderOverflowButton(state)) {
         textMetrics.width = left - metrics.gridX - textMetrics.x;
       }
     }
@@ -874,7 +835,7 @@ class IrisGridRenderer extends GridRenderer {
       height: null
     };
 
-    if (mouseX == null || mouseY == null || !metrics) {
+    if (mouseX == null || mouseY == null) {
       return NULL_POSITION;
     }
 
@@ -884,9 +845,6 @@ class IrisGridRenderer extends GridRenderer {
       left,
       top
     } = GridUtils.getCellInfoFromXY(mouseX, mouseY, metrics);
-    assertNotNull(left);
-    assertNotNull(columnWidth);
-    assertNotNull(top);
     var {
       width: gridWidth,
       verticalBarWidth
@@ -934,18 +892,14 @@ class IrisGridRenderer extends GridRenderer {
     } = theme;
     context.save();
 
-    if (overflowButtonHoverColor && buttonLeft != null && buttonWidth != null && buttonTop != null && buttonHeight != null && mouseX >= buttonLeft && mouseX <= buttonLeft + buttonWidth && mouseY >= buttonTop && mouseY <= buttonTop + buttonHeight) {
+    if (mouseX >= buttonLeft && mouseX <= buttonLeft + buttonWidth && mouseY >= buttonTop && mouseY <= buttonTop + buttonHeight) {
       context.fillStyle = overflowButtonHoverColor;
-    } else if (overflowButtonColor) {
+    } else {
       context.fillStyle = overflowButtonColor;
     }
 
     var icon = this.getIcon(ICON_NAMES.CELL_OVERFLOW);
-
-    if (buttonLeft != null && buttonTop != null) {
-      context.translate(buttonLeft + cellHorizontalPadding, buttonTop + 2);
-    }
-
+    context.translate(buttonLeft + cellHorizontalPadding, buttonTop + 2);
     context.fill(icon);
     context.restore();
   }