@tanstack/table-core 8.0.0-alpha.62 → 8.0.0-alpha.65

package/build/umd/index.development.js

@@ -213,9 +213,7 @@
               var a = _ref[0],
                   b = _ref[1];
               return _extends({}, accu, (_extends3 = {}, _extends3[a] = b, _extends3));
-            }, {}), {
-              parent: parent
-            }));
+            }, {})));
           }
         }
 
@@ -299,9 +297,7 @@
               var a = _ref2[0],
                   b = _ref2[1];
               return _extends({}, accu, (_extends4 = {}, _extends4[a] = b, _extends4));
-            }, {}), {
-              parent: parent
-            }));
+            }, {})));
           }
         }
 
@@ -383,7 +379,7 @@
 
             return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugColumns;
           },
-          key: 'getDefaultColumn'
+          key: "development" === 'production' 
         }),
         getColumnDefs: function getColumnDefs() {
           return instance.options.columns;
@@ -426,7 +422,7 @@
                 return d.getFlatColumns();
               }));
             }, {
-              key: 'column.getFlatColumns',
+              key: "development" === 'production' ,
               debug: function debug() {
                 var _instance$options$deb2;
 
@@ -447,7 +443,7 @@
 
               return [column];
             }, {
-              key: 'column.getLeafColumns',
+              key: "development" === 'production' ,
               debug: function debug() {
                 var _instance$options$deb3;
 
@@ -479,7 +475,7 @@
 
           return recurseColumns(columnDefs);
         }, {
-          key: 'getAllColumns',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb4;
 
@@ -493,7 +489,7 @@
             return column.getFlatColumns();
           });
         }, {
-          key: 'getAllFlatColumns',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb5;
 
@@ -508,7 +504,7 @@
             return acc;
           }, {});
         }, {
-          key: 'getAllFlatColumnsById',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb6;
 
@@ -523,7 +519,7 @@
           });
           return orderColumns(leafColumns);
         }, {
-          key: 'getAllLeafColumns',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb7;
 
@@ -637,7 +633,7 @@
             return acc;
           }, {});
         }, {
-          key: 'row.getAllCellsByColumnId',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb2;
 
@@ -706,8 +702,8 @@
     getDefaultColumn: function getDefaultColumn() {
       return defaultColumnSizing;
     },
-    getInitialState: function getInitialState() {
-      return {
+    getInitialState: function getInitialState(state) {
+      return _extends({
         columnSizing: {},
         columnSizingInfo: {
           startOffset: null,
@@ -717,7 +713,7 @@
           isResizingColumn: false,
           columnSizingStart: []
         }
-      };
+      }, state);
     },
     getDefaultOptions: function getDefaultOptions(instance) {
       return {
@@ -1050,10 +1046,10 @@
 
   //
   var Expanding = {
-    getInitialState: function getInitialState() {
-      return {
+    getInitialState: function getInitialState(state) {
+      return _extends({
         expanded: {}
-      };
+      }, state);
     },
     getDefaultOptions: function getDefaultOptions(instance) {
       return {
@@ -1249,150 +1245,85 @@
     }
   };
 
-  var filterFns = {
-    includesString: includesString,
-    includesStringSensitive: includesStringSensitive,
-    equalsString: equalsString,
-    equalsStringSensitive: equalsStringSensitive,
-    arrIncludes: arrIncludes,
-    arrIncludesAll: arrIncludesAll,
-    arrIncludesSome: arrIncludesSome,
-    equals: equals,
-    weakEquals: weakEquals,
-    betweenNumberRange: betweenNumberRange
+  var includesString = function includesString(row, columnId, filterValue) {
+    var search = filterValue.toLowerCase();
+    return row.values[columnId].toLowerCase().includes(search);
   };
 
-  function includesString(rows, columnIds, filterValue) {
-    var search = String(filterValue).toLowerCase();
-    rows = rows.filter(function (row) {
-      return columnIds.some(function (id) {
-        return String(row.values[id]).toLowerCase().includes(search);
-      });
-    });
-    return rows;
-  }
-
   includesString.autoRemove = function (val) {
     return testFalsey(val);
   };
 
-  function includesStringSensitive(rows, columnIds, filterValue) {
-    var search = String(filterValue);
-    rows = rows.filter(function (row) {
-      return columnIds.some(function (id) {
-        return String(row.values[id]).includes(search);
-      });
-    });
-    return rows;
-  }
+  var includesStringSensitive = function includesStringSensitive(row, columnId, filterValue) {
+    return row.values[columnId].includes(filterValue);
+  };
 
   includesStringSensitive.autoRemove = function (val) {
     return testFalsey(val);
   };
 
-  function equalsString(rows, columnIds, filterValue) {
-    var search = String(filterValue).toLowerCase();
-    return rows.filter(function (row) {
-      return columnIds.some(function (id) {
-        var rowValue = row.values[id];
-        return rowValue !== undefined ? String(rowValue).toLowerCase() === search : true;
-      });
-    });
-  }
+  var equalsString = function equalsString(row, columnId, filterValue) {
+    return row.values[columnId].toLowerCase() === filterValue.toLowerCase();
+  };
 
   equalsString.autoRemove = function (val) {
     return testFalsey(val);
   };
 
-  function equalsStringSensitive(rows, columnIds, filterValue) {
-    var search = String(filterValue);
-    return rows.filter(function (row) {
-      return columnIds.some(function (id) {
-        var rowValue = row.values[id];
-        return rowValue !== undefined ? String(rowValue) === search : true;
-      });
-    });
-  }
-
-  equalsStringSensitive.autoRemove = function (val) {
-    return testFalsey(val);
+  var arrIncludes = function arrIncludes(row, columnId, filterValue) {
+    return row.values[columnId].includes(filterValue);
   };
 
-  function arrIncludes(rows, columnIds, filterValue) {
-    return rows.filter(function (row) {
-      return columnIds.some(function (id) {
-        var rowValue = row.values[id];
-        return rowValue.includes(filterValue);
-      });
-    });
-  }
-
   arrIncludes.autoRemove = function (val) {
     return testFalsey(val) || !(val != null && val.length);
   };
 
-  function arrIncludesAll(rows, columnIds, filterValue) {
-    return rows.filter(function (row) {
-      return columnIds.some(function (id) {
-        var rowValue = row.values[id];
-        return rowValue && rowValue.length && filterValue.every(function (val) {
-          return rowValue.includes(val);
-        });
-      });
+  var arrIncludesAll = function arrIncludesAll(row, columnId, filterValue) {
+    return !filterValue.some(function (val) {
+      return !row.values[columnId].includes(val);
     });
-  }
+  };
 
   arrIncludesAll.autoRemove = function (val) {
     return testFalsey(val) || !(val != null && val.length);
   };
 
-  function arrIncludesSome(rows, columnIds, filterValue) {
-    return rows.filter(function (row) {
-      return columnIds.some(function (id) {
-        var rowValue = row.values[id];
-        return rowValue && rowValue.length && filterValue.some(function (val) {
-          return rowValue.includes(val);
-        });
-      });
+  var arrIncludesSome = function arrIncludesSome(row, columnId, filterValue) {
+    return filterValue.some(function (val) {
+      return row.values[columnId].includes(val);
     });
-  }
+  };
 
   arrIncludesSome.autoRemove = function (val) {
     return testFalsey(val) || !(val != null && val.length);
   };
 
-  function equals(rows, columnIds, filterValue) {
-    return rows.filter(function (row) {
-      return columnIds.some(function (id) {
-        var rowValue = row.values[id];
-        return rowValue === filterValue;
-      });
-    });
-  }
+  var equals = function equals(row, columnId, filterValue) {
+    return row.values[columnId] === filterValue;
+  };
 
   equals.autoRemove = function (val) {
     return testFalsey(val);
   };
 
-  function weakEquals(rows, columnIds, filterValue) {
-    return rows.filter(function (row) {
-      return columnIds.some(function (id) {
-        var rowValue = row.values[id]; // eslint-disable-next-line eqeqeq
-
-        return rowValue == filterValue;
-      });
-    });
-  }
+  var weakEquals = function weakEquals(row, columnId, filterValue) {
+    return row.values[columnId] == filterValue;
+  };
 
   weakEquals.autoRemove = function (val) {
     return testFalsey(val);
   };
 
-  function betweenNumberRange(rows, columnIds, filterValue) {
-    var _ref = filterValue || [],
-        unsafeMin = _ref[0],
-        unsafeMax = _ref[1];
+  var inNumberRange = function inNumberRange(row, columnId, filterValue) {
+    var min = filterValue[0],
+        max = filterValue[1];
+    var rowValue = row.values[columnId];
+    return rowValue >= min && rowValue <= max;
+  };
 
+  inNumberRange.resolveFilterValue = function (val) {
+    var unsafeMin = val[0],
+        unsafeMax = val[1];
     var parsedMin = typeof unsafeMin !== 'number' ? parseFloat(unsafeMin) : unsafeMin;
     var parsedMax = typeof unsafeMax !== 'number' ? parseFloat(unsafeMax) : unsafeMax;
     var min = unsafeMin === null || Number.isNaN(parsedMin) ? -Infinity : parsedMin;
@@ -1404,23 +1335,134 @@
       max = temp;
     }
 
-    return rows.filter(function (row) {
-      return columnIds.some(function (id) {
-        var rowValue = row.values[id];
-        return rowValue >= min && rowValue <= max;
-      });
-    });
-  }
+    return [min, max];
+  };
 
-  betweenNumberRange.autoRemove = function (val) {
+  inNumberRange.autoRemove = function (val) {
     return testFalsey(val) || testFalsey(val[0]) && testFalsey(val[1]);
-  }; // Utils
+  }; // Export
+
 
+  var filterFns = {
+    includesString: includesString,
+    includesStringSensitive: includesStringSensitive,
+    equalsString: equalsString,
+    arrIncludes: arrIncludes,
+    arrIncludesAll: arrIncludesAll,
+    arrIncludesSome: arrIncludesSome,
+    equals: equals,
+    weakEquals: weakEquals,
+    inNumberRange: inNumberRange
+  };
 
+  // Utils
   function testFalsey(val) {
     return val === undefined || val === null || val === '';
   }
 
+  function filterRows(rows, columnIds, instance) {
+    var filterRowImpl = function filterRowImpl(rowsToFilter) {
+      // Horizontally filter rows through each column
+      return rowsToFilter.filter(function (row) {
+        for (var i = 0; i < columnIds.length; i++) {
+          if (row.columnFilterMap[columnIds[i]] === false) {
+            return false;
+          }
+        }
+
+        return true;
+      });
+    };
+
+    if (instance.options.filterFromLeafRows) {
+      return filterRowModelFromLeafs(rows, filterRowImpl, instance);
+    }
+
+    return filterRowModelFromRoot(rows, filterRowImpl, instance);
+  }
+  function filterRowModelFromLeafs(rowsToFilter, filterRows, instance) {
+    var newFilteredFlatRows = [];
+    var newFilteredRowsById = {};
+
+    var recurseFilterRows = function recurseFilterRows(rowsToFilter, depth) {
+      if (depth === void 0) {
+        depth = 0;
+      }
+
+      rowsToFilter = rowsToFilter.slice(); // Filter from children up first
+
+      for (var i = 0; i < rowsToFilter.length; i++) {
+        var _row$subRows;
+
+        var row = rowsToFilter[i];
+
+        if (!((_row$subRows = row.subRows) != null && _row$subRows.length)) {
+          continue;
+        }
+
+        rowsToFilter[i] = instance.createRow(row.id, row.original, row.index, row.depth, row.values);
+        rowsToFilter[i].subRows = recurseFilterRows(row.subRows, depth + 1);
+
+        if (!rowsToFilter[i].subRows.length) {
+          rowsToFilter.splice(i, 1);
+          i--;
+        }
+      }
+
+      rowsToFilter = filterRows(rowsToFilter, depth); // Apply the filter to any subRows
+
+      rowsToFilter.forEach(function (row) {
+        newFilteredFlatRows.push(row);
+        newFilteredRowsById[row.id] = row;
+      });
+      return rowsToFilter;
+    };
+
+    return {
+      rows: recurseFilterRows(rowsToFilter),
+      flatRows: newFilteredFlatRows,
+      rowsById: newFilteredRowsById
+    };
+  }
+  function filterRowModelFromRoot(rowsToFilter, filterRows, instance) {
+    var newFilteredFlatRows = [];
+    var newFilteredRowsById = {}; // Filters top level and nested rows
+
+    var recurseFilterRows = function recurseFilterRows(rowsToFilter, depth) {
+      if (depth === void 0) {
+        depth = 0;
+      }
+
+      // Filter from parents downward first
+      rowsToFilter = filterRows(rowsToFilter, depth); // Apply the filter to any subRows
+
+      for (var i = 0; i < rowsToFilter.length; i++) {
+        var _row$subRows2;
+
+        var row = rowsToFilter[i];
+        newFilteredFlatRows.push(row);
+        newFilteredRowsById[row.id] = row;
+
+        if (!((_row$subRows2 = row.subRows) != null && _row$subRows2.length)) {
+          rowsToFilter.splice(i, 1);
+          i--;
+          continue;
+        }
+
+        rowsToFilter[i] = instance.createRow(row.id, row.original, row.index, row.depth, row.values);
+        rowsToFilter[i].subRows = recurseFilterRows(row.subRows, depth + 1);
+      }
+
+      return rowsToFilter;
+    };
+
+    return {
+      rows: recurseFilterRows(rowsToFilter),
+      flatRows: newFilteredFlatRows,
+      rowsById: newFilteredRowsById
+    };
+  }
+
   //
   var Filters = {
     getDefaultColumn: function getDefaultColumn() {
@@ -1428,13 +1470,13 @@
         filterFn: 'auto'
       };
     },
-    getInitialState: function getInitialState() {
-      return {
+    getInitialState: function getInitialState(state) {
+      return _extends({
         columnFilters: [],
         globalFilter: undefined,
         columnFiltersProgress: 1,
         globalFilterProgress: 1
-      };
+      }, state);
     },
     getDefaultOptions: function getDefaultOptions(instance) {
       return {
@@ -1442,7 +1484,7 @@
         onGlobalFilterChange: makeStateUpdater('globalFilter', instance),
         filterFromLeafRows: true,
         globalFilterFn: 'auto',
-        getColumnCanGlobalFilterFn: function getColumnCanGlobalFilterFn(column) {
+        getColumnCanGlobalFilter: function getColumnCanGlobalFilter(column) {
           var _instance$getCoreRowM, _instance$getCoreRowM2;
 
           var value = (_instance$getCoreRowM = instance.getCoreRowModel().flatRows[0]) == null ? void 0 : (_instance$getCoreRowM2 = _instance$getCoreRowM.getAllCellsByColumnId()[column.id]) == null ? void 0 : _instance$getCoreRowM2.value;
@@ -1451,50 +1493,6 @@
       };
     },
     createColumn: function createColumn(column, instance) {
-      var getFacetInfo = memo(function () {
-        return [column.getPreFilteredRows()];
-      }, function (rows) {
-        var _rows$0$values$column, _rows$, _rows$0$values$column2, _rows$2;
-
-        if (rows === void 0) {
-          rows = [];
-        }
-
-        var preFilteredUniqueValues = new Map();
-        var preFilteredMinMaxValues = [(_rows$0$values$column = (_rows$ = rows[0]) == null ? void 0 : _rows$.values[column.id]) != null ? _rows$0$values$column : null, (_rows$0$values$column2 = (_rows$2 = rows[0]) == null ? void 0 : _rows$2.values[column.id]) != null ? _rows$0$values$column2 : null];
-
-        for (var i = 0; i < rows.length; i++) {
-          var _rows$i;
-
-          var _value = (_rows$i = rows[i]) == null ? void 0 : _rows$i.values[column.id];
-
-          if (preFilteredUniqueValues.has(_value)) {
-            var _preFilteredUniqueVal;
-
-            preFilteredUniqueValues.set(_value, ((_preFilteredUniqueVal = preFilteredUniqueValues.get(_value)) != null ? _preFilteredUniqueVal : 0) + 1);
-          } else {
-            preFilteredUniqueValues.set(_value, 1);
-          }
-
-          if (_value < preFilteredMinMaxValues[0]) {
-            preFilteredMinMaxValues[0] = _value;
-          } else if (_value > preFilteredMinMaxValues[1]) {
-            preFilteredMinMaxValues[1] = _value;
-          }
-        }
-
-        return {
-          preFilteredUniqueValues: preFilteredUniqueValues,
-          preFilteredMinMaxValues: preFilteredMinMaxValues
-        };
-      }, {
-        key: 'column.getFacetInfo',
-        debug: function debug() {
-          var _instance$options$deb;
-
-          return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugColumns;
-        }
-      });
       return {
         filterFn: column.filterFn,
         getCanColumnFilter: function getCanColumnFilter() {
@@ -1515,15 +1513,57 @@
         setColumnFilterValue: function setColumnFilterValue(val) {
           return instance.setColumnFilterValue(column.id, val);
         },
-        getPreFilteredUniqueValues: function getPreFilteredUniqueValues() {
-          return getFacetInfo().preFilteredUniqueValues;
-        },
-        getPreFilteredMinMaxValues: function getPreFilteredMinMaxValues() {
-          return getFacetInfo().preFilteredMinMaxValues;
-        },
-        getPreFilteredRows: function getPreFilteredRows() {
-          return undefined;
-        }
+        getFacetedRowModel: memo(function () {
+          return [instance.getPreFilteredRowModel(), instance.getState().columnFilters, instance.getState().globalFilter, // Include this to force the filtered facet info to be calculated
+          instance.getFilteredRowModel()];
+        }, function (rowModel, columnFilters, globalFilter, _) {
+          if (!(columnFilters != null && columnFilters.length) && !globalFilter) {
+            return rowModel;
+          }
+
+          return filterRows(rowModel.rows, [].concat(columnFilters.map(function (d) {
+            return d.id;
+          }).filter(function (d) {
+            return d !== column.id;
+          }), [globalFilter ? '__global__' : undefined]).filter(Boolean), instance);
+        }, {
+          key: "development" === 'production' ,
+          debug: function debug() {
+            var _instance$options$deb;
+
+            return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugColumns;
+          }
+        }),
+        getFacetedUniqueValues: memo(function () {
+          return [column.getFacetedRowModel()];
+        }, function (facetedRowModel) {
+          return getRowModelUniqueValues(facetedRowModel, column.id);
+        }, {
+          key: "development" === 'production' ,
+          debug: function debug() {
+            var _instance$options$deb2;
+
+            return (_instance$options$deb2 = instance.options.debugAll) != null ? _instance$options$deb2 : instance.options.debugColumns;
+          }
+        }),
+        getFacetedMinMaxValues: memo(function () {
+          return [column.getFacetedRowModel()];
+        }, function (facetedRowModel) {
+          return getRowModelMinMaxValues(facetedRowModel, column.id);
+        }, {
+          key: "development" === 'production' ,
+          debug: function debug() {
+            var _instance$options$deb3;
+
+            return (_instance$options$deb3 = instance.options.debugAll) != null ? _instance$options$deb3 : instance.options.debugColumns;
+          }
+        })
+      };
+    },
+    createRow: function createRow(row, instance) {
+      return {
+        columnFilterMap: {},
+        subRowsByFacetId: {}
       };
     },
     createInstance: function createInstance(instance) {
@@ -1537,7 +1577,7 @@
           }
 
           if (typeof value === 'number') {
-            return filterFns.betweenNumberRange;
+            return filterFns.inNumberRange;
           }
 
           if (value !== null && typeof value === 'object') {
@@ -1550,6 +1590,15 @@
 
           return filterFns.weakEquals;
         },
+        getColumnFacetedRowModel: function getColumnFacetedRowModel(columnId) {
+          var column = instance.getColumn(columnId);
+
+          if (!column) {
+            throw new Error();
+          }
+
+          return column.getFacetedRowModel();
+        },
         getGlobalAutoFilterFn: function getGlobalAutoFilterFn() {
           return filterFns.includesString;
         },
@@ -1605,7 +1654,7 @@
           instance.setGlobalFilter(instance.initialState.globalFilter);
         },
         getColumnCanColumnFilter: function getColumnCanColumnFilter(columnId) {
-          var _ref3, _ref4, _ref5, _ref6, _ref7, _column$enableAllFilt;
+          var _column$enableColumnF, _instance$options$ena, _instance$options$ena2;
 
           var column = instance.getColumn(columnId);
 
@@ -1613,10 +1662,10 @@
             throw new Error();
           }
 
-          return (_ref3 = (_ref4 = (_ref5 = (_ref6 = (_ref7 = (_column$enableAllFilt = column.enableAllFilters) != null ? _column$enableAllFilt : column.enableColumnFilter) != null ? _ref7 : instance.options.enableFilters) != null ? _ref6 : instance.options.enableColumnFilters) != null ? _ref5 : column.defaultCanColumnFilter) != null ? _ref4 : column.defaultCanFilter) != null ? _ref3 : !!column.accessorFn;
+          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;
         },
         getColumnCanGlobalFilter: function getColumnCanGlobalFilter(columnId) {
-          var _ref8, _ref9, _ref10, _ref11, _ref12, _ref13, _instance$options$ena;
+          var _column$enableGlobalF, _instance$options$ena3, _instance$options$ena4, _instance$options$get;
 
           var column = instance.getColumn(columnId);
 
@@ -1624,7 +1673,7 @@
             throw new Error();
           }
 
-          return (_ref8 = ((_ref9 = (_ref10 = (_ref11 = (_ref12 = (_ref13 = (_instance$options$ena = instance.options.enableFilters) != null ? _instance$options$ena : instance.options.enableGlobalFilter) != null ? _ref13 : column.enableAllFilters) != null ? _ref12 : column.enableGlobalFilter) != null ? _ref11 : column.defaultCanGlobalFilter) != null ? _ref10 : column.defaultCanFilter) != null ? _ref9 : !!column.accessorFn) && (instance.options.getColumnCanGlobalFilterFn == null ? void 0 : instance.options.getColumnCanGlobalFilterFn(column))) != null ? _ref8 : true;
+          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;
         },
         getColumnIsFiltered: function getColumnIsFiltered(columnId) {
           return instance.getColumnFilterIndex(columnId) > -1;
@@ -1699,40 +1748,107 @@
 
           instance.setColumnFilters((_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.columnFilters) != null ? _instance$initialStat : []);
         },
-        getPreColumnFilteredRowModel: function getPreColumnFilteredRowModel() {
+        getPreFilteredRowModel: function getPreFilteredRowModel() {
           return instance.getCoreRowModel();
         },
-        getColumnFilteredRowModel: function getColumnFilteredRowModel() {
-          if (!instance._getColumnFilteredRowModel && instance.options.getColumnFilteredRowModel) {
-            instance._getColumnFilteredRowModel = instance.options.getColumnFilteredRowModel(instance);
+        getFilteredRowModel: function getFilteredRowModel() {
+          if (!instance._getFilteredRowModel && instance.options.getFilteredRowModel) {
+            instance._getFilteredRowModel = instance.options.getFilteredRowModel(instance);
           }
 
-          if (instance.options.manualColumnFiltering || !instance._getColumnFilteredRowModel) {
-            return instance.getPreColumnFilteredRowModel();
+          if (instance.options.manualFiltering || !instance._getFilteredRowModel) {
+            return instance.getPreFilteredRowModel();
           }
 
-          return instance._getColumnFilteredRowModel();
+          return instance._getFilteredRowModel();
         },
-        getPreGlobalFilteredRowModel: function getPreGlobalFilteredRowModel() {
-          return instance.getColumnFilteredRowModel();
-        },
-        getGlobalFilteredRowModel: function getGlobalFilteredRowModel() {
-          if (!instance._getGlobalFilteredRowModel && instance.options.getGlobalFilteredRowModel) {
-            instance._getGlobalFilteredRowModel = instance.options.getGlobalFilteredRowModel(instance);
+        getGlobalFacetedRowModel: memo(function () {
+          return [instance.getPreFilteredRowModel(), instance.getState().columnFilters, instance.getState().globalFilter, // Include this to force the filtered facet info to be calculated
+          instance.getFilteredRowModel()];
+        }, function (rowModel, columnFilters, globalFilter, _) {
+          if (!(columnFilters != null && columnFilters.length) && !globalFilter) {
+            return rowModel;
           }
 
-          if (instance.options.manualGlobalFiltering || !instance._getGlobalFilteredRowModel) {
-            return instance.getPreGlobalFilteredRowModel();
+          return filterRows(rowModel.rows, columnFilters.map(function (d) {
+            return d.id;
+          }), instance);
+        }, {
+          key: "development" === 'production' ,
+          debug: function debug() {
+            var _instance$options$deb4;
+
+            return (_instance$options$deb4 = instance.options.debugAll) != null ? _instance$options$deb4 : instance.options.debugColumns;
           }
+        }),
+        getGlobalFacetedUniqueValues: memo(function () {
+          return [instance.getGlobalFacetedRowModel()];
+        }, function (facetedRowModel) {
+          return getRowModelUniqueValues(facetedRowModel, '__global__');
+        }, {
+          key: "development" === 'production' ,
+          debug: function debug() {
+            var _instance$options$deb5;
 
-          return instance._getGlobalFilteredRowModel();
-        }
+            return (_instance$options$deb5 = instance.options.debugAll) != null ? _instance$options$deb5 : instance.options.debugColumns;
+          }
+        }),
+        getGlobalFacetedMinMaxValues: memo(function () {
+          return [instance.getGlobalFacetedRowModel()];
+        }, function (facetedRowModel) {
+          return getRowModelMinMaxValues(facetedRowModel, '__global__');
+        }, {
+          key: "development" === 'production' ,
+          debug: function debug() {
+            var _instance$options$deb6;
+
+            return (_instance$options$deb6 = instance.options.debugAll) != null ? _instance$options$deb6 : instance.options.debugColumns;
+          }
+        })
       };
     }
   };
   function shouldAutoRemoveFilter(filterFn, value, column) {
     return (filterFn && filterFn.autoRemove ? filterFn.autoRemove(value, column) : false) || typeof value === 'undefined' || typeof value === 'string' && !value;
   }
+  function getRowModelMinMaxValues(rowModel, columnId) {
+    var _rowModel$flatRows$0$, _rowModel$flatRows$, _rowModel$flatRows$0$2, _rowModel$flatRows$2;
+
+    var facetedMinMaxValues = [(_rowModel$flatRows$0$ = (_rowModel$flatRows$ = rowModel.flatRows[0]) == null ? void 0 : _rowModel$flatRows$.values[columnId]) != null ? _rowModel$flatRows$0$ : null, (_rowModel$flatRows$0$2 = (_rowModel$flatRows$2 = rowModel.flatRows[0]) == null ? void 0 : _rowModel$flatRows$2.values[columnId]) != null ? _rowModel$flatRows$0$2 : null];
+
+    for (var i = 0; i < rowModel.flatRows.length; i++) {
+      var _rowModel$flatRows$i;
+
+      var _value = (_rowModel$flatRows$i = rowModel.flatRows[i]) == null ? void 0 : _rowModel$flatRows$i.values[columnId];
+
+      if (_value < facetedMinMaxValues[0]) {
+        facetedMinMaxValues[0] = _value;
+      } else if (_value > facetedMinMaxValues[1]) {
+        facetedMinMaxValues[1] = _value;
+      }
+    }
+
+    return facetedMinMaxValues;
+  }
+  function getRowModelUniqueValues(rowModel, columnId) {
+    var facetedUniqueValues = new Map();
+
+    for (var i = 0; i < rowModel.flatRows.length; i++) {
+      var _rowModel$flatRows$i2;
+
+      var _value2 = (_rowModel$flatRows$i2 = rowModel.flatRows[i]) == null ? void 0 : _rowModel$flatRows$i2.values[columnId];
+
+      if (facetedUniqueValues.has(_value2)) {
+        var _facetedUniqueValues$;
+
+        facetedUniqueValues.set(_value2, ((_facetedUniqueValues$ = facetedUniqueValues.get(_value2)) != null ? _facetedUniqueValues$ : 0) + 1);
+      } else {
+        facetedUniqueValues.set(_value2, 1);
+      }
+    }
+
+    return facetedUniqueValues;
+  }
 
   var aggregationFns = {
     sum: sum,
@@ -1855,10 +1971,10 @@
         aggregationFn: 'auto'
       };
     },
-    getInitialState: function getInitialState() {
-      return {
+    getInitialState: function getInitialState(state) {
+      return _extends({
         grouping: []
-      };
+      }, state);
     },
     getDefaultOptions: function getDefaultOptions(instance) {
       return {
@@ -2017,35 +2133,35 @@
           }) : null;
         }
       };
-    },
-    orderColumns: function orderColumns(leafColumns, grouping, groupedColumnMode) {
-      if (!(grouping != null && grouping.length) || !groupedColumnMode) {
-        return leafColumns;
-      }
-
-      var nonGroupingColumns = leafColumns.filter(function (col) {
-        return !grouping.includes(col.id);
-      });
+    }
+  };
+  function orderColumns(leafColumns, grouping, groupedColumnMode) {
+    if (!(grouping != null && grouping.length) || !groupedColumnMode) {
+      return leafColumns;
+    }
 
-      if (groupedColumnMode === 'remove') {
-        return nonGroupingColumns;
-      }
+    var nonGroupingColumns = leafColumns.filter(function (col) {
+      return !grouping.includes(col.id);
+    });
 
-      var groupingColumns = grouping.map(function (g) {
-        return leafColumns.find(function (col) {
-          return col.id === g;
-        });
-      }).filter(Boolean);
-      return [].concat(groupingColumns, nonGroupingColumns);
+    if (groupedColumnMode === 'remove') {
+      return nonGroupingColumns;
     }
-  };
+
+    var groupingColumns = grouping.map(function (g) {
+      return leafColumns.find(function (col) {
+        return col.id === g;
+      });
+    }).filter(Boolean);
+    return [].concat(groupingColumns, nonGroupingColumns);
+  }
 
   //
   var Ordering = {
-    getInitialState: function getInitialState() {
-      return {
+    getInitialState: function getInitialState(state) {
+      return _extends({
         columnOrder: []
-      };
+      }, state);
     },
     getDefaultOptions: function getDefaultOptions(instance) {
       return {
@@ -2097,10 +2213,10 @@
               orderedColumns = [].concat(orderedColumns, columnsCopy);
             }
 
-            return Grouping.orderColumns(orderedColumns, grouping, groupedColumnMode);
+            return orderColumns(orderedColumns, grouping, groupedColumnMode);
           };
         }, {
-          key: 'getOrderColumnsFn' // debug: () => instance.options.debugAll ?? instance.options.debugTable,
+          key: "development" === 'production'  // debug: () => instance.options.debugAll ?? instance.options.debugTable,
 
         })
       };
@@ -2109,14 +2225,14 @@
 
   //
   var Pagination = {
-    getInitialState: function getInitialState(initialState) {
-      return {
+    getInitialState: function getInitialState(state) {
+      return _extends({}, state, {
         pagination: _extends({
           pageCount: -1,
           pageIndex: 0,
           pageSize: 10
-        }, initialState == null ? void 0 : initialState.pagination)
-      };
+        }, state == null ? void 0 : state.pagination)
+      });
     },
     getDefaultOptions: function getDefaultOptions(instance) {
       return {
@@ -2213,7 +2329,7 @@
 
           return pageOptions;
         }, {
-          key: 'getPageOptions',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb;
 
@@ -2276,13 +2392,13 @@
 
   //
   var Pinning = {
-    getInitialState: function getInitialState() {
-      return {
+    getInitialState: function getInitialState(state) {
+      return _extends({
         columnPinning: {
           left: [],
           right: []
         }
-      };
+      }, state);
     },
     getDefaultOptions: function getDefaultOptions(instance) {
       return {
@@ -2315,7 +2431,7 @@
             return !leftAndRight.includes(d.columnId);
           });
         }, {
-          key: 'row.getCenterVisibleCells',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb;
 
@@ -2336,7 +2452,7 @@
           });
           return cells;
         }, {
-          key: 'row.getLeftVisibleCells',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb2;
 
@@ -2357,7 +2473,7 @@
           });
           return cells;
         }, {
-          key: 'row.getRightVisibleCells',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb3;
 
@@ -2366,67 +2482,6 @@
         })
       };
     },
-    createCell: function createCell(cell, instance) {
-      return {
-        getCenterVisibleCells: memo(function () {
-          return [cell.row._getAllVisibleCells(), instance.getState().columnPinning.left, instance.getState().columnPinning.right];
-        }, function (allCells, left, right) {
-          var leftAndRight = [].concat(left != null ? left : [], right != null ? right : []);
-          return allCells.filter(function (d) {
-            return !leftAndRight.includes(d.columnId);
-          });
-        }, {
-          key: 'row.getCenterVisibleCells',
-          debug: function debug() {
-            var _instance$options$deb4;
-
-            return (_instance$options$deb4 = instance.options.debugAll) != null ? _instance$options$deb4 : instance.options.debugRows;
-          }
-        }),
-        getLeftVisibleCells: memo(function () {
-          return [cell.row._getAllVisibleCells(), instance.getState().columnPinning.left,,];
-        }, function (allCells, left) {
-          var cells = (left != null ? left : []).map(function (columnId) {
-            return allCells.find(function (cell) {
-              return cell.columnId === columnId;
-            });
-          }).filter(Boolean).map(function (d) {
-            return _extends({}, d, {
-              position: 'left'
-            });
-          });
-          return cells;
-        }, {
-          key: 'row.getLeftVisibleCells',
-          debug: function debug() {
-            var _instance$options$deb5;
-
-            return (_instance$options$deb5 = instance.options.debugAll) != null ? _instance$options$deb5 : instance.options.debugRows;
-          }
-        }),
-        getRightVisibleCells: memo(function () {
-          return [cell.row._getAllVisibleCells(), instance.getState().columnPinning.right];
-        }, function (allCells, right) {
-          var cells = (right != null ? right : []).map(function (columnId) {
-            return allCells.find(function (cell) {
-              return cell.columnId === columnId;
-            });
-          }).filter(Boolean).map(function (d) {
-            return _extends({}, d, {
-              position: 'left'
-            });
-          });
-          return cells;
-        }, {
-          key: 'row.getRightVisibleCells',
-          debug: function debug() {
-            var _instance$options$deb6;
-
-            return (_instance$options$deb6 = instance.options.debugAll) != null ? _instance$options$deb6 : instance.options.debugRows;
-          }
-        })
-      };
-    },
     createInstance: function createInstance(instance) {
       return {
         setColumnPinning: function setColumnPinning(updater) {
@@ -2490,9 +2545,9 @@
 
           var leafColumns = column.getLeafColumns();
           return leafColumns.some(function (d) {
-            var _ref, _ref2, _d$enablePinning;
+            var _d$enablePinning, _instance$options$ena;
 
-            return (_ref = (_ref2 = (_d$enablePinning = d.enablePinning) != null ? _d$enablePinning : instance.options.enablePinning) != null ? _ref2 : d.defaultCanPin) != null ? _ref : !!d.accessorFn;
+            return ((_d$enablePinning = d.enablePinning) != null ? _d$enablePinning : true) && ((_instance$options$ena = instance.options.enablePinning) != null ? _instance$options$ena : true);
           });
         },
         getColumnIsPinned: function getColumnIsPinned(columnId) {
@@ -2537,11 +2592,11 @@
             });
           }).filter(Boolean);
         }, {
-          key: 'getLeftLeafColumns',
+          key: "development" === 'production' ,
           debug: function debug() {
-            var _instance$options$deb7;
+            var _instance$options$deb4;
 
-            return (_instance$options$deb7 = instance.options.debugAll) != null ? _instance$options$deb7 : instance.options.debugColumns;
+            return (_instance$options$deb4 = instance.options.debugAll) != null ? _instance$options$deb4 : instance.options.debugColumns;
           }
         }),
         getRightLeafColumns: memo(function () {
@@ -2553,11 +2608,11 @@
             });
           }).filter(Boolean);
         }, {
-          key: 'getRightLeafColumns',
+          key: "development" === 'production' ,
           debug: function debug() {
-            var _instance$options$deb8;
+            var _instance$options$deb5;
 
-            return (_instance$options$deb8 = instance.options.debugAll) != null ? _instance$options$deb8 : instance.options.debugColumns;
+            return (_instance$options$deb5 = instance.options.debugAll) != null ? _instance$options$deb5 : instance.options.debugColumns;
           }
         }),
         getCenterLeafColumns: memo(function () {
@@ -2568,11 +2623,11 @@
             return !leftAndRight.includes(d.id);
           });
         }, {
-          key: 'getCenterLeafColumns',
+          key: "development" === 'production' ,
           debug: function debug() {
-            var _instance$options$deb9;
+            var _instance$options$deb6;
 
-            return (_instance$options$deb9 = instance.options.debugAll) != null ? _instance$options$deb9 : instance.options.debugColumns;
+            return (_instance$options$deb6 = instance.options.debugAll) != null ? _instance$options$deb6 : instance.options.debugColumns;
           }
         })
       };
@@ -2581,10 +2636,10 @@
 
   //
   var RowSelection = {
-    getInitialState: function getInitialState() {
-      return {
+    getInitialState: function getInitialState(state) {
+      return _extends({
         rowSelection: {}
-      };
+      }, state);
     },
     getDefaultOptions: function getDefaultOptions(instance) {
       return {
@@ -2723,7 +2778,7 @@
 
           return selectRowsFn(instance, rowModel);
         }, {
-          key: 'getSelectedRowModel',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb;
 
@@ -2731,7 +2786,7 @@
           }
         }),
         getFilteredSelectedRowModel: memo(function () {
-          return [instance.getState().rowSelection, instance.getGlobalFilteredRowModel()];
+          return [instance.getState().rowSelection, instance.getFilteredRowModel()];
         }, function (rowSelection, rowModel) {
           if (!Object.keys(rowSelection).length) {
             return {
@@ -2743,7 +2798,7 @@
 
           return selectRowsFn(instance, rowModel);
         }, {
-          key: 'getFilteredSelectedRowModel',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb2;
 
@@ -2763,7 +2818,7 @@
 
           return selectRowsFn(instance, rowModel);
         }, {
-          key: 'getGroupedSelectedRowModel',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb3;
 
@@ -2851,7 +2906,7 @@
         //   return instance.options.enableGroupingRowSelection ?? false
         // },
         getIsAllRowsSelected: function getIsAllRowsSelected() {
-          var preFilteredFlatRows = instance.getPreGlobalFilteredRowModel().flatRows;
+          var preFilteredFlatRows = instance.getPreFilteredRowModel().flatRows;
 
           var _instance$getState3 = instance.getState(),
               rowSelection = _instance$getState3.rowSelection;
@@ -3132,16 +3187,16 @@
 
   //
   var Sorting = {
+    getInitialState: function getInitialState(state) {
+      return _extends({
+        sorting: []
+      }, state);
+    },
     getDefaultColumn: function getDefaultColumn() {
       return {
         sortingFn: 'auto'
       };
     },
-    getInitialState: function getInitialState() {
-      return {
-        sorting: []
-      };
-    },
     getDefaultOptions: function getDefaultOptions(instance) {
       return {
         onSortingChange: makeStateUpdater('sorting', instance),
@@ -3179,7 +3234,7 @@
     createInstance: function createInstance(instance) {
       return {
         getColumnAutoSortingFn: function getColumnAutoSortingFn(columnId) {
-          var firstRows = instance.getGlobalFilteredRowModel().flatRows.slice(100);
+          var firstRows = instance.getFilteredRowModel().flatRows.slice(100);
           var isString = false;
 
           for (var _iterator = _createForOfIteratorHelperLoose(firstRows), _step; !(_step = _iterator()).done;) {
@@ -3206,7 +3261,7 @@
           return sortingFns.basic;
         },
         getColumnAutoSortDir: function getColumnAutoSortDir(columnId) {
-          var firstRow = instance.getGlobalFilteredRowModel().flatRows[0];
+          var firstRow = instance.getFilteredRowModel().flatRows[0];
           var value = firstRow == null ? void 0 : firstRow.values[columnId];
 
           if (typeof value === 'string') {
@@ -3390,7 +3445,7 @@
           };
         },
         getPreSortedRowModel: function getPreSortedRowModel() {
-          return instance.getGlobalFilteredRowModel();
+          return instance.getFilteredRowModel();
         },
         getSortedRowModel: function getSortedRowModel() {
           if (!instance._getSortedRowModel && instance.options.getSortedRowModel) {
@@ -3409,10 +3464,10 @@
 
   //
   var Visibility = {
-    getInitialState: function getInitialState() {
-      return {
+    getInitialState: function getInitialState(state) {
+      return _extends({
         columnVisibility: {}
-      };
+      }, state);
     },
     getDefaultOptions: function getDefaultOptions(instance) {
       return {
@@ -3455,7 +3510,7 @@
             return cell.column.getIsVisible();
           });
         }, {
-          key: 'row._getAllVisibleCells',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb;
 
@@ -3467,7 +3522,7 @@
         }, function (left, center, right) {
           return [].concat(left, center, right);
         }, {
-          key: 'row.getVisibleCells',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb2;
 
@@ -3676,7 +3731,7 @@
           var headerGroups = buildHeaderGroups(allColumns, [].concat(leftColumns, centerColumns, rightColumns), instance);
           return headerGroups;
         }, {
-          key: 'getHeaderGroups',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb;
 
@@ -3691,7 +3746,7 @@
           });
           return buildHeaderGroups(allColumns, leafColumns, instance, 'center');
         }, {
-          key: 'getCenterHeaderGroups',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb2;
 
@@ -3706,7 +3761,7 @@
           });
           return buildHeaderGroups(allColumns, leafColumns, instance, 'left');
         }, {
-          key: 'getLeftHeaderGroups',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb3;
 
@@ -3721,7 +3776,7 @@
           });
           return buildHeaderGroups(allColumns, leafColumns, instance, 'right');
         }, {
-          key: 'getRightHeaderGroups',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb4;
 
@@ -3734,7 +3789,7 @@
         }, function (headerGroups) {
           return [].concat(headerGroups).reverse();
         }, {
-          key: 'getFooterGroups',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb5;
 
@@ -3746,7 +3801,7 @@
         }, function (headerGroups) {
           return [].concat(headerGroups).reverse();
         }, {
-          key: 'getLeftFooterGroups',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb6;
 
@@ -3758,7 +3813,7 @@
         }, function (headerGroups) {
           return [].concat(headerGroups).reverse();
         }, {
-          key: 'getCenterFooterGroups',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb7;
 
@@ -3770,7 +3825,7 @@
         }, function (headerGroups) {
           return [].concat(headerGroups).reverse();
         }, {
-          key: 'getRightFooterGroups',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb8;
 
@@ -3785,7 +3840,7 @@
             return headerGroup.headers;
           }).flat();
         }, {
-          key: 'getFlatHeaders',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb9;
 
@@ -3799,7 +3854,7 @@
             return headerGroup.headers;
           }).flat();
         }, {
-          key: 'getLeftFlatHeaders',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb10;
 
@@ -3813,7 +3868,7 @@
             return headerGroup.headers;
           }).flat();
         }, {
-          key: 'getCenterFlatHeaders',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb11;
 
@@ -3827,7 +3882,7 @@
             return headerGroup.headers;
           }).flat();
         }, {
-          key: 'getRightFlatHeaders',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb12;
 
@@ -3844,7 +3899,7 @@
             return !((_header$subHeaders = header.subHeaders) != null && _header$subHeaders.length);
           });
         }, {
-          key: 'getCenterLeafHeaders',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb13;
 
@@ -3860,7 +3915,7 @@
             return !((_header$subHeaders2 = header.subHeaders) != null && _header$subHeaders2.length);
           });
         }, {
-          key: 'getLeftLeafHeaders',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb14;
 
@@ -3876,7 +3931,7 @@
             return !((_header$subHeaders3 = header.subHeaders) != null && _header$subHeaders3.length);
           });
         }, {
-          key: 'getRightLeafHeaders',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb15;
 
@@ -3892,7 +3947,7 @@
             return header.getLeafHeaders();
           }).flat();
         }, {
-          key: 'getLeafHeaders',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb16;
 
@@ -4078,9 +4133,13 @@
       coreProgress: 1
     };
 
-    var initialState = _extends({}, coreInitialState, (_options$initialState = options.initialState) != null ? _options$initialState : {}, instance._features.reduce(function (obj, feature) {
-      return Object.assign(obj, feature.getInitialState == null ? void 0 : feature.getInitialState(options.initialState));
-    }, {}));
+    var initialState = _extends({}, coreInitialState, (_options$initialState = options.initialState) != null ? _options$initialState : {});
+
+    instance._features.forEach(function (feature) {
+      var _feature$getInitialSt;
+
+      initialState = (_feature$getInitialSt = feature.getInitialState == null ? void 0 : feature.getInitialState(initialState)) != null ? _feature$getInitialSt : initialState;
+    });
 
     var queued = [];
     var queuedTimeout = false;
@@ -4096,9 +4155,8 @@
           // the current call stack (render, etc) has finished.
 
           Promise.resolve().then(function () {
-            console.log(queued);
-
             while (queued.length) {
+              console.log('queue');
               queued.shift()();
             }
 
@@ -4291,7 +4349,7 @@
           rowsById: rowsById
         };
       }, {
-        key: 'getRowModel',
+        key: "development" === 'production' ,
         debug: function debug() {
           var _instance$options$deb;
 
@@ -4389,7 +4447,7 @@
           };
         };
       }, {
-        key: 'getRowModel',
+        key: "development" === 'production' ,
         initialSync: opts == null ? void 0 : opts.initialSync,
         onProgress: function onProgress(progress) {
           instance.setState(function (old) {
@@ -4412,243 +4470,103 @@
     };
   }
 
-  function filterRowModelFromLeafs(rowsToFilter, filterRows, instance) {
-    var newFilteredFlatRows = [];
-    var newFilteredRowsById = {};
-
-    var recurseFilterRows = function recurseFilterRows(rowsToFilter, depth) {
-      if (depth === void 0) {
-        depth = 0;
-      }
-
-      rowsToFilter = rowsToFilter.slice(); // Filter from children up first
-
-      for (var i = 0; i < rowsToFilter.length; i++) {
-        var _row$subRows;
-
-        var row = rowsToFilter[i];
-
-        if (!((_row$subRows = row.subRows) != null && _row$subRows.length)) {
-          continue;
-        }
-
-        rowsToFilter[i] = instance.createRow(row.id, row.original, row.index, row.depth, row.values);
-        rowsToFilter[i].subRows = recurseFilterRows(row.subRows, depth + 1);
-
-        if (!rowsToFilter[i].subRows.length) {
-          rowsToFilter.splice(i, 1);
-          i--;
-        }
-      }
-
-      rowsToFilter = filterRows(rowsToFilter, depth); // Apply the filter to any subRows
-
-      rowsToFilter.forEach(function (row) {
-        newFilteredFlatRows.push(row);
-        newFilteredRowsById[row.id] = row;
-      });
-      return rowsToFilter;
-    };
-
-    return {
-      rows: recurseFilterRows(rowsToFilter),
-      flatRows: newFilteredFlatRows,
-      rowsById: newFilteredRowsById
-    };
-  }
-  function filterRowModelFromRoot(rowsToFilter, filterRows, instance) {
-    var newFilteredFlatRows = [];
-    var newFilteredRowsById = {}; // Filters top level and nested rows
-
-    var recurseFilterRows = function recurseFilterRows(rowsToFilter, depth) {
-      if (depth === void 0) {
-        depth = 0;
-      }
-
-      // Filter from parents downward first
-      rowsToFilter = filterRows(rowsToFilter, depth); // Apply the filter to any subRows
-
-      for (var i = 0; i < rowsToFilter.length; i++) {
-        var _row$subRows2;
-
-        var row = rowsToFilter[i];
-        newFilteredFlatRows.push(row);
-        newFilteredRowsById[row.id] = row;
-
-        if (!((_row$subRows2 = row.subRows) != null && _row$subRows2.length)) {
-          rowsToFilter.splice(i, 1);
-          i--;
-          continue;
-        }
-
-        rowsToFilter[i] = instance.createRow(row.id, row.original, row.index, row.depth, row.values);
-        rowsToFilter[i].subRows = recurseFilterRows(row.subRows, depth + 1);
-      }
-
-      return rowsToFilter;
-    };
-
-    return {
-      rows: recurseFilterRows(rowsToFilter),
-      flatRows: newFilteredFlatRows,
-      rowsById: newFilteredRowsById
-    };
-  }
-
-  function getColumnFilteredRowModelSync() {
+  function getFilteredRowModelSync() {
     return function (instance) {
       return memo(function () {
-        return [instance.getState().columnFilters, instance.getPreColumnFilteredRowModel()];
-      }, function (columnFilters, rowModel) {
+        return [instance.getPreFilteredRowModel(), instance.getState().columnFilters, instance.getState().globalFilter];
+      }, function (rowModel, columnFilters, globalFilter) {
         var columnFilteredRowModel = function () {
-          if (!rowModel.rows.length || !(columnFilters != null && columnFilters.length)) {
+          if (!rowModel.rows.length || !(columnFilters != null && columnFilters.length) && !globalFilter) {
             return rowModel;
           }
 
-          var filterFromLeafRows = instance.options.filterFromLeafRows;
+          var resolvedColumnFilters = [];
+          var resolvedGlobalFilters = [];
+          (columnFilters != null ? columnFilters : []).forEach(function (d) {
+            var _filterFn$resolveFilt;
 
-          var filterRows = function filterRows(rowsToFilter, depth) {
-            for (var i = 0; i < columnFilters.length; i++) {
-              var _columnFilters$i = columnFilters[i],
-                  columnId = _columnFilters$i.id,
-                  filterValue = _columnFilters$i.value; // Find the columnFilters column
+            var column = instance.getColumn(d.id);
 
-              var column = instance.getColumn(columnId);
-
-              if (!column) {
-                {
-                  console.warn("Table: Could not find a column with id: " + columnId);
-                }
-
-                throw new Error();
+            if (!column) {
+              {
+                console.warn("Table: Could not find a column to filter with columnId: " + d.id);
               }
+            }
 
-              if (depth === 0) {
-                (function () {
-                  var preFilteredRows = [].concat(rowsToFilter);
+            var filterFn = instance.getColumnFilterFn(column.id);
 
-                  column.getPreFilteredRows = function () {
-                    return preFilteredRows;
-                  };
-                })();
+            if (!filterFn) {
+              {
+                console.warn("Could not find a valid 'column.filterFn' for column with the ID: " + column.id + ".");
               }
 
-              var filterFn = instance.getColumnFilterFn(column.id);
-
-              if (!filterFn) {
-                {
-                  console.warn("Could not find a valid 'column.filterFn' for column with the ID: " + column.id + ".");
-                }
-
-                continue;
-              } // Pass the rows, id, filterValue and column to the filterFn
-              // to get the filtered rows back
-
-
-              rowsToFilter = filterFn(rowsToFilter, [columnId], filterValue);
+              return;
             }
 
-            return rowsToFilter;
-          };
-
-          if (filterFromLeafRows) {
-            return filterRowModelFromLeafs(rowModel.rows, filterRows, instance);
-          }
+            resolvedColumnFilters.push({
+              id: d.id,
+              filterFn: filterFn,
+              resolvedFilterValue: (_filterFn$resolveFilt = filterFn.resolveFilterValue == null ? void 0 : filterFn.resolveFilterValue(d.value)) != null ? _filterFn$resolveFilt : d.value
+            });
+          });
+          var filterableIds = columnFilters.map(function (d) {
+            return d.id;
+          });
+          var globalFilterFn = instance.getGlobalFilterFn();
+          var globallyFilterableColumns = instance.getAllLeafColumns().filter(function (column) {
+            return column.getCanGlobalFilter();
+          });
 
-          return filterRowModelFromRoot(rowModel.rows, filterRows, instance);
-        }(); // Now that each filtered column has it's partially filtered rows,
-        // lets assign the final filtered rows to all of the other columns
+          if (globalFilter && globalFilterFn && globallyFilterableColumns.length) {
+            filterableIds.push('__global__');
+            globallyFilterableColumns.forEach(function (column) {
+              var _globalFilterFn$resol;
 
+              resolvedGlobalFilters.push({
+                id: column.id,
+                filterFn: globalFilterFn,
+                resolvedFilterValue: (_globalFilterFn$resol = globalFilterFn.resolveFilterValue == null ? void 0 : globalFilterFn.resolveFilterValue(globalFilter)) != null ? _globalFilterFn$resol : globalFilter
+              });
+            });
+          } // Flag the prefiltered row model with each filter state
 
-        var nonFilteredColumns = instance.getAllLeafColumns().filter(function (column) {
-          var _instance$getState$co;
 
-          return !((_instance$getState$co = instance.getState().columnFilters) != null && _instance$getState$co.find(function (d) {
-            return d.id === column.id;
-          }));
-        }); // This essentially enables faceted filter options to be built easily
-        // using every column's preFilteredRows value
+          for (var j = 0; j < rowModel.flatRows.length; j++) {
+            var row = rowModel.flatRows[j];
+            row.columnFilterMap = {};
 
-        nonFilteredColumns.forEach(function (column) {
-          column.getPreFilteredRows = function () {
-            return columnFilteredRowModel.rows;
-          };
-        });
-        return columnFilteredRowModel;
-      }, {
-        key: 'getColumnFilteredRowModelSync',
-        debug: function debug() {
-          var _instance$options$deb;
+            if (resolvedColumnFilters.length) {
+              for (var i = 0; i < resolvedColumnFilters.length; i++) {
+                var columnFilter = resolvedColumnFilters[i]; // Tag the row with the column filter state
 
-          return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugTable;
-        },
-        onChange: function onChange() {
-          instance.queue(function () {
-            instance._autoResetPageIndex();
-          });
-        }
-      });
-    };
-  }
-
-  function getGlobalFilteredRowModelSync() {
-    return function (instance) {
-      return memo(function () {
-        return [instance.getState().globalFilter, instance.getPreGlobalFilteredRowModel()];
-      }, function (globalFilter, rowModel) {
-        var globalFilteredRowModel = function () {
-          if (!rowModel.rows.length || !globalFilter) {
-            return rowModel;
-          }
-
-          var filterFromLeafRows = instance.options.filterFromLeafRows;
-          var filterFn = instance.getGlobalFilterFn();
-
-          if (!filterFn) {
-            {
-              console.warn("Could not find a valid 'globalFilterType'");
+                row.columnFilterMap[columnFilter.id] = columnFilter.filterFn(row, columnFilter.id, columnFilter.resolvedFilterValue);
+              }
             }
 
-            return rowModel;
-          }
+            if (resolvedGlobalFilters.length) {
 
-          var filterableColumns = instance.getAllLeafColumns().filter(function (column) {
-            return column.getCanGlobalFilter();
-          });
-          var filterableColumnIds = filterableColumns.map(function (d) {
-            return d.id;
-          });
-
-          var filterRows = function filterRows(rows) {
-            return filterFn(rows, filterableColumnIds, globalFilter);
-          };
-
-          if (filterFromLeafRows) {
-            return filterRowModelFromLeafs(rowModel.rows, filterRows, instance);
-          }
+              for (var _i = 0; _i < resolvedGlobalFilters.length; _i++) {
+                var _globalFilter = resolvedGlobalFilters[_i]; // Tag the row with the first truthy global filter state
 
-          return filterRowModelFromRoot(rowModel.rows, filterRows, instance);
-        }(); // Now that each filtered column has it's partially filtered rows,
-        // lets assign the final filtered rows to all of the other columns
+                if (_globalFilter.filterFn(row, _globalFilter.id, _globalFilter.resolvedFilterValue)) {
+                  row.columnFilterMap.__global__ = true;
+                  break;
+                }
+              }
 
+              if (row.columnFilterMap.__global__ !== true) {
+                row.columnFilterMap.__global__ = false;
+              }
+            }
+          } // Filter final rows using all of the active filters
 
-        var nonFilteredColumns = instance.getAllLeafColumns().filter(function (column) {
-          var _instance$getState$co;
 
-          return !((_instance$getState$co = instance.getState().columnFilters) != null && _instance$getState$co.find(function (d) {
-            return d.id === column.id;
-          }));
-        }); // This essentially enables faceted filter options to be built easily
-        // using every column's preFilteredRows value
+          return filterRows(rowModel.rows, filterableIds, instance);
+        }();
 
-        nonFilteredColumns.forEach(function (column) {
-          column.getPreFilteredRows = function () {
-            return globalFilteredRowModel.rows;
-          };
-        });
-        return globalFilteredRowModel;
+        return columnFilteredRowModel;
       }, {
-        key: 'getGlobalFilteredRowModelSync',
+        key: "development" === 'production' ,
         debug: function debug() {
           var _instance$options$deb;
 
@@ -4748,7 +4666,7 @@
           rowsById: rowModel.rowsById
         };
       }, {
-        key: 'getSortedRowModel',
+        key: "development" === 'production' ,
         debug: function debug() {
           var _instance$options$deb;
 
@@ -4890,7 +4808,7 @@
           rowsById: groupedRowsById
         };
       }, {
-        key: 'getGroupedRowModel',
+        key: "development" === 'production' ,
         debug: function debug() {
           var _instance$options$deb;
 
@@ -4935,7 +4853,7 @@
 
         return expandRows(rowModel, instance);
       }, {
-        key: 'getExpandedRowModel',
+        key: "development" === 'production' ,
         debug: function debug() {
           var _instance$options$deb;
 
@@ -4997,7 +4915,7 @@
           rowsById: rowsById
         };
       }, {
-        key: 'getPaginationRowModel',
+        key: "development" === 'production' ,
         debug: function debug() {
           var _instance$options$deb;
 
@@ -5026,13 +4944,14 @@
   exports.flattenBy = flattenBy;
   exports.functionalUpdate = functionalUpdate;
   exports.getBatchGroups = getBatchGroups;
-  exports.getColumnFilteredRowModelSync = getColumnFilteredRowModelSync;
   exports.getCoreRowModelAsync = getCoreRowModelAsync;
   exports.getCoreRowModelSync = getCoreRowModelSync;
   exports.getExpandedRowModel = getExpandedRowModel;
-  exports.getGlobalFilteredRowModelSync = getGlobalFilteredRowModelSync;
+  exports.getFilteredRowModelSync = getFilteredRowModelSync;
   exports.getGroupedRowModelSync = getGroupedRowModelSync;
   exports.getPaginationRowModel = getPaginationRowModel;
+  exports.getRowModelMinMaxValues = getRowModelMinMaxValues;
+  exports.getRowModelUniqueValues = getRowModelUniqueValues;
   exports.getSortedRowModelSync = getSortedRowModelSync;
   exports.incrementalMemo = incrementalMemo;
   exports.isFunction = isFunction;
@@ -5040,6 +4959,7 @@
   exports.makeStateUpdater = makeStateUpdater;
   exports.memo = memo;
   exports.noop = noop;
+  exports.orderColumns = orderColumns;
   exports.passiveEventSupported = passiveEventSupported;
   exports.selectRowsFn = selectRowsFn;
   exports.shouldAutoRemoveFilter = shouldAutoRemoveFilter;