@tanstack/table-core 8.0.0-beta.4 → 8.0.0-beta.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/table-core",
   "author": "Tanner Linsley",
-  "version": "8.0.0-beta.4",
+  "version": "8.0.0-beta.7",
   "description": "Headless UI for building powerful tables & datagrids for TS/JS.",
   "license": "MIT",
   "homepage": "https://github.com/tanstack/table#readme",

package/src/features/Expanding.ts

@@ -63,7 +63,6 @@ export const Expanding: TableFeature = {
   ): ExpandedOptions<TGenerics> => {
     return {
       onExpandedChange: makeStateUpdater('expanded', instance),
-      autoResetExpanded: true,
       paginateExpandedRows: true,
     }
   },
@@ -83,13 +82,10 @@ export const Expanding: TableFeature = {
           return
         }
 
-        if (instance.options.autoResetAll === false) {
-          return
-        }
-
         if (
-          instance.options.autoResetAll === true ||
-          instance.options.autoResetExpanded
+          instance.options.autoResetAll ??
+          instance.options.autoResetExpanded ??
+          !instance.options.manualExpanding
         ) {
           if (queued) return
           queued = true
@@ -160,7 +156,7 @@ export const Expanding: TableFeature = {
 
         return maxDepth
       },
-      getPreExpandedRowModel: () => instance.getGroupedRowModel(),
+      getPreExpandedRowModel: () => instance.getSortedRowModel(),
       getExpandedRowModel: () => {
         if (
           !instance._getExpandedRowModel &&

package/src/features/Grouping.ts

@@ -214,7 +214,7 @@ export const Grouping: TableFeature = {
         )
       },
 
-      getPreGroupedRowModel: () => instance.getSortedRowModel(),
+      getPreGroupedRowModel: () => instance.getFilteredRowModel(),
       getGroupedRowModel: () => {
         if (
           !instance._getGroupedRowModel &&
@@ -258,7 +258,7 @@ export const Grouping: TableFeature = {
       getIsAggregated: () =>
         !cell.getIsGrouped() &&
         !cell.getIsPlaceholder() &&
-        row.subRows?.length > 1,
+        !!row.subRows?.length,
       renderAggregatedCell: () => {
         if (process.env.NODE_ENV === 'development') {
           if (!column.columnDef.aggregatedCell) {

package/src/features/RowSelection.ts

@@ -58,8 +58,8 @@ export type RowSelectionInstance<TGenerics extends TableGenerics> = {
   getIsAllPageRowsSelected: () => boolean
   getIsSomeRowsSelected: () => boolean
   getIsSomePageRowsSelected: () => boolean
-  toggleAllRowsSelected: (value: boolean) => void
-  toggleAllPageRowsSelected: (value: boolean) => void
+  toggleAllRowsSelected: (value?: boolean) => void
+  toggleAllPageRowsSelected: (value?: boolean) => void
   getPreSelectedRowModel: () => RowModel<TGenerics>
   getSelectedRowModel: () => RowModel<TGenerics>
   getFilteredSelectedRowModel: () => RowModel<TGenerics>
@@ -128,7 +128,7 @@ export const RowSelection: TableFeature = {
       },
       toggleAllPageRowsSelected: value =>
         instance.setRowSelection(old => {
-          const selectAll =
+          const resolvedValue =
             typeof value !== 'undefined'
               ? value
               : !instance.getIsAllPageRowsSelected()
@@ -136,7 +136,7 @@ export const RowSelection: TableFeature = {
           const rowSelection: RowSelectionState = { ...old }
 
           instance.getRowModel().rows.forEach(row => {
-            mutateRowIsSelected(rowSelection, row.id, value, instance)
+            mutateRowIsSelected(rowSelection, row.id, resolvedValue, instance)
           })
 
           return rowSelection
@@ -245,7 +245,7 @@ export const RowSelection: TableFeature = {
       ),
 
       getGroupedSelectedRowModel: memo(
-        () => [instance.getState().rowSelection, instance.getGroupedRowModel()],
+        () => [instance.getState().rowSelection, instance.getSortedRowModel()],
         (rowSelection, rowModel) => {
           if (!Object.keys(rowSelection).length) {
             return {
@@ -325,7 +325,9 @@ export const RowSelection: TableFeature = {
         const paginationFlatRows = instance.getPaginationRowModel().flatRows
         return instance.getIsAllPageRowsSelected()
           ? false
-          : !!paginationFlatRows?.length
+          : paginationFlatRows.some(
+              d => d.getIsSelected() || d.getIsSomeSelected()
+            )
       },
 
       getToggleAllRowsSelectedHandler: () => {

package/src/features/Sorting.ts

@@ -345,8 +345,6 @@ export const Sorting: TableFeature = {
   createInstance: <TGenerics extends TableGenerics>(
     instance: TableInstance<TGenerics>
   ): SortingInstance<TGenerics> => {
-    let registered = false
-
     return {
       setSorting: updater => instance.options.onSortingChange?.(updater),
       resetSorting: defaultState => {
@@ -354,7 +352,7 @@ export const Sorting: TableFeature = {
           defaultState ? [] : instance.initialState?.sorting ?? []
         )
       },
-      getPreSortedRowModel: () => instance.getFilteredRowModel(),
+      getPreSortedRowModel: () => instance.getGroupedRowModel(),
       getSortedRowModel: () => {
         if (
           !instance._getSortedRowModel &&

package/src/utils/getPaginationRowModel.ts

@@ -1,4 +1,4 @@
-import { TableInstance, RowModel, TableGenerics } from '../types'
+import { TableInstance, RowModel, TableGenerics, Row } from '../types'
 import { memo } from '../utils'
 import { expandRows } from './getExpandedRowModel'
 
@@ -23,8 +23,10 @@ export function getPaginationRowModel<TGenerics extends TableGenerics>(opts?: {
 
         rows = rows.slice(pageStart, pageEnd)
 
+        let paginatedRowModel: RowModel<TGenerics>
+
         if (!instance.options.paginateExpandedRows) {
-          return expandRows(
+          paginatedRowModel = expandRows(
             {
               rows,
               flatRows,
@@ -32,13 +34,26 @@ export function getPaginationRowModel<TGenerics extends TableGenerics>(opts?: {
             },
             instance
           )
+        } else {
+          paginatedRowModel = {
+            rows,
+            flatRows,
+            rowsById,
+          }
         }
 
-        return {
-          rows,
-          flatRows,
-          rowsById,
+        paginatedRowModel.flatRows = []
+
+        const handleRow = (row: Row<TGenerics>) => {
+          paginatedRowModel.flatRows.push(row)
+          if (row.subRows.length) {
+            row.subRows.forEach(handleRow)
+          }
         }
+
+        paginatedRowModel.rows.forEach(handleRow)
+
+        return paginatedRowModel
       },
       {
         key: process.env.NODE_ENV === 'development' && 'getPaginationRowModel',