Address Don's suggestions

Author: mattrunyon

packages/code-studio/src/index.tsx

@@ -1,10 +1,10 @@
 import React, { Suspense } from 'react';
 import ReactDOM from 'react-dom';
+import '@deephaven/components/scss/BaseStyleSheet.scss'; // Do NOT move any lower. This needs to be imported before any other styles
 import { Provider } from 'react-redux';
 import { LoadingOverlay, preloadTheme } from '@deephaven/components';
 import { ApiBootstrap } from '@deephaven/jsapi-bootstrap';
 import { store } from '@deephaven/redux';
-import '@deephaven/components/scss/BaseStyleSheet.scss';
 import logInit from './log/LogInit';
 
 logInit();

packages/embed-widget/src/index.tsx

@@ -1,6 +1,6 @@
 import React, { Suspense } from 'react';
 import ReactDOM from 'react-dom';
-import '@deephaven/components/scss/BaseStyleSheet.scss';
+import '@deephaven/components/scss/BaseStyleSheet.scss'; // Do NOT move any lower. This needs to be imported before any other styles
 import { LoadingOverlay, preloadTheme } from '@deephaven/components';
 import { ApiBootstrap } from '@deephaven/jsapi-bootstrap';
 import './index.scss';

packages/iris-grid/src/IrisGridRenderer.ts

@@ -573,7 +573,7 @@ export class IrisGridRenderer extends GridRenderer {
 
     context.save();
 
-    context.font = theme.font;
+    context.font = theme.filterBarFont;
     context.textAlign = 'left';
 
     if (

packages/iris-grid/src/IrisGridTheme.ts

@@ -11,18 +11,8 @@ import IrisGridThemeRaw from './IrisGridTheme.module.scss';
 
 const log = Log.module('IrisGridTheme');
 
-interface IrisGridDensity {
-  cellHorizontalPadding: number;
-  headerHorizontalPadding: number;
-  minColumnWidth: number;
-  rowHeight: number;
-  font: string;
-  headerFont: string;
-  iconSize: number;
-  columnHeaderHeight: number;
-}
-
 export type IrisGridThemeType = GridThemeType & {
+  filterBarFont: string;
   filterBarCollapsedHeight: number;
   filterBarHeight: number;
   reverseHeaderBarHeight: number;
@@ -59,8 +49,8 @@ export type IrisGridThemeType = GridThemeType & {
   floatingGridRowColor: NullableGridColor;
   iconSize: number;
   density: {
-    compact: Partial<IrisGridDensity>;
-    spacious: Partial<IrisGridDensity>;
+    compact: Partial<Omit<IrisGridThemeType, 'density'>>;
+    spacious: Partial<Omit<IrisGridThemeType, 'density'>>;
   };
 };
 
@@ -94,6 +84,7 @@ export function createDefaultIrisGridTheme(): IrisGridThemeType {
     white: IrisGridTheme.white,
     black: IrisGridTheme.black,
     font: IrisGridTheme.font,
+    filterBarFont: IrisGridTheme.font,
     headerBackgroundColor: IrisGridTheme['header-bg'],
     headerColor: IrisGridTheme['header-color'],
     headerSeparatorColor: IrisGridTheme['header-separator-color'],
@@ -202,14 +193,13 @@ export function createDefaultIrisGridTheme(): IrisGridThemeType {
 
     density: {
       compact: {
-        cellHorizontalPadding: 2,
+        cellHorizontalPadding: 5, // Same as regular set in GridTheme
         headerHorizontalPadding: 10,
         minColumnWidth: 10,
         rowHeight: 16,
         font: '11px Fira Sans, sans-serif',
-        headerFont: '600 11px Fira Sans, sans-serif',
         iconSize: 14,
-        columnHeaderHeight: 24,
+        columnHeaderHeight: 26,
       },
       spacious: {
         cellHorizontalPadding: 7,

packages/iris-grid/src/__snapshots__/IrisGridTheme.test.ts.snap

@@ -23,10 +23,9 @@ exports[`createDefaultIrisGridTheme should derive the default Iris grid theme 1`
   "dateColor": "IrisGridTheme['date-color']",
   "density": {
     "compact": {
-      "cellHorizontalPadding": 2,
-      "columnHeaderHeight": 24,
+      "cellHorizontalPadding": 5,
+      "columnHeaderHeight": 26,
       "font": "11px Fira Sans, sans-serif",
-      "headerFont": "600 11px Fira Sans, sans-serif",
       "headerHorizontalPadding": 10,
       "iconSize": 14,
       "minColumnWidth": 10,
@@ -46,6 +45,7 @@ exports[`createDefaultIrisGridTheme should derive the default Iris grid theme 1`
   "filterBarExpandedActiveBackgroundColor": "IrisGridTheme['filter-bar-expanded-active-bg']",
   "filterBarExpandedActiveCellBackgroundColor": "IrisGridTheme['filter-bar-expanded-active-cell-bg']",
   "filterBarExpandedBackgroundColor": "IrisGridTheme['filter-bar-expanded-bg']",
+  "filterBarFont": "IrisGridTheme['font']",
   "filterBarHeight": 30,
   "filterBarHorizontalPadding": 4,
   "filterBarSeparatorColor": "IrisGridTheme['filter-bar-separator-color']",