From f5ee43f3d7c0d37a349eb5a3bd8b596f9c9df758 Mon Sep 17 00:00:00 2001
From: Emily Huang <emilyjiajiahuang@gmail.com>
Date: Mon, 3 Apr 2023 09:15:30 -0400
Subject: [PATCH] Reset frozenColumns

---
 packages/iris-grid/src/IrisGrid.tsx              | 1 +
 packages/iris-grid/src/IrisGridModel.ts          | 9 ++++++++-
 packages/iris-grid/src/IrisGridTreeTableModel.ts | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/iris-grid/src/IrisGrid.tsx b/packages/iris-grid/src/IrisGrid.tsx
index 8a7d154268..3e8d1c5323 100644
--- a/packages/iris-grid/src/IrisGrid.tsx
+++ b/packages/iris-grid/src/IrisGrid.tsx
@@ -3198,6 +3198,7 @@ export class IrisGrid extends Component<IrisGridProps, IrisGridState> {
     this.setState({
       rollupConfig,
       movedColumns: [],
+      frozenColumns: [],
       sorts: [],
       reverseType: TableUtils.REVERSE_TYPE.NONE,
       selectDistinctColumns: [],
diff --git a/packages/iris-grid/src/IrisGridModel.ts b/packages/iris-grid/src/IrisGridModel.ts
index 901731e54e..ea7691e85c 100644
--- a/packages/iris-grid/src/IrisGridModel.ts
+++ b/packages/iris-grid/src/IrisGridModel.ts
@@ -275,10 +275,17 @@ abstract class IrisGridModel<
   /**
    * @returns Names of columns which should be frozen to the front and floating
    */
-  get frozenColumns(): readonly ColumnName[] {
+  get frozenColumns(): ColumnName[] {
     return EMPTY_ARRAY;
   }
 
+  // /**
+  //  * @param columns Names of columns which should be frozen to the front and floating
+  //  */
+  // set frozenColumns(columns: ColumnName[]) {
+  //   this.frozenColumns = columns;
+  // }
+
   /**
    * @param index The column index to check
    * @returns Whether the column is one of LayoutHints' frozen columns
diff --git a/packages/iris-grid/src/IrisGridTreeTableModel.ts b/packages/iris-grid/src/IrisGridTreeTableModel.ts
index d6de44e712..4983e3c964 100644
--- a/packages/iris-grid/src/IrisGridTreeTableModel.ts
+++ b/packages/iris-grid/src/IrisGridTreeTableModel.ts
@@ -3,7 +3,7 @@ import memoize from 'memoize-one';
 import { GridRange, ModelIndex } from '@deephaven/grid';
 import { Column, TreeRow, TreeTable } from '@deephaven/jsapi-shim';
 import { assertNotNull } from '@deephaven/utils';
-import { UIRow } from './CommonTypes';
+import { UIRow, ColumnName } from './CommonTypes';
 import IrisGridTableModelTemplate from './IrisGridTableModelTemplate';
 
 export interface UITreeRow extends UIRow {
@@ -182,6 +182,10 @@ class IrisGridTreeTableModel extends IrisGridTableModelTemplate<
         )
       )
   );
+
+  updateFrozenColumns(columns: ColumnName[]): void {
+    this.frozenColumns = columns;
+  }
 }
 
 export default IrisGridTreeTableModel;