Skip to content

fix ColumnHelper['accessor'] TValue type #5999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Smona wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −12
Open

fix ColumnHelper['accessor'] TValue type #5999

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions packages/table-core/src/columnHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,25 @@ import { DeepKeys, DeepValue } from './utils'
// cell: info => info.getValue(),
// })

type AccessorValue<
TData,
TAccessor extends AccessorFn<TData> | DeepKeys<TData>,
> =
TAccessor extends AccessorFn<TData, infer TReturn>
? TReturn
: TAccessor extends DeepKeys<TData>
? DeepValue<TData, TAccessor>
: never

export type ColumnHelper<TData extends RowData> = {
accessor: <
TAccessor extends AccessorFn<TData> | DeepKeys<TData>,
TValue extends TAccessor extends AccessorFn<TData, infer TReturn>
? TReturn
: TAccessor extends DeepKeys<TData>
? DeepValue<TData, TAccessor>
: never,
>(
accessor: <TAccessor extends AccessorFn<TData> | DeepKeys<TData>>(
accessor: TAccessor,
column: TAccessor extends AccessorFn<TData>
? DisplayColumnDef<TData, TValue>
: IdentifiedColumnDef<TData, TValue>
? DisplayColumnDef<TData, AccessorValue<TData, TAccessor>>
: IdentifiedColumnDef<TData, AccessorValue<TData, TAccessor>>
) => TAccessor extends AccessorFn<TData>
? AccessorFnColumnDef<TData, TValue>
: AccessorKeyColumnDef<TData, TValue>
? AccessorFnColumnDef<TData, AccessorValue<TData, TAccessor>>
: AccessorKeyColumnDef<TData, AccessorValue<TData, TAccessor>>
display: (column: DisplayColumnDef<TData>) => DisplayColumnDef<TData, unknown>
group: (column: GroupColumnDef<TData>) => GroupColumnDef<TData, unknown>
}
Expand Down