@tanstack/table-core 9.0.0-beta.5 → 9.0.0-beta.50

package/src/features/row-expanding/rowExpandingFeature.utils.ts

@@ -1,4 +1,4 @@
-import { cloneState } from '../../utils'
+import { cloneState, hasOwn, makeObjectMap } from '../../utils'
 import type { RowData, Updater } from '../../types/type-utils'
 import type { TableFeatures } from '../../types/TableFeatures'
 import type { Table_Internal } from '../../types/Table'
@@ -20,7 +20,7 @@ import type {
  * ```
  */
 export function getDefaultExpandedState(): ExpandedState {
-  return {}
+  return makeObjectMap()
 }
 
 /**
@@ -85,7 +85,7 @@ export function table_toggleAllRowsExpanded<
   if (expanded ?? !table_getIsAllRowsExpanded(table)) {
     table_setExpanded(table, true)
   } else {
-    table_setExpanded(table, {})
+    table_setExpanded(table, makeObjectMap())
   }
 }
 
@@ -105,9 +105,17 @@ export function table_resetExpanded<
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(table: Table_Internal<TFeatures, TData>, defaultState?: boolean) {
+  const initialExpanded = table.initialState.expanded
   table_setExpanded(
     table,
-    defaultState ? {} : cloneState(table.initialState.expanded ?? {}),
+    defaultState
+      ? makeObjectMap()
+      : initialExpanded === true
+        ? true
+        : Object.assign(
+            makeObjectMap<boolean | undefined>(),
+            cloneState(initialExpanded ?? {}),
+          ),
   )
 }
 
@@ -252,29 +260,34 @@ export function row_toggleExpanded<
   TData extends RowData,
 >(row: Row<TFeatures, TData>, expanded?: boolean) {
   table_setExpanded(row.table, (old) => {
-    const exists = old === true ? true : !!old[row.id]
+    const exists = old === true ? true : isExpandedRowId(old, row.id)
 
-    let oldExpanded: ExpandedStateList = {}
+    let oldExpanded: ExpandedStateList = makeObjectMap()
 
     if (old === true) {
       Object.keys(row.table.getRowModel().rowsById).forEach((rowId) => {
         oldExpanded[rowId] = true
       })
     } else {
-      oldExpanded = old
+      oldExpanded = Object.assign(makeObjectMap<boolean | undefined>(), old)
     }
 
     expanded = expanded ?? !exists
 
     if (!exists && expanded) {
-      return {
-        ...oldExpanded,
-        [row.id]: true,
-      }
+      oldExpanded[row.id] = true
+      return oldExpanded
     }
 
     if (exists && !expanded) {
-      const { [row.id]: _, ...rest } = oldExpanded
+      const rest: ExpandedStateList = makeObjectMap()
+      const rowIds = Object.keys(oldExpanded)
+      for (let i = 0; i < rowIds.length; i++) {
+        const rowId = rowIds[i]!
+        if (rowId !== row.id && oldExpanded[rowId]) {
+          rest[rowId] = true
+        }
+      }
       return rest
     }
 
@@ -301,7 +314,19 @@ export function row_getIsExpanded<
 
   return !!(
     row.table.options.getIsRowExpanded?.(row) ??
-    (expanded === true || expanded[row.id])
+    (expanded === true || isExpandedRowId(expanded, row.id))
+  )
+}
+
+function isExpandedRowId(
+  expanded: ExpandedState | undefined,
+  rowId: string,
+): boolean {
+  return !!(
+    expanded &&
+    expanded !== true &&
+    hasOwn(expanded, rowId) &&
+    expanded[rowId]
   )
 }
 

package/src/features/row-pagination/createPaginatedRowModel.ts

@@ -25,7 +25,7 @@ export function createPaginatedRowModel<
       memoDeps: () => [
         table.getPrePaginatedRowModel(),
         table.atoms.pagination?.get(),
-        table.options.paginateExpandedRows
+        !table.options.paginateExpandedRows
           ? table.atoms.expanded?.get()
           : undefined,
       ],

package/src/features/row-pagination/rowPaginationFeature.types.ts

@@ -1,5 +1,4 @@
 import type { RowModel } from '../../core/row-models/coreRowModelsFeature.types'
-import type { Table } from '../../types/Table'
 import type { OnChangeFn, RowData, Updater } from '../../types/type-utils'
 import type { TableFeatures } from '../../types/TableFeatures'
 
@@ -42,8 +41,8 @@ export interface PaginationDefaultOptions {
 }
 
 export interface Table_RowPagination<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
+  in out _TFeatures extends TableFeatures,
+  in out _TData extends RowData,
 > {
   _autoResetPageIndex: () => void
   /**
@@ -117,8 +116,8 @@ export interface Table_RowPagination<
 }
 
 export interface Table_RowModels_Paginated<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
+  in out TFeatures extends TableFeatures,
+  in out TData extends RowData,
 > {
   /**
    * Resolves the row model after pagination has sliced the current page.
@@ -130,23 +129,9 @@ export interface Table_RowModels_Paginated<
   getPrePaginatedRowModel: () => RowModel<TFeatures, TData>
 }
 
-export interface CreateRowModel_Paginated<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {
-  /**
-   * Factory used to retrieve the paginated row model. If using server-side
-   * pagination, this is not required. To use client-side pagination, pass
-   * `createPaginatedRowModel()` or implement your own factory.
-   */
-  paginatedRowModel?: (
-    table: Table<TFeatures, TData>,
-  ) => () => RowModel<TFeatures, TData>
-}
-
 export interface CachedRowModel_Paginated<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
+  in out TFeatures extends TableFeatures,
+  in out TData extends RowData,
 > {
   paginatedRowModel: () => RowModel<TFeatures, TData>
 }

package/src/features/row-pagination/rowPaginationFeature.utils.ts

@@ -46,7 +46,7 @@ export function table_autoResetPageIndex<
     table.options.autoResetPageIndex ??
     !table.options.manualPagination
   ) {
-    table_resetPageIndex(table)
+    table_resetPageIndex(table, true)
   }
 }
 

package/src/features/row-pinning/rowPinningFeature.types.ts

@@ -14,8 +14,8 @@ export interface TableState_RowPinning {
 }
 
 export interface TableOptions_RowPinning<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
+  in out TFeatures extends TableFeatures,
+  in out TData extends RowData,
 > {
   /**
    * Allows rows to be pinned to top or bottom regions.
@@ -63,8 +63,8 @@ export interface Row_RowPinning {
 }
 
 export interface Table_RowPinning<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
+  in out TFeatures extends TableFeatures,
+  in out TData extends RowData,
 > {
   /**
    * Gets rows pinned to the bottom region.

package/src/features/row-selection/rowSelectionFeature.ts

@@ -20,6 +20,7 @@ import {
   table_getIsSomePageRowsSelected,
   table_getIsSomeRowsSelected,
   table_getPreSelectedRowModel,
+  table_getSelectedRowIds,
   table_getSelectedRowModel,
   table_getToggleAllPageRowsSelectedHandler,
   table_getToggleAllRowsSelectedHandler,
@@ -34,6 +35,16 @@ import type { TableFeature } from '../../types/TableFeatures'
  * Feature that adds row selection state and APIs for row and page selection.
  */
 export const rowSelectionFeature: TableFeature = {
+  initTableInstanceData: (table) => {
+    // @ts-ignore - _lastSelectedRowId is row selection table instance data
+    table._lastSelectedRowId = null
+  },
+
+  resetTableInstanceData: (table) => {
+    // @ts-ignore - _lastSelectedRowId is row selection table instance data
+    table._lastSelectedRowId = null
+  },
+
   getInitialState: (initialState) => {
     return {
       rowSelection: getDefaultRowSelectionState(),
@@ -46,7 +57,15 @@ export const rowSelectionFeature: TableFeature = {
       onRowSelectionChange: makeStateUpdater('rowSelection', table),
       enableRowSelection: true,
       enableMultiRowSelection: true,
+      enableRowRangeSelection: true,
       enableSubRowSelection: true,
+      isRowRangeSelectionEvent: (event) => {
+        const rangeEvent = event as {
+          shiftKey?: boolean
+          nativeEvent?: { shiftKey?: boolean }
+        }
+        return Boolean(rangeEvent.shiftKey || rangeEvent.nativeEvent?.shiftKey)
+      },
     }
   },
 
@@ -60,9 +79,19 @@ export const rowSelectionFeature: TableFeature = {
       },
       row_getIsSomeSelected: {
         fn: (row) => row_getIsSomeSelected(row),
+        memoDeps: (row) => [
+          row.subRows,
+          row.table.atoms.rowSelection?.get(),
+          row.table.options.enableRowSelection,
+        ],
       },
       row_getIsAllSubRowsSelected: {
         fn: (row) => row_getIsAllSubRowsSelected(row),
+        memoDeps: (row) => [
+          row.subRows,
+          row.table.atoms.rowSelection?.get(),
+          row.table.options.enableRowSelection,
+        ],
       },
       row_getCanSelect: {
         fn: (row) => row_getCanSelect(row),
@@ -74,7 +103,7 @@ export const rowSelectionFeature: TableFeature = {
         fn: (row) => row_getCanMultiSelect(row),
       },
       row_getToggleSelectedHandler: {
-        fn: (row) => row_getToggleSelectedHandler(row),
+        fn: (row, opts) => row_getToggleSelectedHandler(row, opts),
       },
     })
   },
@@ -88,10 +117,11 @@ export const rowSelectionFeature: TableFeature = {
         fn: (defaultState) => table_resetRowSelection(table, defaultState),
       },
       table_toggleAllRowsSelected: {
-        fn: (value) => table_toggleAllRowsSelected(table, value),
+        fn: (value, opts) => table_toggleAllRowsSelected(table, value, opts),
       },
       table_toggleAllPageRowsSelected: {
-        fn: (value) => table_toggleAllPageRowsSelected(table, value),
+        fn: (value, opts) =>
+          table_toggleAllPageRowsSelected(table, value, opts),
       },
       table_getPreSelectedRowModel: {
         fn: () => table_getPreSelectedRowModel(table),
@@ -117,17 +147,37 @@ export const rowSelectionFeature: TableFeature = {
           table.getSortedRowModel(),
         ],
       },
+      table_getSelectedRowIds: {
+        fn: () => table_getSelectedRowIds(table),
+        memoDeps: () => [table.atoms.rowSelection?.get()],
+      },
       table_getIsAllRowsSelected: {
         fn: () => table_getIsAllRowsSelected(table),
+        memoDeps: () => [
+          table.atoms.rowSelection?.get(),
+          table.getFilteredRowModel(),
+          table.options.enableRowSelection,
+        ],
       },
       table_getIsAllPageRowsSelected: {
         fn: () => table_getIsAllPageRowsSelected(table),
+        memoDeps: () => [
+          table.atoms.rowSelection?.get(),
+          table.getPaginatedRowModel(),
+          table.options.enableRowSelection,
+        ],
       },
       table_getIsSomeRowsSelected: {
         fn: () => table_getIsSomeRowsSelected(table),
+        memoDeps: () => [table.atoms.rowSelection?.get()],
       },
       table_getIsSomePageRowsSelected: {
         fn: () => table_getIsSomePageRowsSelected(table),
+        memoDeps: () => [
+          table.atoms.rowSelection?.get(),
+          table.getPaginatedRowModel(),
+          table.options.enableRowSelection,
+        ],
       },
       table_getToggleAllRowsSelectedHandler: {
         fn: () => table_getToggleAllRowsSelectedHandler(table),

package/src/features/row-selection/rowSelectionFeature.types.ts

@@ -3,16 +3,32 @@ import type { TableFeatures } from '../../types/TableFeatures'
 import type { RowModel } from '../../core/row-models/coreRowModelsFeature.types'
 import type { Row } from '../../types/Row'
 
-export type RowSelectionState = Record<string, boolean | undefined>
+export type RowSelectionState = Record<string, true>
+
+/**
+ * Controls how toggling a row affects its descendants.
+ */
+export interface ToggleSelectedOptions {
+  /**
+   * Whether selectable child rows should be toggled recursively. Defaults to
+   * `true`.
+   */
+  selectChildren?: boolean
+}
 
 export interface TableState_RowSelection {
   rowSelection: RowSelectionState
 }
 
 export interface TableOptions_RowSelection<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
+  in out TFeatures extends TableFeatures,
+  in out TData extends RowData,
 > {
+  /**
+   * Enables inclusive row range selection through
+   * `row.getToggleSelectedHandler()`. Defaults to `true`.
+   */
+  enableRowRangeSelection?: boolean
   /**
    * Allows rows to be selected alongside other rows.
    *
@@ -32,6 +48,14 @@ export interface TableOptions_RowSelection<
    * grouping features and defaults to `true`.
    */
   enableSubRowSelection?: boolean | ((row: Row<TFeatures, TData>) => boolean)
+  /**
+   * Determines whether a row-selection handler event should select or
+   * deselect the inclusive range from the most recent handler interaction.
+   *
+   * By default, events with `shiftKey` directly on the event or on
+   * `event.nativeEvent` are treated as range-selection events.
+   */
+  isRowRangeSelectionEvent?: (event: unknown) => boolean
   /**
    * Called with an updater when row selection state changes. Pair this with
    * `state.rowSelection` when using external state; external atoms can own the
@@ -44,7 +68,6 @@ export interface TableOptions_RowSelection<
   //       row: Row<TFeatures, TData>
   //     ) => boolean)
   // isAdditiveSelectEvent?: (e: unknown) => boolean
-  // isInclusiveSelectEvent?: (e: unknown) => boolean
   // selectRowsFn?: (
   //   table: Table<TFeatures, TData>,
   //   rowModel: RowModel<TFeatures, TData>
@@ -78,18 +101,29 @@ export interface Row_RowSelection {
   getIsSomeSelected: () => boolean
   /**
    * Creates a checkbox-style handler that toggles this row's selected state.
+   * Pass the original checkbox click event, or a framework event whose
+   * `nativeEvent` is that click, so Shift range selection can detect the
+   * modifier key.
    */
-  getToggleSelectedHandler: () => (event: unknown) => void
+  getToggleSelectedHandler: (
+    opts?: ToggleSelectedOptions,
+  ) => (event: unknown) => void
   /**
    * Selects/deselects the row.
    */
-  toggleSelected: (value?: boolean, opts?: { selectChildren?: boolean }) => void
+  toggleSelected: (value?: boolean, opts?: ToggleSelectedOptions) => void
 }
 
 export interface Table_RowSelection<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
+  in out TFeatures extends TableFeatures,
+  in out TData extends RowData,
 > {
+  /**
+   * The most recent row interacted with through the row selection handler.
+   *
+   * @internal
+   */
+  _lastSelectedRowId: string | null
   /**
    * Builds a selected-row model from rows after filtering.
    */
@@ -98,6 +132,10 @@ export interface Table_RowSelection<
    * Builds a selected-row model from rows after grouping.
    */
   getGroupedSelectedRowModel: () => RowModel<TFeatures, TData>
+  /**
+   * Returns the ids of all selected rows.
+   */
+  getSelectedRowIds: () => Array<string>
   /**
    * Checks whether every selectable row on the current page is selected.
    */
@@ -143,9 +181,15 @@ export interface Table_RowSelection<
   /**
    * Selects/deselects all rows on the current page.
    */
-  toggleAllPageRowsSelected: (value?: boolean) => void
+  toggleAllPageRowsSelected: (
+    value?: boolean,
+    opts?: { deselectAll?: boolean },
+  ) => void
   /**
    * Selects/deselects all rows in the table.
    */
-  toggleAllRowsSelected: (value?: boolean) => void
+  toggleAllRowsSelected: (
+    value?: boolean,
+    opts?: { deselectAll?: boolean },
+  ) => void
 }