Skip to content

feat: Pulled out some functions and added middleware option #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dvmoritzschoefl wants to merge 1 commit into
base: performance
Choose a base branch
from
+422 −387
Open

feat: Pulled out some functions and added middleware option #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/table-core/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export * from './features/RowSorting'

//utils
export * from './utils'
export * from './utils/filterRowsUtils'
export * from './utils/getCoreRowModel'
export * from './utils/getExpandedRowModel'
export * from './utils/getFacetedMinMaxValues'
Expand Down
286 changes: 151 additions & 135 deletions packages/table-core/src/utils/getFilteredRowModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,151 @@
import { ResolvedColumnFilter } from '../features/ColumnFiltering'
import { ColumnFiltersState, ResolvedColumnFilter } from '../features/ColumnFiltering'
import { Table, RowModel, Row, RowData } from '../types'
import { getMemoOptions, memo } from '../utils'
import { filterRows } from './filterRowsUtils'

export function getFilteredRowModel<TData extends RowData>(): (
export function getFilteredRowModelUnmemoized<TData extends RowData>(
table: Table<TData>,
columnFilters: ColumnFiltersState,
globalFilter: any,
rowModel: RowModel<TData>

) {
if (
!rowModel.rows.length ||
(!columnFilters?.length && !globalFilter)
) {
// TODO: Does this have any consequences? Would avoid iterating the rows again
return rowModel;
/*
for (let i = 0; i < rowModel.flatRows.length; i++) {
rowModel.flatRows[i]!.columnFilters = {}
rowModel.flatRows[i]!.columnFiltersMeta = {}
}
return rowModel
*/
}

const resolvedColumnFilters: ResolvedColumnFilter<TData>[] = []
const resolvedGlobalFilters: ResolvedColumnFilter<TData>[] = []

; (columnFilters ?? []).forEach(d => {
const column = table.getColumn(d.id)

if (!column) {
return
}

const filterFn = column.getFilterFn()

if (!filterFn) {
if (process.env.NODE_ENV !== 'production') {
console.warn(
`Could not find a valid 'column.filterFn' for column with the ID: ${column.id}.`
)
}
return
}

resolvedColumnFilters.push({
id: d.id,
filterFn,
resolvedValue: filterFn.resolveFilterValue?.(d.value) ?? d.value,
})
})

const filterableIds = (columnFilters ?? []).map(d => d.id)

const globalFilterFn = table.getGlobalFilterFn()

const globallyFilterableColumns = table
.getAllLeafColumns()
.filter(column => column.getCanGlobalFilter())

if (
globalFilter &&
globalFilterFn &&
globallyFilterableColumns.length
) {
filterableIds.push('__global__')

globallyFilterableColumns.forEach(column => {
resolvedGlobalFilters.push({
id: column.id,
filterFn: globalFilterFn,
resolvedValue:
globalFilterFn.resolveFilterValue?.(globalFilter) ??
globalFilter,
})
})
}

let currentColumnFilter
let currentGlobalFilter

// Flag the prefiltered row model with each filter state
for (let j = 0; j < rowModel.flatRows.length; j++) {
const row = rowModel.flatRows[j]!

row.columnFilters = {}

if (resolvedColumnFilters.length) {
for (let i = 0; i < resolvedColumnFilters.length; i++) {
currentColumnFilter = resolvedColumnFilters[i]!
const id = currentColumnFilter.id

// Tag the row with the column filter state
row.columnFilters[id] = currentColumnFilter.filterFn(
row,
id,
currentColumnFilter.resolvedValue,
filterMeta => {
row.columnFiltersMeta[id] = filterMeta
}
)
}
}

if (resolvedGlobalFilters.length) {
for (let i = 0; i < resolvedGlobalFilters.length; i++) {
currentGlobalFilter = resolvedGlobalFilters[i]!
const id = currentGlobalFilter.id
// Tag the row with the first truthy global filter state
if (
currentGlobalFilter.filterFn(
row,
id,
currentGlobalFilter.resolvedValue,
filterMeta => {
row.columnFiltersMeta[id] = filterMeta
}
)
) {
row.columnFilters.__global__ = true
break
}
}

if (row.columnFilters.__global__ !== true) {
row.columnFilters.__global__ = false
}
}
}

const filterRowsImpl = (row: Row<TData>) => {
// Horizontally filter rows through each column
for (let i = 0; i < filterableIds.length; i++) {
if (row.columnFilters[filterableIds[i]!] === false) {
return false
}
}
return true
}

// Filter final rows using all of the active filters
return filterRows(rowModel.rows, filterRowsImpl, table)
}

export function getFilteredRowModel<TData extends RowData>(middleware?: (rowModel: RowModel<TData>) => RowModel<TData>): (
table: Table<TData>
) => () => RowModel<TData> {
return table =>
Expand All @@ -14,139 +156,13 @@ export function getFilteredRowModel<TData extends RowData>(): (
table.getState().globalFilter,
],
(rowModel, columnFilters, globalFilter) => {
if (
!rowModel.rows.length ||
(!columnFilters?.length && !globalFilter)
) {
// TODO: Does this have any consequences? Would avoid iterating the rows again
return rowModel;
/*
for (let i = 0; i < rowModel.flatRows.length; i++) {
rowModel.flatRows[i]!.columnFilters = {}
rowModel.flatRows[i]!.columnFiltersMeta = {}
}
return rowModel
*/
}

const resolvedColumnFilters: ResolvedColumnFilter<TData>[] = []
const resolvedGlobalFilters: ResolvedColumnFilter<TData>[] = []

;(columnFilters ?? []).forEach(d => {
const column = table.getColumn(d.id)

if (!column) {
return
}

const filterFn = column.getFilterFn()

if (!filterFn) {
if (process.env.NODE_ENV !== 'production') {
console.warn(
`Could not find a valid 'column.filterFn' for column with the ID: ${column.id}.`
)
}
return
}

resolvedColumnFilters.push({
id: d.id,
filterFn,
resolvedValue: filterFn.resolveFilterValue?.(d.value) ?? d.value,
})
})

const filterableIds = (columnFilters ?? []).map(d => d.id)

const globalFilterFn = table.getGlobalFilterFn()

const globallyFilterableColumns = table
.getAllLeafColumns()
.filter(column => column.getCanGlobalFilter())

if (
globalFilter &&
globalFilterFn &&
globallyFilterableColumns.length
) {
filterableIds.push('__global__')

globallyFilterableColumns.forEach(column => {
resolvedGlobalFilters.push({
id: column.id,
filterFn: globalFilterFn,
resolvedValue:
globalFilterFn.resolveFilterValue?.(globalFilter) ??
globalFilter,
})
})
}

let currentColumnFilter
let currentGlobalFilter

// Flag the prefiltered row model with each filter state
for (let j = 0; j < rowModel.flatRows.length; j++) {
const row = rowModel.flatRows[j]!

row.columnFilters = {}

if (resolvedColumnFilters.length) {
for (let i = 0; i < resolvedColumnFilters.length; i++) {
currentColumnFilter = resolvedColumnFilters[i]!
const id = currentColumnFilter.id

// Tag the row with the column filter state
row.columnFilters[id] = currentColumnFilter.filterFn(
row,
id,
currentColumnFilter.resolvedValue,
filterMeta => {
row.columnFiltersMeta[id] = filterMeta
}
)
}
}

if (resolvedGlobalFilters.length) {
for (let i = 0; i < resolvedGlobalFilters.length; i++) {
currentGlobalFilter = resolvedGlobalFilters[i]!
const id = currentGlobalFilter.id
// Tag the row with the first truthy global filter state
if (
currentGlobalFilter.filterFn(
row,
id,
currentGlobalFilter.resolvedValue,
filterMeta => {
row.columnFiltersMeta[id] = filterMeta
}
)
) {
row.columnFilters.__global__ = true
break
}
}

if (row.columnFilters.__global__ !== true) {
row.columnFilters.__global__ = false
}
}
}

const filterRowsImpl = (row: Row<TData>) => {
// Horizontally filter rows through each column
for (let i = 0; i < filterableIds.length; i++) {
if (row.columnFilters[filterableIds[i]!] === false) {
return false
}
}
return true
}

// Filter final rows using all of the active filters
return filterRows(rowModel.rows, filterRowsImpl, table)
const newRowModel = getFilteredRowModelUnmemoized(
table,
columnFilters,
globalFilter,
rowModel
)
return middleware ? middleware(newRowModel) : newRowModel
},
getMemoOptions(table.options, 'debugTable', 'getFilteredRowModel', () =>
table._autoResetPageIndex()
Expand Down
Loading