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

package/build/esm/index.js

@@ -207,9 +207,7 @@ function memo(getDeps, fn, opts) {
             var a = _ref[0],
                 b = _ref[1];
             return _extends({}, accu, (_extends3 = {}, _extends3[a] = b, _extends3));
-          }, {}), {
-            parent: parent
-          }));
+          }, {})));
         }
       }
 
@@ -293,9 +291,7 @@ function incrementalMemo(getDeps, getInitialValue, schedule, opts) {
             var a = _ref2[0],
                 b = _ref2[1];
             return _extends({}, accu, (_extends4 = {}, _extends4[a] = b, _extends4));
-          }, {}), {
-            parent: parent
-          }));
+          }, {})));
         }
       }
 
@@ -377,7 +373,7 @@ var Columns = {
 
           return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugColumns;
         },
-        key: 'getDefaultColumn'
+        key: process.env.NODE_ENV === 'production' && 'getDefaultColumn'
       }),
       getColumnDefs: function getColumnDefs() {
         return instance.options.columns;
@@ -422,7 +418,7 @@ var Columns = {
               return d.getFlatColumns();
             }));
           }, {
-            key: 'column.getFlatColumns',
+            key: process.env.NODE_ENV === 'production' && 'column.getFlatColumns',
             debug: function debug() {
               var _instance$options$deb2;
 
@@ -443,7 +439,7 @@ var Columns = {
 
             return [column];
           }, {
-            key: 'column.getLeafColumns',
+            key: process.env.NODE_ENV === 'production' && 'column.getLeafColumns',
             debug: function debug() {
               var _instance$options$deb3;
 
@@ -475,7 +471,7 @@ var Columns = {
 
         return recurseColumns(columnDefs);
       }, {
-        key: 'getAllColumns',
+        key: process.env.NODE_ENV === 'production' && 'getAllColumns',
         debug: function debug() {
           var _instance$options$deb4;
 
@@ -489,7 +485,7 @@ var Columns = {
           return column.getFlatColumns();
         });
       }, {
-        key: 'getAllFlatColumns',
+        key: process.env.NODE_ENV === 'production' && 'getAllFlatColumns',
         debug: function debug() {
           var _instance$options$deb5;
 
@@ -504,7 +500,7 @@ var Columns = {
           return acc;
         }, {});
       }, {
-        key: 'getAllFlatColumnsById',
+        key: process.env.NODE_ENV === 'production' && 'getAllFlatColumnsById',
         debug: function debug() {
           var _instance$options$deb6;
 
@@ -519,7 +515,7 @@ var Columns = {
         });
         return orderColumns(leafColumns);
       }, {
-        key: 'getAllLeafColumns',
+        key: process.env.NODE_ENV === 'production' && 'getAllLeafColumns',
         debug: function debug() {
           var _instance$options$deb7;
 
@@ -635,7 +631,7 @@ var Cells = {
           return acc;
         }, {});
       }, {
-        key: 'row.getAllCellsByColumnId',
+        key: process.env.NODE_ENV === 'production' && 'row.getAllCellsByColumnId',
         debug: function debug() {
           var _instance$options$deb2;
 
@@ -1251,150 +1247,85 @@ var Expanding = {
   }
 };
 
-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;
@@ -1406,23 +1337,134 @@ function betweenNumberRange(rows, columnIds, filterValue) {
     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() {
@@ -1453,50 +1495,6 @@ var Filters = {
     };
   },
   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() {
@@ -1517,15 +1515,57 @@ var Filters = {
       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: process.env.NODE_ENV === 'production' && 'getFacetedRowModel_' + column.id,
+        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: process.env.NODE_ENV === 'production' && 'column.getFacetedUniqueValues',
+        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: process.env.NODE_ENV === 'production' && 'column.getFacetedMinMaxValues',
+        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) {
@@ -1539,7 +1579,7 @@ var Filters = {
         }
 
         if (typeof value === 'number') {
-          return filterFns.betweenNumberRange;
+          return filterFns.inNumberRange;
         }
 
         if (value !== null && typeof value === 'object') {
@@ -1552,6 +1592,15 @@ var Filters = {
 
         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;
       },
@@ -1573,7 +1622,6 @@ var Filters = {
         var _instance$options = instance.options,
             userFilterFns = _instance$options.filterFns,
             globalFilterFn = _instance$options.globalFilterFn;
-        debugger;
         return isFunction(globalFilterFn) ? globalFilterFn : globalFilterFn === 'auto' ? instance.getGlobalAutoFilterFn() : (_ref2 = userFilterFns == null ? void 0 : userFilterFns[globalFilterFn]) != null ? _ref2 : filterFns[globalFilterFn];
       },
       setColumnFilters: function setColumnFilters(updater) {
@@ -1608,7 +1656,7 @@ var Filters = {
         instance.setGlobalFilter(instance.initialState.globalFilter);
       },
       getColumnCanColumnFilter: function getColumnCanColumnFilter(columnId) {
-        var _column$enableColumnF, _instance$options$ena;
+        var _column$enableColumnF, _instance$options$ena, _instance$options$ena2;
 
         var column = instance.getColumn(columnId);
 
@@ -1616,10 +1664,10 @@ var Filters = {
           throw new Error();
         }
 
-        return ((_column$enableColumnF = column.enableColumnFilter) != null ? _column$enableColumnF : true) && ((_instance$options$ena = instance.options.enableColumnFilters) != null ? _instance$options$ena : true) && !!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 _column$enableGlobalF, _instance$options$ena2, _instance$options$get;
+        var _column$enableGlobalF, _instance$options$ena3, _instance$options$ena4, _instance$options$get;
 
         var column = instance.getColumn(columnId);
 
@@ -1627,7 +1675,7 @@ var Filters = {
           throw new Error();
         }
 
-        return ((_column$enableGlobalF = column.enableGlobalFilter) != null ? _column$enableGlobalF : true) && ((_instance$options$ena2 = instance.options.enableGlobalFilter) != null ? _instance$options$ena2 : true) && ((_instance$options$get = instance.options.getColumnCanGlobalFilter == null ? void 0 : instance.options.getColumnCanGlobalFilter(column)) != null ? _instance$options$get : true) && !!column.accessorFn;
+        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;
@@ -1702,40 +1750,107 @@ var Filters = {
 
         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: process.env.NODE_ENV === 'production' && 'getGlobalFacetedRowModel',
+        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: process.env.NODE_ENV === 'production' && 'getGlobalFacetedUniqueValues',
+        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: process.env.NODE_ENV === 'production' && 'getGlobalFacetedMinMaxValues',
+        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,
@@ -2103,7 +2218,7 @@ var Ordering = {
           return orderColumns(orderedColumns, grouping, groupedColumnMode);
         };
       }, {
-        key: 'getOrderColumnsFn' // debug: () => instance.options.debugAll ?? instance.options.debugTable,
+        key: process.env.NODE_ENV === 'production' && 'getOrderColumnsFn' // debug: () => instance.options.debugAll ?? instance.options.debugTable,
 
       })
     };
@@ -2216,7 +2331,7 @@ var Pagination = {
 
         return pageOptions;
       }, {
-        key: 'getPageOptions',
+        key: process.env.NODE_ENV === 'production' && 'getPageOptions',
         debug: function debug() {
           var _instance$options$deb;
 
@@ -2318,7 +2433,7 @@ var Pinning = {
           return !leftAndRight.includes(d.columnId);
         });
       }, {
-        key: 'row.getCenterVisibleCells',
+        key: process.env.NODE_ENV === 'production' && 'row.getCenterVisibleCells',
         debug: function debug() {
           var _instance$options$deb;
 
@@ -2339,7 +2454,7 @@ var Pinning = {
         });
         return cells;
       }, {
-        key: 'row.getLeftVisibleCells',
+        key: process.env.NODE_ENV === 'production' && 'row.getLeftVisibleCells',
         debug: function debug() {
           var _instance$options$deb2;
 
@@ -2360,7 +2475,7 @@ var Pinning = {
         });
         return cells;
       }, {
-        key: 'row.getRightVisibleCells',
+        key: process.env.NODE_ENV === 'production' && 'row.getRightVisibleCells',
         debug: function debug() {
           var _instance$options$deb3;
 
@@ -2479,7 +2594,7 @@ var Pinning = {
           });
         }).filter(Boolean);
       }, {
-        key: 'getLeftLeafColumns',
+        key: process.env.NODE_ENV === 'production' && 'getLeftLeafColumns',
         debug: function debug() {
           var _instance$options$deb4;
 
@@ -2495,7 +2610,7 @@ var Pinning = {
           });
         }).filter(Boolean);
       }, {
-        key: 'getRightLeafColumns',
+        key: process.env.NODE_ENV === 'production' && 'getRightLeafColumns',
         debug: function debug() {
           var _instance$options$deb5;
 
@@ -2510,7 +2625,7 @@ var Pinning = {
           return !leftAndRight.includes(d.id);
         });
       }, {
-        key: 'getCenterLeafColumns',
+        key: process.env.NODE_ENV === 'production' && 'getCenterLeafColumns',
         debug: function debug() {
           var _instance$options$deb6;
 
@@ -2665,7 +2780,7 @@ var RowSelection = {
 
         return selectRowsFn(instance, rowModel);
       }, {
-        key: 'getSelectedRowModel',
+        key: process.env.NODE_ENV === 'production' && 'getSelectedRowModel',
         debug: function debug() {
           var _instance$options$deb;
 
@@ -2673,7 +2788,7 @@ var RowSelection = {
         }
       }),
       getFilteredSelectedRowModel: memo(function () {
-        return [instance.getState().rowSelection, instance.getGlobalFilteredRowModel()];
+        return [instance.getState().rowSelection, instance.getFilteredRowModel()];
       }, function (rowSelection, rowModel) {
         if (!Object.keys(rowSelection).length) {
           return {
@@ -2685,7 +2800,7 @@ var RowSelection = {
 
         return selectRowsFn(instance, rowModel);
       }, {
-        key: 'getFilteredSelectedRowModel',
+        key: process.env.NODE_ENV === 'production' && 'getFilteredSelectedRowModel',
         debug: function debug() {
           var _instance$options$deb2;
 
@@ -2705,7 +2820,7 @@ var RowSelection = {
 
         return selectRowsFn(instance, rowModel);
       }, {
-        key: 'getGroupedSelectedRowModel',
+        key: process.env.NODE_ENV === 'production' && 'getGroupedSelectedRowModel',
         debug: function debug() {
           var _instance$options$deb3;
 
@@ -2793,7 +2908,7 @@ var RowSelection = {
       //   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;
@@ -3121,7 +3236,7 @@ var Sorting = {
   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;) {
@@ -3148,7 +3263,7 @@ var Sorting = {
         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') {
@@ -3332,7 +3447,7 @@ var Sorting = {
         };
       },
       getPreSortedRowModel: function getPreSortedRowModel() {
-        return instance.getGlobalFilteredRowModel();
+        return instance.getFilteredRowModel();
       },
       getSortedRowModel: function getSortedRowModel() {
         if (!instance._getSortedRowModel && instance.options.getSortedRowModel) {
@@ -3397,7 +3512,7 @@ var Visibility = {
           return cell.column.getIsVisible();
         });
       }, {
-        key: 'row._getAllVisibleCells',
+        key: process.env.NODE_ENV === 'production' && 'row._getAllVisibleCells',
         debug: function debug() {
           var _instance$options$deb;
 
@@ -3409,7 +3524,7 @@ var Visibility = {
       }, function (left, center, right) {
         return [].concat(left, center, right);
       }, {
-        key: 'row.getVisibleCells',
+        key: process.env.NODE_ENV === 'production' && 'row.getVisibleCells',
         debug: function debug() {
           var _instance$options$deb2;
 
@@ -3618,7 +3733,7 @@ var Headers = {
         var headerGroups = buildHeaderGroups(allColumns, [].concat(leftColumns, centerColumns, rightColumns), instance);
         return headerGroups;
       }, {
-        key: 'getHeaderGroups',
+        key: process.env.NODE_ENV === 'production' && 'getHeaderGroups',
         debug: function debug() {
           var _instance$options$deb;
 
@@ -3633,7 +3748,7 @@ var Headers = {
         });
         return buildHeaderGroups(allColumns, leafColumns, instance, 'center');
       }, {
-        key: 'getCenterHeaderGroups',
+        key: process.env.NODE_ENV === 'production' && 'getCenterHeaderGroups',
         debug: function debug() {
           var _instance$options$deb2;
 
@@ -3648,7 +3763,7 @@ var Headers = {
         });
         return buildHeaderGroups(allColumns, leafColumns, instance, 'left');
       }, {
-        key: 'getLeftHeaderGroups',
+        key: process.env.NODE_ENV === 'production' && 'getLeftHeaderGroups',
         debug: function debug() {
           var _instance$options$deb3;
 
@@ -3663,7 +3778,7 @@ var Headers = {
         });
         return buildHeaderGroups(allColumns, leafColumns, instance, 'right');
       }, {
-        key: 'getRightHeaderGroups',
+        key: process.env.NODE_ENV === 'production' && 'getRightHeaderGroups',
         debug: function debug() {
           var _instance$options$deb4;
 
@@ -3676,7 +3791,7 @@ var Headers = {
       }, function (headerGroups) {
         return [].concat(headerGroups).reverse();
       }, {
-        key: 'getFooterGroups',
+        key: process.env.NODE_ENV === 'production' && 'getFooterGroups',
         debug: function debug() {
           var _instance$options$deb5;
 
@@ -3688,7 +3803,7 @@ var Headers = {
       }, function (headerGroups) {
         return [].concat(headerGroups).reverse();
       }, {
-        key: 'getLeftFooterGroups',
+        key: process.env.NODE_ENV === 'production' && 'getLeftFooterGroups',
         debug: function debug() {
           var _instance$options$deb6;
 
@@ -3700,7 +3815,7 @@ var Headers = {
       }, function (headerGroups) {
         return [].concat(headerGroups).reverse();
       }, {
-        key: 'getCenterFooterGroups',
+        key: process.env.NODE_ENV === 'production' && 'getCenterFooterGroups',
         debug: function debug() {
           var _instance$options$deb7;
 
@@ -3712,7 +3827,7 @@ var Headers = {
       }, function (headerGroups) {
         return [].concat(headerGroups).reverse();
       }, {
-        key: 'getRightFooterGroups',
+        key: process.env.NODE_ENV === 'production' && 'getRightFooterGroups',
         debug: function debug() {
           var _instance$options$deb8;
 
@@ -3727,7 +3842,7 @@ var Headers = {
           return headerGroup.headers;
         }).flat();
       }, {
-        key: 'getFlatHeaders',
+        key: process.env.NODE_ENV === 'production' && 'getFlatHeaders',
         debug: function debug() {
           var _instance$options$deb9;
 
@@ -3741,7 +3856,7 @@ var Headers = {
           return headerGroup.headers;
         }).flat();
       }, {
-        key: 'getLeftFlatHeaders',
+        key: process.env.NODE_ENV === 'production' && 'getLeftFlatHeaders',
         debug: function debug() {
           var _instance$options$deb10;
 
@@ -3755,7 +3870,7 @@ var Headers = {
           return headerGroup.headers;
         }).flat();
       }, {
-        key: 'getCenterFlatHeaders',
+        key: process.env.NODE_ENV === 'production' && 'getCenterFlatHeaders',
         debug: function debug() {
           var _instance$options$deb11;
 
@@ -3769,7 +3884,7 @@ var Headers = {
           return headerGroup.headers;
         }).flat();
       }, {
-        key: 'getRightFlatHeaders',
+        key: process.env.NODE_ENV === 'production' && 'getRightFlatHeaders',
         debug: function debug() {
           var _instance$options$deb12;
 
@@ -3786,7 +3901,7 @@ var Headers = {
           return !((_header$subHeaders = header.subHeaders) != null && _header$subHeaders.length);
         });
       }, {
-        key: 'getCenterLeafHeaders',
+        key: process.env.NODE_ENV === 'production' && 'getCenterLeafHeaders',
         debug: function debug() {
           var _instance$options$deb13;
 
@@ -3802,7 +3917,7 @@ var Headers = {
           return !((_header$subHeaders2 = header.subHeaders) != null && _header$subHeaders2.length);
         });
       }, {
-        key: 'getLeftLeafHeaders',
+        key: process.env.NODE_ENV === 'production' && 'getLeftLeafHeaders',
         debug: function debug() {
           var _instance$options$deb14;
 
@@ -3818,7 +3933,7 @@ var Headers = {
           return !((_header$subHeaders3 = header.subHeaders) != null && _header$subHeaders3.length);
         });
       }, {
-        key: 'getRightLeafHeaders',
+        key: process.env.NODE_ENV === 'production' && 'getRightLeafHeaders',
         debug: function debug() {
           var _instance$options$deb15;
 
@@ -3834,7 +3949,7 @@ var Headers = {
           return header.getLeafHeaders();
         }).flat();
       }, {
-        key: 'getLeafHeaders',
+        key: process.env.NODE_ENV === 'production' && 'getLeafHeaders',
         debug: function debug() {
           var _instance$options$deb16;
 
@@ -4043,6 +4158,7 @@ function createTableInstance(options) {
 
         Promise.resolve().then(function () {
           while (queued.length) {
+            console.log('queue');
             queued.shift()();
           }
 
@@ -4235,7 +4351,7 @@ function getCoreRowModelSync() {
         rowsById: rowsById
       };
     }, {
-      key: 'getRowModel',
+      key: process.env.NODE_ENV === 'production' && 'getRowModel',
       debug: function debug() {
         var _instance$options$deb;
 
@@ -4333,7 +4449,7 @@ function getCoreRowModelAsync(opts) {
         };
       };
     }, {
-      key: 'getRowModel',
+      key: process.env.NODE_ENV === 'production' && 'getRowModel',
       initialSync: opts == null ? void 0 : opts.initialSync,
       onProgress: function onProgress(progress) {
         instance.setState(function (old) {
@@ -4356,243 +4472,103 @@ function getCoreRowModelAsync(opts) {
   };
 }
 
-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 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(columnId);
+        var resolvedColumnFilters = [];
+        var resolvedGlobalFilters = [];
+        (columnFilters != null ? columnFilters : []).forEach(function (d) {
+          var _filterFn$resolveFilt;
 
-            if (!column) {
-              if (process.env.NODE_ENV !== 'production') {
-                console.warn("Table: Could not find a column with id: " + columnId);
-              }
+          var column = instance.getColumn(d.id);
 
-              throw new Error();
+          if (!column) {
+            if (process.env.NODE_ENV !== 'production') {
+              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) {
+            if (process.env.NODE_ENV !== 'production') {
+              console.warn("Could not find a valid 'column.filterFn' for column with the ID: " + column.id + ".");
             }
 
-            var filterFn = instance.getColumnFilterFn(column.id);
-
-            if (!filterFn) {
-              if (process.env.NODE_ENV !== 'production') {
-                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);
-        }
-
-        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
-
-
-      var nonFilteredColumns = instance.getAllLeafColumns().filter(function (column) {
-        var _instance$getState$co;
+          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 !((_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
+        if (globalFilter && globalFilterFn && globallyFilterableColumns.length) {
+          filterableIds.push('__global__');
+          globallyFilterableColumns.forEach(function (column) {
+            var _globalFilterFn$resol;
 
-      nonFilteredColumns.forEach(function (column) {
-        column.getPreFilteredRows = function () {
-          return columnFilteredRowModel.rows;
-        };
-      });
-      return columnFilteredRowModel;
-    }, {
-      key: 'getColumnFilteredRowModelSync',
-      debug: function debug() {
-        var _instance$options$deb;
+            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
 
-        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;
-        }
+        for (var j = 0; j < rowModel.flatRows.length; j++) {
+          var row = rowModel.flatRows[j];
+          row.columnFilterMap = {};
 
-        var filterFromLeafRows = instance.options.filterFromLeafRows;
-        var filterFn = instance.getGlobalFilterFn();
+          if (resolvedColumnFilters.length) {
+            for (var i = 0; i < resolvedColumnFilters.length; i++) {
+              var columnFilter = resolvedColumnFilters[i]; // Tag the row with the column filter state
 
-        if (!filterFn) {
-          if (process.env.NODE_ENV !== 'production') {
-            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);
-        };
+            for (var _i = 0; _i < resolvedGlobalFilters.length; _i++) {
+              var _globalFilter = resolvedGlobalFilters[_i]; // Tag the row with the first truthy global filter state
 
-        if (filterFromLeafRows) {
-          return filterRowModelFromLeafs(rowModel.rows, filterRows, instance);
-        }
-
-        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: process.env.NODE_ENV === 'production' && 'getFilteredRowModelSync',
       debug: function debug() {
         var _instance$options$deb;
 
@@ -4692,7 +4668,7 @@ function getSortedRowModelSync() {
         rowsById: rowModel.rowsById
       };
     }, {
-      key: 'getSortedRowModel',
+      key: process.env.NODE_ENV === 'production' && 'getSortedRowModel',
       debug: function debug() {
         var _instance$options$deb;
 
@@ -4834,7 +4810,7 @@ function getGroupedRowModelSync() {
         rowsById: groupedRowsById
       };
     }, {
-      key: 'getGroupedRowModel',
+      key: process.env.NODE_ENV === 'production' && 'getGroupedRowModel',
       debug: function debug() {
         var _instance$options$deb;
 
@@ -4879,7 +4855,7 @@ function getExpandedRowModel() {
 
       return expandRows(rowModel, instance);
     }, {
-      key: 'getExpandedRowModel',
+      key: process.env.NODE_ENV === 'production' && 'getExpandedRowModel',
       debug: function debug() {
         var _instance$options$deb;
 
@@ -4941,7 +4917,7 @@ function getPaginationRowModel(opts) {
         rowsById: rowsById
       };
     }, {
-      key: 'getPaginationRowModel',
+      key: process.env.NODE_ENV === 'production' && 'getPaginationRowModel',
       debug: function debug() {
         var _instance$options$deb;
 
@@ -4951,5 +4927,5 @@ function getPaginationRowModel(opts) {
   };
 }
 
-export { ColumnSizing, Expanding, Filters, Grouping, Headers, Ordering, Pagination, Pinning, RowSelection, Sorting, Visibility, buildHeaderGroups, createTableFactory, createTableInstance, defaultColumnSizing, expandRows, flattenBy, functionalUpdate, getBatchGroups, getColumnFilteredRowModelSync, getCoreRowModelAsync, getCoreRowModelSync, getExpandedRowModel, getGlobalFilteredRowModelSync, getGroupedRowModelSync, getPaginationRowModel, getSortedRowModelSync, incrementalMemo, isFunction, isRowSelected, makeStateUpdater, memo, noop, orderColumns, passiveEventSupported, selectRowsFn, shouldAutoRemoveFilter };
+export { ColumnSizing, Expanding, Filters, Grouping, Headers, Ordering, Pagination, Pinning, RowSelection, Sorting, Visibility, buildHeaderGroups, createTableFactory, createTableInstance, defaultColumnSizing, expandRows, flattenBy, functionalUpdate, getBatchGroups, getCoreRowModelAsync, getCoreRowModelSync, getExpandedRowModel, getFilteredRowModelSync, getGroupedRowModelSync, getPaginationRowModel, getRowModelMinMaxValues, getRowModelUniqueValues, getSortedRowModelSync, incrementalMemo, isFunction, isRowSelected, makeStateUpdater, memo, noop, orderColumns, passiveEventSupported, selectRowsFn, shouldAutoRemoveFilter };
 //# sourceMappingURL=index.js.map