fix(table): updated column type definitions

yamada-ui · Nov 25, 2023 · 6523622 · 6523622
1 parent e26110e
commit 6523622
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/.changeset/silly-roses-notice.md b/.changeset/silly-roses-notice.md
@@ -0,0 +1,5 @@
+---
+"@yamada-ui/table": patch
+---
+
+Updated column type definitions.
diff --git a/packages/components/table/src/use-table.tsx b/packages/components/table/src/use-table.tsx
@@ -13,6 +13,8 @@ import type {
   OnChangeFn,
   PaginationOptions,
   HeaderContext,
+  DisplayColumnDef,
+  AccessorColumnDef,
 } from "@tanstack/react-table"
 import {
   getCoreRowModel,
@@ -48,25 +50,25 @@ export const [TableProvider, useTableContext] = createContext<TableContext>({
   name: "TableContext",
 })
 
-export type ColumnStyles = {
+export type PropsColumnDef = {
   className?: string
   style?: CSSProperties
   sx?: CSSUIObject
   css?: CSSUIObject
-}
-
-type UIColumn<Y extends RowData, M = any> = {
   colSpan?: number
   rowSpan?: number
+}
+
+export type GroupColumnDef<Y extends RowData, M = any> = {
   columns?: Column<Y, M>[]
 }
 
-export type Column<Y extends RowData, M = any> = Omit<
-  ColumnDef<Y, M>,
-  "columns"
-> &
-  UIColumn<Y, M> &
-  ColumnStyles
+export type Column<Y extends RowData, M = any> = (
+  | DisplayColumnDef<Y, M>
+  | AccessorColumnDef<Y, M>
+) &
+  GroupColumnDef<Y, M> &
+  PropsColumnDef
 
 type SelectColumn<Y extends RowData, M = any> = Omit<
   Column<Y, M>,