@tanstack/table-core 8.0.0-alpha.12 → 8.0.0-alpha.16

package/src/types.ts

@@ -1,4 +1,3 @@
-import React from 'react'
 import {
   CoreColumn,
   CoreColumnDef,
@@ -42,6 +41,7 @@ import {
   SortingTableState,
 } from './features/Sorting'
 import {
+  GroupingCell,
   GroupingColumn,
   GroupingColumnDef,
   GroupingInstance,
@@ -55,7 +55,7 @@ import {
   ExpandedTableState,
   ExpandedRow,
 } from './features/Expanding'
-import { Overwrite } from './utils'
+import { Overwrite, PartialKeys } from './utils'
 import {
   ColumnSizingColumn,
   ColumnSizingColumnDef,
@@ -76,20 +76,27 @@ import {
   RowSelectionTableState,
 } from './features/RowSelection'
 
-// declare global {
-//   const process.env.NODE_ENV !== 'production': boolean
-// }
-
 export type DefaultGenerics = {
   Row: unknown
   Value: unknown
   FilterFns: object
   SortingFns: object
   AggregationFns: object
+  Render: unknown
+  ColumnMeta: object
 }
 
+export type AnyRender = (Comp: any, props: any) => any
+
+export type UseRenderer<TGenerics extends PartialGenerics> =
+  TGenerics['Render'] extends (...args: any) => any ? TGenerics['Render'] : any
+
 export type PartialGenerics = Partial<DefaultGenerics>
 
+export type AnyGenerics = {
+  [TKey in keyof PartialGenerics]: any
+}
+
 export type TableInstance<TGenerics extends PartialGenerics> =
   TableCore<TGenerics> &
     VisibilityInstance<TGenerics> &
@@ -104,11 +111,6 @@ export type TableInstance<TGenerics extends PartialGenerics> =
     PaginationInstance<TGenerics> &
     RowSelectionInstance<TGenerics>
 
-export type Renderable<TProps> =
-  | React.ReactNode
-  | React.FunctionComponent<TProps>
-  | React.Component<TProps>
-
 //
 
 export type Options<TGenerics extends PartialGenerics> =
@@ -167,6 +169,10 @@ export type _NonGenerated<T> = Overwrite<
   }
 >
 
+export type Renderable<TGenerics extends PartialGenerics, TProps> =
+  | string
+  | ((props: TProps) => ReturnType<UseRenderer<TGenerics>>)
+
 export type ColumnDef<TGenerics extends PartialGenerics> =
   CoreColumnDef<TGenerics> &
     VisibilityColumnDef &
@@ -185,7 +191,10 @@ export type Column<TGenerics extends PartialGenerics> = ColumnDef<TGenerics> &
   GroupingColumn<TGenerics> &
   ColumnSizingColumn<TGenerics>
 
-export type Cell<TGenerics extends PartialGenerics> = {
+export type Cell<TGenerics extends PartialGenerics> = CoreCell<TGenerics> &
+  GroupingCell<TGenerics>
+
+export type CoreCell<TGenerics extends PartialGenerics> = {
   id: string
   rowId: string
   columnId: string
@@ -193,7 +202,7 @@ export type Cell<TGenerics extends PartialGenerics> = {
   row: Row<TGenerics>
   column: Column<TGenerics>
   getCellProps: PropGetter<CellProps>
-  renderCell: () => React.ReactNode
+  renderCell: () => string | null | ReturnType<UseRenderer<TGenerics>>
 }
 
 export type Header<TGenerics extends PartialGenerics> = CoreHeader<TGenerics> &
@@ -212,8 +221,12 @@ export type CoreHeader<TGenerics extends PartialGenerics> = {
   getLeafHeaders: () => Header<TGenerics>[]
   isPlaceholder?: boolean
   placeholderId?: string
-  renderHeader: (options?: { renderPlaceholder?: boolean }) => React.ReactNode
-  renderFooter: (options?: { renderPlaceholder?: boolean }) => React.ReactNode
+  renderHeader: (options?: {
+    renderPlaceholder?: boolean
+  }) => string | null | ReturnType<UseRenderer<TGenerics>>
+  renderFooter: (options?: {
+    renderPlaceholder?: boolean
+  }) => string | null | ReturnType<UseRenderer<TGenerics>>
 }
 
 export type HeaderGroup<TGenerics extends PartialGenerics> = {

package/src/utils/columnFilterRowsFn.ts

@@ -1,6 +1,6 @@
-import { PartialGenerics, TableInstance, Row, RowModel } from '../types'
+import { AnyGenerics, TableInstance, Row, RowModel } from '../types'
 
-export function columnFilterRowsFn<TGenerics extends PartialGenerics>(
+export function columnFilterRowsFn<TGenerics extends AnyGenerics>(
   instance: TableInstance<TGenerics>,
   rowModel: RowModel<TGenerics>
 ): RowModel<TGenerics> {
@@ -18,9 +18,7 @@ export function columnFilterRowsFn<TGenerics extends PartialGenerics>(
 
       if (!column) {
         if (process.env.NODE_ENV !== 'production') {
-          console.warn(
-            `React-Table: Could not find a column with id: ${columnId}`
-          )
+          console.warn(`Table: Could not find a column with id: ${columnId}`)
         }
         throw new Error()
       }

package/src/utils/expandRowsFn.ts

@@ -1,6 +1,6 @@
-import { PartialGenerics, TableInstance, Row, RowModel } from '../types'
+import { TableInstance, Row, RowModel, AnyGenerics } from '../types'
 
-export function expandRowsFn<TGenerics extends PartialGenerics>(
+export function expandRowsFn<TGenerics extends AnyGenerics>(
   instance: TableInstance<TGenerics>,
   sortedRowModel: RowModel<TGenerics>
 ): RowModel<TGenerics> {

package/src/utils/globalFilterRowsFn.ts

@@ -1,6 +1,6 @@
-import { PartialGenerics, TableInstance, Row, RowModel } from '../types'
+import { TableInstance, Row, RowModel, AnyGenerics } from '../types'
 
-export function globalFilterRowsFn<TGenerics extends PartialGenerics>(
+export function globalFilterRowsFn<TGenerics extends AnyGenerics>(
   instance: TableInstance<TGenerics>,
   rowModel: RowModel<TGenerics>
 ): RowModel<TGenerics> {

package/src/utils/groupRowsFn.ts

@@ -1,7 +1,7 @@
-import { PartialGenerics, TableInstance, Row, RowModel } from '../types'
+import { TableInstance, Row, RowModel, AnyGenerics } from '../types'
 import { flattenBy } from '../utils'
 
-export function groupRowsFn<TGenerics extends PartialGenerics>(
+export function groupRowsFn<TGenerics extends AnyGenerics>(
   instance: TableInstance<TGenerics>,
   sortedRowModel: RowModel<TGenerics>
 ): RowModel<TGenerics> {
@@ -52,7 +52,7 @@ export function groupRowsFn<TGenerics extends PartialGenerics>(
         console.info({ column })
         throw new Error(
           process.env.NODE_ENV !== 'production'
-            ? `React Table: Invalid column.aggregateType option for column listed above`
+            ? `Table: Invalid column.aggregateType option for column listed above`
             : ''
         )
       } else {
@@ -151,7 +151,7 @@ export function groupRowsFn<TGenerics extends PartialGenerics>(
   }
 }
 
-function groupBy<TGenerics extends PartialGenerics>(
+function groupBy<TGenerics extends AnyGenerics>(
   rows: Row<TGenerics>[],
   columnId: string
 ) {

package/src/utils/paginateRowsFn.ts

@@ -1,7 +1,7 @@
-import { PartialGenerics, TableInstance, RowModel } from '../types'
+import { TableInstance, RowModel, AnyGenerics } from '../types'
 import { expandRowsFn } from './expandRowsFn'
 
-export function paginateRowsFn<TGenerics extends PartialGenerics>(
+export function paginateRowsFn<TGenerics extends AnyGenerics>(
   instance: TableInstance<TGenerics>,
   rowModel: RowModel<TGenerics>
 ): RowModel<TGenerics> {

package/src/utils/sortRowsFn.ts

@@ -1,7 +1,7 @@
-import { PartialGenerics, TableInstance, Row, RowModel } from '../types'
+import { TableInstance, Row, RowModel, AnyGenerics } from '../types'
 import { SortingFn } from '../features/Sorting'
 
-export function sortRowsFn<TGenerics extends PartialGenerics>(
+export function sortRowsFn<TGenerics extends AnyGenerics>(
   instance: TableInstance<TGenerics>,
   rowModel: RowModel<TGenerics>
 ): RowModel<TGenerics> {

package/src/utils.tsx

@@ -1,18 +1,14 @@
-import React from 'react'
-import {
-  Getter,
-  NoInfer,
-  PropGetterValue,
-  Renderable,
-  TableState,
-  Updater,
-} from './types'
+import { Getter, NoInfer, PropGetterValue, TableState, Updater } from './types'
 
 export type IsAny<T> = 0 extends 1 & T ? true : false
 export type PartialKeys<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>
 export type RequiredKeys<T, K extends keyof T> = Omit<T, K> &
   Required<Pick<T, K>>
-export type Overwrite<T, U> = Omit<T, keyof U> & U
+export type Overwrite<T, U extends { [TKey in keyof T]?: any }> = Omit<
+  T,
+  keyof U
+> &
+  U
 
 export type DataUpdateFunction<T> = (input: T) => T
 
@@ -168,41 +164,6 @@ export function memo<TDeps extends readonly any[], TResult>(
   }
 }
 
-export type Render = typeof flexRender
-
-export function flexRender<TProps extends {}>(
-  Comp: Renderable<TProps>,
-  props: TProps
-): React.ReactNode {
-  return !Comp ? null : isReactComponent(Comp) ? <Comp {...props} /> : Comp
-}
-
-function isReactComponent(component: unknown): component is React.FC {
-  return (
-    isClassComponent(component) ||
-    typeof component === 'function' ||
-    isExoticComponent(component)
-  )
-}
-
-function isClassComponent(component: any) {
-  return (
-    typeof component === 'function' &&
-    (() => {
-      const proto = Object.getPrototypeOf(component)
-      return proto.prototype && proto.prototype.isReactComponent
-    })()
-  )
-}
-
-function isExoticComponent(component: any) {
-  return (
-    typeof component === 'object' &&
-    typeof component.$$typeof === 'symbol' &&
-    ['react.memo', 'react.forward_ref'].includes(component.$$typeof.description)
-  )
-}
-
 // export function hashString(str: string, seed = 0): string {
 //   let h1 = 0xdeadbeef ^ seed,
 //     h2 = 0x41c6ce57 ^ seed