@tanstack/table-core 8.0.0-alpha.62 → 8.0.0-alpha.65

package/src/features/Grouping.ts

@@ -9,6 +9,7 @@ import {
   Updater,
   Renderable,
   TableGenerics,
+  TableFeature,
 } from '../types'
 import { isFunction, makeStateUpdater, Overwrite } from '../utils'
 
@@ -116,7 +117,7 @@ export type GroupingInstance<TGenerics extends TableGenerics> = {
 
 //
 
-export const Grouping = {
+export const Grouping: TableFeature = {
   getDefaultColumn: <
     TGenerics extends TableGenerics
   >(): GroupingColumnDef<TGenerics> => {
@@ -125,9 +126,10 @@ export const Grouping = {
     }
   },
 
-  getInitialState: (): GroupingTableState => {
+  getInitialState: (state): GroupingTableState => {
     return {
       grouping: [],
+      ...state,
     }
   },
 
@@ -302,28 +304,28 @@ export const Grouping = {
       },
     }
   },
+}
 
-  orderColumns: <TGenerics extends TableGenerics>(
-    leafColumns: Column<TGenerics>[],
-    grouping: string[],
-    groupedColumnMode?: GroupingColumnMode
-  ) => {
-    if (!grouping?.length || !groupedColumnMode) {
-      return leafColumns
-    }
+export function orderColumns<TGenerics extends TableGenerics>(
+  leafColumns: Column<TGenerics>[],
+  grouping: string[],
+  groupedColumnMode?: GroupingColumnMode
+) {
+  if (!grouping?.length || !groupedColumnMode) {
+    return leafColumns
+  }
 
-    const nonGroupingColumns = leafColumns.filter(
-      col => !grouping.includes(col.id)
-    )
+  const nonGroupingColumns = leafColumns.filter(
+    col => !grouping.includes(col.id)
+  )
 
-    if (groupedColumnMode === 'remove') {
-      return nonGroupingColumns
-    }
+  if (groupedColumnMode === 'remove') {
+    return nonGroupingColumns
+  }
 
-    const groupingColumns = grouping
-      .map(g => leafColumns.find(col => col.id === g)!)
-      .filter(Boolean)
+  const groupingColumns = grouping
+    .map(g => leafColumns.find(col => col.id === g)!)
+    .filter(Boolean)
 
-    return [...groupingColumns, ...nonGroupingColumns]
-  },
+  return [...groupingColumns, ...nonGroupingColumns]
 }

package/src/features/Headers.ts

@@ -163,7 +163,7 @@ export const Headers = {
           return headerGroups
         },
         {
-          key: 'getHeaderGroups',
+          key: process.env.NODE_ENV === 'production' && 'getHeaderGroups',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugHeaders,
         }
@@ -183,7 +183,7 @@ export const Headers = {
           return buildHeaderGroups(allColumns, leafColumns, instance, 'center')
         },
         {
-          key: 'getCenterHeaderGroups',
+          key: process.env.NODE_ENV === 'production' && 'getCenterHeaderGroups',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugHeaders,
         }
@@ -200,7 +200,7 @@ export const Headers = {
           return buildHeaderGroups(allColumns, leafColumns, instance, 'left')
         },
         {
-          key: 'getLeftHeaderGroups',
+          key: process.env.NODE_ENV === 'production' && 'getLeftHeaderGroups',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugHeaders,
         }
@@ -217,7 +217,7 @@ export const Headers = {
           return buildHeaderGroups(allColumns, leafColumns, instance, 'right')
         },
         {
-          key: 'getRightHeaderGroups',
+          key: process.env.NODE_ENV === 'production' && 'getRightHeaderGroups',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugHeaders,
         }
@@ -231,7 +231,7 @@ export const Headers = {
           return [...headerGroups].reverse()
         },
         {
-          key: 'getFooterGroups',
+          key: process.env.NODE_ENV === 'production' && 'getFooterGroups',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugHeaders,
         }
@@ -243,7 +243,7 @@ export const Headers = {
           return [...headerGroups].reverse()
         },
         {
-          key: 'getLeftFooterGroups',
+          key: process.env.NODE_ENV === 'production' && 'getLeftFooterGroups',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugHeaders,
         }
@@ -255,7 +255,7 @@ export const Headers = {
           return [...headerGroups].reverse()
         },
         {
-          key: 'getCenterFooterGroups',
+          key: process.env.NODE_ENV === 'production' && 'getCenterFooterGroups',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugHeaders,
         }
@@ -267,7 +267,7 @@ export const Headers = {
           return [...headerGroups].reverse()
         },
         {
-          key: 'getRightFooterGroups',
+          key: process.env.NODE_ENV === 'production' && 'getRightFooterGroups',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugHeaders,
         }
@@ -285,7 +285,7 @@ export const Headers = {
             .flat()
         },
         {
-          key: 'getFlatHeaders',
+          key: process.env.NODE_ENV === 'production' && 'getFlatHeaders',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugHeaders,
         }
@@ -301,7 +301,7 @@ export const Headers = {
             .flat()
         },
         {
-          key: 'getLeftFlatHeaders',
+          key: process.env.NODE_ENV === 'production' && 'getLeftFlatHeaders',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugHeaders,
         }
@@ -317,7 +317,7 @@ export const Headers = {
             .flat()
         },
         {
-          key: 'getCenterFlatHeaders',
+          key: process.env.NODE_ENV === 'production' && 'getCenterFlatHeaders',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugHeaders,
         }
@@ -333,7 +333,7 @@ export const Headers = {
             .flat()
         },
         {
-          key: 'getRightFlatHeaders',
+          key: process.env.NODE_ENV === 'production' && 'getRightFlatHeaders',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugHeaders,
         }
@@ -347,7 +347,7 @@ export const Headers = {
           return flatHeaders.filter(header => !header.subHeaders?.length)
         },
         {
-          key: 'getCenterLeafHeaders',
+          key: process.env.NODE_ENV === 'production' && 'getCenterLeafHeaders',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugHeaders,
         }
@@ -359,7 +359,7 @@ export const Headers = {
           return flatHeaders.filter(header => !header.subHeaders?.length)
         },
         {
-          key: 'getLeftLeafHeaders',
+          key: process.env.NODE_ENV === 'production' && 'getLeftLeafHeaders',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugHeaders,
         }
@@ -371,7 +371,7 @@ export const Headers = {
           return flatHeaders.filter(header => !header.subHeaders?.length)
         },
         {
-          key: 'getRightLeafHeaders',
+          key: process.env.NODE_ENV === 'production' && 'getRightLeafHeaders',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugHeaders,
         }
@@ -395,7 +395,7 @@ export const Headers = {
             .flat()
         },
         {
-          key: 'getLeafHeaders',
+          key: process.env.NODE_ENV === 'production' && 'getLeafHeaders',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugHeaders,
         }

package/src/features/Ordering.ts

@@ -6,9 +6,10 @@ import {
   Updater,
   Column,
   TableGenerics,
+  TableFeature,
 } from '../types'
 
-import { Grouping } from './Grouping'
+import { Grouping, orderColumns } from './Grouping'
 
 export type ColumnOrderTableState = {
   columnOrder: ColumnOrderState
@@ -34,10 +35,11 @@ export type ColumnOrderInstance<TGenerics extends TableGenerics> = {
 
 //
 
-export const Ordering = {
-  getInitialState: (): ColumnOrderTableState => {
+export const Ordering: TableFeature = {
+  getInitialState: (state): ColumnOrderTableState => {
     return {
       columnOrder: [],
+      ...state,
     }
   },
 
@@ -95,14 +97,10 @@ export const Ordering = {
             orderedColumns = [...orderedColumns, ...columnsCopy]
           }
 
-          return Grouping.orderColumns(
-            orderedColumns,
-            grouping,
-            groupedColumnMode
-          )
+          return orderColumns(orderedColumns, grouping, groupedColumnMode)
         },
         {
-          key: 'getOrderColumnsFn',
+          key: process.env.NODE_ENV === 'production' && 'getOrderColumnsFn',
           // debug: () => instance.options.debugAll ?? instance.options.debugTable,
         }
       ),

package/src/features/Pagination.ts

@@ -59,13 +59,14 @@ export type PaginationInstance<TGenerics extends TableGenerics> = {
 //
 
 export const Pagination: TableFeature = {
-  getInitialState: (initialState): PaginationTableState => {
+  getInitialState: (state): PaginationTableState => {
     return {
+      ...state,
       pagination: {
         pageCount: -1,
         pageIndex: 0,
         pageSize: 10,
-        ...initialState?.pagination,
+        ...state?.pagination,
       },
     }
   },
@@ -183,7 +184,7 @@ export const Pagination: TableFeature = {
           return pageOptions
         },
         {
-          key: 'getPageOptions',
+          key: process.env.NODE_ENV === 'production' && 'getPageOptions',
           debug: () => instance.options.debugAll ?? instance.options.debugTable,
         }
       ),

package/src/features/Pinning.ts

@@ -6,6 +6,7 @@ import {
   TableGenerics,
   Row,
   Cell,
+  TableFeature,
 } from '../types'
 import { makeStateUpdater, memo } from '../utils'
 
@@ -31,7 +32,6 @@ export type ColumnPinningDefaultOptions = {
 
 export type ColumnPinningColumnDef = {
   enablePinning?: boolean
-  defaultCanPin?: boolean
 }
 
 export type ColumnPinningColumn = {
@@ -47,12 +47,6 @@ export type ColumnPinningRow<TGenerics extends TableGenerics> = {
   getRightVisibleCells: () => Cell<TGenerics>[]
 }
 
-export type ColumnPinningCell<TGenerics extends TableGenerics> = {
-  getLeftVisibleCells: () => Cell<TGenerics>[]
-  getCenterVisibleCells: () => Cell<TGenerics>[]
-  getRightVisibleCells: () => Cell<TGenerics>[]
-}
-
 export type ColumnPinningInstance<TGenerics extends TableGenerics> = {
   setColumnPinning: (updater: Updater<ColumnPinningState>) => void
   resetColumnPinning: () => void
@@ -68,13 +62,14 @@ export type ColumnPinningInstance<TGenerics extends TableGenerics> = {
 
 //
 
-export const Pinning = {
-  getInitialState: (): ColumnPinningTableState => {
+export const Pinning: TableFeature = {
+  getInitialState: (state): ColumnPinningTableState => {
     return {
       columnPinning: {
         left: [],
         right: [],
       },
+      ...state,
     }
   },
 
@@ -115,7 +110,9 @@ export const Pinning = {
           return allCells.filter(d => !leftAndRight.includes(d.columnId))
         },
         {
-          key: 'row.getCenterVisibleCells',
+          key:
+            process.env.NODE_ENV === 'production' &&
+            'row.getCenterVisibleCells',
           debug: () => instance.options.debugAll ?? instance.options.debugRows,
         }
       ),
@@ -134,7 +131,8 @@ export const Pinning = {
           return cells
         },
         {
-          key: 'row.getLeftVisibleCells',
+          key:
+            process.env.NODE_ENV === 'production' && 'row.getLeftVisibleCells',
           debug: () => instance.options.debugAll ?? instance.options.debugRows,
         }
       ),
@@ -152,68 +150,8 @@ export const Pinning = {
           return cells
         },
         {
-          key: 'row.getRightVisibleCells',
-          debug: () => instance.options.debugAll ?? instance.options.debugRows,
-        }
-      ),
-    }
-  },
-
-  createCell: <TGenerics extends TableGenerics>(
-    cell: Cell<TGenerics>,
-    instance: TableInstance<TGenerics>
-  ): ColumnPinningCell<TGenerics> => {
-    return {
-      getCenterVisibleCells: memo(
-        () => [
-          cell.row._getAllVisibleCells(),
-          instance.getState().columnPinning.left,
-          instance.getState().columnPinning.right,
-        ],
-        (allCells, left, right) => {
-          const leftAndRight: string[] = [...(left ?? []), ...(right ?? [])]
-
-          return allCells.filter(d => !leftAndRight.includes(d.columnId))
-        },
-        {
-          key: 'row.getCenterVisibleCells',
-          debug: () => instance.options.debugAll ?? instance.options.debugRows,
-        }
-      ),
-      getLeftVisibleCells: memo(
-        () => [
-          cell.row._getAllVisibleCells(),
-          instance.getState().columnPinning.left,
-          ,
-        ],
-        (allCells, left) => {
-          const cells = (left ?? [])
-            .map(columnId => allCells.find(cell => cell.columnId === columnId)!)
-            .filter(Boolean)
-            .map(d => ({ ...d, position: 'left' } as Cell<TGenerics>))
-
-          return cells
-        },
-        {
-          key: 'row.getLeftVisibleCells',
-          debug: () => instance.options.debugAll ?? instance.options.debugRows,
-        }
-      ),
-      getRightVisibleCells: memo(
-        () => [
-          cell.row._getAllVisibleCells(),
-          instance.getState().columnPinning.right,
-        ],
-        (allCells, right) => {
-          const cells = (right ?? [])
-            .map(columnId => allCells.find(cell => cell.columnId === columnId)!)
-            .filter(Boolean)
-            .map(d => ({ ...d, position: 'left' } as Cell<TGenerics>))
-
-          return cells
-        },
-        {
-          key: 'row.getRightVisibleCells',
+          key:
+            process.env.NODE_ENV === 'production' && 'row.getRightVisibleCells',
           debug: () => instance.options.debugAll ?? instance.options.debugRows,
         }
       ),
@@ -277,10 +215,8 @@ export const Pinning = {
 
         return leafColumns.some(
           d =>
-            d.enablePinning ??
-            instance.options.enablePinning ??
-            d.defaultCanPin ??
-            !!d.accessorFn
+            (d.enablePinning ?? true) &&
+            (instance.options.enablePinning ?? true)
         )
       },
 
@@ -327,7 +263,7 @@ export const Pinning = {
             .filter(Boolean)
         },
         {
-          key: 'getLeftLeafColumns',
+          key: process.env.NODE_ENV === 'production' && 'getLeftLeafColumns',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugColumns,
         }
@@ -344,7 +280,7 @@ export const Pinning = {
             .filter(Boolean)
         },
         {
-          key: 'getRightLeafColumns',
+          key: process.env.NODE_ENV === 'production' && 'getRightLeafColumns',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugColumns,
         }
@@ -362,7 +298,7 @@ export const Pinning = {
           return allColumns.filter(d => !leftAndRight.includes(d.id))
         },
         {
-          key: 'getCenterLeafColumns',
+          key: process.env.NODE_ENV === 'production' && 'getCenterLeafColumns',
           debug: () =>
             instance.options.debugAll ?? instance.options.debugColumns,
         }

package/src/features/RowSelection.ts

@@ -5,6 +5,7 @@ import {
   Row,
   RowModel,
   Updater,
+  TableFeature,
 } from '../types'
 import { makeStateUpdater, memo } from '../utils'
 
@@ -15,10 +16,10 @@ export type RowSelectionTableState = {
 }
 
 export type RowSelectionOptions<TGenerics extends TableGenerics> = {
-  onRowSelectionChange?: OnChangeFn<RowSelectionState>
   enableRowSelection?: boolean | ((row: Row<TGenerics>) => boolean)
   enableMultiRowSelection?: boolean | ((row: Row<TGenerics>) => boolean)
   enableSubRowSelection?: boolean | ((row: Row<TGenerics>) => boolean)
+  onRowSelectionChange?: OnChangeFn<RowSelectionState>
   // enableGroupingRowSelection?:
   //   | boolean
   //   | ((
@@ -76,10 +77,11 @@ export type RowSelectionInstance<TGenerics extends TableGenerics> = {
 
 //
 
-export const RowSelection = {
-  getInitialState: (): RowSelectionTableState => {
+export const RowSelection: TableFeature = {
+  getInitialState: (state): RowSelectionTableState => {
     return {
       rowSelection: {},
+      ...state,
     }
   },
 
@@ -237,7 +239,7 @@ export const RowSelection = {
           return selectRowsFn(instance, rowModel)
         },
         {
-          key: 'getSelectedRowModel',
+          key: process.env.NODE_ENV === 'production' && 'getSelectedRowModel',
           debug: () => instance.options.debugAll ?? instance.options.debugTable,
         }
       ),
@@ -245,7 +247,7 @@ export const RowSelection = {
       getFilteredSelectedRowModel: memo(
         () => [
           instance.getState().rowSelection,
-          instance.getGlobalFilteredRowModel(),
+          instance.getFilteredRowModel(),
         ],
         (rowSelection, rowModel) => {
           if (!Object.keys(rowSelection).length) {
@@ -259,7 +261,9 @@ export const RowSelection = {
           return selectRowsFn(instance, rowModel)
         },
         {
-          key: 'getFilteredSelectedRowModel',
+          key:
+            process.env.NODE_ENV === 'production' &&
+            'getFilteredSelectedRowModel',
           debug: () => instance.options.debugAll ?? instance.options.debugTable,
         }
       ),
@@ -278,7 +282,9 @@ export const RowSelection = {
           return selectRowsFn(instance, rowModel)
         },
         {
-          key: 'getGroupedSelectedRowModel',
+          key:
+            process.env.NODE_ENV === 'production' &&
+            'getGroupedSelectedRowModel',
           debug: () => instance.options.debugAll ?? instance.options.debugTable,
         }
       ),
@@ -364,8 +370,7 @@ export const RowSelection = {
       // },
 
       getIsAllRowsSelected: () => {
-        const preFilteredFlatRows =
-          instance.getPreGlobalFilteredRowModel().flatRows
+        const preFilteredFlatRows = instance.getPreFilteredRowModel().flatRows
         const { rowSelection } = instance.getState()
 
         let isAllRowsSelected = Boolean(

package/src/features/Sorting.ts

@@ -12,6 +12,7 @@ import {
   TableInstance,
   Row,
   Updater,
+  TableFeature,
 } from '../types'
 
 import { isFunction, makeStateUpdater, Overwrite } from '../utils'
@@ -108,18 +109,19 @@ export type SortingInstance<TGenerics extends TableGenerics> = {
 
 //
 
-export const Sorting = {
-  getDefaultColumn: <
-    TGenerics extends TableGenerics
-  >(): SortingColumnDef<TGenerics> => {
+export const Sorting: TableFeature = {
+  getInitialState: (state): SortingTableState => {
     return {
-      sortingFn: 'auto',
+      sorting: [],
+      ...state,
     }
   },
 
-  getInitialState: (): SortingTableState => {
+  getDefaultColumn: <
+    TGenerics extends TableGenerics
+  >(): SortingColumnDef<TGenerics> => {
     return {
-      sorting: [],
+      sortingFn: 'auto',
     }
   },
 
@@ -159,9 +161,7 @@ export const Sorting = {
 
     return {
       getColumnAutoSortingFn: columnId => {
-        const firstRows = instance
-          .getGlobalFilteredRowModel()
-          .flatRows.slice(100)
+        const firstRows = instance.getFilteredRowModel().flatRows.slice(100)
 
         let isString = false
 
@@ -188,7 +188,7 @@ export const Sorting = {
         return sortingFns.basic
       },
       getColumnAutoSortDir: columnId => {
-        const firstRow = instance.getGlobalFilteredRowModel().flatRows[0]
+        const firstRow = instance.getFilteredRowModel().flatRows[0]
 
         const value = firstRow?.values[columnId]
 
@@ -397,7 +397,7 @@ export const Sorting = {
         }
       },
 
-      getPreSortedRowModel: () => instance.getGlobalFilteredRowModel(),
+      getPreSortedRowModel: () => instance.getFilteredRowModel(),
       getSortedRowModel: () => {
         if (
           !instance._getSortedRowModel &&

package/src/features/Visibility.ts

@@ -6,6 +6,7 @@ import {
   TableInstance,
   Updater,
   Row,
+  TableFeature,
 } from '../types'
 import { makeStateUpdater, memo } from '../utils'
 
@@ -62,10 +63,11 @@ export type VisibilityColumn = {
 
 //
 
-export const Visibility = {
-  getInitialState: (): VisibilityTableState => {
+export const Visibility: TableFeature = {
+  getInitialState: (state): VisibilityTableState => {
     return {
       columnVisibility: {},
+      ...state,
     }
   },
 
@@ -119,7 +121,8 @@ export const Visibility = {
           return row.getAllCells().filter(cell => cell.column.getIsVisible())
         },
         {
-          key: 'row._getAllVisibleCells',
+          key:
+            process.env.NODE_ENV === 'production' && 'row._getAllVisibleCells',
           debug: () => instance.options.debugAll ?? instance.options.debugRows,
         }
       ),
@@ -131,7 +134,7 @@ export const Visibility = {
         ],
         (left, center, right) => [...left, ...center, ...right],
         {
-          key: 'row.getVisibleCells',
+          key: process.env.NODE_ENV === 'production' && 'row.getVisibleCells',
           debug: () => instance.options.debugAll ?? instance.options.debugRows,
         }
       ),