@tanstack/table-core 9.0.0-beta.28 → 9.0.0-beta.30

package/src/features/column-filtering/columnFilteringFeature.utils.ts

@@ -59,14 +59,14 @@ export function column_getAutoFilterFn<
     return filterFns?.equals
   }
 
-  if (value !== null && typeof value === 'object') {
-    return filterFns?.equals
-  }
-
   if (Array.isArray(value)) {
     return filterFns?.arrIncludes
   }
 
+  if (value !== null && typeof value === 'object') {
+    return filterFns?.equals
+  }
+
   return filterFns?.weakEquals
 }
 

package/src/features/row-sorting/createSortedRowModel.ts

@@ -1,4 +1,4 @@
-import { makeObjectMap, tableMemo } from '../../utils'
+import { tableMemo } from '../../utils'
 import { table_autoResetPageIndex } from '../row-pagination/rowPaginationFeature.utils'
 import { column_getCanSort, column_getSortFn } from './rowSortingFeature.utils'
 import type { Column_Internal } from '../../types/Column'
@@ -51,81 +51,91 @@ function _createSortedRowModel<
   const sortedFlatRows: Array<Row<TFeatures, TData>> = []
 
   // Filter out sortings that correspond to non existing columns
-  const availableSorting = sorting.filter((sort) =>
-    column_getCanSort(
-      table.getColumn(sort.id) as Column_Internal<TFeatures, TData>,
-    ),
-  )
+  const availableSorting = sorting.filter((sort) => {
+    const column = table.getColumn(sort.id)
+    return column ? column_getCanSort(column) : false
+  })
 
-  const columnInfoById = makeObjectMap<{
+  const resolvedSorting: Array<{
+    id: string
+    desc?: boolean
     sortUndefined?: false | -1 | 1 | 'first' | 'last'
     invertSorting?: boolean
     sortFn: SortFn<TFeatures, TData>
-  }>()
+  }> = []
 
-  availableSorting.forEach((sortEntry) => {
+  for (let i = 0; i < availableSorting.length; i++) {
+    const sortEntry = availableSorting[i]!
     const column: Column_Internal<TFeatures, TData> | undefined =
       table.getColumn(sortEntry.id)
-    if (!column) return
+    if (!column) {
+      continue
+    }
 
-    columnInfoById[sortEntry.id] = {
+    resolvedSorting.push({
+      id: sortEntry.id,
+      desc: sortEntry.desc,
       sortUndefined: column.columnDef.sortUndefined,
       invertSorting: column.columnDef.invertSorting,
       sortFn: column_getSortFn(column),
-    }
-  })
+    })
+  }
 
-  const sortData = (rows: Array<Row<TFeatures, TData>>) => {
-    const sortedData = rows.slice()
+  const compareRows = (
+    rowA: Row<TFeatures, TData>,
+    rowB: Row<TFeatures, TData>,
+  ) => {
+    for (let i = 0; i < resolvedSorting.length; i++) {
+      const sortEntry = resolvedSorting[i]!
+      const sortUndefined = sortEntry.sortUndefined
+      const isDesc = sortEntry.desc
+
+      let sortInt = 0
 
-    sortedData.sort((rowA, rowB) => {
-      for (let i = 0; i < availableSorting.length; i++) {
-        const sortEntry = availableSorting[i]!
-        const columnInfo = columnInfoById[sortEntry.id]!
-        const sortUndefined = columnInfo.sortUndefined
-        const isDesc = sortEntry.desc
-
-        let sortInt = 0
-
-        // All sorting ints should always return in ascending order
-        if (sortUndefined) {
-          const aValue = rowA.getValue(sortEntry.id)
-          const bValue = rowB.getValue(sortEntry.id)
-
-          const aUndefined = aValue === undefined
-          const bUndefined = bValue === undefined
-
-          if (aUndefined || bUndefined) {
-            if (sortUndefined === 'first') return aUndefined ? -1 : 1
-            if (sortUndefined === 'last') return aUndefined ? 1 : -1
-            sortInt =
-              aUndefined && bUndefined
-                ? 0
-                : aUndefined
-                  ? sortUndefined
-                  : -sortUndefined
-          }
+      // All sorting ints should always return in ascending order
+      if (sortUndefined) {
+        const aValue = rowA.getValue(sortEntry.id)
+        const bValue = rowB.getValue(sortEntry.id)
+
+        const aUndefined = aValue === undefined
+        const bUndefined = bValue === undefined
+
+        if (aUndefined && bUndefined) {
+          continue
         }
 
-        if (sortInt === 0) {
-          sortInt = columnInfo.sortFn(rowA, rowB, sortEntry.id)
+        if (aUndefined || bUndefined) {
+          if (sortUndefined === 'first') return aUndefined ? -1 : 1
+          if (sortUndefined === 'last') return aUndefined ? 1 : -1
+          sortInt = aUndefined ? sortUndefined : -sortUndefined
         }
+      }
 
-        // If sorting is non-zero, take care of desc and inversion
-        if (sortInt !== 0) {
-          if (isDesc) {
-            sortInt *= -1
-          }
+      if (sortInt === 0) {
+        sortInt = sortEntry.sortFn(rowA, rowB, sortEntry.id)
+      }
 
-          if (columnInfo.invertSorting) {
-            sortInt *= -1
-          }
+      // If sorting is non-zero, take care of desc and inversion
+      if (sortInt !== 0) {
+        if (isDesc) {
+          sortInt *= -1
+        }
 
-          return sortInt
+        if (sortEntry.invertSorting) {
+          sortInt *= -1
         }
+
+        return sortInt
       }
-      return rowA.index - rowB.index
-    })
+    }
+
+    return rowA.index - rowB.index
+  }
+
+  const sortData = (rows: Array<Row<TFeatures, TData>>) => {
+    const sortedData = rows.slice()
+
+    sortedData.sort(compareRows)
 
     // If there are sub-rows, sort them. Clone only rows that need mutation
     // (i.e. have subRows) so we don't corrupt the source row model.

package/src/fns/aggregationFns.ts

@@ -18,10 +18,12 @@ export function aggregationFn_sum<
 ) {
   // It's faster to just add the aggregations together instead of
   // process leaf nodes individually
-  return childRows.reduce((sumValue, next) => {
-    const nextValue = next.getValue(columnId)
-    return sumValue + (typeof nextValue === 'number' ? nextValue : 0)
-  }, 0)
+  let sumValue = 0
+  for (let i = 0; i < childRows.length; i++) {
+    const nextValue = childRows[i]!.getValue(columnId)
+    sumValue += typeof nextValue === 'number' ? nextValue : 0
+  }
+  return sumValue
 }
 
 /**
@@ -40,17 +42,16 @@ export function aggregationFn_min<
 ) {
   let minValue: number | undefined
 
-  childRows.forEach((row) => {
-    const value = row.getValue(columnId)
+  for (let i = 0; i < childRows.length; i++) {
+    const value = childRows[i]!.getValue(columnId)
 
     if (
-      value != null &&
       typeof value === 'number' &&
       (minValue === undefined || value < minValue)
     ) {
       minValue = value
     }
-  })
+  }
 
   return minValue
 }
@@ -71,16 +72,15 @@ export function aggregationFn_max<
 ) {
   let maxValue: number | undefined
 
-  childRows.forEach((row) => {
-    const value = row.getValue(columnId)
+  for (let i = 0; i < childRows.length; i++) {
+    const value = childRows[i]!.getValue(columnId)
     if (
-      value != null &&
       typeof value === 'number' &&
       (maxValue === undefined || value > maxValue)
     ) {
       maxValue = value
     }
-  })
+  }
 
   return maxValue
 }
@@ -102,9 +102,9 @@ export function aggregationFn_extent<
   let minValue: number | undefined
   let maxValue: number | undefined
 
-  childRows.forEach((row) => {
-    const value = row.getValue(columnId)
-    if (value != null && typeof value === 'number') {
+  for (let i = 0; i < childRows.length; i++) {
+    const value = childRows[i]!.getValue(columnId)
+    if (typeof value === 'number') {
       if (minValue === undefined) {
         minValue = maxValue = value
       } else {
@@ -112,7 +112,7 @@ export function aggregationFn_extent<
         if (maxValue! < value) maxValue = value
       }
     }
-  })
+  }
 
   return [minValue, maxValue]
 }
@@ -130,8 +130,8 @@ export function aggregationFn_mean<
   let count = 0
   let sumValue = 0
 
-  leafRows.forEach((row) => {
-    const value = row.getValue(columnId)
+  for (let i = 0; i < leafRows.length; i++) {
+    const value = leafRows[i]!.getValue(columnId)
     if (value != null && typeof value === 'number') {
       ++count
       sumValue += value
@@ -142,7 +142,7 @@ export function aggregationFn_mean<
         sumValue += numValue
       }
     }
-  })
+  }
 
   if (count) return sumValue / count
 

package/src/fns/filterFns.ts

@@ -54,7 +54,10 @@ export const filterFn_includesStringSensitive = Object.assign(
       row.getValue(columnId)?.toString().includes(String(filterValue)),
     )
   },
-  { autoRemove: (val: any) => testFalsy(val) },
+  {
+    autoRemove: (val: any) => testFalsy(val),
+    resolveFilterValue: (val: any) => String(val),
+  },
 )
 
 /**
@@ -77,7 +80,10 @@ export const filterFn_includesString = Object.assign(
         .includes(String(filterValue).toLowerCase()),
     )
   },
-  { autoRemove: (val: any) => testFalsy(val) },
+  {
+    autoRemove: (val: any) => testFalsy(val),
+    resolveFilterValue: (val: any) => String(val).toLowerCase(),
+  },
 )
 
 /**
@@ -97,7 +103,10 @@ export const filterFn_equalsString = Object.assign(
       String(filterValue).toLowerCase()
     )
   },
-  { autoRemove: (val: any) => testFalsy(val) },
+  {
+    autoRemove: (val: any) => testFalsy(val),
+    resolveFilterValue: (val: any) => String(val).toLowerCase(),
+  },
 )
 
 /**
@@ -113,7 +122,10 @@ export const filterFn_equalsStringSensitive = Object.assign(
   ) => {
     return row.getValue(columnId)?.toString() === String(filterValue)
   },
-  { autoRemove: (val: any) => testFalsy(val) },
+  {
+    autoRemove: (val: any) => testFalsy(val),
+    resolveFilterValue: (val: any) => String(val),
+  },
 )
 
 // Number filters
@@ -143,7 +155,7 @@ export const filterFn_greaterThan = Object.assign(
     const stringFilterValue = String(filterValue).toLowerCase().trim()
     return stringValue > stringFilterValue
   },
-  { resolveFilterValue: (val: any) => testFalsy(val) },
+  { autoRemove: (val: any) => testFalsy(val) },
 )
 
 /**
@@ -162,7 +174,7 @@ export const filterFn_greaterThanOrEqualTo = Object.assign(
       filterFn_equals(row, columnId, filterValue)
     )
   },
-  { resolveFilterValue: (val: any) => testFalsy(val) },
+  { autoRemove: (val: any) => testFalsy(val) },
 )
 
 /**
@@ -178,7 +190,7 @@ export const filterFn_lessThan = Object.assign(
   ) => {
     return !filterFn_greaterThanOrEqualTo(row, columnId, filterValue)
   },
-  { resolveFilterValue: (val: any) => testFalsy(val) },
+  { autoRemove: (val: any) => testFalsy(val) },
 )
 
 /**
@@ -194,7 +206,7 @@ export const filterFn_lessThanOrEqualTo = Object.assign(
   ) => {
     return !filterFn_greaterThan(row, columnId, filterValue)
   },
-  { resolveFilterValue: (val: any) => testFalsy(val) },
+  { autoRemove: (val: any) => testFalsy(val) },
 )
 
 // Range filters
@@ -209,14 +221,29 @@ const filterFn_between = Object.assign(
     row: Row<TFeatures, TData>,
     columnId: string,
     filterValues: [unknown, unknown],
-  ): boolean =>
-    ((['', undefined] as Array<any>).includes(filterValues[0]) ||
-      filterFn_greaterThan(row, columnId, filterValues[0])) &&
-    ((!isNaN(Number(filterValues[0])) &&
-      !isNaN(Number(filterValues[1])) &&
-      Number(filterValues[0]) > Number(filterValues[1])) ||
-      (['', undefined] as Array<any>).includes(filterValues[1]) ||
-      filterFn_lessThan(row, columnId, filterValues[1])),
+  ): boolean => {
+    const min = filterValues[0]
+    if (min !== '' && min !== undefined) {
+      if (!filterFn_greaterThan(row, columnId, min)) {
+        return false
+      }
+    }
+
+    const max = filterValues[1]
+    if (max === '' || max === undefined) {
+      return true
+    }
+
+    if (min !== '' && min !== undefined) {
+      const numericMin = Number(min)
+      const numericMax = Number(max)
+      if (!isNaN(numericMin) && !isNaN(numericMax) && numericMin > numericMax) {
+        return true
+      }
+    }
+
+    return filterFn_lessThan(row, columnId, max)
+  },
   {
     autoRemove: (val: any) =>
       testFalsy(val) || (testFalsy(val[0]) && testFalsy(val[1])),
@@ -233,14 +260,29 @@ const filterFn_betweenInclusive = Object.assign(
     row: Row<TFeatures, TData>,
     columnId: string,
     filterValues: [unknown, unknown],
-  ): boolean =>
-    ((['', undefined] as Array<any>).includes(filterValues[0]) ||
-      filterFn_greaterThanOrEqualTo(row, columnId, filterValues[0])) &&
-    ((!isNaN(Number(filterValues[0])) &&
-      !isNaN(Number(filterValues[1])) &&
-      Number(filterValues[0]) > Number(filterValues[1])) ||
-      (['', undefined] as Array<any>).includes(filterValues[1]) ||
-      filterFn_lessThanOrEqualTo(row, columnId, filterValues[1])),
+  ): boolean => {
+    const min = filterValues[0]
+    if (min !== '' && min !== undefined) {
+      if (!filterFn_greaterThanOrEqualTo(row, columnId, min)) {
+        return false
+      }
+    }
+
+    const max = filterValues[1]
+    if (max === '' || max === undefined) {
+      return true
+    }
+
+    if (min !== '' && min !== undefined) {
+      const numericMin = Number(min)
+      const numericMax = Number(max)
+      if (!isNaN(numericMin) && !isNaN(numericMax) && numericMin > numericMax) {
+        return true
+      }
+    }
+
+    return filterFn_lessThanOrEqualTo(row, columnId, max)
+  },
   {
     autoRemove: (val: any) =>
       testFalsy(val) || (testFalsy(val[0]) && testFalsy(val[1])),
@@ -302,7 +344,13 @@ export const filterFn_arrHas = Object.assign(
     columnId: string,
     filterValue: Array<unknown>,
   ) => {
-    return filterValue.some((val) => row.getValue<unknown>(columnId) === val)
+    const value = row.getValue<unknown>(columnId)
+    for (let i = 0; i < filterValue.length; i++) {
+      if (value === filterValue[i]) {
+        return true
+      }
+    }
+    return false
   },
   { autoRemove: (val: any) => testFalsy(val) || !val?.length },
 )
@@ -316,11 +364,17 @@ export const filterFn_arrIncludes = Object.assign(
     columnId: string,
     filterValue: Array<unknown>,
   ) => {
-    return filterValue.some((val) =>
-      (row.getValue<unknown>(columnId) as Array<unknown> | string).includes(
-        val as any,
-      ),
-    )
+    const value = row.getValue<unknown>(columnId)
+    if (typeof value !== 'string' && !Array.isArray(value)) {
+      return false
+    }
+
+    for (let i = 0; i < filterValue.length; i++) {
+      if (value.includes(filterValue[i] as any)) {
+        return true
+      }
+    }
+    return false
   },
   { autoRemove: (val: any) => testFalsy(val) || !val?.length },
 )
@@ -336,7 +390,12 @@ export const filterFn_arrIncludesAll = Object.assign(
   ) => {
     const value = row.getValue<Array<unknown>>(columnId)
     if (!Array.isArray(value)) return false
-    return !filterValue.some((val) => !value.includes(val))
+    for (let i = 0; i < filterValue.length; i++) {
+      if (!value.includes(filterValue[i])) {
+        return false
+      }
+    }
+    return true
   },
   { autoRemove: (val: any) => testFalsy(val) || !val?.length },
 )
@@ -352,7 +411,12 @@ export const filterFn_arrIncludesSome = Object.assign(
   ) => {
     const value = row.getValue<Array<unknown>>(columnId)
     if (!Array.isArray(value)) return false
-    return filterValue.some((val) => value.includes(val))
+    for (let i = 0; i < filterValue.length; i++) {
+      if (value.includes(filterValue[i])) {
+        return true
+      }
+    }
+    return false
   },
   { autoRemove: (val: any) => testFalsy(val) || !val?.length },
 )