From 98f552265b66c430eccdcc0a616fc07d14ade8cb Mon Sep 17 00:00:00 2001
From: Mingyu Cui <mingyu.cui@robinhood.com>
Date: Tue, 19 Mar 2024 19:52:52 -0400
Subject: [PATCH 1/3] fix(table-core): narrow types on columns from
 ColumnHelper

---
 packages/table-core/src/columnHelper.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/table-core/src/columnHelper.ts b/packages/table-core/src/columnHelper.ts
index b1f006c517..39e826bd12 100644
--- a/packages/table-core/src/columnHelper.ts
+++ b/packages/table-core/src/columnHelper.ts
@@ -1,5 +1,7 @@
 import {
   AccessorFn,
+  AccessorFnColumnDef,
+  AccessorKeyColumnDef,
   ColumnDef,
   DisplayColumnDef,
   GroupColumnDef,
@@ -20,7 +22,7 @@ import { DeepKeys, DeepValue } from './utils'
 //     foo: [
 //       {
 //         bar: 'bar'
-//       }
+//       },
 //     ]
 //     bar: { subBar: boolean }[]
 //     baz: {
@@ -62,9 +64,11 @@ export type ColumnHelper<TData extends RowData> = {
     column: TAccessor extends AccessorFn<TData>
       ? DisplayColumnDef<TData, TValue>
       : IdentifiedColumnDef<TData, TValue>
-  ) => ColumnDef<TData, TValue>
-  display: (column: DisplayColumnDef<TData>) => ColumnDef<TData, unknown>
-  group: (column: GroupColumnDef<TData>) => ColumnDef<TData, unknown>
+  ) => TAccessor extends AccessorFn<TData>
+    ? AccessorFnColumnDef<TData, TValue>
+    : AccessorKeyColumnDef<TData, TValue>
+  display: (column: DisplayColumnDef<TData>) => DisplayColumnDef<TData, unknown>
+  group: (column: GroupColumnDef<TData>) => GroupColumnDef<TData, unknown>
 }
 
 export function createColumnHelper<
@@ -82,7 +86,7 @@ export function createColumnHelper<
             accessorKey: accessor,
           }
     },
-    display: column => column as ColumnDef<TData, unknown>,
-    group: column => column as ColumnDef<TData, unknown>,
+    display: column => column,
+    group: column => column,
   }
 }

From b45ce1dfae468befe93c55368516a31aaa57191a Mon Sep 17 00:00:00 2001
From: Mingyu Cui <mingyu.cui@robinhood.com>
Date: Wed, 20 Mar 2024 13:24:45 -0400
Subject: [PATCH 2/3] remove comma in comment

---
 packages/table-core/src/columnHelper.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/table-core/src/columnHelper.ts b/packages/table-core/src/columnHelper.ts
index 39e826bd12..921a695282 100644
--- a/packages/table-core/src/columnHelper.ts
+++ b/packages/table-core/src/columnHelper.ts
@@ -22,7 +22,7 @@ import { DeepKeys, DeepValue } from './utils'
 //     foo: [
 //       {
 //         bar: 'bar'
-//       },
+//       }
 //     ]
 //     bar: { subBar: boolean }[]
 //     baz: {

From 697696557a682b23ba34209bfc006de1b51cefc0 Mon Sep 17 00:00:00 2001
From: Mingyu Cui <mingyu.cui@robinhood.com>
Date: Wed, 20 Mar 2024 13:28:29 -0400
Subject: [PATCH 3/3] remove unnecessary import

---
 packages/table-core/src/columnHelper.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/table-core/src/columnHelper.ts b/packages/table-core/src/columnHelper.ts
index 921a695282..975a5e5b05 100644
--- a/packages/table-core/src/columnHelper.ts
+++ b/packages/table-core/src/columnHelper.ts
@@ -2,7 +2,6 @@ import {
   AccessorFn,
   AccessorFnColumnDef,
   AccessorKeyColumnDef,
-  ColumnDef,
   DisplayColumnDef,
   GroupColumnDef,
   IdentifiedColumnDef,