@tanstack/svelte-table 8.0.0-alpha.79 → 8.0.0-alpha.83

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -105,7 +105,7 @@
105
105
  const Columns = {
106
106
  createInstance: instance => {
107
107
  return {
108
- getDefaultColumn: memo(() => [instance.options.defaultColumn], defaultColumn => {
108
+ getDefaultColumnDef: memo(() => [instance.options.defaultColumnDef], defaultColumn => {
109
109
  var _defaultColumn;
110
110
 
111
111
  defaultColumn = (_defaultColumn = defaultColumn) != null ? _defaultColumn : {};
@@ -118,7 +118,7 @@
118
118
  return (_props$getValue$toStr = (_props$getValue$toStr2 = (_props$getValue = props.getValue()).toString) == null ? void 0 : _props$getValue$toStr2.call(_props$getValue)) != null ? _props$getValue$toStr : null;
119
119
  },
120
120
  ...instance._features.reduce((obj, feature) => {
121
- return Object.assign(obj, feature.getDefaultColumn == null ? void 0 : feature.getDefaultColumn());
121
+ return Object.assign(obj, feature.getDefaultColumnDef == null ? void 0 : feature.getDefaultColumnDef());
122
122
  }, {}),
123
123
  ...defaultColumn
124
124
  };
@@ -128,13 +128,16 @@
128
128
 
129
129
  return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugColumns;
130
130
  },
131
- key: 'getDefaultColumn'
131
+ key: 'getDefaultColumnDef'
132
132
  }),
133
133
  getColumnDefs: () => instance.options.columns,
134
134
  createColumn: (columnDef, depth, parent) => {
135
135
  var _ref, _columnDef$id;
136
136
 
137
- const defaultColumn = instance.getDefaultColumn();
137
+ const defaultColumnDef = instance.getDefaultColumnDef();
138
+ columnDef = { ...defaultColumnDef,
139
+ ...columnDef
140
+ };
138
141
  let id = (_ref = (_columnDef$id = columnDef.id) != null ? _columnDef$id : columnDef.accessorKey) != null ? _ref : typeof columnDef.header === 'string' ? columnDef.header : undefined;
139
142
  let accessorFn;
140
143
 
@@ -150,8 +153,7 @@
150
153
  }
151
154
  }
152
155
 
153
- let column = { ...defaultColumn,
154
- ...columnDef,
156
+ let column = { ...columnDef,
155
157
  id: "" + id,
156
158
  accessorFn,
157
159
  parent: parent,
@@ -300,7 +302,7 @@
300
302
  const column = instance.getColumn(columnId);
301
303
 
302
304
  if (!column.accessorFn) {
303
- throw new Error();
305
+ return undefined;
304
306
  }
305
307
 
306
308
  row.valuesCache[columnId] = column.accessorFn(row.original, rowIndex);
@@ -385,7 +387,7 @@
385
387
  row,
386
388
  column,
387
389
  getValue: () => row.getValue(columnId),
388
- renderCell: () => column.cell ? instance._render(column.cell, {
390
+ renderCell: () => column.columnDef.cell ? instance._render(column.columnDef.cell, {
389
391
  instance,
390
392
  column,
391
393
  row,
@@ -440,7 +442,7 @@
440
442
  });
441
443
 
442
444
  const ColumnSizing = {
443
- getDefaultColumn: () => {
445
+ getDefaultColumnDef: () => {
444
446
  return defaultColumnSizing;
445
447
  },
446
448
  getInitialState: state => {
@@ -460,10 +462,10 @@
460
462
  createColumn: (column, instance) => {
461
463
  return {
462
464
  getSize: () => {
463
- var _column$minSize, _ref, _column$maxSize;
465
+ var _column$columnDef$min, _ref, _column$columnDef$max;
464
466
 
465
467
  const columnSize = instance.getState().columnSizing[column.id];
466
- return Math.min(Math.max((_column$minSize = column.minSize) != null ? _column$minSize : defaultColumnSizing.minSize, (_ref = columnSize != null ? columnSize : column.size) != null ? _ref : defaultColumnSizing.size), (_column$maxSize = column.maxSize) != null ? _column$maxSize : defaultColumnSizing.maxSize);
468
+ return Math.min(Math.max((_column$columnDef$min = column.columnDef.minSize) != null ? _column$columnDef$min : defaultColumnSizing.minSize, (_ref = columnSize != null ? columnSize : column.columnDef.size) != null ? _ref : defaultColumnSizing.size), (_column$columnDef$max = column.columnDef.maxSize) != null ? _column$columnDef$max : defaultColumnSizing.maxSize);
467
469
  },
468
470
  getStart: position => {
469
471
  const columns = !position ? instance.getVisibleLeafColumns() : position === 'left' ? instance.getLeftVisibleLeafColumns() : instance.getRightVisibleLeafColumns();
@@ -486,9 +488,9 @@
486
488
  });
487
489
  },
488
490
  getCanResize: () => {
489
- var _column$enableResizin, _instance$options$ena;
491
+ var _column$columnDef$ena, _instance$options$ena;
490
492
 
491
- return ((_column$enableResizin = column.enableResizing) != null ? _column$enableResizin : true) && ((_instance$options$ena = instance.options.enableColumnResizing) != null ? _instance$options$ena : true);
493
+ return ((_column$columnDef$ena = column.columnDef.enableResizing) != null ? _column$columnDef$ena : true) && ((_instance$options$ena = instance.options.enableColumnResizing) != null ? _instance$options$ena : true);
492
494
  },
493
495
  getIsResizing: () => {
494
496
  return instance.getState().columnSizingInfo.isResizingColumn === column.id;
@@ -945,7 +947,7 @@
945
947
 
946
948
  //
947
949
  const Filters = {
948
- getDefaultColumn: () => {
950
+ getDefaultColumnDef: () => {
949
951
  return {
950
952
  filterFn: 'auto'
951
953
  };
@@ -988,6 +990,10 @@
988
990
  return filterFns.inNumberRange;
989
991
  }
990
992
 
993
+ if (typeof value === 'boolean') {
994
+ return filterFns.equals;
995
+ }
996
+
991
997
  if (value !== null && typeof value === 'object') {
992
998
  return filterFns.equals;
993
999
  }
@@ -1005,14 +1011,14 @@
1005
1011
  return isFunction(column.filterFn) ? column.filterFn : column.filterFn === 'auto' ? column.getAutoFilterFn() : (_ref = userFilterFns == null ? void 0 : userFilterFns[column.filterFn]) != null ? _ref : filterFns[column.filterFn];
1006
1012
  },
1007
1013
  getCanFilter: () => {
1008
- var _column$enableColumnF, _instance$options$ena, _instance$options$ena2;
1014
+ var _column$columnDef$ena, _instance$options$ena, _instance$options$ena2;
1009
1015
 
1010
- return ((_column$enableColumnF = column.enableColumnFilter) != null ? _column$enableColumnF : true) && ((_instance$options$ena = instance.options.enableColumnFilters) != null ? _instance$options$ena : true) && ((_instance$options$ena2 = instance.options.enableFilters) != null ? _instance$options$ena2 : true) && !!column.accessorFn;
1016
+ return ((_column$columnDef$ena = column.columnDef.enableColumnFilter) != null ? _column$columnDef$ena : true) && ((_instance$options$ena = instance.options.enableColumnFilters) != null ? _instance$options$ena : true) && ((_instance$options$ena2 = instance.options.enableFilters) != null ? _instance$options$ena2 : true) && !!column.accessorFn;
1011
1017
  },
1012
1018
  getCanGlobalFilter: () => {
1013
- var _column$enableGlobalF, _instance$options$ena3, _instance$options$ena4, _instance$options$get;
1019
+ var _column$columnDef$ena2, _instance$options$ena3, _instance$options$ena4, _instance$options$get;
1014
1020
 
1015
- return ((_column$enableGlobalF = column.enableGlobalFilter) != null ? _column$enableGlobalF : true) && ((_instance$options$ena3 = instance.options.enableGlobalFilter) != null ? _instance$options$ena3 : true) && ((_instance$options$ena4 = instance.options.enableFilters) != null ? _instance$options$ena4 : true) && ((_instance$options$get = instance.options.getColumnCanGlobalFilter == null ? void 0 : instance.options.getColumnCanGlobalFilter(column)) != null ? _instance$options$get : true) && !!column.accessorFn;
1021
+ return ((_column$columnDef$ena2 = column.columnDef.enableGlobalFilter) != null ? _column$columnDef$ena2 : true) && ((_instance$options$ena3 = instance.options.enableGlobalFilter) != null ? _instance$options$ena3 : true) && ((_instance$options$ena4 = instance.options.enableFilters) != null ? _instance$options$ena4 : true) && ((_instance$options$get = instance.options.getColumnCanGlobalFilter == null ? void 0 : instance.options.getColumnCanGlobalFilter(column)) != null ? _instance$options$get : true) && !!column.accessorFn;
1016
1022
  },
1017
1023
  getIsFiltered: () => column.getFilterIndex() > -1,
1018
1024
  getFilterValue: () => {
@@ -1091,7 +1097,8 @@
1091
1097
  },
1092
1098
  createRow: (row, instance) => {
1093
1099
  return {
1094
- columnFilterMap: {},
1100
+ columnFilters: {},
1101
+ columnFiltersMeta: {},
1095
1102
  subRowsByFacetId: {}
1096
1103
  };
1097
1104
  },
@@ -1289,7 +1296,7 @@
1289
1296
 
1290
1297
  //
1291
1298
  const Grouping = {
1292
- getDefaultColumn: () => {
1299
+ getDefaultColumnDef: () => {
1293
1300
  return {
1294
1301
  aggregationFn: 'auto'
1295
1302
  };
@@ -1319,9 +1326,9 @@
1319
1326
  });
1320
1327
  },
1321
1328
  getCanGroup: () => {
1322
- var _ref, _ref2, _ref3, _column$enableGroupin;
1329
+ var _ref, _ref2, _ref3, _column$columnDef$ena;
1323
1330
 
1324
- return (_ref = (_ref2 = (_ref3 = (_column$enableGroupin = column.enableGrouping) != null ? _column$enableGroupin : true) != null ? _ref3 : instance.options.enableGrouping) != null ? _ref2 : true) != null ? _ref : !!column.accessorFn;
1331
+ return (_ref = (_ref2 = (_ref3 = (_column$columnDef$ena = column.columnDef.enableGrouping) != null ? _column$columnDef$ena : true) != null ? _ref3 : instance.options.enableGrouping) != null ? _ref2 : true) != null ? _ref : !!column.accessorFn;
1325
1332
  },
1326
1333
  getIsGrouped: () => {
1327
1334
  var _instance$getState$gr;
@@ -1405,9 +1412,9 @@
1405
1412
  return !cell.getIsGrouped() && !cell.getIsPlaceholder() && ((_row$subRows = row.subRows) == null ? void 0 : _row$subRows.length) > 1;
1406
1413
  },
1407
1414
  renderAggregatedCell: () => {
1408
- var _column$aggregatedCel;
1415
+ var _column$columnDef$agg;
1409
1416
 
1410
- const template = (_column$aggregatedCel = column.aggregatedCell) != null ? _column$aggregatedCel : column.cell;
1417
+ const template = (_column$columnDef$agg = column.columnDef.aggregatedCell) != null ? _column$columnDef$agg : column.columnDef.cell;
1411
1418
  return template ? instance._render(template, {
1412
1419
  instance,
1413
1420
  column,
@@ -1714,9 +1721,9 @@
1714
1721
  getCanPin: () => {
1715
1722
  const leafColumns = column.getLeafColumns();
1716
1723
  return leafColumns.some(d => {
1717
- var _d$enablePinning, _instance$options$ena;
1724
+ var _d$columnDef$enablePi, _instance$options$ena;
1718
1725
 
1719
- return ((_d$enablePinning = d.enablePinning) != null ? _d$enablePinning : true) && ((_instance$options$ena = instance.options.enablePinning) != null ? _instance$options$ena : true);
1726
+ return ((_d$columnDef$enablePi = d.columnDef.enablePinning) != null ? _d$columnDef$enablePi : true) && ((_instance$options$ena = instance.options.enablePinning) != null ? _instance$options$ena : true);
1720
1727
  });
1721
1728
  },
1722
1729
  getIsPinned: () => {
@@ -1786,12 +1793,18 @@
1786
1793
 
1787
1794
  return instance.setColumnPinning(defaultState ? getDefaultPinningState() : (_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.columnPinning) != null ? _instance$initialStat : getDefaultPinningState());
1788
1795
  },
1789
- getIsSomeColumnsPinned: () => {
1790
- const {
1791
- left,
1792
- right
1793
- } = instance.getState().columnPinning;
1794
- return Boolean((left == null ? void 0 : left.length) || (right == null ? void 0 : right.length));
1796
+ getIsSomeColumnsPinned: position => {
1797
+ var _pinningState$positio;
1798
+
1799
+ const pinningState = instance.getState().columnPinning;
1800
+
1801
+ if (!position) {
1802
+ var _pinningState$left, _pinningState$right;
1803
+
1804
+ return Boolean(((_pinningState$left = pinningState.left) == null ? void 0 : _pinningState$left.length) || ((_pinningState$right = pinningState.right) == null ? void 0 : _pinningState$right.length));
1805
+ }
1806
+
1807
+ return Boolean((_pinningState$positio = pinningState[position]) == null ? void 0 : _pinningState$positio.length);
1795
1808
  },
1796
1809
  getLeftLeafColumns: memo(() => [instance.getAllLeafColumns(), instance.getState().columnPinning.left], (allColumns, left) => {
1797
1810
  return (left != null ? left : []).map(columnId => allColumns.find(column => column.id === columnId)).filter(Boolean);
@@ -2317,7 +2330,7 @@
2317
2330
  ...state
2318
2331
  };
2319
2332
  },
2320
- getDefaultColumn: () => {
2333
+ getDefaultColumnDef: () => {
2321
2334
  return {
2322
2335
  sortingFn: 'auto'
2323
2336
  };
@@ -2333,7 +2346,7 @@
2333
2346
  createColumn: (column, instance) => {
2334
2347
  return {
2335
2348
  getAutoSortingFn: () => {
2336
- const firstRows = instance.getFilteredRowModel().flatRows.slice(100);
2349
+ const firstRows = instance.getFilteredRowModel().flatRows.slice(10);
2337
2350
  let isString = false;
2338
2351
 
2339
2352
  for (const row of firstRows) {
@@ -2377,7 +2390,7 @@
2377
2390
  throw new Error();
2378
2391
  }
2379
2392
 
2380
- return isFunction(column.sortingFn) ? column.sortingFn : column.sortingFn === 'auto' ? column.getAutoSortingFn() : (_ref = userSortingFn == null ? void 0 : userSortingFn[column.sortingFn]) != null ? _ref : sortingFns[column.sortingFn];
2393
+ return isFunction(column.columnDef.sortingFn) ? column.columnDef.sortingFn : column.columnDef.sortingFn === 'auto' ? column.getAutoSortingFn() : (_ref = userSortingFn == null ? void 0 : userSortingFn[column.columnDef.sortingFn]) != null ? _ref : sortingFns[column.columnDef.sortingFn];
2381
2394
  },
2382
2395
  toggleSorting: (desc, multi) => {
2383
2396
  // if (column.columns.length) {
@@ -2389,7 +2402,7 @@
2389
2402
  // return
2390
2403
  // }
2391
2404
  instance.setSorting(old => {
2392
- var _ref2, _column$sortDescFirst, _instance$options$ena, _instance$options$ena2;
2405
+ var _ref2, _column$columnDef$sor, _instance$options$ena, _instance$options$ena2;
2393
2406
 
2394
2407
  // Find any existing sorting for this column
2395
2408
  const existingSorting = old == null ? void 0 : old.find(d => d.id === column.id);
@@ -2416,7 +2429,7 @@
2416
2429
  }
2417
2430
  }
2418
2431
 
2419
- const sortDescFirst = (_ref2 = (_column$sortDescFirst = column.sortDescFirst) != null ? _column$sortDescFirst : instance.options.sortDescFirst) != null ? _ref2 : column.getAutoSortDir() === 'desc'; // Handle toggle states that will remove the sorting
2432
+ const sortDescFirst = (_ref2 = (_column$columnDef$sor = column.columnDef.sortDescFirst) != null ? _column$columnDef$sor : instance.options.sortDescFirst) != null ? _ref2 : column.getAutoSortDir() === 'desc'; // Handle toggle states that will remove the sorting
2420
2433
 
2421
2434
  if (sortAction === 'toggle' && ( // Must be toggling
2422
2435
  (_instance$options$ena = instance.options.enableSortingRemoval) != null ? _instance$options$ena : true) && // If enableSortRemove, enable in general
@@ -2460,14 +2473,14 @@
2460
2473
  });
2461
2474
  },
2462
2475
  getCanSort: () => {
2463
- var _column$enableSorting, _instance$options$ena3;
2476
+ var _column$columnDef$ena, _instance$options$ena3;
2464
2477
 
2465
- return ((_column$enableSorting = column.enableSorting) != null ? _column$enableSorting : true) && ((_instance$options$ena3 = instance.options.enableSorting) != null ? _instance$options$ena3 : true) && !!column.accessorFn;
2478
+ return ((_column$columnDef$ena = column.columnDef.enableSorting) != null ? _column$columnDef$ena : true) && ((_instance$options$ena3 = instance.options.enableSorting) != null ? _instance$options$ena3 : true) && !!column.accessorFn;
2466
2479
  },
2467
2480
  getCanMultiSort: () => {
2468
- var _ref3, _column$enableMultiSo;
2481
+ var _ref3, _column$columnDef$ena2;
2469
2482
 
2470
- return (_ref3 = (_column$enableMultiSo = column.enableMultiSort) != null ? _column$enableMultiSo : instance.options.enableMultiSort) != null ? _ref3 : !!column.accessorFn;
2483
+ return (_ref3 = (_column$columnDef$ena2 = column.columnDef.enableMultiSort) != null ? _column$columnDef$ena2 : instance.options.enableMultiSort) != null ? _ref3 : !!column.accessorFn;
2471
2484
  },
2472
2485
  getIsSorted: () => {
2473
2486
  var _instance$getState$so;
@@ -2531,7 +2544,7 @@
2531
2544
  onColumnVisibilityChange: makeStateUpdater('columnVisibility', instance)
2532
2545
  };
2533
2546
  },
2534
- getDefaultColumn: () => {
2547
+ getDefaultColumnDef: () => {
2535
2548
  return {
2536
2549
  defaultIsVisible: true
2537
2550
  };
@@ -2551,9 +2564,9 @@
2551
2564
  return (_instance$getState$co = (_instance$getState$co2 = instance.getState().columnVisibility) == null ? void 0 : _instance$getState$co2[column.id]) != null ? _instance$getState$co : true;
2552
2565
  },
2553
2566
  getCanHide: () => {
2554
- var _column$enableHiding, _instance$options$ena;
2567
+ var _column$columnDef$ena, _instance$options$ena;
2555
2568
 
2556
- return ((_column$enableHiding = column.enableHiding) != null ? _column$enableHiding : true) && ((_instance$options$ena = instance.options.enableHiding) != null ? _instance$options$ena : true);
2569
+ return ((_column$columnDef$ena = column.columnDef.enableHiding) != null ? _column$columnDef$ena : true) && ((_instance$options$ena = instance.options.enableHiding) != null ? _instance$options$ena : true);
2557
2570
  },
2558
2571
  getToggleVisibilityHandler: () => {
2559
2572
  return e => {
@@ -2664,12 +2677,12 @@
2664
2677
  recurseHeader(header);
2665
2678
  return leafHeaders;
2666
2679
  },
2667
- renderHeader: () => column.header ? instance._render(column.header, {
2680
+ renderHeader: () => column.columnDef.header ? instance._render(column.columnDef.header, {
2668
2681
  instance,
2669
2682
  header: header,
2670
2683
  column
2671
2684
  }) : null,
2672
- renderFooter: () => column.footer ? instance._render(column.footer, {
2685
+ renderFooter: () => column.columnDef.footer ? instance._render(column.columnDef.footer, {
2673
2686
  instance,
2674
2687
  header: header,
2675
2688
  column
@@ -3177,10 +3190,11 @@
3177
3190
  throw new Error('');
3178
3191
  })()
3179
3192
  },
3180
- setGenerics: () => table,
3193
+ // setGenerics: () => table as any,
3181
3194
  setRowType: () => table,
3182
3195
  setTableMetaType: () => table,
3183
3196
  setColumnMetaType: () => table,
3197
+ setFilterMetaType: () => table,
3184
3198
  setOptions: newOptions => createTable$1(_, __, { ...options,
3185
3199
  ...newOptions
3186
3200
  }),
@@ -3212,7 +3226,8 @@
3212
3226
  }
3213
3227
 
3214
3228
  throw new Error('Invalid accessor');
3215
- }
3229
+ },
3230
+ createOptions: options => options
3216
3231
  };
3217
3232
  return table;
3218
3233
  }
@@ -3308,7 +3323,7 @@
3308
3323
 
3309
3324
  if ((_row$subRows = row.subRows) != null && _row$subRows.length) {
3310
3325
  newRow = instance.createRow(row.id, row.original, row.index, row.depth);
3311
- newRow.columnFilterMap = row.columnFilterMap;
3326
+ newRow.columnFilters = row.columnFilters;
3312
3327
  newRow.subRows = recurseFilterRows(row.subRows, depth + 1);
3313
3328
 
3314
3329
  if (!newRow.subRows.length) {
@@ -3381,6 +3396,11 @@
3381
3396
  function getFilteredRowModel() {
3382
3397
  return instance => memo(() => [instance.getPreFilteredRowModel(), instance.getState().columnFilters, instance.getState().globalFilter], (rowModel, columnFilters, globalFilter) => {
3383
3398
  if (!rowModel.rows.length || !(columnFilters != null && columnFilters.length) && !globalFilter) {
3399
+ for (let i = 0; i < rowModel.flatRows.length; i++) {
3400
+ rowModel.flatRows[i].columnFilters = {};
3401
+ rowModel.flatRows[i].columnFiltersMeta = {};
3402
+ }
3403
+
3384
3404
  return rowModel;
3385
3405
  }
3386
3406
 
@@ -3435,28 +3455,34 @@
3435
3455
 
3436
3456
  for (let j = 0; j < rowModel.flatRows.length; j++) {
3437
3457
  const row = rowModel.flatRows[j];
3438
- row.columnFilterMap = {};
3458
+ row.columnFilters = {};
3439
3459
 
3440
3460
  if (resolvedColumnFilters.length) {
3441
3461
  for (let i = 0; i < resolvedColumnFilters.length; i++) {
3442
- currentColumnFilter = resolvedColumnFilters[i]; // Tag the row with the column filter state
3462
+ currentColumnFilter = resolvedColumnFilters[i];
3463
+ const id = currentColumnFilter.id; // Tag the row with the column filter state
3443
3464
 
3444
- row.columnFilterMap[currentColumnFilter.id] = currentColumnFilter.filterFn(row, currentColumnFilter.id, currentColumnFilter.resolvedValue);
3465
+ row.columnFilters[id] = currentColumnFilter.filterFn(row, id, currentColumnFilter.resolvedValue, filterMeta => {
3466
+ row.columnFiltersMeta[id] = filterMeta;
3467
+ });
3445
3468
  }
3446
3469
  }
3447
3470
 
3448
3471
  if (resolvedGlobalFilters.length) {
3449
3472
  for (let i = 0; i < resolvedGlobalFilters.length; i++) {
3450
- currentGlobalFilter = resolvedGlobalFilters[i]; // Tag the row with the first truthy global filter state
3473
+ currentGlobalFilter = resolvedGlobalFilters[i];
3474
+ const id = currentGlobalFilter.id; // Tag the row with the first truthy global filter state
3451
3475
 
3452
- if (currentGlobalFilter.filterFn(row, currentGlobalFilter.id, currentGlobalFilter.resolvedValue)) {
3453
- row.columnFilterMap.__global__ = true;
3476
+ if (currentGlobalFilter.filterFn(row, id, currentGlobalFilter.resolvedValue, filterMeta => {
3477
+ row.columnFiltersMeta[id] = filterMeta;
3478
+ })) {
3479
+ row.columnFilters.__global__ = true;
3454
3480
  break;
3455
3481
  }
3456
3482
  }
3457
3483
 
3458
- if (row.columnFilterMap.__global__ !== true) {
3459
- row.columnFilterMap.__global__ = false;
3484
+ if (row.columnFilters.__global__ !== true) {
3485
+ row.columnFilters.__global__ = false;
3460
3486
  }
3461
3487
  }
3462
3488
  }
@@ -3464,7 +3490,7 @@
3464
3490
  const filterRowsImpl = row => {
3465
3491
  // Horizontally filter rows through each column
3466
3492
  for (let i = 0; i < filterableIds.length; i++) {
3467
- if (row.columnFilterMap[filterableIds[i]] === false) {
3493
+ if (row.columnFilters[filterableIds[i]] === false) {
3468
3494
  return false;
3469
3495
  }
3470
3496
  }
@@ -3498,7 +3524,7 @@
3498
3524
  const filterRowsImpl = row => {
3499
3525
  // Horizontally filter rows through each column
3500
3526
  for (let i = 0; i < filterableIds.length; i++) {
3501
- if (row.columnFilterMap[filterableIds[i]] === false) {
3527
+ if (row.columnFilters[filterableIds[i]] === false) {
3502
3528
  return false;
3503
3529
  }
3504
3530
  }
@@ -3598,8 +3624,8 @@
3598
3624
  availableSorting.forEach(sortEntry => {
3599
3625
  const column = instance.getColumn(sortEntry.id);
3600
3626
  columnInfoById[sortEntry.id] = {
3601
- sortUndefined: column.sortUndefined,
3602
- invertSorting: column.invertSorting,
3627
+ sortUndefined: column.columnDef.sortUndefined,
3628
+ invertSorting: column.columnDef.invertSorting,
3603
3629
  sortingFn: column.getSortingFn()
3604
3630
  };
3605
3631
  });
@@ -3747,8 +3773,8 @@
3747
3773
  row.groupingValuesCache[columnId] = aggregateFn(() => leafRows.map(row => {
3748
3774
  let columnValue = row.getValue(columnId);
3749
3775
 
3750
- if (!depth && column.aggregateValue) {
3751
- columnValue = column.aggregateValue(columnValue);
3776
+ if (!depth && column.columnDef.aggregateValue) {
3777
+ columnValue = column.columnDef.aggregateValue(columnValue);
3752
3778
  }
3753
3779
 
3754
3780
  return columnValue;
@@ -4113,12 +4139,14 @@
4113
4139
  exports.RowSelection = RowSelection;
4114
4140
  exports.Sorting = Sorting;
4115
4141
  exports.Visibility = Visibility;
4142
+ exports.aggregationFns = aggregationFns;
4116
4143
  exports.buildHeaderGroups = buildHeaderGroups;
4117
4144
  exports.createTable = createTable;
4118
4145
  exports.createTableFactory = createTableFactory;
4119
4146
  exports.createTableInstance = createTableInstance;
4120
4147
  exports.defaultColumnSizing = defaultColumnSizing;
4121
4148
  exports.expandRows = expandRows;
4149
+ exports.filterFns = filterFns;
4122
4150
  exports.flattenBy = flattenBy;
4123
4151
  exports.functionalUpdate = functionalUpdate;
4124
4152
  exports.getCoreRowModel = getCoreRowModel;
@@ -4133,14 +4161,17 @@
4133
4161
  exports.isFunction = isFunction;
4134
4162
  exports.isRowSelected = isRowSelected;
4135
4163
  exports.makeStateUpdater = makeStateUpdater;
4164
+ exports.mean = mean;
4136
4165
  exports.memo = memo;
4137
4166
  exports.noop = noop;
4138
4167
  exports.orderColumns = orderColumns;
4139
4168
  exports.passiveEventSupported = passiveEventSupported;
4169
+ exports.reSplitAlphaNumeric = reSplitAlphaNumeric;
4140
4170
  exports.render = render;
4141
4171
  exports.renderComponent = renderComponent;
4142
4172
  exports.selectRowsFn = selectRowsFn;
4143
4173
  exports.shouldAutoRemoveFilter = shouldAutoRemoveFilter;
4174
+ exports.sortingFns = sortingFns;
4144
4175
 
4145
4176
  Object.defineProperty(exports, '__esModule', { value: true });
4146
4177