fix: cap width of columns with long names (#1574)

Closes #1276 - adds a max column width in GridMetricCalculator - value is obtained from GridTheme
deephaven · Oct 18, 2023 · 876a6ac · 876a6ac
1 parent 94ab25c
commit 876a6ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/packages/grid/src/GridMetricCalculator.ts b/packages/grid/src/GridMetricCalculator.ts
@@ -1656,7 +1656,7 @@ export class GridMetricCalculator {
     treePaddingX: number = this.calculateTreePaddingX(state)
   ): number {
     const { theme } = state;
-    const { autoSizeColumns, minColumnWidth } = theme;
+    const { autoSizeColumns, minColumnWidth, maxColumnWidth } = theme;
     if (!autoSizeColumns) {
       const { columnWidth } = theme;
       return columnWidth;
@@ -1667,6 +1667,7 @@ export class GridMetricCalculator {
     const cachedValue = this.calculatedColumnWidths.get(modelColumn);
     let columnWidth = Math.ceil(Math.max(headerWidth, dataWidth));
     columnWidth = Math.max(minColumnWidth, columnWidth);
+    columnWidth = Math.min(maxColumnWidth, columnWidth);
     if (cachedValue != null && cachedValue > columnWidth) {
       columnWidth = cachedValue;
     } else {

diff --git a/packages/grid/src/GridTheme.ts b/packages/grid/src/GridTheme.ts
@@ -105,6 +105,7 @@ export type GridTheme = {
   columnWidth: number;
   minRowHeight: number;
   minColumnWidth: number;
+  maxColumnWidth: number;
 
   // Default row/column header/footers width/height
   columnHeaderHeight: number;
@@ -206,6 +207,7 @@ const defaultTheme: GridTheme = Object.freeze({
   columnWidth: 100,
   minRowHeight: 20,
   minColumnWidth: 55,
+  maxColumnWidth: 600,
   columnHeaderHeight: 20,
   rowHeaderWidth: 30,
   rowFooterWidth: 0,