@tanstack/table-core 8.5.6 → 8.5.9

package/package.json

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

package/src/types.ts

@@ -240,7 +240,7 @@ export type AccessorFnColumnDef<
 
 export type AccessorKeyColumnDef<TData extends RowData, TValue = unknown> = {
   id?: string
-} & ColumnIdentifiers<TData, TValue> &
+} & Partial<ColumnIdentifiers<TData, TValue>> &
   ColumnDefBase<TData, TValue> & {
     accessorKey: DeepKeys<TData>
   }

package/src/utils/getExpandedRowModel.ts

@@ -14,14 +14,18 @@ export function getExpandedRowModel<TData extends RowData>(): (
       (expanded, rowModel, paginateExpandedRows) => {
         if (
           !rowModel.rows.length ||
-          // Do not expand if rows are not included in pagination
-          !paginateExpandedRows ||
           (expanded !== true && !Object.keys(expanded ?? {}).length)
         ) {
           return rowModel
         }
 
-        return expandRows(rowModel, table)
+        if (!paginateExpandedRows) {
+          // Only expand rows at this point if they are being paginated
+          console.log(rowModel.rows)
+          return rowModel
+        }
+
+        return expandRows(rowModel)
       },
       {
         key: process.env.NODE_ENV === 'development' && 'getExpandedRowModel',
@@ -30,10 +34,7 @@ export function getExpandedRowModel<TData extends RowData>(): (
     )
 }
 
-export function expandRows<TData extends RowData>(
-  rowModel: RowModel<TData>,
-  table: Table<TData>
-) {
+export function expandRows<TData extends RowData>(rowModel: RowModel<TData>) {
   const expandedRows: Row<TData>[] = []
 
   const handleRow = (row: Row<TData>) => {

package/src/utils/getPaginationRowModel.ts

@@ -7,7 +7,13 @@ export function getPaginationRowModel<TData extends RowData>(opts?: {
 }): (table: Table<TData>) => () => RowModel<TData> {
   return table =>
     memo(
-      () => [table.getState().pagination, table.getPrePaginationRowModel()],
+      () => [
+        table.getState().pagination,
+        table.getPrePaginationRowModel(),
+        table.options.paginateExpandedRows
+          ? undefined
+          : table.getState().expanded,
+      ],
       (pagination, rowModel) => {
         if (!rowModel.rows.length) {
           return rowModel
@@ -23,14 +29,11 @@ export function getPaginationRowModel<TData extends RowData>(opts?: {
         let paginatedRowModel: RowModel<TData>
 
         if (!table.options.paginateExpandedRows) {
-          paginatedRowModel = expandRows(
-            {
-              rows,
-              flatRows,
-              rowsById,
-            },
-            table
-          )
+          paginatedRowModel = expandRows({
+            rows,
+            flatRows,
+            rowsById,
+          })
         } else {
           paginatedRowModel = {
             rows,
@@ -39,6 +42,8 @@ export function getPaginationRowModel<TData extends RowData>(opts?: {
           }
         }
 
+        console.log(paginatedRowModel.rows)
+
         paginatedRowModel.flatRows = []
 
         const handleRow = (row: Row<TData>) => {

package/src/utils.ts

@@ -24,11 +24,11 @@ type ComputeRange<
 > = Result['length'] extends N
   ? Result
   : ComputeRange<N, [...Result, Result['length']]>
-type Index100 = ComputeRange<100>[number]
+type Index40 = ComputeRange<40>[number]
 
 // Is this type a tuple?
 type IsTuple<T> = T extends readonly any[] & { length: infer Length }
-  ? Length extends Index100
+  ? Length extends Index40
     ? T
     : never
   : never
@@ -48,48 +48,18 @@ export type DeepKeys<T> = unknown extends T
   : object extends T
   ? string
   : T extends readonly any[] & IsTuple<T>
-  ? AllowedIndexes<T> | DeepKeysPrefix<T>
+  ? AllowedIndexes<T> | DeepKeysPrefix<T, AllowedIndexes<T>>
   : T extends any[]
   ? never & 'Dynamic length array indexing is not supported'
   : T extends Date
   ? never
   : T extends object
-  ? (keyof T & string) | DeepKeysPrefix<T>
+  ? (keyof T & string) | DeepKeysPrefix<T, keyof T>
   : never
 
-type Key = string | number | symbol
-type Join<L extends Key | undefined, R extends Key | undefined> = L extends
-  | string
-  | number
-  ? R extends string | number
-    ? `${L}.${R}`
-    : L
-  : R extends string | number
-  ? R
-  : undefined
-type Union<
-  L extends unknown | undefined,
-  R extends unknown | undefined
-> = L extends undefined
-  ? R extends undefined
-    ? undefined
-    : R
-  : R extends undefined
-  ? L
-  : L | R
-type DeepKeysPrefix<
-  T extends object,
-  Prev extends Key | undefined = undefined,
-  Path extends Key | undefined = undefined,
-  PrevTypes extends object = T
-> = string &
-  {
-    [K in keyof T]: T[K] extends PrevTypes | T
-      ? Union<Union<Prev, Path>, Join<Path, K>>
-      : T[K] extends object
-      ? DeepKeysPrefix<T[K], Union<Prev, Path>, Join<Path, K>, PrevTypes | T>
-      : Union<Union<Prev, Path>, Join<Path, K>>
-  }[keyof T]
+type DeepKeysPrefix<T, TPrefix> = TPrefix extends keyof T & (number | string)
+  ? `${TPrefix}.${DeepKeys<T[TPrefix]> & string}`
+  : never
 
 export type DeepValue<T, TProp> = T extends Record<string | number, any>
   ? TProp extends `${infer TBranch}.${infer TDeepProp}`