Fix types and generate snapshots

packages/iris-grid/src/IrisGrid.tsx

@@ -1498,7 +1498,7 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
     return rowIndex != null ? modelRows.get(rowIndex) : null;
   }
 
-  getTheme(): Partial<IrisGridThemeType> {
+  getTheme(): IrisGridThemeType {
     const { model, theme } = this.props;
 
     return this.getCachedTheme(

packages/iris-grid/src/IrisGridIcons.ts

@@ -7,8 +7,6 @@ import {
   IconDefinition,
 } from '@deephaven/icons';
 
-export const ICON_SIZE = 16;
-
 export type IconName =
   | 'sortUp'
   | 'sortDown'

packages/iris-grid/src/IrisGridRenderer.ts

@@ -133,7 +133,7 @@ export class IrisGridRenderer extends GridRenderer {
     mouseX: Coordinate | null;
     mouseY: Coordinate | null;
     metrics: GridMetrics | undefined;
-    theme: GridThemeType;
+    theme: IrisGridThemeType;
   }): {
     left: Coordinate | null;
     top: Coordinate | null;

packages/iris-grid/src/IrisGridTextCellRenderer.ts

@@ -5,15 +5,14 @@ import {
   DEFAULT_FONT_WIDTH,
   getOrThrow,
   GridMetrics,
-  GridThemeType,
   GridUtils,
   TextCellRenderer,
   VisibleIndex,
 } from '@deephaven/grid';
 import { TableUtils } from '@deephaven/jsapi-utils';
 import { IrisGridRenderState } from './IrisGridRenderer';
-import { ICON_SIZE } from './IrisGridIcons';
 import IrisGridCellRendererUtils from './IrisGridCellRendererUtils';
+import type { IrisGridThemeType } from './IrisGridTheme';
 
 class IrisGridTextCellRenderer extends TextCellRenderer {
   drawCellContent(
@@ -85,7 +84,7 @@ class IrisGridTextCellRenderer extends TextCellRenderer {
     mouseX: Coordinate | null,
     mouseY: Coordinate | null,
     metrics: GridMetrics | undefined,
-    theme: GridThemeType
+    theme: IrisGridThemeType
   ): {
     left: Coordinate | null;
     top: Coordinate | null;
@@ -107,9 +106,9 @@ class IrisGridTextCellRenderer extends TextCellRenderer {
     }
 
     const { width: gridWidth, verticalBarWidth } = metrics;
-    const { cellHorizontalPadding } = theme;
+    const { cellHorizontalPadding, iconSize } = theme;
 
-    const width = ICON_SIZE + 2 * cellHorizontalPadding;
+    const width = iconSize + 2 * cellHorizontalPadding;
     const height = rowHeight;
     // Right edge of column or of visible grid, whichever is smaller
     const right = Math.min(

packages/iris-grid/src/mousehandlers/IrisGridCellOverflowMouseHandler.ts

@@ -51,7 +51,7 @@ class IrisGridCellOverflowMouseHandler extends GridMouseHandler {
     const { model } = props;
 
     const { canvasContext: context } = grid;
-    const theme = grid.getTheme();
+    const theme = this.irisGrid.getTheme();
     const rendererState = {
       context,
       mouseX: x,