@tanstack/table-core 8.0.0-alpha.10 → 8.0.0-alpha.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/table-core",
   "author": "Tanner Linsley",
-  "version": "8.0.0-alpha.10",
+  "version": "8.0.0-alpha.13",
   "description": "Hooks for building lightweight, fast and extendable datagrids for React",
   "license": "MIT",
   "homepage": "https://github.com/tanstack/react-table#readme",

package/src/createTable.tsx

@@ -78,11 +78,17 @@ export type TableFactory<TGenerics extends Partial<DefaultGenerics>> = {
     column: Overwrite<
       TAccessor extends (...args: any[]) => any
         ? // Accessor Fn
-          _NonGenerated<ColumnDef<TGenerics>>
+          _NonGenerated<
+            ColumnDef<Overwrite<TGenerics, { Value: ReturnType<TAccessor> }>>
+          >
         : TAccessor extends keyof TGenerics['Row']
         ? // Accessor Key
           Overwrite<
-            _NonGenerated<ColumnDef<TGenerics>>,
+            _NonGenerated<
+              ColumnDef<
+                Overwrite<TGenerics, { Value: TGenerics['Row'][TAccessor] }>
+              >
+            >,
             {
               id?: string
             }
@@ -93,7 +99,18 @@ export type TableFactory<TGenerics extends Partial<DefaultGenerics>> = {
         accessorKey?: never
       }
     >
-  ) => ColumnDef<TGenerics>
+  ) => ColumnDef<
+    Overwrite<
+      TGenerics,
+      {
+        Value: TAccessor extends (...args: any[]) => any
+          ? ReturnType<TAccessor>
+          : TAccessor extends keyof TGenerics['Row']
+          ? TGenerics['Row'][TAccessor]
+          : never
+      }
+    >
+  >
 }
 
 export function createTable<TRow>() {

package/src/features/Sorting.ts

@@ -67,6 +67,7 @@ export type SortingColumn<TGenerics extends PartialGenerics> = {
   getCanMultiSort: () => boolean
   getSortIndex: () => number
   getIsSorted: () => false | SortDirection
+  resetSorting: () => void
   toggleSorting: (desc?: boolean, isMulti?: boolean) => void
   getToggleSortingProps: <TGetter extends Getter<ToggleSortingProps>>(
     userProps?: TGetter
@@ -108,7 +109,7 @@ export type SortingInstance<TGenerics extends PartialGenerics> = {
     desc?: boolean,
     multi?: boolean
   ) => void
-  resetSorting: () => void
+  resetSorting: (columnId?: string) => void
   getColumnCanSort: (columnId: string) => boolean
   getColumnCanMultiSort: (columnId: string) => boolean
   getColumnIsSorted: (columnId: string) => false | 'asc' | 'desc'
@@ -160,6 +161,7 @@ export const Sorting = {
       getCanMultiSort: () => instance.getColumnCanMultiSort(column.id),
       getSortIndex: () => instance.getColumnSortIndex(column.id),
       getIsSorted: () => instance.getColumnIsSorted(column.id),
+      resetSorting: () => instance.resetSorting(column.id),
       toggleSorting: (desc, isMulti) =>
         instance.toggleColumnSorting(column.id, desc, isMulti),
       getToggleSortingProps: userProps =>
@@ -402,8 +404,14 @@ export const Sorting = {
       getColumnSortIndex: columnId =>
         instance.getState().sorting?.findIndex(d => d.id === columnId) ?? -1,
 
-      resetSorting: () => {
-        instance.setSorting(instance.initialState?.sorting ?? [])
+      resetSorting: (columnId?: string) => {
+        if (columnId) {
+          instance.setSorting(old =>
+            old?.length ? old.filter(d => d.id !== columnId) : []
+          )
+        } else {
+          instance.setSorting(instance.initialState?.sorting ?? [])
+        }
       },
 
       getToggleSortingProps: (columnId, userProps) => {