@tanstack/table-core 8.5.1 → 8.5.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/table-core",
   "author": "Tanner Linsley",
-  "version": "8.5.1",
+  "version": "8.5.2",
   "description": "Headless UI for building powerful tables & datagrids for TS/JS.",
   "license": "MIT",
   "homepage": "https://github.com/tanstack/table#readme",

package/src/columnHelper.ts

@@ -1,3 +1,8 @@
+import {
+  CoreColumnDefDisplay,
+  CoreColumnDefDisplayWithStringHeader,
+} from './core/column'
+import { GroupingColumnDef } from './features/Grouping'
 import { AccessorFn, ColumnDef, RowData } from './types'
 import { DeepKeys, DeepValue, RequiredKeys } from './utils'
 
@@ -60,10 +65,14 @@ export type ColumnHelper<TData extends RowData> = {
     >
   ) => ColumnDef<TData, unknown>
   group: (
-    column: RequiredKeys<
-      Omit<ColumnDef<TData, unknown>, 'accessorKey' | 'accessorFn'>,
-      'id' | 'columns'
-    >
+    column: Omit<
+      ColumnDef<TData, unknown>,
+      'id' | 'header' | 'accessorKey' | 'accessorFn' | 'columns'
+    > &
+      (
+        | CoreColumnDefDisplayWithStringHeader<TData, unknown>
+        | CoreColumnDefDisplay<TData, unknown>
+      ) & { columns: ColumnDef<TData, any>[] }
   ) => ColumnDef<TData, unknown>
 }
 

package/src/core/table.ts

@@ -17,7 +17,7 @@ import {
 } from '../types'
 
 //
-import { createColumn } from './column'
+import { CoreColumnDefResolved, createColumn } from './column'
 import { Headers } from './headers'
 //
 
@@ -232,8 +232,21 @@ export function createTable<TData extends RowData>(
         >
 
         return {
-          header: props => props.header.column.id,
-          footer: props => props.header.column.id,
+          header: props => {
+            const resolvedColumnDef = props.header.column
+              .columnDef as CoreColumnDefResolved<TData>
+
+            if (resolvedColumnDef.accessorKey) {
+              return resolvedColumnDef.accessorKey
+            }
+
+            if (resolvedColumnDef.accessorFn) {
+              return resolvedColumnDef.id
+            }
+
+            return null
+          },
+          // footer: props => props.header.column.id,
           cell: props => props.renderValue<any>()?.toString?.() ?? null,
           ...table._features.reduce((obj, feature) => {
             return Object.assign(obj, feature.getDefaultColumnDef?.())