@tanstack/table-core 8.0.0-alpha.28 → 8.0.0-alpha.30

package/package.json

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

package/src/core.tsx

@@ -84,6 +84,11 @@ export type CoreOptions<TGenerics extends AnyGenerics> = {
     parent?: Row<TGenerics>
   ) => string
   autoResetAll?: boolean
+  mergeOptions?: (
+    defaultOptions: TableFeature,
+    options: Partial<Options<TGenerics>>
+  ) => Options<TGenerics>
+  meta?: TGenerics['TableMeta'] extends {} ? TGenerics['TableMeta'] : any
 }
 
 export type TableCore<TGenerics extends AnyGenerics> = {
@@ -249,9 +254,15 @@ export function createTableInstance<TGenerics extends AnyGenerics>(
       instance.setState(instance.initialState)
     },
     setOptions: updater => {
-      instance.options = buildOptions(
-        functionalUpdate(updater, instance.options)
-      )
+      const newOptions = functionalUpdate(updater, instance.options)
+      if (instance.options.mergeOptions) {
+        instance.options = instance.options.mergeOptions(
+          defaultOptions,
+          newOptions
+        )
+      } else {
+        instance.options = buildOptions(newOptions)
+      }
     },
     render: (template, props) => {
       if (typeof instance.options.render === 'function') {

package/src/createTable.tsx

@@ -14,13 +14,9 @@ export type CreateTableFactory<TGenerics extends AnyGenerics> = <
   TSubGenerics extends {
     Row: any
     ColumnMeta?: object
+    TableMeta?: object
   }
->() => Table<
-  Overwrite<
-    TGenerics,
-    { Row: TSubGenerics['Row']; ColumnMeta: TSubGenerics['ColumnMeta'] }
-  >
->
+>() => Table<Overwrite<TGenerics, TSubGenerics>>
 
 export type CreateTableFactoryOptions<
   TRender extends AnyRender,

package/src/features/Expanding.ts

@@ -211,7 +211,7 @@ export const Expanding = {
           title: canExpand ? 'Toggle Expanded' : undefined,
           onClick: canExpand
             ? (e: MouseEvent | TouchEvent) => {
-                e.persist()
+                e.persist?.()
                 instance.toggleRowExpanded(rowId)
               }
             : undefined,
@@ -223,7 +223,7 @@ export const Expanding = {
         const initialProps: ToggleExpandedProps = {
           title: 'Toggle All Expanded',
           onClick: (e: MouseEvent | TouchEvent) => {
-            e.persist()
+            e.persist?.()
             instance.toggleAllRowsExpanded()
           },
         }

package/src/features/Filters.ts

@@ -350,7 +350,7 @@ export const Filters = {
       },
 
       resetGlobalFilter: () => {
-        instance.setGlobalFilter(undefined)
+        instance.setGlobalFilter(instance.initialState.globalFilter)
       },
 
       getColumnCanColumnFilter: columnId => {

package/src/features/Pagination.ts

@@ -187,7 +187,7 @@ export const Pagination = {
       getCanPreviousPage: () => instance.getState().pagination.pageIndex > 0,
 
       getCanNextPage: () => {
-        const { pageIndex, pageSize } = instance.getState().pagination
+        const { pageIndex } = instance.getState().pagination
 
         const pageCount = instance.getPageCount()
 
@@ -199,13 +199,7 @@ export const Pagination = {
           return false
         }
 
-        return (
-          pageIndex <
-          Math.ceil(
-            instance.getPrePaginationRowModel().rows.length / pageSize
-          ) -
-            1
-        )
+        return pageIndex < pageCount - 1
       },
 
       previousPage: () => {

package/src/features/Sorting.ts

@@ -428,7 +428,7 @@ export const Sorting = {
           title: canSort ? 'Toggle Sorting' : undefined,
           onClick: canSort
             ? (e: MouseEvent | TouchEvent) => {
-                e.persist()
+                e.persist?.()
                 column.toggleSorting?.(
                   undefined,
                   column.getCanMultiSort()

package/src/types.ts

@@ -84,6 +84,7 @@ export type DefaultGenerics = {
   AggregationFns: object
   Render: unknown
   ColumnMeta: object
+  TableMeta: object
 }
 
 export type AnyRender = (Comp: any, props: any) => any

package/src/utils.tsx

@@ -91,7 +91,7 @@ export function memo<TDeps extends readonly any[], TResult>(
 
   return () => {
     let depTime: number
-    if (opts.key && opts.debug) depTime = performance.now()
+    if (opts.key && opts.debug) depTime = Date.now()
 
     const newDeps = getDeps()
 
@@ -102,17 +102,16 @@ export function memo<TDeps extends readonly any[], TResult>(
     if (depsChanged) {
       let oldResult = result
       let resultTime: number
-      if (opts.key && opts.debug) resultTime = performance.now()
+      if (opts.key && opts.debug) resultTime = Date.now()
       result = fn(...newDeps)
       deps = newDeps
       opts?.onChange?.(result, oldResult)
 
       if (opts.key && opts.debug) {
         if (opts?.debug()) {
-          const depEndTime =
-            Math.round((performance.now() - depTime!) * 100) / 100
+          const depEndTime = Math.round((Date.now() - depTime!) * 100) / 100
           const resultEndTime =
-            Math.round((performance.now() - resultTime!) * 100) / 100
+            Math.round((Date.now() - resultTime!) * 100) / 100
           const resultFpsPercentage = resultEndTime / 16
 
           const pad = (str: number | string, num: number) => {