Skip to content

Commit 420b7a8

Browse files
KevinVandyKevinVandy
committed
clean up more state refactors
1 parent 3fead84 commit 420b7a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+939
-1106
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { assignAPIs, getMemoOptions, memo } from '../../utils'
2-
import { _table_getState } from '../table/Tables.utils'
2+
import { table_getState } from '../table/Tables.utils'
33
import { _createColumn } from './createColumn'
44
import {
55
column_getFlatColumns,
@@ -33,8 +33,8 @@ export const Columns: TableFeature = {
3333
{
3434
fn: () => column_getLeafColumns(column, table),
3535
memoDeps: () => [
36-
_table_getState(table).columnOrder,
37-
_table_getState(table).grouping,
36+
table_getState(table).columnOrder,
37+
table_getState(table).grouping,
3838
table.options.columns,
3939
table.options.groupedColumnMode,
4040
],
@@ -65,8 +65,8 @@ export const Columns: TableFeature = {
6565
{
6666
fn: () => table_getAllLeafColumns(table),
6767
memoDeps: () => [
68-
_table_getState(table).columnOrder,
69-
_table_getState(table).grouping,
68+
table_getState(table).columnOrder,
69+
table_getState(table).grouping,
7070
table.options.columns,
7171
table.options.groupedColumnMode,
7272
],

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { assignAPIs, getMemoOptions, memo } from '../../utils'
2-
import { _table_getState } from '../table/Tables.utils'
2+
import { table_getState } from '../table/Tables.utils'
33
import {
44
table_getCenterHeaderGroups,
55
table_getLeftHeaderGroups,
@@ -41,9 +41,9 @@ export const Headers: TableFeature = {
4141
fn: () => table_getHeaderGroups(table),
4242
memoDeps: () => [
4343
table.options.columns,
44-
_table_getState(table).columnOrder,
45-
_table_getState(table).grouping,
46-
_table_getState(table).columnPinning,
44+
table_getState(table).columnOrder,
45+
table_getState(table).grouping,
46+
table_getState(table).columnPinning,
4747
table.options.groupedColumnMode,
4848
],
4949
},

‎packages/table-core/src/core/headers/Headers.utils.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { table_getAllColumns } from '../columns/Columns.utils'
22
import { table_getVisibleLeafColumns } from '../../features/column-visibility/ColumnVisibility.utils'
3-
import { _table_getState } from '../table/Tables.utils'
3+
import { table_getState } from '../table/Tables.utils'
44
import {
55
getDefaultColumnPinningState,
66
table_getCenterHeaderGroups,
@@ -51,7 +51,7 @@ export function table_getHeaderGroups<
5151
TData extends RowData,
5252
>(table: Table<TFeatures, TData>) {
5353
const { left, right } =
54-
_table_getState(table).columnPinning ?? getDefaultColumnPinningState()
54+
table_getState(table).columnPinning ?? getDefaultColumnPinningState()
5555
const allColumns = table_getAllColumns(table)
5656
const leafColumns = table_getVisibleLeafColumns(table)
5757

‎packages/table-core/src/core/rows/Rows.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ export const Rows: TableFeature = {
5555
_createTable: <TFeatures extends TableFeatures, TData extends RowData>(
5656
table: Table<TFeatures, TData>,
5757
): void => {
58-
5958
assignAPIs(table, table, [
6059
{
6160
fn: (row, index, parent) => table_getRowId(row, table, index, parent),

‎packages/table-core/src/core/rows/Rows.utils.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ export function table_getRow<
156156
rowId: string,
157157
searchAll?: boolean,
158158
): Row<TFeatures, TData> {
159+
// TODO - simplify this across different row models
159160
let row = (
160161
searchAll ? table_getPrePaginationRowModel(table) : table_getRowModel(table)
161162
).rowsById[rowId]

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

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

1818
export function table_mergeOptions<
@@ -44,19 +44,7 @@ export function table_getInitialState<
4444
TFeatures extends TableFeatures,
4545
TData extends RowData,
4646
>(table: Table<TFeatures, TData>): TableState<TFeatures> {
47-
return structuredClone(table.initialState) as TableState<TFeatures>
48-
}
49-
50-
/**
51-
* For internal use only. Assumes any features may or may not be present.
52-
* @param table
53-
* @returns
54-
*/
55-
export function _table_getInitialState<
56-
TFeatures extends TableFeatures,
57-
TData extends RowData,
58-
>(table: Table<TFeatures, TData>): Partial<TableState<TableFeatures>> {
59-
return table_getInitialState(table) as Partial<TableState<TableFeatures>>
47+
return structuredClone(table.initialState)
6048
}
6149

6250
export function table_getState<
@@ -66,18 +54,6 @@ export function table_getState<
6654
return table.options.state as TableState<TFeatures>
6755
}
6856

69-
/**
70-
* For internal use only. Assumes any features may or may not be present.
71-
* @param table
72-
* @returns
73-
*/
74-
export function _table_getState<
75-
TFeatures extends TableFeatures,
76-
TData extends RowData,
77-
>(table: Table<TFeatures, TData>): Partial<TableState<TableFeatures>> {
78-
return table_getState(table) as Partial<TableState<TableFeatures>>
79-
}
80-
8157
export function table_setState<
8258
TFeatures extends TableFeatures,
8359
TData extends RowData,

‎packages/table-core/src/core/table/createTable.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export function getInitialTableState<TFeatures extends TableFeatures>(
5656
Object.values(features).forEach((feature) => {
5757
initialState = feature._getInitialState?.(initialState) ?? initialState
5858
})
59-
return initialState as TableState<TFeatures>
59+
return structuredClone(initialState) as TableState<TFeatures>
6060
}
6161

6262
export function _createTable<

‎packages/table-core/src/features/column-faceting/createFacetedRowModel.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { isDev, tableMemo } from '../../utils'
22
import { filterRows } from '../column-filtering/filterRowsUtils'
3-
import { _table_getState } from '../../core/table/Tables.utils'
3+
import { table_getState } from '../../core/table/Tables.utils'
44
import {
55
table_getFilteredRowModel,
66
table_getPreFilteredRowModel,
@@ -25,8 +25,8 @@ export function createFacetedRowModel<
2525
fnName: 'createFacetedRowModel',
2626
memoDeps: () => [
2727
table_getPreFilteredRowModel(table),
28-
_table_getState(table).columnFilters,
29-
_table_getState(table).globalFilter,
28+
table_getState(table).columnFilters,
29+
table_getState(table).globalFilter,
3030
table_getFilteredRowModel(table),
3131
],
3232
fn: (preRowModel, columnFilters, globalFilter) =>

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { filterFns } from '../../fns/filterFns'
22
import { functionalUpdate, isFunction } from '../../utils'
33
import { row_getValue } from '../../core/rows/Rows.utils'
44
import {
5-
_table_getState,
65
table_getCoreRowModel,
6+
table_getState,
77
} from '../../core/table/Tables.utils'
88
import type { BuiltInFilterFn } from '../../fns/filterFns'
99
import type { CellData, RowData, Updater } from '../../types/type-utils'
@@ -61,13 +61,13 @@ export function column_getFilterFn<
6161
table: Table<TFeatures, TData> & {
6262
options: TableOptions_ColumnFiltering<TFeatures, TData>
6363
},
64-
) {
64+
): FilterFn<TFeatures, TData> | undefined {
6565
return isFunction(column.columnDef.filterFn)
6666
? column.columnDef.filterFn
6767
: column.columnDef.filterFn === 'auto'
6868
? column_getAutoFilterFn(column, table)
69-
: table.options.filterFns?.[column.columnDef.filterFn as string] ??
70-
filterFns[column.columnDef.filterFn as BuiltInFilterFn]
69+
: (table.options.filterFns?.[column.columnDef.filterFn as string] ??
70+
filterFns[column.columnDef.filterFn as BuiltInFilterFn])
7171
}
7272

7373
export function column_getCanFilter<
@@ -117,7 +117,7 @@ export function column_getFilterValue<
117117
options: TableOptions_ColumnFiltering<TFeatures, TData>
118118
},
119119
) {
120-
return _table_getState(table).columnFilters?.find((d) => d.id === column.id)
120+
return table_getState(table).columnFilters?.find((d) => d.id === column.id)
121121
?.value
122122
}
123123

@@ -134,9 +134,8 @@ export function column_getFilterIndex<
134134
},
135135
): number {
136136
return (
137-
_table_getState(table).columnFilters?.findIndex(
138-
(d) => d.id === column.id,
139-
) ?? -1
137+
table_getState(table).columnFilters?.findIndex((d) => d.id === column.id) ??
138+
-1
140139
)
141140
}
142141

@@ -226,7 +225,7 @@ export function table_resetColumnFilters<
226225
) {
227226
table_setColumnFilters(
228227
table,
229-
defaultState ? [] : table.initialState.columnFilters ?? [],
228+
defaultState ? [] : (table.initialState.columnFilters ?? []),
230229
)
231230
}
232231

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
column_getCanGlobalFilter,
55
table_getGlobalFilterFn,
66
} from '../global-filtering/GlobalFiltering.utils'
7-
import { _table_getState } from '../../core/table/Tables.utils'
7+
import { table_getState } from '../../core/table/Tables.utils'
88
import { table_autoResetPageIndex } from '../row-pagination/RowPagination.utils'
99
import { filterRows } from './filterRowsUtils'
1010
import {
@@ -29,8 +29,8 @@ export function createFilteredRowModel<
2929
memo(
3030
() => [
3131
table_getPreFilteredRowModel(table),
32-
_table_getState(table).columnFilters,
33-
_table_getState(table).globalFilter,
32+
table_getState(table).columnFilters,
33+
table_getState(table).globalFilter,
3434
],
3535
(rowModel, columnFilters, globalFilter) => {
3636
if (

0 commit comments

Comments
 (0)