From ea404fbf297d31516aceead65bdccf0c566e813f Mon Sep 17 00:00:00 2001
From: Matt Skrobola <mattskrobola@gmail.com>
Date: Wed, 1 Dec 2021 00:41:47 +0000
Subject: [PATCH] set Table grid bleed >= numFrozenColumns

---
 packages/table/src/table.tsx  | 7 +++++--
 packages/table/src/table2.tsx | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/table/src/table.tsx b/packages/table/src/table.tsx
index 90d336a81b..5dc7631642 100644
--- a/packages/table/src/table.tsx
+++ b/packages/table/src/table.tsx
@@ -1081,9 +1081,12 @@ export class Table extends AbstractComponent2<TableProps, TableState, TableSnaps
 
     private validateGrid() {
         if (this.grid == null) {
-            const { defaultRowHeight, defaultColumnWidth } = this.props;
+            const { defaultRowHeight, defaultColumnWidth, numFrozenColumns } = this.props;
             const { rowHeights, columnWidths } = this.state;
-            this.grid = new Grid(rowHeights, columnWidths, Grid.DEFAULT_BLEED, defaultRowHeight, defaultColumnWidth);
+
+            // gridBleed should always be >= numFrozenColumns since columnIndexStart adds numFrozenColumns
+            const gridBleed = Math.max(Grid.DEFAULT_BLEED, numFrozenColumns);
+            this.grid = new Grid(rowHeights, columnWidths, gridBleed, defaultRowHeight, defaultColumnWidth);
             this.invokeOnVisibleCellsChangeCallback(this.state.viewportRect);
             this.hotkeysImpl.setGrid(this.grid);
         }
diff --git a/packages/table/src/table2.tsx b/packages/table/src/table2.tsx
index 2ec1065ba2..4982ccd1b0 100644
--- a/packages/table/src/table2.tsx
+++ b/packages/table/src/table2.tsx
@@ -927,9 +927,12 @@ export class Table2 extends AbstractComponent2<TableProps, TableState, TableSnap
 
     private validateGrid() {
         if (this.grid == null) {
-            const { defaultRowHeight, defaultColumnWidth } = this.props;
+            const { defaultRowHeight, defaultColumnWidth, numFrozenColumns } = this.props;
             const { rowHeights, columnWidths } = this.state;
-            this.grid = new Grid(rowHeights, columnWidths, Grid.DEFAULT_BLEED, defaultRowHeight, defaultColumnWidth);
+
+            // gridBleed should always be >= numFrozenColumns since columnIndexStart adds numFrozenColumns
+            const gridBleed = Math.max(Grid.DEFAULT_BLEED, numFrozenColumns);
+            this.grid = new Grid(rowHeights, columnWidths, gridBleed, defaultRowHeight, defaultColumnWidth);
             this.invokeOnVisibleCellsChangeCallback(this.state.viewportRect);
             this.hotkeysImpl.setGrid(this.grid);
         }