@tanstack/table-core 8.5.6 → 8.5.9

package/build/types/index.d.ts

@@ -674,7 +674,7 @@ declare type AccessorFnColumnDef<TData extends RowData, TValue = unknown> = Colu
 };
 declare type AccessorKeyColumnDef<TData extends RowData, TValue = unknown> = {
     id?: string;
-} & ColumnIdentifiers<TData, TValue> & ColumnDefBase<TData, TValue> & {
+} & Partial<ColumnIdentifiers<TData, TValue>> & ColumnDefBase<TData, TValue> & {
     accessorKey: DeepKeys<TData>;
 };
 declare type AccessorColumnDef<TData extends RowData, TValue = unknown> = AccessorKeyColumnDef<TData, TValue> | AccessorFnColumnDef<TData, TValue>;
@@ -696,18 +696,13 @@ declare type UnionToIntersection<T> = (T extends any ? (x: T) => any : never) ex
 declare type IsAny<T, Y, N> = 1 extends 0 & T ? Y : N;
 declare type IsKnown<T, Y, N> = unknown extends T ? N : Y;
 declare type ComputeRange<N extends number, Result extends Array<unknown> = []> = Result['length'] extends N ? Result : ComputeRange<N, [...Result, Result['length']]>;
-declare type Index100 = ComputeRange<100>[number];
+declare type Index40 = ComputeRange<40>[number];
 declare type IsTuple<T> = T extends readonly any[] & {
     length: infer Length;
-} ? Length extends Index100 ? T : never : never;
+} ? Length extends Index40 ? T : never : never;
 declare type AllowedIndexes<Tuple extends ReadonlyArray<any>, Keys extends number = never> = Tuple extends readonly [] ? Keys : Tuple extends readonly [infer _, ...infer Tail] ? AllowedIndexes<Tail, Keys | Tail['length']> : Keys;
-declare type DeepKeys<T> = unknown extends T ? keyof T : object extends T ? string : T extends readonly any[] & IsTuple<T> ? AllowedIndexes<T> | DeepKeysPrefix<T> : T extends any[] ? never & 'Dynamic length array indexing is not supported' : T extends Date ? never : T extends object ? (keyof T & string) | DeepKeysPrefix<T> : never;
-declare type Key = string | number | symbol;
-declare 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;
-declare type Union<L extends unknown | undefined, R extends unknown | undefined> = L extends undefined ? R extends undefined ? undefined : R : R extends undefined ? L : L | R;
-declare 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];
+declare type DeepKeys<T> = unknown extends T ? keyof T : object extends T ? string : T extends readonly any[] & IsTuple<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> : never;
+declare type DeepKeysPrefix<T, TPrefix> = TPrefix extends keyof T & (number | string) ? `${TPrefix}.${DeepKeys<T[TPrefix]> & string}` : never;
 declare type DeepValue<T, TProp> = T extends Record<string | number, any> ? TProp extends `${infer TBranch}.${infer TDeepProp}` ? DeepValue<T[TBranch], TDeepProp> : T[TProp & string] : never;
 declare type NoInfer<T> = [T][T extends any ? 0 : never];
 declare type Getter<TValue> = <TTValue = TValue>() => NoInfer<TTValue>;
@@ -800,7 +795,7 @@ declare function getSortedRowModel<TData extends RowData>(): (table: Table<TData
 declare function getGroupedRowModel<TData extends RowData>(): (table: Table<TData>) => () => RowModel<TData>;
 
 declare function getExpandedRowModel<TData extends RowData>(): (table: Table<TData>) => () => RowModel<TData>;
-declare function expandRows<TData extends RowData>(rowModel: RowModel<TData>, table: Table<TData>): {
+declare function expandRows<TData extends RowData>(rowModel: RowModel<TData>): {
     rows: Row<TData>[];
     flatRows: Row<TData>[];
     rowsById: Record<string, Row<TData>>;

package/build/umd/index.development.js

@@ -3785,8 +3785,13 @@
 
   function getExpandedRowModel() {
     return table => memo(() => [table.getState().expanded, table.getPreExpandedRowModel(), table.options.paginateExpandedRows], (expanded, rowModel, paginateExpandedRows) => {
-      if (!rowModel.rows.length || // Do not expand if rows are not included in pagination
-      !paginateExpandedRows || expanded !== true && !Object.keys(expanded != null ? expanded : {}).length) {
+      if (!rowModel.rows.length || expanded !== true && !Object.keys(expanded != null ? expanded : {}).length) {
+        return rowModel;
+      }
+
+      if (!paginateExpandedRows) {
+        // Only expand rows at this point if they are being paginated
+        console.log(rowModel.rows);
         return rowModel;
       }
 
@@ -3800,7 +3805,7 @@
       }
     });
   }
-  function expandRows(rowModel, table) {
+  function expandRows(rowModel) {
     const expandedRows = [];
 
     const handleRow = row => {
@@ -3822,7 +3827,7 @@
   }
 
   function getPaginationRowModel(opts) {
-    return table => memo(() => [table.getState().pagination, table.getPrePaginationRowModel()], (pagination, rowModel) => {
+    return table => memo(() => [table.getState().pagination, table.getPrePaginationRowModel(), table.options.paginateExpandedRows ? undefined : table.getState().expanded], (pagination, rowModel) => {
       if (!rowModel.rows.length) {
         return rowModel;
       }
@@ -3855,6 +3860,7 @@
         };
       }
 
+      console.log(paginatedRowModel.rows);
       paginatedRowModel.flatRows = [];
 
       const handleRow = row => {