Skip to content

Commit d19dab0

Browse files
KevinVandyKevinVandy
committed
chore: use temp features types
1 parent f714978 commit d19dab0

File tree

25 files changed

+182
-64
lines changed

25 files changed

+182
-64
lines changed

‎packages/angular-table/src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export function injectTable<
3636
const table = _createTable(resolvedOptions)
3737

3838
// By default, manage table state here using the table's initial state
39-
const state = signal<TableState>(table.initialState)
39+
const state = signal<TableState<TFeatures>>(table.initialState as any) //TODO: fix type
4040

4141
// Compose table options using computed.
4242
// This is to allow `tableSignal` to listen and set table option

‎packages/table-core/src/core/columns/Columns.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export const Columns: TableFeature = {
3737
//@ts-ignore - don't know
3838
column.getLeafColumns = memo(
3939
() => [table._getOrderColumnsFn()],
40-
(orderColumns) => column_getLeafColumns(column, orderColumns),
40+
(orderColumns) => column_getLeafColumns(column as any, orderColumns), //TODO: fix type
4141
getMemoOptions(table.options, 'debugColumns', 'column.getLeafColumns'),
4242
)
4343
},

‎packages/table-core/src/core/headers/buildHeaderGroups.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export function buildHeaderGroups<
108108
pendingParentHeaders.push(header)
109109
}
110110

111-
headerGroup.headers.push(headerToGroup)
111+
headerGroup.headers.push(headerToGroup as any) //TODO: fix this type
112112
headerToGroup.headerGroup = headerGroup
113113
})
114114

@@ -169,7 +169,7 @@ export function buildHeaderGroups<
169169
})
170170
}
171171

172-
recurseHeadersForSpans(headerGroups[0]?.headers ?? [])
172+
recurseHeadersForSpans(headerGroups[0]?.headers ?? ([] as any)) //TODO: fix this type
173173

174174
return headerGroups
175175
}

‎packages/table-core/src/core/table/Tables.types.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ export interface Table_CoreProperties<
102102
* @link [API Docs](https://tanstack.com/table/v8/docs/api/core/table#initialstate)
103103
* @link [Guide](https://tanstack.com/table/v8/docs/guide/tables)
104104
*/
105-
initialState: TableState<TFeatures>
105+
initialState: Partial<TableState<TFeatures>>
106106
/**
107107
* A read-only reference to the table's current options.
108108
* @link [API Docs](https://tanstack.com/table/v8/docs/api/core/table#options)
109109
* @link [Guide](https://tanstack.com/table/v8/docs/guide/tables)
110110
*/
111-
options: TableOptions_All<TData>
111+
options: TableOptions<TFeatures, TData>
112112
}
113113

114114
export interface Table_Table<

‎packages/table-core/src/core/table/Tables.utils.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export function table_reset<
1515
TFeatures extends TableFeatures,
1616
TData extends RowData,
1717
>(table: Table<TFeatures, TData>): void {
18-
table_setState(table, table.initialState)
18+
table_setState(table, table.initialState as TableState<TFeatures>)
1919
}
2020

2121
export function table_mergeOptions<
@@ -53,7 +53,10 @@ export function table_getState<
5353
export function table_setState<
5454
TFeatures extends TableFeatures,
5555
TData extends RowData,
56-
>(table: Table<TFeatures, TData>, updater: Updater<TableState<TFeatures>>): void {
56+
>(
57+
table: Table<TFeatures, TData>,
58+
updater: Updater<TableState<TFeatures>>,
59+
): void {
5760
table.options.onStateChange?.(updater)
5861
}
5962

‎packages/table-core/src/features/column-filtering/ColumnFiltering.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
table_setColumnFilters,
1414
} from './ColumnFiltering.utils'
1515
import type {
16+
CellData,
1617
Column,
1718
Row,
1819
RowData,
@@ -55,8 +56,12 @@ export const ColumnFiltering: TableFeature = {
5556
} as TableOptions_ColumnFiltering<TFeatures, TData>
5657
},
5758

58-
_createColumn: <TFeatures extends TableFeatures, TData extends RowData>(
59-
column: Column<TFeatures, TData, unknown>,
59+
_createColumn: <
60+
TFeatures extends TableFeatures,
61+
TData extends RowData,
62+
TValue extends CellData = CellData,
63+
>(
64+
column: Column<TFeatures, TData, TValue>,
6065
table: Table<TFeatures, TData>,
6166
): void => {
6267
column.getAutoFilterFn = () => column_getAutoFilterFn(column, table)

‎packages/table-core/src/features/column-filtering/ColumnFiltering.utils.ts‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { row_getValue } from '../../core/rows/Rows.utils'
44
import { table_getCoreRowModel } from '../../core/table/Tables.utils'
55
import type { BuiltInFilterFn } from '../../fns/filterFns'
66
import type {
7+
CellData,
78
Column,
89
RowData,
910
RowModel,
@@ -16,7 +17,8 @@ import type { ColumnFiltersState, FilterFn } from './ColumnFiltering.types'
1617
export function column_getAutoFilterFn<
1718
TFeatures extends TableFeatures,
1819
TData extends RowData,
19-
>(column: Column<TFeatures, TData, unknown>, table: Table<TFeatures, TData>) {
20+
TValue extends CellData = CellData,
21+
>(column: Column<TFeatures, TData, TValue>, table: Table<TFeatures, TData>) {
2022
const firstRow = table_getCoreRowModel(table).flatRows[0]
2123

2224
const value = firstRow ? row_getValue(firstRow, table, column.id) : undefined
@@ -47,7 +49,8 @@ export function column_getAutoFilterFn<
4749
export function column_getFilterFn<
4850
TFeatures extends TableFeatures,
4951
TData extends RowData,
50-
>(column: Column<TFeatures, TData, unknown>, table: Table<TFeatures, TData>) {
52+
TValue extends CellData = CellData,
53+
>(column: Column<TFeatures, TData, TValue>, table: Table<TFeatures, TData>) {
5154
return isFunction(column.columnDef.filterFn)
5255
? column.columnDef.filterFn
5356
: column.columnDef.filterFn === 'auto'
@@ -59,7 +62,8 @@ export function column_getFilterFn<
5962
export function column_getCanFilter<
6063
TFeatures extends TableFeatures,
6164
TData extends RowData,
62-
>(column: Column<TFeatures, TData, unknown>, table: Table<TFeatures, TData>) {
65+
TValue extends CellData = CellData,
66+
>(column: Column<TFeatures, TData, TValue>, table: Table<TFeatures, TData>) {
6367
return (
6468
(column.columnDef.enableColumnFilter ?? true) &&
6569
(table.options.enableColumnFilters ?? true) &&
@@ -71,29 +75,33 @@ export function column_getCanFilter<
7175
export function column_getIsFiltered<
7276
TFeatures extends TableFeatures,
7377
TData extends RowData,
74-
>(column: Column<TFeatures, TData, unknown>) {
78+
TValue extends CellData = CellData,
79+
>(column: Column<TFeatures, TData, TValue>) {
7580
return column.getFilterIndex() > -1
7681
}
7782

7883
export function column_getFilterValue<
7984
TFeatures extends TableFeatures,
8085
TData extends RowData,
81-
>(column: Column<TFeatures, TData, unknown>, table: Table<TFeatures, TData>) {
86+
TValue extends CellData = CellData,
87+
>(column: Column<TFeatures, TData, TValue>, table: Table<TFeatures, TData>) {
8288
return table.getState().columnFilters.find((d) => d.id === column.id)?.value
8389
}
8490

8591
export function column_getFilterIndex<
8692
TFeatures extends TableFeatures,
8793
TData extends RowData,
88-
>(column: Column<TFeatures, TData, unknown>, table: Table<TFeatures, TData>) {
94+
TValue extends CellData = CellData,
95+
>(column: Column<TFeatures, TData, TValue>, table: Table<TFeatures, TData>) {
8996
return table.getState().columnFilters.findIndex((d) => d.id === column.id)
9097
}
9198

9299
export function column_setFilterValue<
93100
TFeatures extends TableFeatures,
94101
TData extends RowData,
102+
TValue extends CellData = CellData,
95103
>(
96-
column: Column<TFeatures, TData, unknown>,
104+
column: Column<TFeatures, TData, TValue>,
97105
table: Table<TFeatures, TData>,
98106
value: any,
99107
) {
@@ -160,7 +168,7 @@ export function table_resetColumnFilters<
160168
>(table: Table<TFeatures, TData>, defaultState?: boolean) {
161169
table_setColumnFilters(
162170
table,
163-
defaultState ? [] : table.initialState.columnFilters,
171+
defaultState ? [] : table.initialState.columnFilters ?? [],
164172
)
165173
}
166174

@@ -189,14 +197,15 @@ export function table_getFilteredRowModel<
189197
export function shouldAutoRemoveFilter<
190198
TFeatures extends TableFeatures,
191199
TData extends RowData,
200+
TValue extends CellData = CellData,
192201
>(
193202
filterFn?: FilterFn<TFeatures, TData>,
194203
value?: any,
195-
column?: Column<TFeatures, TData, unknown>,
204+
column?: Column<TFeatures, TData, TValue>,
196205
) {
197206
return (
198207
(filterFn && filterFn.autoRemove
199-
? filterFn.autoRemove(value, column)
208+
? filterFn.autoRemove(value, column as any) //TODO: fix this
200209
: false) ||
201210
typeof value === 'undefined' ||
202211
(typeof value === 'string' && !value)

‎packages/table-core/src/features/column-grouping/ColumnGrouping.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ export const ColumnGrouping: TableFeature = {
3737
_getDefaultColumnDef: <
3838
TFeatures extends TableFeatures,
3939
TData extends RowData,
40-
>(): ColumnDef_ColumnGrouping<TFeatures, TData, unknown> => {
40+
TValue extends CellData = CellData,
41+
>(): ColumnDef_ColumnGrouping<TFeatures, TData, TValue> => {
4142
return {
4243
aggregatedCell: (props) =>
4344
(props.getValue() as any)?.toString?.() ?? null,

‎packages/table-core/src/features/column-grouping/ColumnGrouping.utils.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,10 @@ export function table_resetGrouping<
115115
TFeatures extends TableFeatures,
116116
TData extends RowData,
117117
>(table: Table<TFeatures, TData>, defaultState?: boolean) {
118-
table_setGrouping(table, defaultState ? [] : table.initialState.grouping)
118+
table_setGrouping(
119+
table,
120+
defaultState ? [] : table.initialState.grouping ?? [],
121+
)
119122
}
120123

121124
export function table_getPreGroupedRowModel<

‎packages/table-core/src/features/column-ordering/ColumnOrdering.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import type {
1313
TableState_ColumnOrdering,
1414
} from './ColumnOrdering.types'
1515
import type {
16+
CellData,
1617
Column,
1718
RowData,
1819
Table,
@@ -36,13 +37,17 @@ export const ColumnOrdering: TableFeature = {
3637
}
3738
},
3839

39-
_createColumn: <TFeatures extends TableFeatures, TData extends RowData>(
40-
column: Column<TFeatures, TData, unknown>,
40+
_createColumn: <
41+
TFeatures extends TableFeatures,
42+
TData extends RowData,
43+
TValue extends CellData = CellData,
44+
>(
45+
column: Column<TFeatures, TData, TValue>,
4146
table: Table<TFeatures, TData>,
4247
): void => {
4348
column.getIndex = memo(
4449
(position) => [column_getVisibleLeafColumns(table, position)],
45-
(columns) => column_getIndex(columns, column),
50+
(columns) => column_getIndex(columns, column as any), //TODO: fix this
4651
getMemoOptions(table.options, 'debugColumns', 'getIndex'),
4752
)
4853

0 commit comments

Comments
 (0)