@tanstack/table-core 8.0.0-alpha.78 → 8.0.0-alpha.82

package/build/types/createTable.d.ts

@@ -23,7 +23,10 @@ export declare type Table<TGenerics extends TableGenerics> = {
     setColumnMetaType: <TColumnMeta>() => Table<Overwrite<TGenerics, {
         ColumnMeta: TColumnMeta;
     }>>;
-    setOptions: <TFilterFns extends Record<string, FilterFn<any>>, TSortingFns extends Record<string, SortingFn<any>>, TAggregationFns extends Record<string, AggregationFn<any>>>(options: CreateTableOptions<any, TFilterFns, TSortingFns, TAggregationFns, TGenerics>) => Table<Overwrite<TGenerics, {
+    setFilterMetaType: <TFilterMeta>() => Table<Overwrite<TGenerics, {
+        FilterMeta: TFilterMeta;
+    }>>;
+    setOptions: <TFilterFns extends Record<string, FilterFn<TGenerics>>, TSortingFns extends Record<string, SortingFn<TGenerics>>, TAggregationFns extends Record<string, AggregationFn<TGenerics>>>(options: CreateTableOptions<any, TFilterFns, TSortingFns, TAggregationFns, TGenerics>) => Table<Overwrite<TGenerics, {
         FilterFns: IfDefined<TFilterFns, TGenerics['FilterFns']>;
         SortingFns: IfDefined<TSortingFns, TGenerics['SortingFns']>;
         AggregationFns: IfDefined<TAggregationFns, TGenerics['AggregationFns']>;

package/build/types/features/Filters.d.ts

@@ -17,7 +17,7 @@ export declare type ResolvedColumnFilter<TGenerics extends TableGenerics> = {
     filterFn: FilterFn<TGenerics>;
 };
 export declare type FilterFn<TGenerics extends TableGenerics> = {
-    (row: Row<TGenerics>, columnId: string, filterValue: any): boolean;
+    (row: Row<TGenerics>, columnId: string, filterValue: any, addMeta: (meta: TGenerics['FilterMeta']) => void): boolean;
     resolveFilterValue?: TransformFilterValueFn<TGenerics>;
     autoRemove?: ColumnFilterAutoRemoveTestFn<TGenerics>;
 };
@@ -53,7 +53,8 @@ export declare type FiltersColumn<TGenerics extends TableGenerics> = {
     _getFacetedMinMaxValues?: () => undefined | [number, number];
 };
 export declare type FiltersRow<TGenerics extends TableGenerics> = {
-    columnFilterMap: Record<string, boolean>;
+    columnFilters: Record<string, boolean>;
+    columnFiltersMeta: Record<string, TGenerics['FilterMeta']>;
     subRowsByFacetId: Record<string, Row<TGenerics>[]>;
 };
 export declare type FiltersOptions<TGenerics extends TableGenerics> = {

package/build/types/features/Grouping.d.ts

@@ -3,7 +3,7 @@ import { BuiltInAggregationFn } from '../aggregationFns';
 import { Cell, Column, OnChangeFn, TableInstance, Row, Updater, Renderable, TableGenerics, TableFeature } from '../types';
 import { Overwrite } from '../utils';
 export declare type GroupingState = string[];
-export declare type AggregationFn<TGenerics extends TableGenerics> = (getLeafValues: () => TGenerics['Row'][], getChildValues: () => TGenerics['Row'][]) => any;
+export declare type AggregationFn<TGenerics extends TableGenerics> = (getLeafValues: () => TGenerics['Value'][], getChildValues: () => TGenerics['Value'][]) => any;
 export declare type CustomAggregationFns<TGenerics extends TableGenerics> = Record<string, AggregationFn<TGenerics>>;
 export declare type AggregationFnOption<TGenerics extends TableGenerics> = 'auto' | BuiltInAggregationFn | keyof TGenerics['AggregationFns'] | AggregationFn<TGenerics>;
 export declare type GroupingTableState = {

package/build/types/index.d.ts

@@ -14,6 +14,9 @@ export * from './features/RowSelection';
 export * from './features/Sorting';
 export * from './features/Visibility';
 export * from './features/Expanding';
+export * from './filterFns';
+export * from './sortingFns';
+export * from './aggregationFns';
 export * from './utils';
 export * from './utils/getCoreRowModel';
 export * from './utils/getFilteredRowModel';

package/build/types/types.d.ts

@@ -26,6 +26,7 @@ export declare type TableGenerics = {
     Rendered?: any;
     ColumnMeta?: any;
     TableMeta?: any;
+    FilterMeta?: any;
 };
 export declare type AnyRender = (Comp: any, props: any) => any;
 export declare type TableFeature = {

package/build/umd/index.development.js

@@ -290,7 +290,7 @@
               const column = instance.getColumn(columnId);
 
               if (!column.accessorFn) {
-                throw new Error();
+                return undefined;
               }
 
               row.valuesCache[columnId] = column.accessorFn(row.original, rowIndex);
@@ -527,7 +527,7 @@
               }
             }
 
-            const startSize = column.getSize();
+            const startSize = header.getSize();
             const columnSizingStart = header ? header.getLeafHeaders().map(d => [d.column.id, d.column.getSize()]) : [[column.id, column.getSize()]];
             const clientX = isTouchStartEvent(e) ? Math.round(e.touches[0].clientX) : e.clientX;
 
@@ -1081,7 +1081,8 @@
     },
     createRow: (row, instance) => {
       return {
-        columnFilterMap: {},
+        columnFilters: {},
+        columnFiltersMeta: {},
         subRowsByFacetId: {}
       };
     },
@@ -2323,7 +2324,7 @@
     createColumn: (column, instance) => {
       return {
         getAutoSortingFn: () => {
-          const firstRows = instance.getFilteredRowModel().flatRows.slice(100);
+          const firstRows = instance.getFilteredRowModel().flatRows.slice(10);
           let isString = false;
 
           for (const row of firstRows) {
@@ -3171,6 +3172,7 @@
       setRowType: () => table,
       setTableMetaType: () => table,
       setColumnMetaType: () => table,
+      setFilterMetaType: () => table,
       setOptions: newOptions => createTable(_, __, { ...options,
         ...newOptions
       }),
@@ -3298,7 +3300,7 @@
 
         if ((_row$subRows = row.subRows) != null && _row$subRows.length) {
           newRow = instance.createRow(row.id, row.original, row.index, row.depth);
-          newRow.columnFilterMap = row.columnFilterMap;
+          newRow.columnFilters = row.columnFilters;
           newRow.subRows = recurseFilterRows(row.subRows, depth + 1);
 
           if (!newRow.subRows.length) {
@@ -3371,6 +3373,11 @@
   function getFilteredRowModel() {
     return instance => memo(() => [instance.getPreFilteredRowModel(), instance.getState().columnFilters, instance.getState().globalFilter], (rowModel, columnFilters, globalFilter) => {
       if (!rowModel.rows.length || !(columnFilters != null && columnFilters.length) && !globalFilter) {
+        for (let i = 0; i < rowModel.flatRows.length; i++) {
+          rowModel.flatRows[i].columnFilters = {};
+          rowModel.flatRows[i].columnFiltersMeta = {};
+        }
+
         return rowModel;
       }
 
@@ -3425,28 +3432,34 @@
 
       for (let j = 0; j < rowModel.flatRows.length; j++) {
         const row = rowModel.flatRows[j];
-        row.columnFilterMap = {};
+        row.columnFilters = {};
 
         if (resolvedColumnFilters.length) {
           for (let i = 0; i < resolvedColumnFilters.length; i++) {
-            currentColumnFilter = resolvedColumnFilters[i]; // Tag the row with the column filter state
+            currentColumnFilter = resolvedColumnFilters[i];
+            const id = currentColumnFilter.id; // Tag the row with the column filter state
 
-            row.columnFilterMap[currentColumnFilter.id] = currentColumnFilter.filterFn(row, currentColumnFilter.id, currentColumnFilter.resolvedValue);
+            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]; // Tag the row with the first truthy global filter state
+            currentGlobalFilter = resolvedGlobalFilters[i];
+            const id = currentGlobalFilter.id; // Tag the row with the first truthy global filter state
 
-            if (currentGlobalFilter.filterFn(row, currentGlobalFilter.id, currentGlobalFilter.resolvedValue)) {
-              row.columnFilterMap.__global__ = true;
+            if (currentGlobalFilter.filterFn(row, id, currentGlobalFilter.resolvedValue, filterMeta => {
+              row.columnFiltersMeta[id] = filterMeta;
+            })) {
+              row.columnFilters.__global__ = true;
               break;
             }
           }
 
-          if (row.columnFilterMap.__global__ !== true) {
-            row.columnFilterMap.__global__ = false;
+          if (row.columnFilters.__global__ !== true) {
+            row.columnFilters.__global__ = false;
           }
         }
       }
@@ -3454,7 +3467,7 @@
       const filterRowsImpl = row => {
         // Horizontally filter rows through each column
         for (let i = 0; i < filterableIds.length; i++) {
-          if (row.columnFilterMap[filterableIds[i]] === false) {
+          if (row.columnFilters[filterableIds[i]] === false) {
             return false;
           }
         }
@@ -3488,7 +3501,7 @@
       const filterRowsImpl = row => {
         // Horizontally filter rows through each column
         for (let i = 0; i < filterableIds.length; i++) {
-          if (row.columnFilterMap[filterableIds[i]] === false) {
+          if (row.columnFilters[filterableIds[i]] === false) {
             return false;
           }
         }
@@ -3907,11 +3920,13 @@
   exports.RowSelection = RowSelection;
   exports.Sorting = Sorting;
   exports.Visibility = Visibility;
+  exports.aggregationFns = aggregationFns;
   exports.buildHeaderGroups = buildHeaderGroups;
   exports.createTableFactory = createTableFactory;
   exports.createTableInstance = createTableInstance;
   exports.defaultColumnSizing = defaultColumnSizing;
   exports.expandRows = expandRows;
+  exports.filterFns = filterFns;
   exports.flattenBy = flattenBy;
   exports.functionalUpdate = functionalUpdate;
   exports.getCoreRowModel = getCoreRowModel;
@@ -3926,12 +3941,15 @@
   exports.isFunction = isFunction;
   exports.isRowSelected = isRowSelected;
   exports.makeStateUpdater = makeStateUpdater;
+  exports.mean = mean;
   exports.memo = memo;
   exports.noop = noop;
   exports.orderColumns = orderColumns;
   exports.passiveEventSupported = passiveEventSupported;
+  exports.reSplitAlphaNumeric = reSplitAlphaNumeric;
   exports.selectRowsFn = selectRowsFn;
   exports.shouldAutoRemoveFilter = shouldAutoRemoveFilter;
+  exports.sortingFns = sortingFns;
 
   Object.defineProperty(exports, '__esModule', { value: true });