@tanstack/table-core 8.0.0-alpha.63 → 8.0.0-alpha.67

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
-            }));
+            }, {})));
           }
         }
 
@@ -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;
 
@@ -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 {
@@ -729,139 +725,70 @@
     createColumn: function createColumn(column, instance) {
       return {
         getSize: function getSize() {
-          return instance.getColumnSize(column.id);
-        },
-        getStart: function getStart(position) {
-          return instance.getColumnStart(column.id, position);
-        },
-        getIsResizing: function getIsResizing() {
-          return instance.getColumnIsResizing(column.id);
-        },
-        getCanResize: function getCanResize() {
-          return instance.getColumnCanResize(column.id);
-        },
-        resetSize: function resetSize() {
-          return instance.resetColumnSize(column.id);
-        }
-      };
-    },
-    createHeader: function createHeader(header, instance) {
-      return {
-        getIsResizing: function getIsResizing() {
-          return instance.getColumnIsResizing(header.column.id);
-        },
-        getCanResize: function getCanResize() {
-          return instance.getColumnCanResize(header.column.id);
-        },
-        resetSize: function resetSize() {
-          return instance.resetColumnSize(header.column.id);
-        },
-        getResizeHandler: function getResizeHandler() {
-          return instance.getResizeHandler(header.id);
-        }
-      };
-    },
-    createInstance: function createInstance(instance) {
-      return {
-        getColumnSize: function getColumnSize(columnId) {
           var _column$minSize, _ref, _column$maxSize;
 
-          var column = instance.getColumn(columnId);
-
-          if (!column) {
-            throw new Error();
-          }
-
           var columnSize = instance.getState().columnSizing[column.id];
           return Math.min(Math.max((_column$minSize = column.minSize) != null ? _column$minSize : defaultColumnSizing.minSize, (_ref = columnSize != null ? columnSize : column.size) != null ? _ref : defaultColumnSizing.size), (_column$maxSize = column.maxSize) != null ? _column$maxSize : defaultColumnSizing.maxSize);
         },
-        getColumnStart: function getColumnStart(columnId, position) {
-          var column = instance.getColumn(columnId);
-
-          if (!column) {
-            throw new Error();
-          }
-
+        getStart: function getStart(position) {
           var columns = !position ? instance.getVisibleLeafColumns() : position === 'left' ? instance.getLeftVisibleLeafColumns() : instance.getRightVisibleLeafColumns();
           var index = columns.findIndex(function (d) {
-            return d.id === columnId;
+            return d.id === column.id;
           });
 
           if (index > 0) {
             var prevSiblingColumn = columns[index - 1];
-            return instance.getColumnStart(prevSiblingColumn.id, position) + prevSiblingColumn.getSize();
+            return prevSiblingColumn.getStart(position) + prevSiblingColumn.getSize();
           }
 
           return 0;
         },
-        setColumnSizing: function setColumnSizing(updater) {
-          return instance.options.onColumnSizingChange == null ? void 0 : instance.options.onColumnSizingChange(updater);
-        },
-        setColumnSizingInfo: function setColumnSizingInfo(updater) {
-          return instance.options.onColumnSizingInfoChange == null ? void 0 : instance.options.onColumnSizingInfoChange(updater);
-        },
-        resetColumnSizing: function resetColumnSizing() {
-          var _instance$initialStat;
-
-          instance.setColumnSizing((_instance$initialStat = instance.initialState.columnSizing) != null ? _instance$initialStat : {});
-        },
-        resetHeaderSizeInfo: function resetHeaderSizeInfo() {
-          var _instance$initialStat2;
-
-          instance.setColumnSizingInfo((_instance$initialStat2 = instance.initialState.columnSizingInfo) != null ? _instance$initialStat2 : {});
-        },
-        resetColumnSize: function resetColumnSize(columnId) {
+        resetSize: function resetSize() {
           instance.setColumnSizing(function (_ref2) {
-            _ref2[columnId];
-                var rest = _objectWithoutPropertiesLoose(_ref2, [columnId].map(_toPropertyKey));
+            var _column$id = column.id;
+                _ref2[_column$id];
+                var rest = _objectWithoutPropertiesLoose(_ref2, [_column$id].map(_toPropertyKey));
 
             return rest;
           });
         },
-        resetHeaderSize: function resetHeaderSize(headerId) {
-          var header = instance.getHeader(headerId);
-          return instance.resetColumnSize(header.column.id);
-        },
-        getHeaderCanResize: function getHeaderCanResize(headerId) {
-          var header = instance.getHeader(headerId);
-
-          if (!header) {
-            throw new Error();
-          }
+        getCanResize: function getCanResize() {
+          var _column$enableResizin, _instance$options$ena;
 
-          return instance.getColumnCanResize(header.column.id);
+          return ((_column$enableResizin = column.enableResizing) != null ? _column$enableResizin : true) && ((_instance$options$ena = instance.options.enableColumnResizing) != null ? _instance$options$ena : true);
         },
-        getColumnCanResize: function getColumnCanResize(columnId) {
-          var _ref3, _ref4, _column$enableResizin;
-
-          var column = instance.getColumn(columnId);
-
-          if (!column) {
-            throw new Error();
-          }
+        getIsResizing: function getIsResizing() {
+          return instance.getState().columnSizingInfo.isResizingColumn === column.id;
+        }
+      };
+    },
+    createHeader: function createHeader(header, instance) {
+      return {
+        getSize: function getSize() {
+          var sum = 0;
 
-          return (_ref3 = (_ref4 = (_column$enableResizin = column.enableResizing) != null ? _column$enableResizin : instance.options.enableColumnResizing) != null ? _ref4 : column.defaultCanResize) != null ? _ref3 : true;
-        },
-        getColumnIsResizing: function getColumnIsResizing(columnId) {
-          var column = instance.getColumn(columnId);
+          var recurse = function recurse(header) {
+            if (header.subHeaders.length) {
+              header.subHeaders.forEach(recurse);
+            } else {
+              var _header$column$getSiz;
 
-          if (!column) {
-            throw new Error();
-          }
+              sum += (_header$column$getSiz = header.column.getSize()) != null ? _header$column$getSiz : 0;
+            }
+          };
 
-          return instance.getState().columnSizingInfo.isResizingColumn === columnId;
+          recurse(header);
+          return sum;
         },
-        getHeaderIsResizing: function getHeaderIsResizing(headerId) {
-          var header = instance.getHeader(headerId);
-
-          if (!header) {
-            throw new Error();
+        getStart: function getStart() {
+          if (header.index > 0) {
+            var prevSiblingHeader = header.headerGroup.headers[header.index - 1];
+            return prevSiblingHeader.getStart() + prevSiblingHeader.getSize();
           }
 
-          return instance.getColumnIsResizing(header.column.id);
+          return 0;
         },
-        getResizeHandler: function getResizeHandler(headerId) {
-          var header = instance.getHeader(headerId);
+        getResizeHandler: function getResizeHandler() {
           var column = instance.getColumn(header.column.id);
           var canResize = column.getCanResize();
           return function (e) {
@@ -877,10 +804,9 @@
               }
             }
 
-            var header = headerId ? instance.getHeader(headerId) : undefined;
-            var startSize = header ? header.getSize() : column.getSize();
+            var startSize = column.getSize();
             var columnSizingStart = header ? header.getLeafHeaders().map(function (d) {
-              return [d.column.id, d.getSize()];
+              return [d.column.id, d.column.getSize()];
             }) : [[column.id, column.getSize()]];
             var clientX = isTouchStartEvent(e) ? Math.round(e.touches[0].clientX) : e.clientX;
 
@@ -895,9 +821,9 @@
 
                 var deltaOffset = clientXPos - ((_old$startOffset = old == null ? void 0 : old.startOffset) != null ? _old$startOffset : 0);
                 var deltaPercentage = Math.max(deltaOffset / ((_old$startSize = old == null ? void 0 : old.startSize) != null ? _old$startSize : 0), -0.999999);
-                old.columnSizingStart.forEach(function (_ref5) {
-                  var columnId = _ref5[0],
-                      headerSize = _ref5[1];
+                old.columnSizingStart.forEach(function (_ref3) {
+                  var columnId = _ref3[0],
+                      headerSize = _ref3[1];
                   newColumnSizing[columnId] = Math.round(Math.max(headerSize + headerSize * deltaPercentage, 0) * 100) / 100;
                 });
                 return _extends({}, old, {
@@ -941,36 +867,11 @@
                 onEnd(e.clientX);
               }
             };
-            var touchEvents = {
-              moveHandler: function moveHandler(e) {
-                if (e.cancelable) {
-                  e.preventDefault();
-                  e.stopPropagation();
-                }
-
-                onMove(e.touches[0].clientX);
-                return false;
-              },
-              upHandler: function upHandler(e) {
-                document.removeEventListener('touchmove', touchEvents.moveHandler);
-                document.removeEventListener('touchend', touchEvents.upHandler);
-
-                if (e.cancelable) {
-                  e.preventDefault();
-                  e.stopPropagation();
-                }
-
-                onEnd(e.touches[0].clientX);
-              }
-            };
             var passiveIfSupported = passiveEventSupported() ? {
               passive: false
             } : false;
 
-            if (isTouchStartEvent(e)) {
-              document.addEventListener('touchmove', touchEvents.moveHandler, passiveIfSupported);
-              document.addEventListener('touchend', touchEvents.upHandler, passiveIfSupported);
-            } else {
+            if (isTouchStartEvent(e)) ; else {
               document.addEventListener('mousemove', mouseEvents.moveHandler, passiveIfSupported);
               document.addEventListener('mouseup', mouseEvents.upHandler, passiveIfSupported);
             }
@@ -986,33 +887,53 @@
               });
             });
           };
+        }
+      };
+    },
+    createInstance: function createInstance(instance) {
+      return {
+        setColumnSizing: function setColumnSizing(updater) {
+          return instance.options.onColumnSizingChange == null ? void 0 : instance.options.onColumnSizingChange(updater);
+        },
+        setColumnSizingInfo: function setColumnSizingInfo(updater) {
+          return instance.options.onColumnSizingInfoChange == null ? void 0 : instance.options.onColumnSizingInfoChange(updater);
+        },
+        resetColumnSizing: function resetColumnSizing() {
+          var _instance$initialStat;
+
+          instance.setColumnSizing((_instance$initialStat = instance.initialState.columnSizing) != null ? _instance$initialStat : {});
+        },
+        resetHeaderSizeInfo: function resetHeaderSizeInfo() {
+          var _instance$initialStat2;
+
+          instance.setColumnSizingInfo((_instance$initialStat2 = instance.initialState.columnSizingInfo) != null ? _instance$initialStat2 : {});
         },
         getTotalSize: function getTotalSize() {
           var _instance$getHeaderGr, _instance$getHeaderGr2;
 
           return (_instance$getHeaderGr = (_instance$getHeaderGr2 = instance.getHeaderGroups()[0]) == null ? void 0 : _instance$getHeaderGr2.headers.reduce(function (sum, header) {
-            return sum + header.getSize();
+            return sum + header.column.getSize();
           }, 0)) != null ? _instance$getHeaderGr : 0;
         },
         getLeftTotalSize: function getLeftTotalSize() {
           var _instance$getLeftHead, _instance$getLeftHead2;
 
           return (_instance$getLeftHead = (_instance$getLeftHead2 = instance.getLeftHeaderGroups()[0]) == null ? void 0 : _instance$getLeftHead2.headers.reduce(function (sum, header) {
-            return sum + header.getSize();
+            return sum + header.column.getSize();
           }, 0)) != null ? _instance$getLeftHead : 0;
         },
         getCenterTotalSize: function getCenterTotalSize() {
           var _instance$getCenterHe, _instance$getCenterHe2;
 
           return (_instance$getCenterHe = (_instance$getCenterHe2 = instance.getCenterHeaderGroups()[0]) == null ? void 0 : _instance$getCenterHe2.headers.reduce(function (sum, header) {
-            return sum + header.getSize();
+            return sum + header.column.getSize();
           }, 0)) != null ? _instance$getCenterHe : 0;
         },
         getRightTotalSize: function getRightTotalSize() {
           var _instance$getRightHea, _instance$getRightHea2;
 
           return (_instance$getRightHea = (_instance$getRightHea2 = instance.getRightHeaderGroups()[0]) == null ? void 0 : _instance$getRightHea2.headers.reduce(function (sum, header) {
-            return sum + header.getSize();
+            return sum + header.column.getSize();
           }, 0)) != null ? _instance$getRightHea : 0;
         }
       };
@@ -1050,10 +971,10 @@
 
   //
   var Expanding = {
-    getInitialState: function getInitialState() {
-      return {
+    getInitialState: function getInitialState(state) {
+      return _extends({
         expanded: {}
-      };
+      }, state);
     },
     getDefaultOptions: function getDefaultOptions(instance) {
       return {
@@ -1083,41 +1004,6 @@
         setExpanded: function setExpanded(updater) {
           return instance.options.onExpandedChange == null ? void 0 : instance.options.onExpandedChange(updater);
         },
-        toggleRowExpanded: function toggleRowExpanded(rowId, expanded) {
-          if (!rowId) return;
-          instance.setExpanded(function (old) {
-            var _expanded;
-
-            var exists = old === true ? true : !!(old != null && old[rowId]);
-            var oldExpanded = {};
-
-            if (old === true) {
-              Object.keys(instance.getRowModel().rowsById).forEach(function (rowId) {
-                oldExpanded[rowId] = true;
-              });
-            } else {
-              oldExpanded = old;
-            }
-
-            expanded = (_expanded = expanded) != null ? _expanded : !exists;
-
-            if (!exists && expanded) {
-              var _extends2;
-
-              return _extends({}, oldExpanded, (_extends2 = {}, _extends2[rowId] = true, _extends2));
-            }
-
-            if (exists && !expanded) {
-              var _oldExpanded = oldExpanded;
-                  _oldExpanded[rowId];
-                  var rest = _objectWithoutPropertiesLoose(_oldExpanded, [rowId].map(_toPropertyKey));
-
-              return rest;
-            }
-
-            return old;
-          });
-        },
         toggleAllRowsExpanded: function toggleAllRowsExpanded(expanded) {
           if (expanded != null ? expanded : !instance.getIsAllRowsExpanded()) {
             instance.setExpanded(true);
@@ -1130,55 +1016,11 @@
 
           instance.setExpanded((_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.expanded) != null ? _instance$initialStat : {});
         },
-        getIsRowExpanded: function getIsRowExpanded(rowId) {
-          var _instance$options$get;
-
-          var row = instance.getPreExpandedRowModel().rowsById[rowId];
-
-          if (!row) {
-            {
-              console.warn("[Table] getIsRowExpanded: no row found with id " + rowId);
-            }
-
-            throw new Error();
-          }
-
-          var expanded = instance.getState().expanded;
-          return !!((_instance$options$get = instance.options.getIsRowExpanded == null ? void 0 : instance.options.getIsRowExpanded(row)) != null ? _instance$options$get : expanded === true || (expanded == null ? void 0 : expanded[rowId]));
-        },
-        getRowCanExpand: function getRowCanExpand(rowId) {
-          var _ref, _ref2, _instance$options$get2, _row$subRows;
-
-          var row = instance.getRow(rowId);
-
-          if (!row) {
-            {
-              console.warn("[Table] getRowCanExpand: no row found with id " + rowId);
-            }
-
-            throw new Error();
-          }
-
-          return (_ref = (_ref2 = (_instance$options$get2 = instance.options.getRowCanExpand == null ? void 0 : instance.options.getRowCanExpand(row)) != null ? _instance$options$get2 : instance.options.enableExpanded) != null ? _ref2 : instance.options.defaultCanExpand) != null ? _ref : !!((_row$subRows = row.subRows) != null && _row$subRows.length);
-        },
         getCanSomeRowsExpand: function getCanSomeRowsExpand() {
-          return Object.keys(instance.getRowModel().rowsById).some(function (id) {
-            return instance.getRowCanExpand(id);
+          return instance.getRowModel().flatRows.some(function (row) {
+            return row.getCanExpand();
           });
         },
-        getToggleExpandedHandler: function getToggleExpandedHandler(rowId) {
-          var row = instance.getRow(rowId);
-
-          if (!row) {
-            return;
-          }
-
-          var canExpand = instance.getRowCanExpand(rowId);
-          return function () {
-            if (!canExpand) return;
-            instance.toggleRowExpanded(rowId);
-          };
-        },
         getToggleAllRowsExpandedHandler: function getToggleAllRowsExpandedHandler() {
           return function (e) {
             e.persist == null ? void 0 : e.persist();
@@ -1197,8 +1039,8 @@
           } // If any row is not expanded, return false
 
 
-          if (Object.keys(instance.getRowModel().rowsById).some(function (id) {
-            return !instance.getIsRowExpanded(id);
+          if (instance.getRowModel().flatRows.some(function (row) {
+            return row.getIsExpanded();
           })) {
             return false;
           } // They must all be expanded :shrug:
@@ -1234,165 +1076,141 @@
     createRow: function createRow(row, instance) {
       return {
         toggleExpanded: function toggleExpanded(expanded) {
-          return void instance.toggleRowExpanded(row.id, expanded);
+          instance.setExpanded(function (old) {
+            var _expanded;
+
+            var exists = old === true ? true : !!(old != null && old[row.id]);
+            var oldExpanded = {};
+
+            if (old === true) {
+              Object.keys(instance.getRowModel().rowsById).forEach(function (rowId) {
+                oldExpanded[rowId] = true;
+              });
+            } else {
+              oldExpanded = old;
+            }
+
+            expanded = (_expanded = expanded) != null ? _expanded : !exists;
+
+            if (!exists && expanded) {
+              var _extends2;
+
+              return _extends({}, oldExpanded, (_extends2 = {}, _extends2[row.id] = true, _extends2));
+            }
+
+            if (exists && !expanded) {
+              var _oldExpanded = oldExpanded,
+                  _row$id = row.id;
+                  _oldExpanded[_row$id];
+                  var rest = _objectWithoutPropertiesLoose(_oldExpanded, [_row$id].map(_toPropertyKey));
+
+              return rest;
+            }
+
+            return old;
+          });
         },
         getIsExpanded: function getIsExpanded() {
-          return instance.getIsRowExpanded(row.id);
+          var _instance$options$get;
+
+          var expanded = instance.getState().expanded;
+          return !!((_instance$options$get = instance.options.getIsRowExpanded == null ? void 0 : instance.options.getIsRowExpanded(row)) != null ? _instance$options$get : expanded === true || (expanded == null ? void 0 : expanded[row.id]));
         },
         getCanExpand: function getCanExpand() {
-          return row.subRows && !!row.subRows.length;
+          var _instance$options$get2, _instance$options$ena, _row$subRows;
+
+          return ((_instance$options$get2 = instance.options.getRowCanExpand == null ? void 0 : instance.options.getRowCanExpand(row)) != null ? _instance$options$get2 : true) && ((_instance$options$ena = instance.options.enableExpanding) != null ? _instance$options$ena : true) && !!((_row$subRows = row.subRows) != null && _row$subRows.length);
         },
         getToggleExpandedHandler: function getToggleExpandedHandler() {
-          return instance.getToggleExpandedHandler(row.id);
+          var canExpand = row.getCanExpand();
+          return function () {
+            if (!canExpand) return;
+            row.toggleExpanded();
+          };
         }
       };
     }
   };
 
-  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 +1222,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 +1357,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 +1371,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,93 +1380,18 @@
       };
     },
     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() {
-          return instance.getColumnCanColumnFilter(column.id);
-        },
-        getCanGlobalFilter: function getCanGlobalFilter() {
-          return instance.getColumnCanGlobalFilter(column.id);
-        },
-        getColumnFilterIndex: function getColumnFilterIndex() {
-          return instance.getColumnFilterIndex(column.id);
-        },
-        getColumnIsFiltered: function getColumnIsFiltered() {
-          return instance.getColumnIsFiltered(column.id);
-        },
-        getColumnFilterValue: function getColumnFilterValue() {
-          return instance.getColumnFilterValue(column.id);
-        },
-        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;
-        }
-      };
-    },
-    createInstance: function createInstance(instance) {
-      return {
-        getColumnAutoFilterFn: function getColumnAutoFilterFn(columnId) {
+        getAutoFilterFn: function getAutoFilterFn() {
           var firstRow = instance.getCoreRowModel().flatRows[0];
-          var value = firstRow == null ? void 0 : firstRow.values[columnId];
+          var value = firstRow == null ? void 0 : firstRow.values[column.id];
 
           if (typeof value === 'string') {
             return filterFns.includesString;
           }
 
           if (typeof value === 'number') {
-            return filterFns.betweenNumberRange;
+            return filterFns.inNumberRange;
           }
 
           if (value !== null && typeof value === 'object') {
@@ -1550,115 +1404,44 @@
 
           return filterFns.weakEquals;
         },
-        getGlobalAutoFilterFn: function getGlobalAutoFilterFn() {
-          return filterFns.includesString;
-        },
-        getColumnFilterFn: function getColumnFilterFn(columnId) {
+        getFilterFn: function getFilterFn() {
           var _ref;
 
-          var column = instance.getColumn(columnId);
           var userFilterFns = instance.options.filterFns;
-
-          if (!column) {
-            throw new Error();
-          }
-
-          return isFunction(column.filterFn) ? column.filterFn : column.filterFn === 'auto' ? instance.getColumnAutoFilterFn(columnId) : (_ref = userFilterFns == null ? void 0 : userFilterFns[column.filterFn]) != null ? _ref : filterFns[column.filterFn];
+          return isFunction(column.filterFn) ? column.filterFn : column.filterFn === 'auto' ? column.getAutoFilterFn() : (_ref = userFilterFns == null ? void 0 : userFilterFns[column.filterFn]) != null ? _ref : filterFns[column.filterFn];
         },
-        getGlobalFilterFn: function getGlobalFilterFn() {
-          var _ref2;
+        getCanFilter: function getCanFilter() {
+          var _column$enableColumnF, _instance$options$ena, _instance$options$ena2;
 
-          var _instance$options = instance.options,
-              userFilterFns = _instance$options.filterFns,
-              globalFilterFn = _instance$options.globalFilterFn;
-          return isFunction(globalFilterFn) ? globalFilterFn : globalFilterFn === 'auto' ? instance.getGlobalAutoFilterFn() : (_ref2 = userFilterFns == null ? void 0 : userFilterFns[globalFilterFn]) != null ? _ref2 : filterFns[globalFilterFn];
+          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;
         },
-        setColumnFilters: function setColumnFilters(updater) {
-          var leafColumns = instance.getAllLeafColumns();
-
-          var updateFn = function updateFn(old) {
-            var _functionalUpdate;
-
-            return (_functionalUpdate = functionalUpdate(updater, old)) == null ? void 0 : _functionalUpdate.filter(function (filter) {
-              var column = leafColumns.find(function (d) {
-                return d.id === filter.id;
-              });
-
-              if (column) {
-                var filterFn = instance.getColumnFilterFn(column.id);
-
-                if (shouldAutoRemoveFilter(filterFn, filter.value, column)) {
-                  return false;
-                }
-              }
-
-              return true;
-            });
-          };
-
-          instance.options.onColumnFiltersChange == null ? void 0 : instance.options.onColumnFiltersChange(updateFn);
-        },
-        setGlobalFilter: function setGlobalFilter(updater) {
-          instance.options.onGlobalFilterChange == null ? void 0 : instance.options.onGlobalFilterChange(updater);
-        },
-        resetGlobalFilter: function resetGlobalFilter() {
-          instance.setGlobalFilter(instance.initialState.globalFilter);
-        },
-        getColumnCanColumnFilter: function getColumnCanColumnFilter(columnId) {
-          var _ref3, _ref4, _ref5, _ref6, _ref7, _column$enableAllFilt;
-
-          var column = instance.getColumn(columnId);
-
-          if (!column) {
-            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;
-        },
-        getColumnCanGlobalFilter: function getColumnCanGlobalFilter(columnId) {
-          var _ref8, _ref9, _ref10, _ref11, _ref12, _ref13, _instance$options$ena;
-
-          var column = instance.getColumn(columnId);
-
-          if (!column) {
-            throw new Error();
-          }
+        getCanGlobalFilter: function getCanGlobalFilter() {
+          var _column$enableGlobalF, _instance$options$ena3, _instance$options$ena4, _instance$options$get;
 
-          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;
+        getIsFiltered: function getIsFiltered() {
+          return column.getFilterIndex() > -1;
         },
-        getColumnFilterValue: function getColumnFilterValue(columnId) {
+        getFilterValue: function getFilterValue() {
           var _instance$getState$co, _instance$getState$co2;
 
           return (_instance$getState$co = instance.getState().columnFilters) == null ? void 0 : (_instance$getState$co2 = _instance$getState$co.find(function (d) {
-            return d.id === columnId;
+            return d.id === column.id;
           })) == null ? void 0 : _instance$getState$co2.value;
         },
-        getColumnFilterIndex: function getColumnFilterIndex(columnId) {
+        getFilterIndex: function getFilterIndex() {
           var _instance$getState$co3, _instance$getState$co4;
 
           return (_instance$getState$co3 = (_instance$getState$co4 = instance.getState().columnFilters) == null ? void 0 : _instance$getState$co4.findIndex(function (d) {
-            return d.id === columnId;
+            return d.id === column.id;
           })) != null ? _instance$getState$co3 : -1;
         },
-        setColumnFilterValue: function setColumnFilterValue(columnId, value) {
-          if (!columnId) return;
+        setFilterValue: function setFilterValue(value) {
           instance.setColumnFilters(function (old) {
-            var column = instance.getColumn(columnId);
-
-            if (!column) {
-              {
-                console.warn("Table: Could not find a column with id: " + columnId);
-              }
-
-              throw new Error();
-            }
-
-            var filterFn = instance.getColumnFilterFn(column.id);
+            var filterFn = column.getFilterFn();
             var previousfilter = old == null ? void 0 : old.find(function (d) {
-              return d.id === columnId;
+              return d.id === column.id;
             });
             var newFilter = functionalUpdate(value, previousfilter ? previousfilter.value : undefined); //
 
@@ -1666,12 +1449,12 @@
               var _old$filter;
 
               return (_old$filter = old == null ? void 0 : old.filter(function (d) {
-                return d.id !== columnId;
+                return d.id !== column.id;
               })) != null ? _old$filter : [];
             }
 
             var newFilterObj = {
-              id: columnId,
+              id: column.id,
               value: newFilter
             };
 
@@ -1679,7 +1462,7 @@
               var _old$map;
 
               return (_old$map = old == null ? void 0 : old.map(function (d) {
-                if (d.id === columnId) {
+                if (d.id === column.id) {
                   return newFilterObj;
                 }
 
@@ -1694,45 +1477,209 @@
             return [newFilterObj];
           });
         },
+        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) {
+      return {
+        getGlobalAutoFilterFn: function getGlobalAutoFilterFn() {
+          return filterFns.includesString;
+        },
+        getGlobalFilterFn: function getGlobalFilterFn() {
+          var _ref2;
+
+          var _instance$options = instance.options,
+              userFilterFns = _instance$options.filterFns,
+              globalFilterFn = _instance$options.globalFilterFn;
+          return isFunction(globalFilterFn) ? globalFilterFn : globalFilterFn === 'auto' ? instance.getGlobalAutoFilterFn() : (_ref2 = userFilterFns == null ? void 0 : userFilterFns[globalFilterFn]) != null ? _ref2 : filterFns[globalFilterFn];
+        },
+        setColumnFilters: function setColumnFilters(updater) {
+          var leafColumns = instance.getAllLeafColumns();
+
+          var updateFn = function updateFn(old) {
+            var _functionalUpdate;
+
+            return (_functionalUpdate = functionalUpdate(updater, old)) == null ? void 0 : _functionalUpdate.filter(function (filter) {
+              var column = leafColumns.find(function (d) {
+                return d.id === filter.id;
+              });
+
+              if (column) {
+                var filterFn = column.getFilterFn();
+
+                if (shouldAutoRemoveFilter(filterFn, filter.value, column)) {
+                  return false;
+                }
+              }
+
+              return true;
+            });
+          };
+
+          instance.options.onColumnFiltersChange == null ? void 0 : instance.options.onColumnFiltersChange(updateFn);
+        },
+        setGlobalFilter: function setGlobalFilter(updater) {
+          instance.options.onGlobalFilterChange == null ? void 0 : instance.options.onGlobalFilterChange(updater);
+        },
+        resetGlobalFilter: function resetGlobalFilter() {
+          instance.setGlobalFilter(instance.initialState.globalFilter);
+        },
         resetColumnFilters: function resetColumnFilters() {
           var _instance$initialStat, _instance$initialStat2;
 
           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();
-        },
-        getPreGlobalFilteredRowModel: function getPreGlobalFilteredRowModel() {
-          return instance.getColumnFilteredRowModel();
+          return instance._getFilteredRowModel();
         },
-        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 +1802,10 @@
         aggregationFn: 'auto'
       };
     },
-    getInitialState: function getInitialState() {
-      return {
+    getInitialState: function getInitialState(state) {
+      return _extends({
         grouping: []
-      };
+      }, state);
     },
     getDefaultOptions: function getDefaultOptions(instance) {
       return {
@@ -1868,21 +1815,39 @@
     },
     createColumn: function createColumn(column, instance) {
       return {
-        aggregationFn: column.aggregationFn,
-        getCanGroup: function getCanGroup() {
-          return instance.getColumnCanGroup(column.id);
+        toggleGrouping: function toggleGrouping() {
+          instance.setGrouping(function (old) {
+            // Find any existing grouping for this column
+            if (old != null && old.includes(column.id)) {
+              return old.filter(function (d) {
+                return d !== column.id;
+              });
+            }
+
+            return [].concat(old != null ? old : [], [column.id]);
+          });
         },
-        getGroupedIndex: function getGroupedIndex() {
-          return instance.getColumnGroupedIndex(column.id);
+        getCanGroup: function getCanGroup() {
+          var _ref, _ref2, _ref3, _column$enableGroupin;
+
+          return (_ref = (_ref2 = (_ref3 = (_column$enableGroupin = column.enableGrouping) != null ? _column$enableGroupin : true) != null ? _ref3 : instance.options.enableGrouping) != null ? _ref2 : true) != null ? _ref : !!column.accessorFn;
         },
         getIsGrouped: function getIsGrouped() {
-          return instance.getColumnIsGrouped(column.id);
+          var _instance$getState$gr;
+
+          return (_instance$getState$gr = instance.getState().grouping) == null ? void 0 : _instance$getState$gr.includes(column.id);
         },
-        toggleGrouping: function toggleGrouping() {
-          return instance.toggleColumnGrouping(column.id);
+        getGroupedIndex: function getGroupedIndex() {
+          var _instance$getState$gr2;
+
+          return (_instance$getState$gr2 = instance.getState().grouping) == null ? void 0 : _instance$getState$gr2.indexOf(column.id);
         },
         getToggleGroupingHandler: function getToggleGroupingHandler() {
-          return instance.getToggleGroupingHandler(column.id);
+          var canGroup = column.getCanGroup();
+          return function () {
+            if (!canGroup) return;
+            column.toggleGrouping();
+          };
         }
       };
     },
@@ -1903,7 +1868,7 @@
           return aggregationFns.count;
         },
         getColumnAggregationFn: function getColumnAggregationFn(columnId) {
-          var _ref;
+          var _ref4;
 
           var column = instance.getColumn(columnId);
           var userAggregationFns = instance.options.aggregationFns;
@@ -1912,62 +1877,16 @@
             throw new Error();
           }
 
-          return isFunction(column.aggregationFn) ? column.aggregationFn : column.aggregationFn === 'auto' ? instance.getColumnAutoAggregationFn(columnId) : (_ref = userAggregationFns == null ? void 0 : userAggregationFns[column.aggregationFn]) != null ? _ref : aggregationFns[column.aggregationFn];
+          return isFunction(column.aggregationFn) ? column.aggregationFn : column.aggregationFn === 'auto' ? instance.getColumnAutoAggregationFn(columnId) : (_ref4 = userAggregationFns == null ? void 0 : userAggregationFns[column.aggregationFn]) != null ? _ref4 : aggregationFns[column.aggregationFn];
         },
         setGrouping: function setGrouping(updater) {
           return instance.options.onGroupingChange == null ? void 0 : instance.options.onGroupingChange(updater);
         },
-        toggleColumnGrouping: function toggleColumnGrouping(columnId) {
-          instance.setGrouping(function (old) {
-            // Find any existing grouping for this column
-            if (old != null && old.includes(columnId)) {
-              return old.filter(function (d) {
-                return d !== columnId;
-              });
-            }
-
-            return [].concat(old != null ? old : [], [columnId]);
-          });
-        },
-        getColumnCanGroup: function getColumnCanGroup(columnId) {
-          var _ref2, _ref3, _column$enableGroupin;
-
-          var column = instance.getColumn(columnId);
-
-          if (!column) {
-            throw new Error();
-          }
-
-          return (_ref2 = (_ref3 = (_column$enableGroupin = column.enableGrouping) != null ? _column$enableGroupin : instance.options.enableGrouping) != null ? _ref3 : column.defaultCanGroup) != null ? _ref2 : !!column.accessorFn;
-        },
-        getColumnIsGrouped: function getColumnIsGrouped(columnId) {
-          var _instance$getState$gr;
-
-          return (_instance$getState$gr = instance.getState().grouping) == null ? void 0 : _instance$getState$gr.includes(columnId);
-        },
-        getColumnGroupedIndex: function getColumnGroupedIndex(columnId) {
-          var _instance$getState$gr2;
-
-          return (_instance$getState$gr2 = instance.getState().grouping) == null ? void 0 : _instance$getState$gr2.indexOf(columnId);
-        },
         resetGrouping: function resetGrouping() {
           var _instance$initialStat, _instance$initialStat2;
 
           instance.setGrouping((_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.grouping) != null ? _instance$initialStat : []);
         },
-        getToggleGroupingHandler: function getToggleGroupingHandler(columnId) {
-          var column = instance.getColumn(columnId);
-          var canGroup = column.getCanGroup();
-          return function () {
-            if (!canGroup) return;
-            column.toggleGrouping == null ? void 0 : column.toggleGrouping();
-          };
-        },
-        getRowIsGrouped: function getRowIsGrouped(rowId) {
-          var _instance$getRow;
-
-          return !!((_instance$getRow = instance.getRow(rowId)) != null && _instance$getRow.groupingColumnId);
-        },
         getPreGroupedRowModel: function getPreGroupedRowModel() {
           return instance.getSortedRowModel();
         },
@@ -1987,7 +1906,7 @@
     createRow: function createRow(row, instance) {
       return {
         getIsGrouped: function getIsGrouped() {
-          return instance.getRowIsGrouped(row.id);
+          return !!row.groupingColumnId;
         }
       };
     },
@@ -2017,35 +1936,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,7 +2016,7 @@
               orderedColumns = [].concat(orderedColumns, columnsCopy);
             }
 
-            return Grouping.orderColumns(orderedColumns, grouping, groupedColumnMode);
+            return orderColumns(orderedColumns, grouping, groupedColumnMode);
           };
         }, {
           key: 'getOrderColumnsFn' // debug: () => instance.options.debugAll ?? instance.options.debugTable,
@@ -2109,14 +2028,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 {
@@ -2276,13 +2195,13 @@
 
   //
   var Pinning = {
-    getInitialState: function getInitialState() {
-      return {
+    getInitialState: function getInitialState(state) {
+      return _extends({
         columnPinning: {
           left: [],
           right: []
         }
-      };
+      }, state);
     },
     getDefaultOptions: function getDefaultOptions(instance) {
       return {
@@ -2291,155 +2210,8 @@
     },
     createColumn: function createColumn(column, instance) {
       return {
-        getCanPin: function getCanPin() {
-          return instance.getColumnCanPin(column.id);
-        },
-        getPinnedIndex: function getPinnedIndex() {
-          return instance.getColumnPinnedIndex(column.id);
-        },
-        getIsPinned: function getIsPinned() {
-          return instance.getColumnIsPinned(column.id);
-        },
         pin: function pin(position) {
-          return instance.pinColumn(column.id, position);
-        }
-      };
-    },
-    createRow: function createRow(row, instance) {
-      return {
-        getCenterVisibleCells: memo(function () {
-          return [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$deb;
-
-            return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugRows;
-          }
-        }),
-        getLeftVisibleCells: memo(function () {
-          return [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$deb2;
-
-            return (_instance$options$deb2 = instance.options.debugAll) != null ? _instance$options$deb2 : instance.options.debugRows;
-          }
-        }),
-        getRightVisibleCells: memo(function () {
-          return [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$deb3;
-
-            return (_instance$options$deb3 = instance.options.debugAll) != null ? _instance$options$deb3 : instance.options.debugRows;
-          }
-        })
-      };
-    },
-    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) {
-          return instance.options.onColumnPinningChange == null ? void 0 : instance.options.onColumnPinningChange(updater);
-        },
-        resetColumnPinning: function resetColumnPinning() {
-          var _instance$initialStat, _instance$initialStat2;
-
-          return instance.setColumnPinning((_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.columnPinning) != null ? _instance$initialStat : {});
-        },
-        pinColumn: function pinColumn(columnId, position) {
-          var column = instance.getColumn(columnId);
-          var columnIds = column == null ? void 0 : column.getLeafColumns().map(function (d) {
+          var columnIds = column.getLeafColumns().map(function (d) {
             return d.id;
           }).filter(Boolean);
           instance.setColumnPinning(function (old) {
@@ -2480,47 +2252,108 @@
               })
             };
           });
-        },
-        getColumnCanPin: function getColumnCanPin(columnId) {
-          var column = instance.getColumn(columnId);
+        },
+        getCanPin: function getCanPin() {
+          var leafColumns = column.getLeafColumns();
+          return leafColumns.some(function (d) {
+            var _d$enablePinning, _instance$options$ena;
+
+            return ((_d$enablePinning = d.enablePinning) != null ? _d$enablePinning : true) && ((_instance$options$ena = instance.options.enablePinning) != null ? _instance$options$ena : true);
+          });
+        },
+        getIsPinned: function getIsPinned() {
+          var leafColumnIds = column.getLeafColumns().map(function (d) {
+            return d.id;
+          });
+          var _instance$getState$co = instance.getState().columnPinning,
+              left = _instance$getState$co.left,
+              right = _instance$getState$co.right;
+          var isLeft = leafColumnIds.some(function (d) {
+            return left == null ? void 0 : left.includes(d);
+          });
+          var isRight = leafColumnIds.some(function (d) {
+            return right == null ? void 0 : right.includes(d);
+          });
+          return isLeft ? 'left' : isRight ? 'right' : false;
+        },
+        getPinnedIndex: function getPinnedIndex() {
+          var _instance$getState$co2, _instance$getState$co3, _instance$getState$co4;
+
+          var position = column.getIsPinned();
+          return position ? (_instance$getState$co2 = (_instance$getState$co3 = instance.getState().columnPinning) == null ? void 0 : (_instance$getState$co4 = _instance$getState$co3[position]) == null ? void 0 : _instance$getState$co4.indexOf(column.id)) != null ? _instance$getState$co2 : -1 : 0;
+        }
+      };
+    },
+    createRow: function createRow(row, instance) {
+      return {
+        getCenterVisibleCells: memo(function () {
+          return [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: "development" === 'production' ,
+          debug: function debug() {
+            var _instance$options$deb;
+
+            return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugRows;
+          }
+        }),
+        getLeftVisibleCells: memo(function () {
+          return [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: "development" === 'production' ,
+          debug: function debug() {
+            var _instance$options$deb2;
 
-          if (!column) {
-            throw new Error();
+            return (_instance$options$deb2 = instance.options.debugAll) != null ? _instance$options$deb2 : instance.options.debugRows;
           }
-
-          var leafColumns = column.getLeafColumns();
-          return leafColumns.some(function (d) {
-            var _ref, _ref2, _d$enablePinning;
-
-            return (_ref = (_ref2 = (_d$enablePinning = d.enablePinning) != null ? _d$enablePinning : instance.options.enablePinning) != null ? _ref2 : d.defaultCanPin) != null ? _ref : !!d.accessorFn;
+        }),
+        getRightVisibleCells: memo(function () {
+          return [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'
+            });
           });
-        },
-        getColumnIsPinned: function getColumnIsPinned(columnId) {
-          var column = instance.getColumn(columnId);
+          return cells;
+        }, {
+          key: "development" === 'production' ,
+          debug: function debug() {
+            var _instance$options$deb3;
 
-          if (!column) {
-            throw new Error();
+            return (_instance$options$deb3 = instance.options.debugAll) != null ? _instance$options$deb3 : instance.options.debugRows;
           }
-
-          var leafColumnIds = column.getLeafColumns().map(function (d) {
-            return d.id;
-          });
-          var _instance$getState$co = instance.getState().columnPinning,
-              left = _instance$getState$co.left,
-              right = _instance$getState$co.right;
-          var isLeft = leafColumnIds.some(function (d) {
-            return left == null ? void 0 : left.includes(d);
-          });
-          var isRight = leafColumnIds.some(function (d) {
-            return right == null ? void 0 : right.includes(d);
-          });
-          return isLeft ? 'left' : isRight ? 'right' : false;
+        })
+      };
+    },
+    createInstance: function createInstance(instance) {
+      return {
+        setColumnPinning: function setColumnPinning(updater) {
+          return instance.options.onColumnPinningChange == null ? void 0 : instance.options.onColumnPinningChange(updater);
         },
-        getColumnPinnedIndex: function getColumnPinnedIndex(columnId) {
-          var _instance$getState$co2, _instance$getState$co3, _instance$getState$co4;
+        resetColumnPinning: function resetColumnPinning() {
+          var _instance$initialStat, _instance$initialStat2;
 
-          var position = instance.getColumnIsPinned(columnId);
-          return position ? (_instance$getState$co2 = (_instance$getState$co3 = instance.getState().columnPinning) == null ? void 0 : (_instance$getState$co4 = _instance$getState$co3[position]) == null ? void 0 : _instance$getState$co4.indexOf(columnId)) != null ? _instance$getState$co2 : -1 : 0;
+          return instance.setColumnPinning((_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.columnPinning) != null ? _instance$initialStat : {});
         },
         getIsSomeColumnsPinned: function getIsSomeColumnsPinned() {
           var _instance$getState$co5 = instance.getState().columnPinning,
@@ -2539,9 +2372,9 @@
         }, {
           key: 'getLeftLeafColumns',
           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 () {
@@ -2555,9 +2388,9 @@
         }, {
           key: 'getRightLeafColumns',
           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 () {
@@ -2570,9 +2403,9 @@
         }, {
           key: 'getCenterLeafColumns',
           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 +2414,10 @@
 
   //
   var RowSelection = {
-    getInitialState: function getInitialState() {
-      return {
+    getInitialState: function getInitialState(state) {
+      return _extends({
         rowSelection: {}
-      };
+      }, state);
     },
     getDefaultOptions: function getDefaultOptions(instance) {
       return {
@@ -2641,22 +2474,6 @@
             return rowSelection;
           });
         },
-        toggleRowSelected: function toggleRowSelected(rowId, value) {
-          var row = instance.getRow(rowId);
-          var isSelected = row.getIsSelected();
-          instance.setRowSelection(function (old) {
-            value = typeof value !== 'undefined' ? value : !isSelected;
-
-            if (isSelected === value) {
-              return old;
-            }
-
-            var selectedRowIds = _extends({}, old);
-
-            mutateRowIsSelected(selectedRowIds, rowId, value, instance);
-            return selectedRowIds;
-          });
-        },
         // addRowSelectionRange: rowId => {
         //   const {
         //     rows,
@@ -2731,7 +2548,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 +2560,7 @@
 
           return selectRowsFn(instance, rowModel);
         }, {
-          key: 'getFilteredSelectedRowModel',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb2;
 
@@ -2763,7 +2580,7 @@
 
           return selectRowsFn(instance, rowModel);
         }, {
-          key: 'getGroupedSelectedRowModel',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb3;
 
@@ -2771,75 +2588,6 @@
           }
         }),
         ///
-        getRowIsSelected: function getRowIsSelected(rowId) {
-          var _instance$getState = instance.getState(),
-              rowSelection = _instance$getState.rowSelection;
-
-          var row = instance.getRow(rowId);
-
-          if (!row) {
-            throw new Error();
-          }
-
-          return isRowSelected(row, rowSelection) === true;
-        },
-        getRowIsSomeSelected: function getRowIsSomeSelected(rowId) {
-          var _instance$getState2 = instance.getState(),
-              rowSelection = _instance$getState2.rowSelection;
-
-          var row = instance.getRow(rowId);
-
-          if (!row) {
-            throw new Error();
-          }
-
-          return isRowSelected(row, rowSelection) === 'some';
-        },
-        getRowCanSelect: function getRowCanSelect(rowId) {
-          var _instance$options$ena;
-
-          var row = instance.getRow(rowId);
-
-          if (!row) {
-            throw new Error();
-          }
-
-          if (typeof instance.options.enableRowSelection === 'function') {
-            return instance.options.enableRowSelection(row);
-          }
-
-          return (_instance$options$ena = instance.options.enableRowSelection) != null ? _instance$options$ena : true;
-        },
-        getRowCanSelectSubRows: function getRowCanSelectSubRows(rowId) {
-          var _instance$options$ena2;
-
-          var row = instance.getRow(rowId);
-
-          if (!row) {
-            throw new Error();
-          }
-
-          if (typeof instance.options.enableSubRowSelection === 'function') {
-            return instance.options.enableSubRowSelection(row);
-          }
-
-          return (_instance$options$ena2 = instance.options.enableSubRowSelection) != null ? _instance$options$ena2 : true;
-        },
-        getRowCanMultiSelect: function getRowCanMultiSelect(rowId) {
-          var _instance$options$ena3;
-
-          var row = instance.getRow(rowId);
-
-          if (!row) {
-            throw new Error();
-          }
-
-          if (typeof instance.options.enableMultiRowSelection === 'function') {
-            return instance.options.enableMultiRowSelection(row);
-          }
-
-          return (_instance$options$ena3 = instance.options.enableMultiRowSelection) != null ? _instance$options$ena3 : true;
-        },
         // getGroupingRowCanSelect: rowId => {
         //   const row = instance.getRow(rowId)
         //   if (!row) {
@@ -2851,10 +2599,10 @@
         //   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;
+          var _instance$getState = instance.getState(),
+              rowSelection = _instance$getState.rowSelection;
 
           var isAllRowsSelected = Boolean(preFilteredFlatRows.length && Object.keys(rowSelection).length);
 
@@ -2871,8 +2619,8 @@
         getIsAllPageRowsSelected: function getIsAllPageRowsSelected() {
           var paginationFlatRows = instance.getPaginationRowModel().flatRows;
 
-          var _instance$getState4 = instance.getState(),
-              rowSelection = _instance$getState4.rowSelection;
+          var _instance$getState2 = instance.getState(),
+              rowSelection = _instance$getState2.rowSelection;
 
           var isAllPageRowsSelected = !!paginationFlatRows.length;
 
@@ -2893,18 +2641,6 @@
           var paginationFlatRows = instance.getPaginationRowModel().flatRows;
           return instance.getIsAllPageRowsSelected() ? false : !!(paginationFlatRows != null && paginationFlatRows.length);
         },
-        getToggleRowSelectedHandler: function getToggleRowSelectedHandler(rowId) {
-          var row = instance.getRow(rowId);
-          row.getIsSelected();
-          row.getIsSomeSelected();
-          var canSelect = row.getCanSelect();
-          return function (e) {
-            var _target;
-
-            if (!canSelect) return;
-            row.toggleSelected((_target = e.target) == null ? void 0 : _target.checked);
-          };
-        },
         getToggleAllRowsSelectedHandler: function getToggleAllRowsSelectedHandler() {
           return function (e) {
             instance.toggleAllRowsSelected(e.target.checked);
@@ -2919,23 +2655,68 @@
     },
     createRow: function createRow(row, instance) {
       return {
+        toggleSelected: function toggleSelected(value) {
+          var isSelected = row.getIsSelected();
+          instance.setRowSelection(function (old) {
+            value = typeof value !== 'undefined' ? value : !isSelected;
+
+            if (isSelected === value) {
+              return old;
+            }
+
+            var selectedRowIds = _extends({}, old);
+
+            mutateRowIsSelected(selectedRowIds, row.id, value, instance);
+            return selectedRowIds;
+          });
+        },
         getIsSelected: function getIsSelected() {
-          return instance.getRowIsSelected(row.id);
+          var _instance$getState3 = instance.getState(),
+              rowSelection = _instance$getState3.rowSelection;
+
+          return isRowSelected(row, rowSelection) === true;
         },
         getIsSomeSelected: function getIsSomeSelected() {
-          return instance.getRowIsSomeSelected(row.id);
+          var _instance$getState4 = instance.getState(),
+              rowSelection = _instance$getState4.rowSelection;
+
+          return isRowSelected(row, rowSelection) === 'some';
         },
-        toggleSelected: function toggleSelected(value) {
-          return instance.toggleRowSelected(row.id, value);
+        getCanSelect: function getCanSelect() {
+          var _instance$options$ena;
+
+          if (typeof instance.options.enableRowSelection === 'function') {
+            return instance.options.enableRowSelection(row);
+          }
+
+          return (_instance$options$ena = instance.options.enableRowSelection) != null ? _instance$options$ena : true;
         },
-        getToggleSelectedHandler: function getToggleSelectedHandler() {
-          return instance.getToggleRowSelectedHandler(row.id);
+        getCanSelectSubRows: function getCanSelectSubRows() {
+          var _instance$options$ena2;
+
+          if (typeof instance.options.enableSubRowSelection === 'function') {
+            return instance.options.enableSubRowSelection(row);
+          }
+
+          return (_instance$options$ena2 = instance.options.enableSubRowSelection) != null ? _instance$options$ena2 : true;
         },
         getCanMultiSelect: function getCanMultiSelect() {
-          return instance.getRowCanMultiSelect(row.id);
+          var _instance$options$ena3;
+
+          if (typeof instance.options.enableMultiRowSelection === 'function') {
+            return instance.options.enableMultiRowSelection(row);
+          }
+
+          return (_instance$options$ena3 = instance.options.enableMultiRowSelection) != null ? _instance$options$ena3 : true;
         },
-        getCanSelect: function getCanSelect() {
-          return instance.getRowCanSelect(row.id);
+        getToggleSelectedHandler: function getToggleSelectedHandler() {
+          var canSelect = row.getCanSelect();
+          return function (e) {
+            var _target;
+
+            if (!canSelect) return;
+            row.toggleSelected((_target = e.target) == null ? void 0 : _target.checked);
+          };
         }
       };
     }
@@ -2957,7 +2738,7 @@
     } // }
 
 
-    if ((_row$subRows = row.subRows) != null && _row$subRows.length && instance.getRowCanSelectSubRows(row.id)) {
+    if ((_row$subRows = row.subRows) != null && _row$subRows.length && row.getCanSelectSubRows()) {
       row.subRows.forEach(function (row) {
         return mutateRowIsSelected(selectedRowIds, row.id, value, instance);
       });
@@ -3132,59 +2913,33 @@
 
   //
   var Sorting = {
-    getDefaultColumn: function getDefaultColumn() {
-      return {
-        sortingFn: 'auto'
-      };
-    },
-    getInitialState: function getInitialState() {
-      return {
+    getInitialState: function getInitialState(state) {
+      return _extends({
         sorting: []
-      };
-    },
-    getDefaultOptions: function getDefaultOptions(instance) {
-      return {
-        onSortingChange: makeStateUpdater('sorting', instance),
-        isMultiSortEvent: function isMultiSortEvent(e) {
-          return e.shiftKey;
-        }
-      };
+      }, state);
     },
-    createColumn: function createColumn(column, instance) {
-      return {
-        sortingFn: column.sortingFn,
-        getCanSort: function getCanSort() {
-          return instance.getColumnCanSort(column.id);
-        },
-        getCanMultiSort: function getCanMultiSort() {
-          return instance.getColumnCanMultiSort(column.id);
-        },
-        getSortIndex: function getSortIndex() {
-          return instance.getColumnSortIndex(column.id);
-        },
-        getIsSorted: function getIsSorted() {
-          return instance.getColumnIsSorted(column.id);
-        },
-        resetSorting: function resetSorting() {
-          return instance.resetSorting(column.id);
-        },
-        toggleSorting: function toggleSorting(desc, isMulti) {
-          return instance.toggleColumnSorting(column.id, desc, isMulti);
-        },
-        getToggleSortingHandler: function getToggleSortingHandler() {
-          return instance.getToggleSortingHandler(column.id);
+    getDefaultColumn: function getDefaultColumn() {
+      return {
+        sortingFn: 'auto'
+      };
+    },
+    getDefaultOptions: function getDefaultOptions(instance) {
+      return {
+        onSortingChange: makeStateUpdater('sorting', instance),
+        isMultiSortEvent: function isMultiSortEvent(e) {
+          return e.shiftKey;
         }
       };
     },
-    createInstance: function createInstance(instance) {
+    createColumn: function createColumn(column, instance) {
       return {
-        getColumnAutoSortingFn: function getColumnAutoSortingFn(columnId) {
-          var firstRows = instance.getGlobalFilteredRowModel().flatRows.slice(100);
+        getAutoSortingFn: function getAutoSortingFn() {
+          var firstRows = instance.getFilteredRowModel().flatRows.slice(100);
           var isString = false;
 
           for (var _iterator = _createForOfIteratorHelperLoose(firstRows), _step; !(_step = _iterator()).done;) {
             var row = _step.value;
-            var value = row == null ? void 0 : row.values[columnId];
+            var value = row == null ? void 0 : row.values[column.id];
 
             if (Object.prototype.toString.call(value) === '[object Date]') {
               return sortingFns.datetime;
@@ -3205,9 +2960,9 @@
 
           return sortingFns.basic;
         },
-        getColumnAutoSortDir: function getColumnAutoSortDir(columnId) {
-          var firstRow = instance.getGlobalFilteredRowModel().flatRows[0];
-          var value = firstRow == null ? void 0 : firstRow.values[columnId];
+        getAutoSortDir: function getAutoSortDir() {
+          var firstRow = instance.getFilteredRowModel().flatRows[0];
+          var value = firstRow == null ? void 0 : firstRow.values[column.id];
 
           if (typeof value === 'string') {
             return 'asc';
@@ -3215,27 +2970,19 @@
 
           return 'desc';
         },
-        getColumnSortingFn: function getColumnSortingFn(columnId) {
+        getSortingFn: function getSortingFn() {
           var _ref;
 
-          var column = instance.getColumn(columnId);
           var userSortingFn = instance.options.sortingFns;
 
           if (!column) {
             throw new Error();
           }
 
-          return isFunction(column.sortingFn) ? column.sortingFn : column.sortingFn === 'auto' ? instance.getColumnAutoSortingFn(columnId) : (_ref = userSortingFn == null ? void 0 : userSortingFn[column.sortingFn]) != null ? _ref : sortingFns[column.sortingFn];
-        },
-        setSorting: function setSorting(updater) {
-          return instance.options.onSortingChange == null ? void 0 : instance.options.onSortingChange(updater);
+          return isFunction(column.sortingFn) ? column.sortingFn : column.sortingFn === 'auto' ? column.getAutoSortingFn() : (_ref = userSortingFn == null ? void 0 : userSortingFn[column.sortingFn]) != null ? _ref : sortingFns[column.sortingFn];
         },
-        toggleColumnSorting: function toggleColumnSorting(columnId, desc, multi) {
-          var column = instance.getColumn(columnId);
-
-          if (!column) {
-            throw new Error();
-          } // if (column.columns.length) {
+        toggleSorting: function toggleSorting(desc, multi) {
+          // if (column.columns.length) {
           //   column.columns.forEach((c, i) => {
           //     if (c.id) {
           //       instance.toggleColumnSorting(c.id, undefined, multi || !!i)
@@ -3243,17 +2990,15 @@
           //   })
           //   return
           // }
-
-
           instance.setSorting(function (old) {
             var _ref2, _column$sortDescFirst, _instance$options$ena, _instance$options$ena2;
 
             // Find any existing sorting for this column
             var existingSorting = old == null ? void 0 : old.find(function (d) {
-              return d.id === columnId;
+              return d.id === column.id;
             });
             var existingIndex = old == null ? void 0 : old.findIndex(function (d) {
-              return d.id === columnId;
+              return d.id === column.id;
             });
             var hasDescDefined = typeof desc !== 'undefined' && desc !== null;
             var newSorting = []; // What should we do with this sort action?
@@ -3277,7 +3022,7 @@
               }
             }
 
-            var sortDescFirst = (_ref2 = (_column$sortDescFirst = column.sortDescFirst) != null ? _column$sortDescFirst : instance.options.sortDescFirst) != null ? _ref2 : instance.getColumnAutoSortDir(columnId) === 'desc'; // Handle toggle states that will remove the sorting
+            var sortDescFirst = (_ref2 = (_column$sortDescFirst = column.sortDescFirst) != null ? _column$sortDescFirst : instance.options.sortDescFirst) != null ? _ref2 : column.getAutoSortDir() === 'desc'; // Handle toggle states that will remove the sorting
 
             if (sortAction === 'toggle' && ( // Must be toggling
             (_instance$options$ena = instance.options.enableSortingRemoval) != null ? _instance$options$ena : true) && // If enableSortRemove, enable in general
@@ -3290,14 +3035,14 @@
 
             if (sortAction === 'replace') {
               newSorting = [{
-                id: columnId,
+                id: column.id,
                 desc: hasDescDefined ? desc : !!sortDescFirst
               }];
             } else if (sortAction === 'add' && old != null && old.length) {
               var _instance$options$max;
 
               newSorting = [].concat(old, [{
-                id: columnId,
+                id: column.id,
                 desc: hasDescDefined ? desc : !!sortDescFirst
               }]); // Take latest n columns
 
@@ -3305,7 +3050,7 @@
             } else if (sortAction === 'toggle' && old != null && old.length) {
               // This flips (or sets) the
               newSorting = old.map(function (d) {
-                if (d.id === columnId) {
+                if (d.id === column.id) {
                   return _extends({}, d, {
                     desc: hasDescDefined ? desc : !(existingSorting != null && existingSorting.desc)
                   });
@@ -3315,51 +3060,36 @@
               });
             } else if (sortAction === 'remove' && old != null && old.length) {
               newSorting = old.filter(function (d) {
-                return d.id !== columnId;
+                return d.id !== column.id;
               });
             }
 
             return newSorting;
           });
         },
-        getColumnCanSort: function getColumnCanSort(columnId) {
-          var _ref3, _ref4, _column$enableSorting;
-
-          var column = instance.getColumn(columnId);
-
-          if (!column) {
-            throw new Error();
-          }
+        getCanSort: function getCanSort() {
+          var _column$enableSorting, _instance$options$ena3;
 
-          return (_ref3 = (_ref4 = (_column$enableSorting = column.enableSorting) != null ? _column$enableSorting : instance.options.enableSorting) != null ? _ref4 : column.defaultCanSort) != null ? _ref3 : !!column.accessorFn // (!!column.accessorFn ||
-          //   column.columns?.some(c => c.id && instance.getColumnCanSort(c.id))) ??
-          // false
-          ;
+          return ((_column$enableSorting = column.enableSorting) != null ? _column$enableSorting : true) && ((_instance$options$ena3 = instance.options.enableSorting) != null ? _instance$options$ena3 : true) && !!column.accessorFn;
         },
-        getColumnCanMultiSort: function getColumnCanMultiSort(columnId) {
-          var _ref5, _column$enableMultiSo;
-
-          var column = instance.getColumn(columnId);
-
-          if (!column) {
-            throw new Error();
-          }
+        getCanMultiSort: function getCanMultiSort() {
+          var _ref3, _column$enableMultiSo;
 
-          return (_ref5 = (_column$enableMultiSo = column.enableMultiSort) != null ? _column$enableMultiSo : instance.options.enableMultiSort) != null ? _ref5 : !!column.accessorFn;
+          return (_ref3 = (_column$enableMultiSo = column.enableMultiSort) != null ? _column$enableMultiSo : instance.options.enableMultiSort) != null ? _ref3 : !!column.accessorFn;
         },
-        getColumnIsSorted: function getColumnIsSorted(columnId) {
+        getIsSorted: function getIsSorted() {
           var _instance$getState$so;
 
           var columnSort = (_instance$getState$so = instance.getState().sorting) == null ? void 0 : _instance$getState$so.find(function (d) {
-            return d.id === columnId;
+            return d.id === column.id;
           });
           return !columnSort ? false : columnSort.desc ? 'desc' : 'asc';
         },
-        getColumnSortIndex: function getColumnSortIndex(columnId) {
+        getSortIndex: function getSortIndex() {
           var _instance$getState$so2, _instance$getState$so3;
 
           return (_instance$getState$so2 = (_instance$getState$so3 = instance.getState().sorting) == null ? void 0 : _instance$getState$so3.findIndex(function (d) {
-            return d.id === columnId;
+            return d.id === column.id;
           })) != null ? _instance$getState$so2 : -1;
         },
         resetSorting: function resetSorting(columnId) {
@@ -3375,22 +3105,23 @@
             instance.setSorting((_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.sorting) != null ? _instance$initialStat : []);
           }
         },
-        getToggleSortingHandler: function getToggleSortingHandler(columnId) {
-          var column = instance.getColumn(columnId);
-
-          if (!column) {
-            throw new Error();
-          }
-
+        getToggleSortingHandler: function getToggleSortingHandler() {
           var canSort = column.getCanSort();
           return function (e) {
             if (!canSort) return;
             e.persist == null ? void 0 : e.persist();
             column.toggleSorting == null ? void 0 : column.toggleSorting(undefined, column.getCanMultiSort() ? instance.options.isMultiSortEvent == null ? void 0 : instance.options.isMultiSortEvent(e) : false);
           };
+        }
+      };
+    },
+    createInstance: function createInstance(instance) {
+      return {
+        setSorting: function setSorting(updater) {
+          return instance.options.onSortingChange == null ? void 0 : instance.options.onSortingChange(updater);
         },
         getPreSortedRowModel: function getPreSortedRowModel() {
-          return instance.getGlobalFilteredRowModel();
+          return instance.getFilteredRowModel();
         },
         getSortedRowModel: function getSortedRowModel() {
           if (!instance._getSortedRowModel && instance.options.getSortedRowModel) {
@@ -3409,10 +3140,10 @@
 
   //
   var Visibility = {
-    getInitialState: function getInitialState() {
-      return {
+    getInitialState: function getInitialState(state) {
+      return _extends({
         columnVisibility: {}
-      };
+      }, state);
     },
     getDefaultOptions: function getDefaultOptions(instance) {
       return {
@@ -3426,14 +3157,24 @@
     },
     createColumn: function createColumn(column, instance) {
       return {
-        getCanHide: function getCanHide() {
-          return instance.getColumnCanHide(column.id);
+        toggleVisibility: function toggleVisibility(value) {
+          if (column.getCanHide()) {
+            instance.setColumnVisibility(function (old) {
+              var _extends2;
+
+              return _extends({}, old, (_extends2 = {}, _extends2[column.id] = value != null ? value : !column.getIsVisible(), _extends2));
+            });
+          }
         },
         getIsVisible: function getIsVisible() {
-          return instance.getColumnIsVisible(column.id);
+          var _instance$getState$co, _instance$getState$co2;
+
+          return (_instance$getState$co = (_instance$getState$co2 = instance.getState().columnVisibility) == null ? void 0 : _instance$getState$co2[column.id]) != null ? _instance$getState$co : true;
         },
-        toggleVisibility: function toggleVisibility(value) {
-          return instance.toggleColumnVisibility(column.id, value);
+        getCanHide: function getCanHide() {
+          var _column$enableHiding, _instance$options$ena;
+
+          return ((_column$enableHiding = column.enableHiding) != null ? _column$enableHiding : true) && ((_instance$options$ena = instance.options.enableHiding) != null ? _instance$options$ena : true);
         },
         getToggleVisibilityHandler: function getToggleVisibilityHandler() {
           return function (e) {
@@ -3455,7 +3196,7 @@
             return cell.column.getIsVisible();
           });
         }, {
-          key: 'row._getAllVisibleCells',
+          key: "development" === 'production' ,
           debug: function debug() {
             var _instance$options$deb;
 
@@ -3517,17 +3258,6 @@
         setColumnVisibility: function setColumnVisibility(updater) {
           return instance.options.onColumnVisibilityChange == null ? void 0 : instance.options.onColumnVisibilityChange(updater);
         },
-        toggleColumnVisibility: function toggleColumnVisibility(columnId, value) {
-          if (!columnId) return;
-
-          if (instance.getColumnCanHide(columnId)) {
-            instance.setColumnVisibility(function (old) {
-              var _extends2;
-
-              return _extends({}, old, (_extends2 = {}, _extends2[columnId] = value != null ? value : !instance.getColumnIsVisible(columnId), _extends2));
-            });
-          }
-        },
         toggleAllColumnsVisible: function toggleAllColumnsVisible(value) {
           var _value;
 
@@ -3538,28 +3268,6 @@
             return _extends({}, obj, (_extends3 = {}, _extends3[column.id] = !value ? !(column.getCanHide != null && column.getCanHide()) : value, _extends3));
           }, {}));
         },
-        getColumnIsVisible: function getColumnIsVisible(columnId) {
-          var _ref, _instance$getState$co, _instance$getState$co2;
-
-          var column = instance.getColumn(columnId);
-
-          if (!column) {
-            throw new Error();
-          }
-
-          return (_ref = (_instance$getState$co = (_instance$getState$co2 = instance.getState().columnVisibility) == null ? void 0 : _instance$getState$co2[columnId]) != null ? _instance$getState$co : column.defaultIsVisible) != null ? _ref : true;
-        },
-        getColumnCanHide: function getColumnCanHide(columnId) {
-          var _ref2, _ref3, _instance$options$ena;
-
-          var column = instance.getColumn(columnId);
-
-          if (!column) {
-            throw new Error();
-          }
-
-          return (_ref2 = (_ref3 = (_instance$options$ena = instance.options.enableHiding) != null ? _instance$options$ena : column.enableHiding) != null ? _ref3 : column.defaultCanHide) != null ? _ref2 : true;
-        },
         getIsAllColumnsVisible: function getIsAllColumnsVisible() {
           return !instance.getAllLeafColumns().some(function (column) {
             return !(column.getIsVisible != null && column.getIsVisible());
@@ -3600,30 +3308,6 @@
             colSpan: 0,
             rowSpan: 0,
             headerGroup: null,
-            getSize: function getSize() {
-              var sum = 0;
-
-              var recurse = function recurse(header) {
-                if (header.subHeaders.length) {
-                  header.subHeaders.forEach(recurse);
-                } else {
-                  var _header$column$getSiz;
-
-                  sum += (_header$column$getSiz = header.column.getSize()) != null ? _header$column$getSiz : 0;
-                }
-              };
-
-              recurse(header);
-              return sum;
-            },
-            getStart: function getStart() {
-              if (header.index > 0) {
-                var prevSiblingHeader = header.headerGroup.headers[header.index - 1];
-                return prevSiblingHeader.getStart() + prevSiblingHeader.getSize();
-              }
-
-              return 0;
-            },
             getLeafHeaders: function getLeafHeaders() {
               var leafHeaders = [];
 
@@ -4078,9 +3762,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;
@@ -4108,7 +3796,6 @@
           });
         }
       },
-      // willUpdate: () => {},
       initialState: initialState,
       reset: function reset() {
         instance.setState(instance.initialState);
@@ -4410,243 +4097,98 @@
     };
   }
 
-  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) {
-        var columnFilteredRowModel = function () {
-          if (!rowModel.rows.length || !(columnFilters != null && columnFilters.length)) {
-            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);
-
-              if (!column) {
-                {
-                  console.warn("Table: Could not find a column with id: " + columnId);
-                }
-
-                throw new Error();
-              }
-
-              if (depth === 0) {
-                (function () {
-                  var preFilteredRows = [].concat(rowsToFilter);
-
-                  column.getPreFilteredRows = function () {
-                    return preFilteredRows;
-                  };
-                })();
-              }
-
-              var filterFn = instance.getColumnFilterFn(column.id);
-
-              if (!filterFn) {
-                {
-                  console.warn("Could not find a valid 'column.filterFn' for column with the ID: " + column.id + ".");
-                }
+        return [instance.getPreFilteredRowModel(), instance.getState().columnFilters, instance.getState().globalFilter];
+      }, function (rowModel, columnFilters, globalFilter) {
+        if (!rowModel.rows.length || !(columnFilters != null && columnFilters.length) && !globalFilter) {
+          return rowModel;
+        }
 
-                continue;
-              } // Pass the rows, id, filterValue and column to the filterFn
-              // to get the filtered rows back
+        var resolvedColumnFilters = [];
+        var resolvedGlobalFilters = [];
+        (columnFilters != null ? columnFilters : []).forEach(function (d) {
+          var _filterFn$resolveFilt;
 
+          var column = instance.getColumn(d.id);
 
-              rowsToFilter = filterFn(rowsToFilter, [columnId], filterValue);
+          if (!column) {
+            {
+              console.warn("Table: Could not find a column to filter with columnId: " + d.id);
             }
-
-            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;
-
-          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
-
-        nonFilteredColumns.forEach(function (column) {
-          column.getPreFilteredRows = function () {
-            return columnFilteredRowModel.rows;
-          };
-        });
-        return columnFilteredRowModel;
-      }, {
-        key: 'getColumnFilteredRowModelSync',
-        debug: function debug() {
-          var _instance$options$deb;
-
-          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();
+          var filterFn = column.getFilterFn();
 
           if (!filterFn) {
             {
-              console.warn("Could not find a valid 'globalFilterType'");
+              console.warn("Could not find a valid 'column.filterFn' for column with the ID: " + column.id + ".");
             }
 
-            return rowModel;
+            return;
           }
 
-          var filterableColumns = instance.getAllLeafColumns().filter(function (column) {
-            return column.getCanGlobalFilter();
+          resolvedColumnFilters.push({
+            id: d.id,
+            filterFn: filterFn,
+            resolvedValue: (_filterFn$resolveFilt = filterFn.resolveFilterValue == null ? void 0 : filterFn.resolveFilterValue(d.value)) != null ? _filterFn$resolveFilt : d.value
           });
-          var filterableColumnIds = filterableColumns.map(function (d) {
-            return d.id;
+        });
+        var filterableIds = columnFilters.map(function (d) {
+          return d.id;
+        });
+        var globalFilterFn = instance.getGlobalFilterFn();
+        var globallyFilterableColumns = instance.getAllLeafColumns().filter(function (column) {
+          return column.getCanGlobalFilter();
+        });
+
+        if (globalFilter && globalFilterFn && globallyFilterableColumns.length) {
+          filterableIds.push('__global__');
+          globallyFilterableColumns.forEach(function (column) {
+            var _globalFilterFn$resol;
+
+            resolvedGlobalFilters.push({
+              id: column.id,
+              filterFn: globalFilterFn,
+              resolvedValue: (_globalFilterFn$resol = globalFilterFn.resolveFilterValue == null ? void 0 : globalFilterFn.resolveFilterValue(globalFilter)) != null ? _globalFilterFn$resol : globalFilter
+            });
           });
+        } // Flag the prefiltered row model with each filter state
 
-          var filterRows = function filterRows(rows) {
-            return filterFn(rows, filterableColumnIds, globalFilter);
-          };
 
-          if (filterFromLeafRows) {
-            return filterRowModelFromLeafs(rowModel.rows, filterRows, instance);
+        for (var j = 0; j < rowModel.flatRows.length; j++) {
+          var row = rowModel.flatRows[j];
+          row.columnFilterMap = {};
+
+          if (resolvedColumnFilters.length) {
+            for (var i = 0; i < resolvedColumnFilters.length; i++) {
+              var columnFilter = resolvedColumnFilters[i]; // Tag the row with the column filter state
+
+              row.columnFilterMap[columnFilter.id] = columnFilter.filterFn(row, columnFilter.id, columnFilter.resolvedValue);
+            }
           }
 
-          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 (resolvedGlobalFilters.length) {
+            for (var _i = 0; _i < resolvedGlobalFilters.length; _i++) {
+              var _globalFilter = resolvedGlobalFilters[_i]; // Tag the row with the first truthy global filter state
 
+              if (_globalFilter.filterFn(row, _globalFilter.id, _globalFilter.resolvedValue)) {
+                row.columnFilterMap.__global__ = true;
+                break;
+              }
+            }
 
-        var nonFilteredColumns = instance.getAllLeafColumns().filter(function (column) {
-          var _instance$getState$co;
+            if (row.columnFilterMap.__global__ !== true) {
+              row.columnFilterMap.__global__ = false;
+            }
+          }
+        } // Filter final rows using all of the active filters
 
-          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
 
-        nonFilteredColumns.forEach(function (column) {
-          column.getPreFilteredRows = function () {
-            return globalFilteredRowModel.rows;
-          };
-        });
-        return globalFilteredRowModel;
+        return filterRows(rowModel.rows, filterableIds, instance);
       }, {
-        key: 'getGlobalFilteredRowModelSync',
+        key: 'getFilteredRowModelSync',
         debug: function debug() {
           var _instance$options$deb;
 
@@ -4674,7 +4216,7 @@
         var sortedFlatRows = []; // Filter out sortings that correspond to non existing columns
 
         var availableSorting = sortingState.filter(function (sort) {
-          return instance.getColumnCanSort(sort.id);
+          return instance.getColumn(sort.id).getCanSort();
         });
         var columnInfoById = {};
         availableSorting.forEach(function (sortEntry) {
@@ -4682,7 +4224,7 @@
           columnInfoById[sortEntry.id] = {
             sortUndefined: column.sortUndefined,
             invertSorting: column.invertSorting,
-            sortingFn: instance.getColumnSortingFn(sortEntry.id)
+            sortingFn: column.getSortingFn()
           };
         });
 
@@ -4950,7 +4492,7 @@
 
       expandedRows.push(row);
 
-      if (instance.options.expandSubRows && (_row$subRows = row.subRows) != null && _row$subRows.length && instance.getIsRowExpanded(row.id)) {
+      if (instance.options.expandSubRows && (_row$subRows = row.subRows) != null && _row$subRows.length && row.getIsExpanded()) {
         row.subRows.forEach(handleRow);
       }
     };
@@ -5024,13 +4566,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;
@@ -5038,6 +4581,7 @@
   exports.makeStateUpdater = makeStateUpdater;
   exports.memo = memo;
   exports.noop = noop;
+  exports.orderColumns = orderColumns;
   exports.passiveEventSupported = passiveEventSupported;
   exports.selectRowsFn = selectRowsFn;
   exports.shouldAutoRemoveFilter = shouldAutoRemoveFilter;