@tanstack/table-core 8.0.12 → 8.1.0

package/build/esm/index.js

@@ -13,9 +13,9 @@ function functionalUpdate(updater, input) {
 }
 function noop() {//
 }
-function makeStateUpdater(key, instance) {
+function makeStateUpdater(key, table) {
   return updater => {
-    instance.setState(old => {
+    table.setState(old => {
       return { ...old,
         [key]: functionalUpdate(updater, old[key])
       };
@@ -85,38 +85,37 @@ function memo(getDeps, fn, opts) {
   };
 }
 
-function createColumn(instance, columnDef, depth, parent) {
-  var _ref, _columnDef$id;
+function createColumn(table, columnDef, depth, parent) {
+  var _ref, _resolvedColumnDef$id;
 
-  const defaultColumn = instance._getDefaultColumnDef();
+  const defaultColumn = table._getDefaultColumnDef();
 
-  columnDef = { ...defaultColumn,
+  const resolvedColumnDef = { ...defaultColumn,
     ...columnDef
   };
-  let id = (_ref = (_columnDef$id = columnDef.id) != null ? _columnDef$id : columnDef.accessorKey) != null ? _ref : typeof columnDef.header === 'string' ? columnDef.header : undefined;
+  let id = (_ref = (_resolvedColumnDef$id = resolvedColumnDef.id) != null ? _resolvedColumnDef$id : resolvedColumnDef.accessorKey) != null ? _ref : typeof resolvedColumnDef.header === 'string' ? resolvedColumnDef.header : undefined;
   let accessorFn;
 
-  if (columnDef.accessorFn) {
-    accessorFn = columnDef.accessorFn;
-  } else if (columnDef.accessorKey) {
-    accessorFn = originalRow => originalRow[columnDef.accessorKey];
+  if (resolvedColumnDef.accessorFn) {
+    accessorFn = resolvedColumnDef.accessorFn;
+  } else if (resolvedColumnDef.accessorKey) {
+    accessorFn = originalRow => originalRow[resolvedColumnDef.accessorKey];
   }
 
   if (!id) {
     if (process.env.NODE_ENV !== 'production') {
-      throw new Error(columnDef.accessorFn ? "Columns require an id when using an accessorFn" : "Columns require an id when using a non-string header");
+      throw new Error(resolvedColumnDef.accessorFn ? "Columns require an id when using an accessorFn" : "Columns require an id when using a non-string header");
     }
 
     throw new Error();
   }
 
   let column = {
-    id: "" + id,
+    id: "" + String(id),
     accessorFn,
     parent: parent,
     depth,
-    columnDef,
-    columnDefType: columnDef.columnDefType,
+    columnDef: resolvedColumnDef,
     columns: [],
     getFlatColumns: memo(() => [true], () => {
       var _column$columns;
@@ -125,12 +124,12 @@ function createColumn(instance, columnDef, depth, parent) {
     }, {
       key: process.env.NODE_ENV === 'production' && 'column.getFlatColumns',
       debug: () => {
-        var _instance$options$deb;
+        var _table$options$debugA;
 
-        return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugColumns;
+        return (_table$options$debugA = table.options.debugAll) != null ? _table$options$debugA : table.options.debugColumns;
       }
     }),
-    getLeafColumns: memo(() => [instance._getOrderColumnsFn()], orderColumns => {
+    getLeafColumns: memo(() => [table._getOrderColumnsFn()], orderColumns => {
       var _column$columns2;
 
       if ((_column$columns2 = column.columns) != null && _column$columns2.length) {
@@ -142,21 +141,21 @@ function createColumn(instance, columnDef, depth, parent) {
     }, {
       key: process.env.NODE_ENV === 'production' && 'column.getLeafColumns',
       debug: () => {
-        var _instance$options$deb2;
+        var _table$options$debugA2;
 
-        return (_instance$options$deb2 = instance.options.debugAll) != null ? _instance$options$deb2 : instance.options.debugColumns;
+        return (_table$options$debugA2 = table.options.debugAll) != null ? _table$options$debugA2 : table.options.debugColumns;
       }
     })
   };
-  column = instance._features.reduce((obj, feature) => {
-    return Object.assign(obj, feature.createColumn == null ? void 0 : feature.createColumn(column, instance));
-  }, column); // Yes, we have to convert instance to uknown, because we know more than the compiler here.
+  column = table._features.reduce((obj, feature) => {
+    return Object.assign(obj, feature.createColumn == null ? void 0 : feature.createColumn(column, table));
+  }, column); // Yes, we have to convert table to uknown, because we know more than the compiler here.
 
   return column;
 }
 
 //
-function createHeader(instance, column, options) {
+function createHeader(table, column, options) {
   var _options$id;
 
   const id = (_options$id = options.id) != null ? _options$id : column.id;
@@ -185,174 +184,169 @@ function createHeader(instance, column, options) {
       recurseHeader(header);
       return leafHeaders;
     },
-    renderHeader: () => column.columnDef.header ? instance._render(column.columnDef.header, {
-      instance,
+    getContext: () => ({
+      table,
       header: header,
       column
-    }) : null,
-    renderFooter: () => column.columnDef.footer ? instance._render(column.columnDef.footer, {
-      instance,
-      header: header,
-      column
-    }) : null
+    })
   };
 
-  instance._features.forEach(feature => {
-    Object.assign(header, feature.createHeader == null ? void 0 : feature.createHeader(header, instance));
+  table._features.forEach(feature => {
+    Object.assign(header, feature.createHeader == null ? void 0 : feature.createHeader(header, table));
   });
 
   return header;
 }
 
 const Headers = {
-  createInstance: instance => {
+  createTable: table => {
     return {
       // Header Groups
-      getHeaderGroups: memo(() => [instance.getAllColumns(), instance.getVisibleLeafColumns(), instance.getState().columnPinning.left, instance.getState().columnPinning.right], (allColumns, leafColumns, left, right) => {
+      getHeaderGroups: memo(() => [table.getAllColumns(), table.getVisibleLeafColumns(), table.getState().columnPinning.left, table.getState().columnPinning.right], (allColumns, leafColumns, left, right) => {
         var _left$map$filter, _right$map$filter;
 
         const leftColumns = (_left$map$filter = left == null ? void 0 : left.map(columnId => leafColumns.find(d => d.id === columnId)).filter(Boolean)) != null ? _left$map$filter : [];
         const rightColumns = (_right$map$filter = right == null ? void 0 : right.map(columnId => leafColumns.find(d => d.id === columnId)).filter(Boolean)) != null ? _right$map$filter : [];
         const centerColumns = leafColumns.filter(column => !(left != null && left.includes(column.id)) && !(right != null && right.includes(column.id)));
-        const headerGroups = buildHeaderGroups(allColumns, [...leftColumns, ...centerColumns, ...rightColumns], instance);
+        const headerGroups = buildHeaderGroups(allColumns, [...leftColumns, ...centerColumns, ...rightColumns], table);
         return headerGroups;
       }, {
         key: process.env.NODE_ENV === 'development' && 'getHeaderGroups',
         debug: () => {
-          var _instance$options$deb;
+          var _table$options$debugA;
 
-          return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugHeaders;
+          return (_table$options$debugA = table.options.debugAll) != null ? _table$options$debugA : table.options.debugHeaders;
         }
       }),
-      getCenterHeaderGroups: memo(() => [instance.getAllColumns(), instance.getVisibleLeafColumns(), instance.getState().columnPinning.left, instance.getState().columnPinning.right], (allColumns, leafColumns, left, right) => {
+      getCenterHeaderGroups: memo(() => [table.getAllColumns(), table.getVisibleLeafColumns(), table.getState().columnPinning.left, table.getState().columnPinning.right], (allColumns, leafColumns, left, right) => {
         leafColumns = leafColumns.filter(column => !(left != null && left.includes(column.id)) && !(right != null && right.includes(column.id)));
-        return buildHeaderGroups(allColumns, leafColumns, instance, 'center');
+        return buildHeaderGroups(allColumns, leafColumns, table, 'center');
       }, {
         key: process.env.NODE_ENV === 'development' && 'getCenterHeaderGroups',
         debug: () => {
-          var _instance$options$deb2;
+          var _table$options$debugA2;
 
-          return (_instance$options$deb2 = instance.options.debugAll) != null ? _instance$options$deb2 : instance.options.debugHeaders;
+          return (_table$options$debugA2 = table.options.debugAll) != null ? _table$options$debugA2 : table.options.debugHeaders;
         }
       }),
-      getLeftHeaderGroups: memo(() => [instance.getAllColumns(), instance.getVisibleLeafColumns(), instance.getState().columnPinning.left], (allColumns, leafColumns, left) => {
+      getLeftHeaderGroups: memo(() => [table.getAllColumns(), table.getVisibleLeafColumns(), table.getState().columnPinning.left], (allColumns, leafColumns, left) => {
         var _left$map$filter2;
 
         const orderedLeafColumns = (_left$map$filter2 = left == null ? void 0 : left.map(columnId => leafColumns.find(d => d.id === columnId)).filter(Boolean)) != null ? _left$map$filter2 : [];
-        return buildHeaderGroups(allColumns, orderedLeafColumns, instance, 'left');
+        return buildHeaderGroups(allColumns, orderedLeafColumns, table, 'left');
       }, {
         key: process.env.NODE_ENV === 'development' && 'getLeftHeaderGroups',
         debug: () => {
-          var _instance$options$deb3;
+          var _table$options$debugA3;
 
-          return (_instance$options$deb3 = instance.options.debugAll) != null ? _instance$options$deb3 : instance.options.debugHeaders;
+          return (_table$options$debugA3 = table.options.debugAll) != null ? _table$options$debugA3 : table.options.debugHeaders;
         }
       }),
-      getRightHeaderGroups: memo(() => [instance.getAllColumns(), instance.getVisibleLeafColumns(), instance.getState().columnPinning.right], (allColumns, leafColumns, right) => {
+      getRightHeaderGroups: memo(() => [table.getAllColumns(), table.getVisibleLeafColumns(), table.getState().columnPinning.right], (allColumns, leafColumns, right) => {
         var _right$map$filter2;
 
         const orderedLeafColumns = (_right$map$filter2 = right == null ? void 0 : right.map(columnId => leafColumns.find(d => d.id === columnId)).filter(Boolean)) != null ? _right$map$filter2 : [];
-        return buildHeaderGroups(allColumns, orderedLeafColumns, instance, 'right');
+        return buildHeaderGroups(allColumns, orderedLeafColumns, table, 'right');
       }, {
         key: process.env.NODE_ENV === 'development' && 'getRightHeaderGroups',
         debug: () => {
-          var _instance$options$deb4;
+          var _table$options$debugA4;
 
-          return (_instance$options$deb4 = instance.options.debugAll) != null ? _instance$options$deb4 : instance.options.debugHeaders;
+          return (_table$options$debugA4 = table.options.debugAll) != null ? _table$options$debugA4 : table.options.debugHeaders;
         }
       }),
       // Footer Groups
-      getFooterGroups: memo(() => [instance.getHeaderGroups()], headerGroups => {
+      getFooterGroups: memo(() => [table.getHeaderGroups()], headerGroups => {
         return [...headerGroups].reverse();
       }, {
         key: process.env.NODE_ENV === 'development' && 'getFooterGroups',
         debug: () => {
-          var _instance$options$deb5;
+          var _table$options$debugA5;
 
-          return (_instance$options$deb5 = instance.options.debugAll) != null ? _instance$options$deb5 : instance.options.debugHeaders;
+          return (_table$options$debugA5 = table.options.debugAll) != null ? _table$options$debugA5 : table.options.debugHeaders;
         }
       }),
-      getLeftFooterGroups: memo(() => [instance.getLeftHeaderGroups()], headerGroups => {
+      getLeftFooterGroups: memo(() => [table.getLeftHeaderGroups()], headerGroups => {
         return [...headerGroups].reverse();
       }, {
         key: process.env.NODE_ENV === 'development' && 'getLeftFooterGroups',
         debug: () => {
-          var _instance$options$deb6;
+          var _table$options$debugA6;
 
-          return (_instance$options$deb6 = instance.options.debugAll) != null ? _instance$options$deb6 : instance.options.debugHeaders;
+          return (_table$options$debugA6 = table.options.debugAll) != null ? _table$options$debugA6 : table.options.debugHeaders;
         }
       }),
-      getCenterFooterGroups: memo(() => [instance.getCenterHeaderGroups()], headerGroups => {
+      getCenterFooterGroups: memo(() => [table.getCenterHeaderGroups()], headerGroups => {
         return [...headerGroups].reverse();
       }, {
         key: process.env.NODE_ENV === 'development' && 'getCenterFooterGroups',
         debug: () => {
-          var _instance$options$deb7;
+          var _table$options$debugA7;
 
-          return (_instance$options$deb7 = instance.options.debugAll) != null ? _instance$options$deb7 : instance.options.debugHeaders;
+          return (_table$options$debugA7 = table.options.debugAll) != null ? _table$options$debugA7 : table.options.debugHeaders;
         }
       }),
-      getRightFooterGroups: memo(() => [instance.getRightHeaderGroups()], headerGroups => {
+      getRightFooterGroups: memo(() => [table.getRightHeaderGroups()], headerGroups => {
         return [...headerGroups].reverse();
       }, {
         key: process.env.NODE_ENV === 'development' && 'getRightFooterGroups',
         debug: () => {
-          var _instance$options$deb8;
+          var _table$options$debugA8;
 
-          return (_instance$options$deb8 = instance.options.debugAll) != null ? _instance$options$deb8 : instance.options.debugHeaders;
+          return (_table$options$debugA8 = table.options.debugAll) != null ? _table$options$debugA8 : table.options.debugHeaders;
         }
       }),
       // Flat Headers
-      getFlatHeaders: memo(() => [instance.getHeaderGroups()], headerGroups => {
+      getFlatHeaders: memo(() => [table.getHeaderGroups()], headerGroups => {
         return headerGroups.map(headerGroup => {
           return headerGroup.headers;
         }).flat();
       }, {
         key: process.env.NODE_ENV === 'development' && 'getFlatHeaders',
         debug: () => {
-          var _instance$options$deb9;
+          var _table$options$debugA9;
 
-          return (_instance$options$deb9 = instance.options.debugAll) != null ? _instance$options$deb9 : instance.options.debugHeaders;
+          return (_table$options$debugA9 = table.options.debugAll) != null ? _table$options$debugA9 : table.options.debugHeaders;
         }
       }),
-      getLeftFlatHeaders: memo(() => [instance.getLeftHeaderGroups()], left => {
+      getLeftFlatHeaders: memo(() => [table.getLeftHeaderGroups()], left => {
         return left.map(headerGroup => {
           return headerGroup.headers;
         }).flat();
       }, {
         key: process.env.NODE_ENV === 'development' && 'getLeftFlatHeaders',
         debug: () => {
-          var _instance$options$deb10;
+          var _table$options$debugA10;
 
-          return (_instance$options$deb10 = instance.options.debugAll) != null ? _instance$options$deb10 : instance.options.debugHeaders;
+          return (_table$options$debugA10 = table.options.debugAll) != null ? _table$options$debugA10 : table.options.debugHeaders;
         }
       }),
-      getCenterFlatHeaders: memo(() => [instance.getCenterHeaderGroups()], left => {
+      getCenterFlatHeaders: memo(() => [table.getCenterHeaderGroups()], left => {
         return left.map(headerGroup => {
           return headerGroup.headers;
         }).flat();
       }, {
         key: process.env.NODE_ENV === 'development' && 'getCenterFlatHeaders',
         debug: () => {
-          var _instance$options$deb11;
+          var _table$options$debugA11;
 
-          return (_instance$options$deb11 = instance.options.debugAll) != null ? _instance$options$deb11 : instance.options.debugHeaders;
+          return (_table$options$debugA11 = table.options.debugAll) != null ? _table$options$debugA11 : table.options.debugHeaders;
         }
       }),
-      getRightFlatHeaders: memo(() => [instance.getRightHeaderGroups()], left => {
+      getRightFlatHeaders: memo(() => [table.getRightHeaderGroups()], left => {
         return left.map(headerGroup => {
           return headerGroup.headers;
         }).flat();
       }, {
         key: process.env.NODE_ENV === 'development' && 'getRightFlatHeaders',
         debug: () => {
-          var _instance$options$deb12;
+          var _table$options$debugA12;
 
-          return (_instance$options$deb12 = instance.options.debugAll) != null ? _instance$options$deb12 : instance.options.debugHeaders;
+          return (_table$options$debugA12 = table.options.debugAll) != null ? _table$options$debugA12 : table.options.debugHeaders;
         }
       }),
       // Leaf Headers
-      getCenterLeafHeaders: memo(() => [instance.getCenterFlatHeaders()], flatHeaders => {
+      getCenterLeafHeaders: memo(() => [table.getCenterFlatHeaders()], flatHeaders => {
         return flatHeaders.filter(header => {
           var _header$subHeaders;
 
@@ -361,12 +355,12 @@ const Headers = {
       }, {
         key: process.env.NODE_ENV === 'development' && 'getCenterLeafHeaders',
         debug: () => {
-          var _instance$options$deb13;
+          var _table$options$debugA13;
 
-          return (_instance$options$deb13 = instance.options.debugAll) != null ? _instance$options$deb13 : instance.options.debugHeaders;
+          return (_table$options$debugA13 = table.options.debugAll) != null ? _table$options$debugA13 : table.options.debugHeaders;
         }
       }),
-      getLeftLeafHeaders: memo(() => [instance.getLeftFlatHeaders()], flatHeaders => {
+      getLeftLeafHeaders: memo(() => [table.getLeftFlatHeaders()], flatHeaders => {
         return flatHeaders.filter(header => {
           var _header$subHeaders2;
 
@@ -375,12 +369,12 @@ const Headers = {
       }, {
         key: process.env.NODE_ENV === 'development' && 'getLeftLeafHeaders',
         debug: () => {
-          var _instance$options$deb14;
+          var _table$options$debugA14;
 
-          return (_instance$options$deb14 = instance.options.debugAll) != null ? _instance$options$deb14 : instance.options.debugHeaders;
+          return (_table$options$debugA14 = table.options.debugAll) != null ? _table$options$debugA14 : table.options.debugHeaders;
         }
       }),
-      getRightLeafHeaders: memo(() => [instance.getRightFlatHeaders()], flatHeaders => {
+      getRightLeafHeaders: memo(() => [table.getRightFlatHeaders()], flatHeaders => {
         return flatHeaders.filter(header => {
           var _header$subHeaders3;
 
@@ -389,12 +383,12 @@ const Headers = {
       }, {
         key: process.env.NODE_ENV === 'development' && 'getRightLeafHeaders',
         debug: () => {
-          var _instance$options$deb15;
+          var _table$options$debugA15;
 
-          return (_instance$options$deb15 = instance.options.debugAll) != null ? _instance$options$deb15 : instance.options.debugHeaders;
+          return (_table$options$debugA15 = table.options.debugAll) != null ? _table$options$debugA15 : table.options.debugHeaders;
         }
       }),
-      getLeafHeaders: memo(() => [instance.getLeftHeaderGroups(), instance.getCenterHeaderGroups(), instance.getRightHeaderGroups()], (left, center, right) => {
+      getLeafHeaders: memo(() => [table.getLeftHeaderGroups(), table.getCenterHeaderGroups(), table.getRightHeaderGroups()], (left, center, right) => {
         var _left$0$headers, _left$, _center$0$headers, _center$, _right$0$headers, _right$;
 
         return [...((_left$0$headers = (_left$ = left[0]) == null ? void 0 : _left$.headers) != null ? _left$0$headers : []), ...((_center$0$headers = (_center$ = center[0]) == null ? void 0 : _center$.headers) != null ? _center$0$headers : []), ...((_right$0$headers = (_right$ = right[0]) == null ? void 0 : _right$.headers) != null ? _right$0$headers : [])].map(header => {
@@ -403,15 +397,15 @@ const Headers = {
       }, {
         key: process.env.NODE_ENV === 'development' && 'getLeafHeaders',
         debug: () => {
-          var _instance$options$deb16;
+          var _table$options$debugA16;
 
-          return (_instance$options$deb16 = instance.options.debugAll) != null ? _instance$options$deb16 : instance.options.debugHeaders;
+          return (_table$options$debugA16 = table.options.debugAll) != null ? _table$options$debugA16 : table.options.debugHeaders;
         }
       })
     };
   }
 };
-function buildHeaderGroups(allColumns, columnsToGroup, instance, headerFamily) {
+function buildHeaderGroups(allColumns, columnsToGroup, table, headerFamily) {
   var _headerGroups$0$heade, _headerGroups$;
 
   // Find the max depth of the columns:
@@ -465,12 +459,12 @@ function buildHeaderGroups(allColumns, columnsToGroup, instance, headerFamily) {
         isPlaceholder = true;
       }
 
-      if ((latestPendingParentHeader == null ? void 0 : latestPendingParentHeader.column) === column) {
+      if (latestPendingParentHeader && (latestPendingParentHeader == null ? void 0 : latestPendingParentHeader.column) === column) {
         // This column is repeated. Add it as a sub header to the next batch
         latestPendingParentHeader.subHeaders.push(headerToGroup);
       } else {
         // This is a new header. Let's create it
-        const header = createHeader(instance, column, {
+        const header = createHeader(table, column, {
           id: [headerFamily, depth, column.id, headerToGroup == null ? void 0 : headerToGroup.id].filter(Boolean).join('_'),
           isPlaceholder,
           placeholderId: isPlaceholder ? "" + pendingParentHeaders.filter(d => d.column === column).length : undefined,
@@ -494,7 +488,7 @@ function buildHeaderGroups(allColumns, columnsToGroup, instance, headerFamily) {
     }
   };
 
-  const bottomHeaders = columnsToGroup.map((column, index) => createHeader(instance, column, {
+  const bottomHeaders = columnsToGroup.map((column, index) => createHeader(table, column, {
     depth: maxDepth,
     index
   }));
@@ -566,23 +560,23 @@ const ColumnSizing = {
       ...state
     };
   },
-  getDefaultOptions: instance => {
+  getDefaultOptions: table => {
     return {
       columnResizeMode: 'onEnd',
-      onColumnSizingChange: makeStateUpdater('columnSizing', instance),
-      onColumnSizingInfoChange: makeStateUpdater('columnSizingInfo', instance)
+      onColumnSizingChange: makeStateUpdater('columnSizing', table),
+      onColumnSizingInfoChange: makeStateUpdater('columnSizingInfo', table)
     };
   },
-  createColumn: (column, instance) => {
+  createColumn: (column, table) => {
     return {
       getSize: () => {
         var _column$columnDef$min, _ref, _column$columnDef$max;
 
-        const columnSize = instance.getState().columnSizing[column.id];
+        const columnSize = table.getState().columnSizing[column.id];
         return Math.min(Math.max((_column$columnDef$min = column.columnDef.minSize) != null ? _column$columnDef$min : defaultColumnSizing.minSize, (_ref = columnSize != null ? columnSize : column.columnDef.size) != null ? _ref : defaultColumnSizing.size), (_column$columnDef$max = column.columnDef.maxSize) != null ? _column$columnDef$max : defaultColumnSizing.maxSize);
       },
       getStart: position => {
-        const columns = !position ? instance.getVisibleLeafColumns() : position === 'left' ? instance.getLeftVisibleLeafColumns() : instance.getRightVisibleLeafColumns();
+        const columns = !position ? table.getVisibleLeafColumns() : position === 'left' ? table.getLeftVisibleLeafColumns() : table.getRightVisibleLeafColumns();
         const index = columns.findIndex(d => d.id === column.id);
 
         if (index > 0) {
@@ -593,7 +587,7 @@ const ColumnSizing = {
         return 0;
       },
       resetSize: () => {
-        instance.setColumnSizing(_ref2 => {
+        table.setColumnSizing(_ref2 => {
           let {
             [column.id]: _,
             ...rest
@@ -602,16 +596,16 @@ const ColumnSizing = {
         });
       },
       getCanResize: () => {
-        var _column$columnDef$ena, _instance$options$ena;
+        var _column$columnDef$ena, _table$options$enable;
 
-        return ((_column$columnDef$ena = column.columnDef.enableResizing) != null ? _column$columnDef$ena : true) && ((_instance$options$ena = instance.options.enableColumnResizing) != null ? _instance$options$ena : true);
+        return ((_column$columnDef$ena = column.columnDef.enableResizing) != null ? _column$columnDef$ena : true) && ((_table$options$enable = table.options.enableColumnResizing) != null ? _table$options$enable : true);
       },
       getIsResizing: () => {
-        return instance.getState().columnSizingInfo.isResizingColumn === column.id;
+        return table.getState().columnSizingInfo.isResizingColumn === column.id;
       }
     };
   },
-  createHeader: (header, instance) => {
+  createHeader: (header, table) => {
     return {
       getSize: () => {
         let sum = 0;
@@ -638,7 +632,7 @@ const ColumnSizing = {
         return 0;
       },
       getResizeHandler: () => {
-        const column = instance.getColumn(header.column.id);
+        const column = table.getColumn(header.column.id);
         const canResize = column.getCanResize();
         return e => {
           if (!canResize) {
@@ -663,7 +657,7 @@ const ColumnSizing = {
             }
 
             let newColumnSizing = {};
-            instance.setColumnSizingInfo(old => {
+            table.setColumnSizingInfo(old => {
               var _old$startOffset, _old$startSize;
 
               const deltaOffset = clientXPos - ((_old$startOffset = old == null ? void 0 : old.startOffset) != null ? _old$startOffset : 0);
@@ -678,8 +672,8 @@ const ColumnSizing = {
               };
             });
 
-            if (instance.options.columnResizeMode === 'onChange' || eventType === 'end') {
-              instance.setColumnSizing(old => ({ ...old,
+            if (table.options.columnResizeMode === 'onChange' || eventType === 'end') {
+              table.setColumnSizing(old => ({ ...old,
                 ...newColumnSizing
               }));
             }
@@ -689,7 +683,7 @@ const ColumnSizing = {
 
           const onEnd = clientXPos => {
             updateOffset('end', clientXPos);
-            instance.setColumnSizingInfo(old => ({ ...old,
+            table.setColumnSizingInfo(old => ({ ...old,
               isResizingColumn: false,
               startOffset: null,
               startSize: null,
@@ -716,7 +710,7 @@ const ColumnSizing = {
             document.addEventListener('mouseup', mouseEvents.upHandler, passiveIfSupported);
           }
 
-          instance.setColumnSizingInfo(old => ({ ...old,
+          table.setColumnSizingInfo(old => ({ ...old,
             startOffset: clientX,
             startSize,
             deltaOffset: 0,
@@ -728,47 +722,47 @@ const ColumnSizing = {
       }
     };
   },
-  createInstance: instance => {
+  createTable: table => {
     return {
-      setColumnSizing: updater => instance.options.onColumnSizingChange == null ? void 0 : instance.options.onColumnSizingChange(updater),
-      setColumnSizingInfo: updater => instance.options.onColumnSizingInfoChange == null ? void 0 : instance.options.onColumnSizingInfoChange(updater),
+      setColumnSizing: updater => table.options.onColumnSizingChange == null ? void 0 : table.options.onColumnSizingChange(updater),
+      setColumnSizingInfo: updater => table.options.onColumnSizingInfoChange == null ? void 0 : table.options.onColumnSizingInfoChange(updater),
       resetColumnSizing: defaultState => {
-        var _instance$initialStat;
+        var _table$initialState$c;
 
-        instance.setColumnSizing(defaultState ? {} : (_instance$initialStat = instance.initialState.columnSizing) != null ? _instance$initialStat : {});
+        table.setColumnSizing(defaultState ? {} : (_table$initialState$c = table.initialState.columnSizing) != null ? _table$initialState$c : {});
       },
       resetHeaderSizeInfo: defaultState => {
-        var _instance$initialStat2;
+        var _table$initialState$c2;
 
-        instance.setColumnSizingInfo(defaultState ? getDefaultColumnSizingInfoState() : (_instance$initialStat2 = instance.initialState.columnSizingInfo) != null ? _instance$initialStat2 : getDefaultColumnSizingInfoState());
+        table.setColumnSizingInfo(defaultState ? getDefaultColumnSizingInfoState() : (_table$initialState$c2 = table.initialState.columnSizingInfo) != null ? _table$initialState$c2 : getDefaultColumnSizingInfoState());
       },
       getTotalSize: () => {
-        var _instance$getHeaderGr, _instance$getHeaderGr2;
+        var _table$getHeaderGroup, _table$getHeaderGroup2;
 
-        return (_instance$getHeaderGr = (_instance$getHeaderGr2 = instance.getHeaderGroups()[0]) == null ? void 0 : _instance$getHeaderGr2.headers.reduce((sum, header) => {
+        return (_table$getHeaderGroup = (_table$getHeaderGroup2 = table.getHeaderGroups()[0]) == null ? void 0 : _table$getHeaderGroup2.headers.reduce((sum, header) => {
           return sum + header.getSize();
-        }, 0)) != null ? _instance$getHeaderGr : 0;
+        }, 0)) != null ? _table$getHeaderGroup : 0;
       },
       getLeftTotalSize: () => {
-        var _instance$getLeftHead, _instance$getLeftHead2;
+        var _table$getLeftHeaderG, _table$getLeftHeaderG2;
 
-        return (_instance$getLeftHead = (_instance$getLeftHead2 = instance.getLeftHeaderGroups()[0]) == null ? void 0 : _instance$getLeftHead2.headers.reduce((sum, header) => {
+        return (_table$getLeftHeaderG = (_table$getLeftHeaderG2 = table.getLeftHeaderGroups()[0]) == null ? void 0 : _table$getLeftHeaderG2.headers.reduce((sum, header) => {
           return sum + header.getSize();
-        }, 0)) != null ? _instance$getLeftHead : 0;
+        }, 0)) != null ? _table$getLeftHeaderG : 0;
       },
       getCenterTotalSize: () => {
-        var _instance$getCenterHe, _instance$getCenterHe2;
+        var _table$getCenterHeade, _table$getCenterHeade2;
 
-        return (_instance$getCenterHe = (_instance$getCenterHe2 = instance.getCenterHeaderGroups()[0]) == null ? void 0 : _instance$getCenterHe2.headers.reduce((sum, header) => {
+        return (_table$getCenterHeade = (_table$getCenterHeade2 = table.getCenterHeaderGroups()[0]) == null ? void 0 : _table$getCenterHeade2.headers.reduce((sum, header) => {
           return sum + header.getSize();
-        }, 0)) != null ? _instance$getCenterHe : 0;
+        }, 0)) != null ? _table$getCenterHeade : 0;
       },
       getRightTotalSize: () => {
-        var _instance$getRightHea, _instance$getRightHea2;
+        var _table$getRightHeader, _table$getRightHeader2;
 
-        return (_instance$getRightHea = (_instance$getRightHea2 = instance.getRightHeaderGroups()[0]) == null ? void 0 : _instance$getRightHea2.headers.reduce((sum, header) => {
+        return (_table$getRightHeader = (_table$getRightHeader2 = table.getRightHeaderGroups()[0]) == null ? void 0 : _table$getRightHeader2.headers.reduce((sum, header) => {
           return sum + header.getSize();
-        }, 0)) != null ? _instance$getRightHea : 0;
+        }, 0)) != null ? _table$getRightHeader : 0;
       }
     };
   }
@@ -811,65 +805,65 @@ const Expanding = {
       ...state
     };
   },
-  getDefaultOptions: instance => {
+  getDefaultOptions: table => {
     return {
-      onExpandedChange: makeStateUpdater('expanded', instance),
+      onExpandedChange: makeStateUpdater('expanded', table),
       paginateExpandedRows: true
     };
   },
-  createInstance: instance => {
+  createTable: table => {
     let registered = false;
     let queued = false;
     return {
       _autoResetExpanded: () => {
-        var _ref, _instance$options$aut;
+        var _ref, _table$options$autoRe;
 
         if (!registered) {
-          instance._queue(() => {
+          table._queue(() => {
             registered = true;
           });
 
           return;
         }
 
-        if ((_ref = (_instance$options$aut = instance.options.autoResetAll) != null ? _instance$options$aut : instance.options.autoResetExpanded) != null ? _ref : !instance.options.manualExpanding) {
+        if ((_ref = (_table$options$autoRe = table.options.autoResetAll) != null ? _table$options$autoRe : table.options.autoResetExpanded) != null ? _ref : !table.options.manualExpanding) {
           if (queued) return;
           queued = true;
 
-          instance._queue(() => {
-            instance.resetExpanded();
+          table._queue(() => {
+            table.resetExpanded();
             queued = false;
           });
         }
       },
-      setExpanded: updater => instance.options.onExpandedChange == null ? void 0 : instance.options.onExpandedChange(updater),
+      setExpanded: updater => table.options.onExpandedChange == null ? void 0 : table.options.onExpandedChange(updater),
       toggleAllRowsExpanded: expanded => {
-        if (expanded != null ? expanded : !instance.getIsAllRowsExpanded()) {
-          instance.setExpanded(true);
+        if (expanded != null ? expanded : !table.getIsAllRowsExpanded()) {
+          table.setExpanded(true);
         } else {
-          instance.setExpanded({});
+          table.setExpanded({});
         }
       },
       resetExpanded: defaultState => {
-        var _instance$initialStat, _instance$initialStat2;
+        var _table$initialState$e, _table$initialState;
 
-        instance.setExpanded(defaultState ? {} : (_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.expanded) != null ? _instance$initialStat : {});
+        table.setExpanded(defaultState ? {} : (_table$initialState$e = (_table$initialState = table.initialState) == null ? void 0 : _table$initialState.expanded) != null ? _table$initialState$e : {});
       },
       getCanSomeRowsExpand: () => {
-        return instance.getRowModel().flatRows.some(row => row.getCanExpand());
+        return table.getRowModel().flatRows.some(row => row.getCanExpand());
       },
       getToggleAllRowsExpandedHandler: () => {
         return e => {
           e.persist == null ? void 0 : e.persist();
-          instance.toggleAllRowsExpanded();
+          table.toggleAllRowsExpanded();
         };
       },
       getIsSomeRowsExpanded: () => {
-        const expanded = instance.getState().expanded;
+        const expanded = table.getState().expanded;
         return expanded === true || Object.values(expanded).some(Boolean);
       },
       getIsAllRowsExpanded: () => {
-        const expanded = instance.getState().expanded; // If expanded is true, save some cycles and return true
+        const expanded = table.getState().expanded; // If expanded is true, save some cycles and return true
 
         if (typeof expanded === 'boolean') {
           return expanded === true;
@@ -880,7 +874,7 @@ const Expanding = {
         } // If any row is not expanded, return false
 
 
-        if (instance.getRowModel().flatRows.some(row => row.getIsExpanded())) {
+        if (table.getRowModel().flatRows.some(row => row.getIsExpanded())) {
           return false;
         } // They must all be expanded :shrug:
 
@@ -889,38 +883,38 @@ const Expanding = {
       },
       getExpandedDepth: () => {
         let maxDepth = 0;
-        const rowIds = instance.getState().expanded === true ? Object.keys(instance.getRowModel().rowsById) : Object.keys(instance.getState().expanded);
+        const rowIds = table.getState().expanded === true ? Object.keys(table.getRowModel().rowsById) : Object.keys(table.getState().expanded);
         rowIds.forEach(id => {
           const splitId = id.split('.');
           maxDepth = Math.max(maxDepth, splitId.length);
         });
         return maxDepth;
       },
-      getPreExpandedRowModel: () => instance.getSortedRowModel(),
+      getPreExpandedRowModel: () => table.getSortedRowModel(),
       getExpandedRowModel: () => {
-        if (!instance._getExpandedRowModel && instance.options.getExpandedRowModel) {
-          instance._getExpandedRowModel = instance.options.getExpandedRowModel(instance);
+        if (!table._getExpandedRowModel && table.options.getExpandedRowModel) {
+          table._getExpandedRowModel = table.options.getExpandedRowModel(table);
         }
 
-        if (instance.options.manualExpanding || !instance._getExpandedRowModel) {
-          return instance.getPreExpandedRowModel();
+        if (table.options.manualExpanding || !table._getExpandedRowModel) {
+          return table.getPreExpandedRowModel();
         }
 
-        return instance._getExpandedRowModel();
+        return table._getExpandedRowModel();
       }
     };
   },
-  createRow: (row, instance) => {
+  createRow: (row, table) => {
     return {
       toggleExpanded: expanded => {
-        instance.setExpanded(old => {
+        table.setExpanded(old => {
           var _expanded;
 
           const exists = old === true ? true : !!(old != null && old[row.id]);
           let oldExpanded = {};
 
           if (old === true) {
-            Object.keys(instance.getRowModel().rowsById).forEach(rowId => {
+            Object.keys(table.getRowModel().rowsById).forEach(rowId => {
               oldExpanded[rowId] = true;
             });
           } else {
@@ -947,15 +941,15 @@ const Expanding = {
         });
       },
       getIsExpanded: () => {
-        var _instance$options$get;
+        var _table$options$getIsR;
 
-        const 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]));
+        const expanded = table.getState().expanded;
+        return !!((_table$options$getIsR = table.options.getIsRowExpanded == null ? void 0 : table.options.getIsRowExpanded(row)) != null ? _table$options$getIsR : expanded === true || (expanded == null ? void 0 : expanded[row.id]));
       },
       getCanExpand: () => {
-        var _instance$options$get2, _instance$options$ena, _row$subRows;
+        var _table$options$getRow, _table$options$enable, _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);
+        return ((_table$options$getRow = table.options.getRowCanExpand == null ? void 0 : table.options.getRowCanExpand(row)) != null ? _table$options$getRow : true) && ((_table$options$enable = table.options.enableExpanding) != null ? _table$options$enable : true) && !!((_row$subRows = row.subRows) != null && _row$subRows.length);
       },
       getToggleExpandedHandler: () => {
         const canExpand = row.getCanExpand();
@@ -1091,24 +1085,24 @@ const Filters = {
       ...state
     };
   },
-  getDefaultOptions: instance => {
+  getDefaultOptions: table => {
     return {
-      onColumnFiltersChange: makeStateUpdater('columnFilters', instance),
-      onGlobalFilterChange: makeStateUpdater('globalFilter', instance),
+      onColumnFiltersChange: makeStateUpdater('columnFilters', table),
+      onGlobalFilterChange: makeStateUpdater('globalFilter', table),
       filterFromLeafRows: false,
       globalFilterFn: 'auto',
       getColumnCanGlobalFilter: column => {
-        var _instance$getCoreRowM, _instance$getCoreRowM2;
+        var _table$getCoreRowMode, _table$getCoreRowMode2;
 
-        const value = (_instance$getCoreRowM = instance.getCoreRowModel().flatRows[0]) == null ? void 0 : (_instance$getCoreRowM2 = _instance$getCoreRowM._getAllCellsByColumnId()[column.id]) == null ? void 0 : _instance$getCoreRowM2.getValue();
+        const value = (_table$getCoreRowMode = table.getCoreRowModel().flatRows[0]) == null ? void 0 : (_table$getCoreRowMode2 = _table$getCoreRowMode._getAllCellsByColumnId()[column.id]) == null ? void 0 : _table$getCoreRowMode2.getValue();
         return typeof value === 'string';
       }
     };
   },
-  createColumn: (column, instance) => {
+  createColumn: (column, table) => {
     return {
       getAutoFilterFn: () => {
-        const firstRow = instance.getCoreRowModel().flatRows[0];
+        const firstRow = table.getCoreRowModel().flatRows[0];
         const value = firstRow == null ? void 0 : firstRow.getValue(column.id);
 
         if (typeof value === 'string') {
@@ -1134,34 +1128,31 @@ const Filters = {
         return filterFns.weakEquals;
       },
       getFilterFn: () => {
-        var _ref;
-
-        const userFilterFns = instance.options.filterFns;
-        return isFunction(column.columnDef.filterFn) ? column.columnDef.filterFn : column.columnDef.filterFn === 'auto' ? column.getAutoFilterFn() : (_ref = userFilterFns == null ? void 0 : userFilterFns[column.columnDef.filterFn]) != null ? _ref : filterFns[column.columnDef.filterFn];
+        return isFunction(column.columnDef.filterFn) ? column.columnDef.filterFn : column.columnDef.filterFn === 'auto' ? column.getAutoFilterFn() : filterFns[column.columnDef.filterFn];
       },
       getCanFilter: () => {
-        var _column$columnDef$ena, _instance$options$ena, _instance$options$ena2;
+        var _column$columnDef$ena, _table$options$enable, _table$options$enable2;
 
-        return ((_column$columnDef$ena = column.columnDef.enableColumnFilter) != null ? _column$columnDef$ena : true) && ((_instance$options$ena = instance.options.enableColumnFilters) != null ? _instance$options$ena : true) && ((_instance$options$ena2 = instance.options.enableFilters) != null ? _instance$options$ena2 : true) && !!column.accessorFn;
+        return ((_column$columnDef$ena = column.columnDef.enableColumnFilter) != null ? _column$columnDef$ena : true) && ((_table$options$enable = table.options.enableColumnFilters) != null ? _table$options$enable : true) && ((_table$options$enable2 = table.options.enableFilters) != null ? _table$options$enable2 : true) && !!column.accessorFn;
       },
       getCanGlobalFilter: () => {
-        var _column$columnDef$ena2, _instance$options$ena3, _instance$options$ena4, _instance$options$get;
+        var _column$columnDef$ena2, _table$options$enable3, _table$options$enable4, _table$options$getCol;
 
-        return ((_column$columnDef$ena2 = column.columnDef.enableGlobalFilter) != null ? _column$columnDef$ena2 : true) && ((_instance$options$ena3 = instance.options.enableGlobalFilter) != null ? _instance$options$ena3 : true) && ((_instance$options$ena4 = instance.options.enableFilters) != null ? _instance$options$ena4 : true) && ((_instance$options$get = instance.options.getColumnCanGlobalFilter == null ? void 0 : instance.options.getColumnCanGlobalFilter(column)) != null ? _instance$options$get : true) && !!column.accessorFn;
+        return ((_column$columnDef$ena2 = column.columnDef.enableGlobalFilter) != null ? _column$columnDef$ena2 : true) && ((_table$options$enable3 = table.options.enableGlobalFilter) != null ? _table$options$enable3 : true) && ((_table$options$enable4 = table.options.enableFilters) != null ? _table$options$enable4 : true) && ((_table$options$getCol = table.options.getColumnCanGlobalFilter == null ? void 0 : table.options.getColumnCanGlobalFilter(column)) != null ? _table$options$getCol : true) && !!column.accessorFn;
       },
       getIsFiltered: () => column.getFilterIndex() > -1,
       getFilterValue: () => {
-        var _instance$getState$co, _instance$getState$co2;
+        var _table$getState$colum, _table$getState$colum2;
 
-        return (_instance$getState$co = instance.getState().columnFilters) == null ? void 0 : (_instance$getState$co2 = _instance$getState$co.find(d => d.id === column.id)) == null ? void 0 : _instance$getState$co2.value;
+        return (_table$getState$colum = table.getState().columnFilters) == null ? void 0 : (_table$getState$colum2 = _table$getState$colum.find(d => d.id === column.id)) == null ? void 0 : _table$getState$colum2.value;
       },
       getFilterIndex: () => {
-        var _instance$getState$co3, _instance$getState$co4;
+        var _table$getState$colum3, _table$getState$colum4;
 
-        return (_instance$getState$co3 = (_instance$getState$co4 = instance.getState().columnFilters) == null ? void 0 : _instance$getState$co4.findIndex(d => d.id === column.id)) != null ? _instance$getState$co3 : -1;
+        return (_table$getState$colum3 = (_table$getState$colum4 = table.getState().columnFilters) == null ? void 0 : _table$getState$colum4.findIndex(d => d.id === column.id)) != null ? _table$getState$colum3 : -1;
       },
       setFilterValue: value => {
-        instance.setColumnFilters(old => {
+        table.setColumnFilters(old => {
           const filterFn = column.getFilterFn();
           const previousfilter = old == null ? void 0 : old.find(d => d.id === column.id);
           const newFilter = functionalUpdate(value, previousfilter ? previousfilter.value : undefined); //
@@ -1196,15 +1187,15 @@ const Filters = {
           return [newFilterObj];
         });
       },
-      _getFacetedRowModel: instance.options.getFacetedRowModel && instance.options.getFacetedRowModel(instance, column.id),
+      _getFacetedRowModel: table.options.getFacetedRowModel && table.options.getFacetedRowModel(table, column.id),
       getFacetedRowModel: () => {
         if (!column._getFacetedRowModel) {
-          return instance.getPreFilteredRowModel();
+          return table.getPreFilteredRowModel();
         }
 
         return column._getFacetedRowModel();
       },
-      _getFacetedUniqueValues: instance.options.getFacetedUniqueValues && instance.options.getFacetedUniqueValues(instance, column.id),
+      _getFacetedUniqueValues: table.options.getFacetedUniqueValues && table.options.getFacetedUniqueValues(table, column.id),
       getFacetedUniqueValues: () => {
         if (!column._getFacetedUniqueValues) {
           return new Map();
@@ -1212,7 +1203,7 @@ const Filters = {
 
         return column._getFacetedUniqueValues();
       },
-      _getFacetedMinMaxValues: instance.options.getFacetedMinMaxValues && instance.options.getFacetedMinMaxValues(instance, column.id),
+      _getFacetedMinMaxValues: table.options.getFacetedMinMaxValues && table.options.getFacetedMinMaxValues(table, column.id),
       getFacetedMinMaxValues: () => {
         if (!column._getFacetedMinMaxValues) {
           return undefined;
@@ -1224,28 +1215,25 @@ const Filters = {
 
     };
   },
-  createRow: (row, instance) => {
+  createRow: (row, table) => {
     return {
       columnFilters: {},
       columnFiltersMeta: {}
     };
   },
-  createInstance: instance => {
+  createTable: table => {
     return {
       getGlobalAutoFilterFn: () => {
         return filterFns.includesString;
       },
       getGlobalFilterFn: () => {
-        var _ref2;
-
         const {
-          filterFns: userFilterFns,
           globalFilterFn: globalFilterFn
-        } = instance.options;
-        return isFunction(globalFilterFn) ? globalFilterFn : globalFilterFn === 'auto' ? instance.getGlobalAutoFilterFn() : (_ref2 = userFilterFns == null ? void 0 : userFilterFns[globalFilterFn]) != null ? _ref2 : filterFns[globalFilterFn];
+        } = table.options;
+        return isFunction(globalFilterFn) ? globalFilterFn : globalFilterFn === 'auto' ? table.getGlobalAutoFilterFn() : filterFns[globalFilterFn];
       },
       setColumnFilters: updater => {
-        const leafColumns = instance.getAllLeafColumns();
+        const leafColumns = table.getAllLeafColumns();
 
         const updateFn = old => {
           var _functionalUpdate;
@@ -1265,51 +1253,51 @@ const Filters = {
           });
         };
 
-        instance.options.onColumnFiltersChange == null ? void 0 : instance.options.onColumnFiltersChange(updateFn);
+        table.options.onColumnFiltersChange == null ? void 0 : table.options.onColumnFiltersChange(updateFn);
       },
       setGlobalFilter: updater => {
-        instance.options.onGlobalFilterChange == null ? void 0 : instance.options.onGlobalFilterChange(updater);
+        table.options.onGlobalFilterChange == null ? void 0 : table.options.onGlobalFilterChange(updater);
       },
       resetGlobalFilter: defaultState => {
-        instance.setGlobalFilter(defaultState ? undefined : instance.initialState.globalFilter);
+        table.setGlobalFilter(defaultState ? undefined : table.initialState.globalFilter);
       },
       resetColumnFilters: defaultState => {
-        var _instance$initialStat, _instance$initialStat2;
+        var _table$initialState$c, _table$initialState;
 
-        instance.setColumnFilters(defaultState ? [] : (_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.columnFilters) != null ? _instance$initialStat : []);
+        table.setColumnFilters(defaultState ? [] : (_table$initialState$c = (_table$initialState = table.initialState) == null ? void 0 : _table$initialState.columnFilters) != null ? _table$initialState$c : []);
       },
-      getPreFilteredRowModel: () => instance.getCoreRowModel(),
-      _getFilteredRowModel: instance.options.getFilteredRowModel && instance.options.getFilteredRowModel(instance),
+      getPreFilteredRowModel: () => table.getCoreRowModel(),
+      _getFilteredRowModel: table.options.getFilteredRowModel && table.options.getFilteredRowModel(table),
       getFilteredRowModel: () => {
-        if (instance.options.manualFiltering || !instance._getFilteredRowModel) {
-          return instance.getPreFilteredRowModel();
+        if (table.options.manualFiltering || !table._getFilteredRowModel) {
+          return table.getPreFilteredRowModel();
         }
 
-        return instance._getFilteredRowModel();
+        return table._getFilteredRowModel();
       },
-      _getGlobalFacetedRowModel: instance.options.getFacetedRowModel && instance.options.getFacetedRowModel(instance, '__global__'),
+      _getGlobalFacetedRowModel: table.options.getFacetedRowModel && table.options.getFacetedRowModel(table, '__global__'),
       getGlobalFacetedRowModel: () => {
-        if (instance.options.manualFiltering || !instance._getGlobalFacetedRowModel) {
-          return instance.getPreFilteredRowModel();
+        if (table.options.manualFiltering || !table._getGlobalFacetedRowModel) {
+          return table.getPreFilteredRowModel();
         }
 
-        return instance._getGlobalFacetedRowModel();
+        return table._getGlobalFacetedRowModel();
       },
-      _getGlobalFacetedUniqueValues: instance.options.getFacetedUniqueValues && instance.options.getFacetedUniqueValues(instance, '__global__'),
+      _getGlobalFacetedUniqueValues: table.options.getFacetedUniqueValues && table.options.getFacetedUniqueValues(table, '__global__'),
       getGlobalFacetedUniqueValues: () => {
-        if (!instance._getGlobalFacetedUniqueValues) {
+        if (!table._getGlobalFacetedUniqueValues) {
           return new Map();
         }
 
-        return instance._getGlobalFacetedUniqueValues();
+        return table._getGlobalFacetedUniqueValues();
       },
-      _getGlobalFacetedMinMaxValues: instance.options.getFacetedMinMaxValues && instance.options.getFacetedMinMaxValues(instance, '__global__'),
+      _getGlobalFacetedMinMaxValues: table.options.getFacetedMinMaxValues && table.options.getFacetedMinMaxValues(table, '__global__'),
       getGlobalFacetedMinMaxValues: () => {
-        if (!instance._getGlobalFacetedMinMaxValues) {
+        if (!table._getGlobalFacetedMinMaxValues) {
           return;
         }
 
-        return instance._getGlobalFacetedMinMaxValues();
+        return table._getGlobalFacetedMinMaxValues();
       }
     };
   }
@@ -1430,9 +1418,9 @@ const Grouping = {
   getDefaultColumnDef: () => {
     return {
       aggregatedCell: props => {
-        var _props$getValue$toStr, _props$getValue;
+        var _toString, _props$getValue;
 
-        return (_props$getValue$toStr = (_props$getValue = props.getValue()) == null ? void 0 : _props$getValue.toString == null ? void 0 : _props$getValue.toString()) != null ? _props$getValue$toStr : null;
+        return (_toString = (_props$getValue = props.getValue()) == null ? void 0 : _props$getValue.toString == null ? void 0 : _props$getValue.toString()) != null ? _toString : null;
       },
       aggregationFn: 'auto'
     };
@@ -1443,16 +1431,16 @@ const Grouping = {
       ...state
     };
   },
-  getDefaultOptions: instance => {
+  getDefaultOptions: table => {
     return {
-      onGroupingChange: makeStateUpdater('grouping', instance),
+      onGroupingChange: makeStateUpdater('grouping', table),
       groupedColumnMode: 'reorder'
     };
   },
-  createColumn: (column, instance) => {
+  createColumn: (column, table) => {
     return {
       toggleGrouping: () => {
-        instance.setGrouping(old => {
+        table.setGrouping(old => {
           // Find any existing grouping for this column
           if (old != null && old.includes(column.id)) {
             return old.filter(d => d !== column.id);
@@ -1464,17 +1452,17 @@ const Grouping = {
       getCanGroup: () => {
         var _ref, _ref2, _ref3, _column$columnDef$ena;
 
-        return (_ref = (_ref2 = (_ref3 = (_column$columnDef$ena = column.columnDef.enableGrouping) != null ? _column$columnDef$ena : true) != null ? _ref3 : instance.options.enableGrouping) != null ? _ref2 : true) != null ? _ref : !!column.accessorFn;
+        return (_ref = (_ref2 = (_ref3 = (_column$columnDef$ena = column.columnDef.enableGrouping) != null ? _column$columnDef$ena : true) != null ? _ref3 : table.options.enableGrouping) != null ? _ref2 : true) != null ? _ref : !!column.accessorFn;
       },
       getIsGrouped: () => {
-        var _instance$getState$gr;
+        var _table$getState$group;
 
-        return (_instance$getState$gr = instance.getState().grouping) == null ? void 0 : _instance$getState$gr.includes(column.id);
+        return (_table$getState$group = table.getState().grouping) == null ? void 0 : _table$getState$group.includes(column.id);
       },
       getGroupedIndex: () => {
-        var _instance$getState$gr2;
+        var _table$getState$group2;
 
-        return (_instance$getState$gr2 = instance.getState().grouping) == null ? void 0 : _instance$getState$gr2.indexOf(column.id);
+        return (_table$getState$group2 = table.getState().grouping) == null ? void 0 : _table$getState$group2.indexOf(column.id);
       },
       getToggleGroupingHandler: () => {
         const canGroup = column.getCanGroup();
@@ -1484,7 +1472,7 @@ const Grouping = {
         };
       },
       getAutoAggregationFn: () => {
-        const firstRow = instance.getCoreRowModel().flatRows[0];
+        const firstRow = table.getCoreRowModel().flatRows[0];
         const value = firstRow == null ? void 0 : firstRow.getValue(column.id);
 
         if (typeof value === 'number') {
@@ -1496,37 +1484,33 @@ const Grouping = {
         }
       },
       getAggregationFn: () => {
-        var _ref4;
-
-        const userAggregationFns = instance.options.aggregationFns;
-
         if (!column) {
           throw new Error();
         }
 
-        return isFunction(column.columnDef.aggregationFn) ? column.columnDef.aggregationFn : column.columnDef.aggregationFn === 'auto' ? column.getAutoAggregationFn() : (_ref4 = userAggregationFns == null ? void 0 : userAggregationFns[column.columnDef.aggregationFn]) != null ? _ref4 : aggregationFns[column.columnDef.aggregationFn];
+        return isFunction(column.columnDef.aggregationFn) ? column.columnDef.aggregationFn : column.columnDef.aggregationFn === 'auto' ? column.getAutoAggregationFn() : aggregationFns[column.columnDef.aggregationFn];
       }
     };
   },
-  createInstance: instance => {
+  createTable: table => {
     return {
-      setGrouping: updater => instance.options.onGroupingChange == null ? void 0 : instance.options.onGroupingChange(updater),
+      setGrouping: updater => table.options.onGroupingChange == null ? void 0 : table.options.onGroupingChange(updater),
       resetGrouping: defaultState => {
-        var _instance$initialStat, _instance$initialStat2;
+        var _table$initialState$g, _table$initialState;
 
-        instance.setGrouping(defaultState ? [] : (_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.grouping) != null ? _instance$initialStat : []);
+        table.setGrouping(defaultState ? [] : (_table$initialState$g = (_table$initialState = table.initialState) == null ? void 0 : _table$initialState.grouping) != null ? _table$initialState$g : []);
       },
-      getPreGroupedRowModel: () => instance.getFilteredRowModel(),
+      getPreGroupedRowModel: () => table.getFilteredRowModel(),
       getGroupedRowModel: () => {
-        if (!instance._getGroupedRowModel && instance.options.getGroupedRowModel) {
-          instance._getGroupedRowModel = instance.options.getGroupedRowModel(instance);
+        if (!table._getGroupedRowModel && table.options.getGroupedRowModel) {
+          table._getGroupedRowModel = table.options.getGroupedRowModel(table);
         }
 
-        if (instance.options.manualGrouping || !instance._getGroupedRowModel) {
-          return instance.getPreGroupedRowModel();
+        if (table.options.manualGrouping || !table._getGroupedRowModel) {
+          return table.getPreGroupedRowModel();
         }
 
-        return instance._getGroupedRowModel();
+        return table._getGroupedRowModel();
       }
     };
   },
@@ -1536,12 +1520,7 @@ const Grouping = {
       _groupingValuesCache: {}
     };
   },
-  createCell: (cell, column, row, instance) => {
-    const getRenderValue = () => {
-      var _cell$getValue;
-
-      return (_cell$getValue = cell.getValue()) != null ? _cell$getValue : instance.options.renderFallbackValue;
-    };
+  createCell: (cell, column, row, table) => {
 
     return {
       getIsGrouped: () => column.getIsGrouped() && column.id === row.groupingColumnId,
@@ -1550,22 +1529,6 @@ const Grouping = {
         var _row$subRows;
 
         return !cell.getIsGrouped() && !cell.getIsPlaceholder() && !!((_row$subRows = row.subRows) != null && _row$subRows.length);
-      },
-      renderAggregatedCell: () => {
-        if (process.env.NODE_ENV === 'development') {
-          if (!column.columnDef.aggregatedCell) {
-            console.warn('A columnDef.aggregatedCell template is recommended for displaying aggregated values.');
-          }
-        }
-
-        const template = column.columnDef.aggregatedCell || column.columnDef.cell;
-        return template ? instance._render(template, {
-          instance,
-          column,
-          row,
-          cell,
-          getValue: getRenderValue
-        }) : null;
       }
     };
   }
@@ -1593,20 +1556,20 @@ const Ordering = {
       ...state
     };
   },
-  getDefaultOptions: instance => {
+  getDefaultOptions: table => {
     return {
-      onColumnOrderChange: makeStateUpdater('columnOrder', instance)
+      onColumnOrderChange: makeStateUpdater('columnOrder', table)
     };
   },
-  createInstance: instance => {
+  createTable: table => {
     return {
-      setColumnOrder: updater => instance.options.onColumnOrderChange == null ? void 0 : instance.options.onColumnOrderChange(updater),
+      setColumnOrder: updater => table.options.onColumnOrderChange == null ? void 0 : table.options.onColumnOrderChange(updater),
       resetColumnOrder: defaultState => {
-        var _instance$initialStat;
+        var _table$initialState$c;
 
-        instance.setColumnOrder(defaultState ? [] : (_instance$initialStat = instance.initialState.columnOrder) != null ? _instance$initialStat : []);
+        table.setColumnOrder(defaultState ? [] : (_table$initialState$c = table.initialState.columnOrder) != null ? _table$initialState$c : []);
       },
-      _getOrderColumnsFn: memo(() => [instance.getState().columnOrder, instance.getState().grouping, instance.options.groupedColumnMode], (columnOrder, grouping, groupedColumnMode) => columns => {
+      _getOrderColumnsFn: memo(() => [table.getState().columnOrder, table.getState().grouping, table.options.groupedColumnMode], (columnOrder, grouping, groupedColumnMode) => columns => {
         // Sort grouped columns to the start of the column list
         // before the headers are built
         let orderedColumns = []; // If there is no order, return the normal columns
@@ -1634,7 +1597,7 @@ const Ordering = {
 
         return orderColumns(orderedColumns, grouping, groupedColumnMode);
       }, {
-        key: process.env.NODE_ENV === 'development' && 'getOrderColumnsFn' // debug: () => instance.options.debugAll ?? instance.options.debugTable,
+        key: process.env.NODE_ENV === 'development' && 'getOrderColumnsFn' // debug: () => table.options.debugAll ?? table.options.debugTable,
 
       })
     };
@@ -1658,32 +1621,32 @@ const Pagination = {
       }
     };
   },
-  getDefaultOptions: instance => {
+  getDefaultOptions: table => {
     return {
-      onPaginationChange: makeStateUpdater('pagination', instance)
+      onPaginationChange: makeStateUpdater('pagination', table)
     };
   },
-  createInstance: instance => {
+  createTable: table => {
     let registered = false;
     let queued = false;
     return {
       _autoResetPageIndex: () => {
-        var _ref, _instance$options$aut;
+        var _ref, _table$options$autoRe;
 
         if (!registered) {
-          instance._queue(() => {
+          table._queue(() => {
             registered = true;
           });
 
           return;
         }
 
-        if ((_ref = (_instance$options$aut = instance.options.autoResetAll) != null ? _instance$options$aut : instance.options.autoResetPageIndex) != null ? _ref : !instance.options.manualPagination) {
+        if ((_ref = (_table$options$autoRe = table.options.autoResetAll) != null ? _table$options$autoRe : table.options.autoResetPageIndex) != null ? _ref : !table.options.manualPagination) {
           if (queued) return;
           queued = true;
 
-          instance._queue(() => {
-            instance.resetPageIndex();
+          table._queue(() => {
+            table.resetPageIndex();
             queued = false;
           });
         }
@@ -1694,17 +1657,17 @@ const Pagination = {
           return newState;
         };
 
-        return instance.options.onPaginationChange == null ? void 0 : instance.options.onPaginationChange(safeUpdater);
+        return table.options.onPaginationChange == null ? void 0 : table.options.onPaginationChange(safeUpdater);
       },
       resetPagination: defaultState => {
-        var _instance$initialStat;
+        var _table$initialState$p;
 
-        instance.setPagination(defaultState ? getDefaultPaginationState() : (_instance$initialStat = instance.initialState.pagination) != null ? _instance$initialStat : getDefaultPaginationState());
+        table.setPagination(defaultState ? getDefaultPaginationState() : (_table$initialState$p = table.initialState.pagination) != null ? _table$initialState$p : getDefaultPaginationState());
       },
       setPageIndex: updater => {
-        instance.setPagination(old => {
+        table.setPagination(old => {
           let pageIndex = functionalUpdate(updater, old.pageIndex);
-          const maxPageIndex = typeof instance.options.pageCount === 'undefined' || instance.options.pageCount === -1 ? Number.MAX_SAFE_INTEGER : instance.options.pageCount - 1;
+          const maxPageIndex = typeof table.options.pageCount === 'undefined' || table.options.pageCount === -1 ? Number.MAX_SAFE_INTEGER : table.options.pageCount - 1;
           pageIndex = Math.min(Math.max(0, pageIndex), maxPageIndex);
           return { ...old,
             pageIndex
@@ -1712,17 +1675,17 @@ const Pagination = {
         });
       },
       resetPageIndex: defaultState => {
-        var _instance$initialStat2, _instance$initialStat3, _instance$initialStat4;
+        var _table$initialState$p2, _table$initialState, _table$initialState$p3;
 
-        instance.setPageIndex(defaultState ? defaultPageIndex : (_instance$initialStat2 = (_instance$initialStat3 = instance.initialState) == null ? void 0 : (_instance$initialStat4 = _instance$initialStat3.pagination) == null ? void 0 : _instance$initialStat4.pageIndex) != null ? _instance$initialStat2 : defaultPageIndex);
+        table.setPageIndex(defaultState ? defaultPageIndex : (_table$initialState$p2 = (_table$initialState = table.initialState) == null ? void 0 : (_table$initialState$p3 = _table$initialState.pagination) == null ? void 0 : _table$initialState$p3.pageIndex) != null ? _table$initialState$p2 : defaultPageIndex);
       },
       resetPageSize: defaultState => {
-        var _instance$initialStat5, _instance$initialStat6, _instance$initialStat7;
+        var _table$initialState$p4, _table$initialState2, _table$initialState2$;
 
-        instance.setPageSize(defaultState ? defaultPageSize : (_instance$initialStat5 = (_instance$initialStat6 = instance.initialState) == null ? void 0 : (_instance$initialStat7 = _instance$initialStat6.pagination) == null ? void 0 : _instance$initialStat7.pageSize) != null ? _instance$initialStat5 : defaultPageSize);
+        table.setPageSize(defaultState ? defaultPageSize : (_table$initialState$p4 = (_table$initialState2 = table.initialState) == null ? void 0 : (_table$initialState2$ = _table$initialState2.pagination) == null ? void 0 : _table$initialState2$.pageSize) != null ? _table$initialState$p4 : defaultPageSize);
       },
       setPageSize: updater => {
-        instance.setPagination(old => {
+        table.setPagination(old => {
           const pageSize = Math.max(1, functionalUpdate(updater, old.pageSize));
           const topRowIndex = old.pageSize * old.pageIndex;
           const pageIndex = Math.floor(topRowIndex / pageSize);
@@ -1732,10 +1695,10 @@ const Pagination = {
           };
         });
       },
-      setPageCount: updater => instance.setPagination(old => {
-        var _instance$options$pag;
+      setPageCount: updater => table.setPagination(old => {
+        var _table$options$pageCo;
 
-        let newPageCount = functionalUpdate(updater, (_instance$options$pag = instance.options.pageCount) != null ? _instance$options$pag : -1);
+        let newPageCount = functionalUpdate(updater, (_table$options$pageCo = table.options.pageCount) != null ? _table$options$pageCo : -1);
 
         if (typeof newPageCount === 'number') {
           newPageCount = Math.max(-1, newPageCount);
@@ -1745,7 +1708,7 @@ const Pagination = {
           pageCount: newPageCount
         };
       }),
-      getPageOptions: memo(() => [instance.getPageCount()], pageCount => {
+      getPageOptions: memo(() => [table.getPageCount()], pageCount => {
         let pageOptions = [];
 
         if (pageCount && pageCount > 0) {
@@ -1756,17 +1719,17 @@ const Pagination = {
       }, {
         key: process.env.NODE_ENV === 'development' && 'getPageOptions',
         debug: () => {
-          var _instance$options$deb;
+          var _table$options$debugA;
 
-          return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugTable;
+          return (_table$options$debugA = table.options.debugAll) != null ? _table$options$debugA : table.options.debugTable;
         }
       }),
-      getCanPreviousPage: () => instance.getState().pagination.pageIndex > 0,
+      getCanPreviousPage: () => table.getState().pagination.pageIndex > 0,
       getCanNextPage: () => {
         const {
           pageIndex
-        } = instance.getState().pagination;
-        const pageCount = instance.getPageCount();
+        } = table.getState().pagination;
+        const pageCount = table.getPageCount();
 
         if (pageCount === -1) {
           return true;
@@ -1779,29 +1742,29 @@ const Pagination = {
         return pageIndex < pageCount - 1;
       },
       previousPage: () => {
-        return instance.setPageIndex(old => old - 1);
+        return table.setPageIndex(old => old - 1);
       },
       nextPage: () => {
-        return instance.setPageIndex(old => {
+        return table.setPageIndex(old => {
           return old + 1;
         });
       },
-      getPrePaginationRowModel: () => instance.getExpandedRowModel(),
+      getPrePaginationRowModel: () => table.getExpandedRowModel(),
       getPaginationRowModel: () => {
-        if (!instance._getPaginationRowModel && instance.options.getPaginationRowModel) {
-          instance._getPaginationRowModel = instance.options.getPaginationRowModel(instance);
+        if (!table._getPaginationRowModel && table.options.getPaginationRowModel) {
+          table._getPaginationRowModel = table.options.getPaginationRowModel(table);
         }
 
-        if (instance.options.manualPagination || !instance._getPaginationRowModel) {
-          return instance.getPrePaginationRowModel();
+        if (table.options.manualPagination || !table._getPaginationRowModel) {
+          return table.getPrePaginationRowModel();
         }
 
-        return instance._getPaginationRowModel();
+        return table._getPaginationRowModel();
       },
       getPageCount: () => {
-        var _instance$options$pag2;
+        var _table$options$pageCo2;
 
-        return (_instance$options$pag2 = instance.options.pageCount) != null ? _instance$options$pag2 : Math.ceil(instance.getPrePaginationRowModel().rows.length / instance.getState().pagination.pageSize);
+        return (_table$options$pageCo2 = table.options.pageCount) != null ? _table$options$pageCo2 : Math.ceil(table.getPrePaginationRowModel().rows.length / table.getState().pagination.pageSize);
       }
     };
   }
@@ -1820,16 +1783,16 @@ const Pinning = {
       ...state
     };
   },
-  getDefaultOptions: instance => {
+  getDefaultOptions: table => {
     return {
-      onColumnPinningChange: makeStateUpdater('columnPinning', instance)
+      onColumnPinningChange: makeStateUpdater('columnPinning', table)
     };
   },
-  createColumn: (column, instance) => {
+  createColumn: (column, table) => {
     return {
       pin: position => {
         const columnIds = column.getLeafColumns().map(d => d.id).filter(Boolean);
-        instance.setColumnPinning(old => {
+        table.setColumnPinning(old => {
           var _old$left3, _old$right3;
 
           if (position === 'right') {
@@ -1859,9 +1822,9 @@ const Pinning = {
       getCanPin: () => {
         const leafColumns = column.getLeafColumns();
         return leafColumns.some(d => {
-          var _d$columnDef$enablePi, _instance$options$ena;
+          var _d$columnDef$enablePi, _table$options$enable;
 
-          return ((_d$columnDef$enablePi = d.columnDef.enablePinning) != null ? _d$columnDef$enablePi : true) && ((_instance$options$ena = instance.options.enablePinning) != null ? _instance$options$ena : true);
+          return ((_d$columnDef$enablePi = d.columnDef.enablePinning) != null ? _d$columnDef$enablePi : true) && ((_table$options$enable = table.options.enablePinning) != null ? _table$options$enable : true);
         });
       },
       getIsPinned: () => {
@@ -1869,33 +1832,33 @@ const Pinning = {
         const {
           left,
           right
-        } = instance.getState().columnPinning;
+        } = table.getState().columnPinning;
         const isLeft = leafColumnIds.some(d => left == null ? void 0 : left.includes(d));
         const isRight = leafColumnIds.some(d => right == null ? void 0 : right.includes(d));
         return isLeft ? 'left' : isRight ? 'right' : false;
       },
       getPinnedIndex: () => {
-        var _instance$getState$co, _instance$getState$co2, _instance$getState$co3;
+        var _table$getState$colum, _table$getState$colum2, _table$getState$colum3;
 
         const position = column.getIsPinned();
-        return position ? (_instance$getState$co = (_instance$getState$co2 = instance.getState().columnPinning) == null ? void 0 : (_instance$getState$co3 = _instance$getState$co2[position]) == null ? void 0 : _instance$getState$co3.indexOf(column.id)) != null ? _instance$getState$co : -1 : 0;
+        return position ? (_table$getState$colum = (_table$getState$colum2 = table.getState().columnPinning) == null ? void 0 : (_table$getState$colum3 = _table$getState$colum2[position]) == null ? void 0 : _table$getState$colum3.indexOf(column.id)) != null ? _table$getState$colum : -1 : 0;
       }
     };
   },
-  createRow: (row, instance) => {
+  createRow: (row, table) => {
     return {
-      getCenterVisibleCells: memo(() => [row._getAllVisibleCells(), instance.getState().columnPinning.left, instance.getState().columnPinning.right], (allCells, left, right) => {
+      getCenterVisibleCells: memo(() => [row._getAllVisibleCells(), table.getState().columnPinning.left, table.getState().columnPinning.right], (allCells, left, right) => {
         const leftAndRight = [...(left != null ? left : []), ...(right != null ? right : [])];
         return allCells.filter(d => !leftAndRight.includes(d.column.id));
       }, {
         key: process.env.NODE_ENV === 'production' && 'row.getCenterVisibleCells',
         debug: () => {
-          var _instance$options$deb;
+          var _table$options$debugA;
 
-          return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugRows;
+          return (_table$options$debugA = table.options.debugAll) != null ? _table$options$debugA : table.options.debugRows;
         }
       }),
-      getLeftVisibleCells: memo(() => [row._getAllVisibleCells(), instance.getState().columnPinning.left,,], (allCells, left) => {
+      getLeftVisibleCells: memo(() => [row._getAllVisibleCells(), table.getState().columnPinning.left,,], (allCells, left) => {
         const cells = (left != null ? left : []).map(columnId => allCells.find(cell => cell.column.id === columnId)).filter(Boolean).map(d => ({ ...d,
           position: 'left'
         }));
@@ -1903,12 +1866,12 @@ const Pinning = {
       }, {
         key: process.env.NODE_ENV === 'production' && 'row.getLeftVisibleCells',
         debug: () => {
-          var _instance$options$deb2;
+          var _table$options$debugA2;
 
-          return (_instance$options$deb2 = instance.options.debugAll) != null ? _instance$options$deb2 : instance.options.debugRows;
+          return (_table$options$debugA2 = table.options.debugAll) != null ? _table$options$debugA2 : table.options.debugRows;
         }
       }),
-      getRightVisibleCells: memo(() => [row._getAllVisibleCells(), instance.getState().columnPinning.right], (allCells, right) => {
+      getRightVisibleCells: memo(() => [row._getAllVisibleCells(), table.getState().columnPinning.right], (allCells, right) => {
         const cells = (right != null ? right : []).map(columnId => allCells.find(cell => cell.column.id === columnId)).filter(Boolean).map(d => ({ ...d,
           position: 'left'
         }));
@@ -1916,25 +1879,25 @@ const Pinning = {
       }, {
         key: process.env.NODE_ENV === 'production' && 'row.getRightVisibleCells',
         debug: () => {
-          var _instance$options$deb3;
+          var _table$options$debugA3;
 
-          return (_instance$options$deb3 = instance.options.debugAll) != null ? _instance$options$deb3 : instance.options.debugRows;
+          return (_table$options$debugA3 = table.options.debugAll) != null ? _table$options$debugA3 : table.options.debugRows;
         }
       })
     };
   },
-  createInstance: instance => {
+  createTable: table => {
     return {
-      setColumnPinning: updater => instance.options.onColumnPinningChange == null ? void 0 : instance.options.onColumnPinningChange(updater),
+      setColumnPinning: updater => table.options.onColumnPinningChange == null ? void 0 : table.options.onColumnPinningChange(updater),
       resetColumnPinning: defaultState => {
-        var _instance$initialStat, _instance$initialStat2;
+        var _table$initialState$c, _table$initialState;
 
-        return instance.setColumnPinning(defaultState ? getDefaultPinningState() : (_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.columnPinning) != null ? _instance$initialStat : getDefaultPinningState());
+        return table.setColumnPinning(defaultState ? getDefaultPinningState() : (_table$initialState$c = (_table$initialState = table.initialState) == null ? void 0 : _table$initialState.columnPinning) != null ? _table$initialState$c : getDefaultPinningState());
       },
       getIsSomeColumnsPinned: position => {
         var _pinningState$positio;
 
-        const pinningState = instance.getState().columnPinning;
+        const pinningState = table.getState().columnPinning;
 
         if (!position) {
           var _pinningState$left, _pinningState$right;
@@ -1944,35 +1907,35 @@ const Pinning = {
 
         return Boolean((_pinningState$positio = pinningState[position]) == null ? void 0 : _pinningState$positio.length);
       },
-      getLeftLeafColumns: memo(() => [instance.getAllLeafColumns(), instance.getState().columnPinning.left], (allColumns, left) => {
+      getLeftLeafColumns: memo(() => [table.getAllLeafColumns(), table.getState().columnPinning.left], (allColumns, left) => {
         return (left != null ? left : []).map(columnId => allColumns.find(column => column.id === columnId)).filter(Boolean);
       }, {
         key: process.env.NODE_ENV === 'development' && 'getLeftLeafColumns',
         debug: () => {
-          var _instance$options$deb4;
+          var _table$options$debugA4;
 
-          return (_instance$options$deb4 = instance.options.debugAll) != null ? _instance$options$deb4 : instance.options.debugColumns;
+          return (_table$options$debugA4 = table.options.debugAll) != null ? _table$options$debugA4 : table.options.debugColumns;
         }
       }),
-      getRightLeafColumns: memo(() => [instance.getAllLeafColumns(), instance.getState().columnPinning.right], (allColumns, right) => {
+      getRightLeafColumns: memo(() => [table.getAllLeafColumns(), table.getState().columnPinning.right], (allColumns, right) => {
         return (right != null ? right : []).map(columnId => allColumns.find(column => column.id === columnId)).filter(Boolean);
       }, {
         key: process.env.NODE_ENV === 'development' && 'getRightLeafColumns',
         debug: () => {
-          var _instance$options$deb5;
+          var _table$options$debugA5;
 
-          return (_instance$options$deb5 = instance.options.debugAll) != null ? _instance$options$deb5 : instance.options.debugColumns;
+          return (_table$options$debugA5 = table.options.debugAll) != null ? _table$options$debugA5 : table.options.debugColumns;
         }
       }),
-      getCenterLeafColumns: memo(() => [instance.getAllLeafColumns(), instance.getState().columnPinning.left, instance.getState().columnPinning.right], (allColumns, left, right) => {
+      getCenterLeafColumns: memo(() => [table.getAllLeafColumns(), table.getState().columnPinning.left, table.getState().columnPinning.right], (allColumns, left, right) => {
         const leftAndRight = [...(left != null ? left : []), ...(right != null ? right : [])];
         return allColumns.filter(d => !leftAndRight.includes(d.id));
       }, {
         key: process.env.NODE_ENV === 'development' && 'getCenterLeafColumns',
         debug: () => {
-          var _instance$options$deb6;
+          var _table$options$debugA6;
 
-          return (_instance$options$deb6 = instance.options.debugAll) != null ? _instance$options$deb6 : instance.options.debugColumns;
+          return (_table$options$debugA6 = table.options.debugAll) != null ? _table$options$debugA6 : table.options.debugColumns;
         }
       })
     };
@@ -1987,9 +1950,9 @@ const RowSelection = {
       ...state
     };
   },
-  getDefaultOptions: instance => {
+  getDefaultOptions: table => {
     return {
-      onRowSelectionChange: makeStateUpdater('rowSelection', instance),
+      onRowSelectionChange: makeStateUpdater('rowSelection', table),
       enableRowSelection: true,
       enableMultiRowSelection: true,
       enableSubRowSelection: true // enableGroupingRowSelection: false,
@@ -1998,20 +1961,20 @@ const RowSelection = {
 
     };
   },
-  createInstance: instance => {
+  createTable: table => {
     return {
-      setRowSelection: updater => instance.options.onRowSelectionChange == null ? void 0 : instance.options.onRowSelectionChange(updater),
+      setRowSelection: updater => table.options.onRowSelectionChange == null ? void 0 : table.options.onRowSelectionChange(updater),
       resetRowSelection: defaultState => {
-        var _instance$initialStat;
+        var _table$initialState$r;
 
-        return instance.setRowSelection(defaultState ? {} : (_instance$initialStat = instance.initialState.rowSelection) != null ? _instance$initialStat : {});
+        return table.setRowSelection(defaultState ? {} : (_table$initialState$r = table.initialState.rowSelection) != null ? _table$initialState$r : {});
       },
       toggleAllRowsSelected: value => {
-        instance.setRowSelection(old => {
-          value = typeof value !== 'undefined' ? value : !instance.getIsAllRowsSelected();
+        table.setRowSelection(old => {
+          value = typeof value !== 'undefined' ? value : !table.getIsAllRowsSelected();
           const rowSelection = { ...old
           };
-          const preGroupedFlatRows = instance.getPreGroupedRowModel().flatRows; // We don't use `mutateRowIsSelected` here for performance reasons.
+          const preGroupedFlatRows = table.getPreGroupedRowModel().flatRows; // We don't use `mutateRowIsSelected` here for performance reasons.
           // All of the rows are flat already, so it wouldn't be worth it
 
           if (value) {
@@ -2027,12 +1990,12 @@ const RowSelection = {
           return rowSelection;
         });
       },
-      toggleAllPageRowsSelected: value => instance.setRowSelection(old => {
-        const resolvedValue = typeof value !== 'undefined' ? value : !instance.getIsAllPageRowsSelected();
+      toggleAllPageRowsSelected: value => table.setRowSelection(old => {
+        const resolvedValue = typeof value !== 'undefined' ? value : !table.getIsAllPageRowsSelected();
         const rowSelection = { ...old
         };
-        instance.getRowModel().rows.forEach(row => {
-          mutateRowIsSelected(rowSelection, row.id, resolvedValue, instance);
+        table.getRowModel().rows.forEach(row => {
+          mutateRowIsSelected(rowSelection, row.id, resolvedValue, table);
         });
         return rowSelection;
       }),
@@ -2041,7 +2004,7 @@ const RowSelection = {
       //     rows,
       //     rowsById,
       //     options: { selectGroupingRows, selectSubRows },
-      //   } = instance
+      //   } = table
       //   const findSelectedRow = (rows: Row[]) => {
       //     let found
       //     rows.find(d => {
@@ -2069,7 +2032,7 @@ const RowSelection = {
       //       selectSubRows: selectSubRows!,
       //     })
       //   }
-      //   instance.rows.forEach(row => {
+      //   table.rows.forEach(row => {
       //     const isFirstRow = row.id === firstRow.id
       //     const isLastRow = row.id === lastRow.id
       //     if (isFirstRow || isLastRow) {
@@ -2084,10 +2047,10 @@ const RowSelection = {
       //       addRow(row)
       //     }
       //   })
-      //   instance.setRowSelection(selectedRowIds)
+      //   table.setRowSelection(selectedRowIds)
       // },
-      getPreSelectedRowModel: () => instance.getCoreRowModel(),
-      getSelectedRowModel: memo(() => [instance.getState().rowSelection, instance.getCoreRowModel()], (rowSelection, rowModel) => {
+      getPreSelectedRowModel: () => table.getCoreRowModel(),
+      getSelectedRowModel: memo(() => [table.getState().rowSelection, table.getCoreRowModel()], (rowSelection, rowModel) => {
         if (!Object.keys(rowSelection).length) {
           return {
             rows: [],
@@ -2096,16 +2059,16 @@ const RowSelection = {
           };
         }
 
-        return selectRowsFn(instance, rowModel);
+        return selectRowsFn(table, rowModel);
       }, {
         key: process.env.NODE_ENV === 'development' && 'getSelectedRowModel',
         debug: () => {
-          var _instance$options$deb;
+          var _table$options$debugA;
 
-          return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugTable;
+          return (_table$options$debugA = table.options.debugAll) != null ? _table$options$debugA : table.options.debugTable;
         }
       }),
-      getFilteredSelectedRowModel: memo(() => [instance.getState().rowSelection, instance.getFilteredRowModel()], (rowSelection, rowModel) => {
+      getFilteredSelectedRowModel: memo(() => [table.getState().rowSelection, table.getFilteredRowModel()], (rowSelection, rowModel) => {
         if (!Object.keys(rowSelection).length) {
           return {
             rows: [],
@@ -2114,16 +2077,16 @@ const RowSelection = {
           };
         }
 
-        return selectRowsFn(instance, rowModel);
+        return selectRowsFn(table, rowModel);
       }, {
         key: process.env.NODE_ENV === 'production' && 'getFilteredSelectedRowModel',
         debug: () => {
-          var _instance$options$deb2;
+          var _table$options$debugA2;
 
-          return (_instance$options$deb2 = instance.options.debugAll) != null ? _instance$options$deb2 : instance.options.debugTable;
+          return (_table$options$debugA2 = table.options.debugAll) != null ? _table$options$debugA2 : table.options.debugTable;
         }
       }),
-      getGroupedSelectedRowModel: memo(() => [instance.getState().rowSelection, instance.getSortedRowModel()], (rowSelection, rowModel) => {
+      getGroupedSelectedRowModel: memo(() => [table.getState().rowSelection, table.getSortedRowModel()], (rowSelection, rowModel) => {
         if (!Object.keys(rowSelection).length) {
           return {
             rows: [],
@@ -2132,31 +2095,31 @@ const RowSelection = {
           };
         }
 
-        return selectRowsFn(instance, rowModel);
+        return selectRowsFn(table, rowModel);
       }, {
         key: process.env.NODE_ENV === 'production' && 'getGroupedSelectedRowModel',
         debug: () => {
-          var _instance$options$deb3;
+          var _table$options$debugA3;
 
-          return (_instance$options$deb3 = instance.options.debugAll) != null ? _instance$options$deb3 : instance.options.debugTable;
+          return (_table$options$debugA3 = table.options.debugAll) != null ? _table$options$debugA3 : table.options.debugTable;
         }
       }),
       ///
       // getGroupingRowCanSelect: rowId => {
-      //   const row = instance.getRow(rowId)
+      //   const row = table.getRow(rowId)
       //   if (!row) {
       //     throw new Error()
       //   }
-      //   if (typeof instance.options.enableGroupingRowSelection === 'function') {
-      //     return instance.options.enableGroupingRowSelection(row)
+      //   if (typeof table.options.enableGroupingRowSelection === 'function') {
+      //     return table.options.enableGroupingRowSelection(row)
       //   }
-      //   return instance.options.enableGroupingRowSelection ?? false
+      //   return table.options.enableGroupingRowSelection ?? false
       // },
       getIsAllRowsSelected: () => {
-        const preFilteredFlatRows = instance.getPreFilteredRowModel().flatRows;
+        const preFilteredFlatRows = table.getPreFilteredRowModel().flatRows;
         const {
           rowSelection
-        } = instance.getState();
+        } = table.getState();
         let isAllRowsSelected = Boolean(preFilteredFlatRows.length && Object.keys(rowSelection).length);
 
         if (isAllRowsSelected) {
@@ -2168,10 +2131,10 @@ const RowSelection = {
         return isAllRowsSelected;
       },
       getIsAllPageRowsSelected: () => {
-        const paginationFlatRows = instance.getPaginationRowModel().flatRows;
+        const paginationFlatRows = table.getPaginationRowModel().flatRows;
         const {
           rowSelection
-        } = instance.getState();
+        } = table.getState();
         let isAllPageRowsSelected = !!paginationFlatRows.length;
 
         if (isAllPageRowsSelected && paginationFlatRows.some(row => !rowSelection[row.id])) {
@@ -2181,31 +2144,31 @@ const RowSelection = {
         return isAllPageRowsSelected;
       },
       getIsSomeRowsSelected: () => {
-        var _instance$getState$ro;
+        var _table$getState$rowSe;
 
-        return !instance.getIsAllRowsSelected() && !!Object.keys((_instance$getState$ro = instance.getState().rowSelection) != null ? _instance$getState$ro : {}).length;
+        return !table.getIsAllRowsSelected() && !!Object.keys((_table$getState$rowSe = table.getState().rowSelection) != null ? _table$getState$rowSe : {}).length;
       },
       getIsSomePageRowsSelected: () => {
-        const paginationFlatRows = instance.getPaginationRowModel().flatRows;
-        return instance.getIsAllPageRowsSelected() ? false : paginationFlatRows.some(d => d.getIsSelected() || d.getIsSomeSelected());
+        const paginationFlatRows = table.getPaginationRowModel().flatRows;
+        return table.getIsAllPageRowsSelected() ? false : paginationFlatRows.some(d => d.getIsSelected() || d.getIsSomeSelected());
       },
       getToggleAllRowsSelectedHandler: () => {
         return e => {
-          instance.toggleAllRowsSelected(e.target.checked);
+          table.toggleAllRowsSelected(e.target.checked);
         };
       },
       getToggleAllPageRowsSelectedHandler: () => {
         return e => {
-          instance.toggleAllPageRowsSelected(e.target.checked);
+          table.toggleAllPageRowsSelected(e.target.checked);
         };
       }
     };
   },
-  createRow: (row, instance) => {
+  createRow: (row, table) => {
     return {
       toggleSelected: value => {
         const isSelected = row.getIsSelected();
-        instance.setRowSelection(old => {
+        table.setRowSelection(old => {
           value = typeof value !== 'undefined' ? value : !isSelected;
 
           if (isSelected === value) {
@@ -2214,48 +2177,54 @@ const RowSelection = {
 
           const selectedRowIds = { ...old
           };
-          mutateRowIsSelected(selectedRowIds, row.id, value, instance);
+          mutateRowIsSelected(selectedRowIds, row.id, value, table);
           return selectedRowIds;
         });
       },
       getIsSelected: () => {
         const {
           rowSelection
-        } = instance.getState();
-        return isRowSelected(row, rowSelection) === true;
+        } = table.getState();
+        return isRowSelected(row, rowSelection);
       },
       getIsSomeSelected: () => {
         const {
           rowSelection
-        } = instance.getState();
-        return isRowSelected(row, rowSelection) === 'some';
+        } = table.getState();
+        return isSubRowSelected(row, rowSelection) === 'some';
+      },
+      getIsAllSubRowsSelected: () => {
+        const {
+          rowSelection
+        } = table.getState();
+        return isSubRowSelected(row, rowSelection) === 'all';
       },
       getCanSelect: () => {
-        var _instance$options$ena;
+        var _table$options$enable;
 
-        if (typeof instance.options.enableRowSelection === 'function') {
-          return instance.options.enableRowSelection(row);
+        if (typeof table.options.enableRowSelection === 'function') {
+          return table.options.enableRowSelection(row);
         }
 
-        return (_instance$options$ena = instance.options.enableRowSelection) != null ? _instance$options$ena : true;
+        return (_table$options$enable = table.options.enableRowSelection) != null ? _table$options$enable : true;
       },
       getCanSelectSubRows: () => {
-        var _instance$options$ena2;
+        var _table$options$enable2;
 
-        if (typeof instance.options.enableSubRowSelection === 'function') {
-          return instance.options.enableSubRowSelection(row);
+        if (typeof table.options.enableSubRowSelection === 'function') {
+          return table.options.enableSubRowSelection(row);
         }
 
-        return (_instance$options$ena2 = instance.options.enableSubRowSelection) != null ? _instance$options$ena2 : true;
+        return (_table$options$enable2 = table.options.enableSubRowSelection) != null ? _table$options$enable2 : true;
       },
       getCanMultiSelect: () => {
-        var _instance$options$ena3;
+        var _table$options$enable3;
 
-        if (typeof instance.options.enableMultiRowSelection === 'function') {
-          return instance.options.enableMultiRowSelection(row);
+        if (typeof table.options.enableMultiRowSelection === 'function') {
+          return table.options.enableMultiRowSelection(row);
         }
 
-        return (_instance$options$ena3 = instance.options.enableMultiRowSelection) != null ? _instance$options$ena3 : true;
+        return (_table$options$enable3 = table.options.enableMultiRowSelection) != null ? _table$options$enable3 : true;
       },
       getToggleSelectedHandler: () => {
         const canSelect = row.getCanSelect();
@@ -2270,16 +2239,20 @@ const RowSelection = {
   }
 };
 
-const mutateRowIsSelected = (selectedRowIds, id, value, instance) => {
+const mutateRowIsSelected = (selectedRowIds, id, value, table) => {
   var _row$subRows;
 
-  const row = instance.getRow(id);
+  const row = table.getRow(id);
   row.getIsGrouped(); // if ( // TODO: enforce grouping row selection rules
   //   !isGrouped ||
-  //   (isGrouped && instance.options.enableGroupingRowSelection)
+  //   (isGrouped && table.options.enableGroupingRowSelection)
   // ) {
 
   if (value) {
+    if (!row.getCanMultiSelect()) {
+      Object.keys(selectedRowIds).forEach(key => delete selectedRowIds[key]);
+    }
+
     selectedRowIds[id] = true;
   } else {
     delete selectedRowIds[id];
@@ -2287,12 +2260,12 @@ const mutateRowIsSelected = (selectedRowIds, id, value, instance) => {
 
 
   if ((_row$subRows = row.subRows) != null && _row$subRows.length && row.getCanSelectSubRows()) {
-    row.subRows.forEach(row => mutateRowIsSelected(selectedRowIds, row.id, value, instance));
+    row.subRows.forEach(row => mutateRowIsSelected(selectedRowIds, row.id, value, table));
   }
 };
 
-function selectRowsFn(instance, rowModel) {
-  const rowSelection = instance.getState().rowSelection;
+function selectRowsFn(table, rowModel) {
+  const rowSelection = table.getState().rowSelection;
   const newSelectedFlatRows = [];
   const newSelectedRowsById = {}; // Filters top level and nested rows
 
@@ -2301,7 +2274,7 @@ function selectRowsFn(instance, rowModel) {
     return rows.map(row => {
       var _row$subRows2;
 
-      const isSelected = isRowSelected(row, rowSelection) === true;
+      const isSelected = isRowSelected(row, rowSelection);
 
       if (isSelected) {
         newSelectedFlatRows.push(row);
@@ -2326,11 +2299,12 @@ function selectRowsFn(instance, rowModel) {
     rowsById: newSelectedRowsById
   };
 }
-function isRowSelected(row, selection, instance) {
-  if (selection[row.id]) {
-    return true;
-  }
+function isRowSelected(row, selection) {
+  var _selection$row$id;
 
+  return (_selection$row$id = selection[row.id]) != null ? _selection$row$id : false;
+}
+function isSubRowSelected(row, selection, table) {
   if (row.subRows && row.subRows.length) {
     let allChildrenSelected = true;
     let someSelected = false;
@@ -2346,7 +2320,7 @@ function isRowSelected(row, selection, instance) {
         allChildrenSelected = false;
       }
     });
-    return allChildrenSelected ? true : someSelected ? 'some' : false;
+    return allChildrenSelected ? 'all' : someSelected ? 'some' : false;
   }
 
   return false;
@@ -2472,18 +2446,18 @@ const Sorting = {
       sortingFn: 'auto'
     };
   },
-  getDefaultOptions: instance => {
+  getDefaultOptions: table => {
     return {
-      onSortingChange: makeStateUpdater('sorting', instance),
+      onSortingChange: makeStateUpdater('sorting', table),
       isMultiSortEvent: e => {
         return e.shiftKey;
       }
     };
   },
-  createColumn: (column, instance) => {
+  createColumn: (column, table) => {
     return {
       getAutoSortingFn: () => {
-        const firstRows = instance.getFilteredRowModel().flatRows.slice(10);
+        const firstRows = table.getFilteredRowModel().flatRows.slice(10);
         let isString = false;
 
         for (const row of firstRows) {
@@ -2509,7 +2483,7 @@ const Sorting = {
         return sortingFns.basic;
       },
       getAutoSortDir: () => {
-        const firstRow = instance.getFilteredRowModel().flatRows[0];
+        const firstRow = table.getFilteredRowModel().flatRows[0];
         const value = firstRow == null ? void 0 : firstRow.getValue(column.id);
 
         if (typeof value === 'string') {
@@ -2519,29 +2493,25 @@ const Sorting = {
         return 'desc';
       },
       getSortingFn: () => {
-        var _ref;
-
-        const userSortingFn = instance.options.sortingFns;
-
         if (!column) {
           throw new Error();
         }
 
-        return isFunction(column.columnDef.sortingFn) ? column.columnDef.sortingFn : column.columnDef.sortingFn === 'auto' ? column.getAutoSortingFn() : (_ref = userSortingFn == null ? void 0 : userSortingFn[column.columnDef.sortingFn]) != null ? _ref : sortingFns[column.columnDef.sortingFn];
+        return isFunction(column.columnDef.sortingFn) ? column.columnDef.sortingFn : column.columnDef.sortingFn === 'auto' ? column.getAutoSortingFn() : sortingFns[column.columnDef.sortingFn];
       },
       toggleSorting: (desc, multi) => {
         // if (column.columns.length) {
         //   column.columns.forEach((c, i) => {
         //     if (c.id) {
-        //       instance.toggleColumnSorting(c.id, undefined, multi || !!i)
+        //       table.toggleColumnSorting(c.id, undefined, multi || !!i)
         //     }
         //   })
         //   return
         // }
-        // this needs to be outside of instance.setSorting to be in sync with rerender
+        // this needs to be outside of table.setSorting to be in sync with rerender
         const nextSortingOrder = column.getNextSortingOrder();
-        instance.setSorting(old => {
-          var _instance$options$ena, _instance$options$ena2;
+        table.setSorting(old => {
+          var _table$options$enable, _table$options$enable2;
 
           // Find any existing sorting for this column
           const existingSorting = old == null ? void 0 : old.find(d => d.id === column.id);
@@ -2570,9 +2540,9 @@ const Sorting = {
 
 
           if (sortAction === 'toggle' && ( // Must be toggling
-          (_instance$options$ena = instance.options.enableSortingRemoval) != null ? _instance$options$ena : true) && // If enableSortRemove, enable in general
+          (_table$options$enable = table.options.enableSortingRemoval) != null ? _table$options$enable : true) && // If enableSortRemove, enable in general
           !hasDescDefined && ( // Must not be setting desc
-          multi ? (_instance$options$ena2 = instance.options.enableMultiRemove) != null ? _instance$options$ena2 : true : true) && // If multi, don't allow if enableMultiRemove
+          multi ? (_table$options$enable2 = table.options.enableMultiRemove) != null ? _table$options$enable2 : true : true) && // If multi, don't allow if enableMultiRemove
           !nextSortingOrder // Finally, detect if it should indeed be removed
           ) {
             sortAction = 'remove';
@@ -2584,14 +2554,14 @@ const Sorting = {
               desc: hasDescDefined ? desc : nextSortingOrder === 'desc'
             }];
           } else if (sortAction === 'add' && old != null && old.length) {
-            var _instance$options$max;
+            var _table$options$maxMul;
 
             newSorting = [...old, {
               id: column.id,
               desc: hasDescDefined ? desc : nextSortingOrder === 'desc'
             }]; // Take latest n columns
 
-            newSorting.splice(0, newSorting.length - ((_instance$options$max = instance.options.maxMultiSortColCount) != null ? _instance$options$max : Number.MAX_SAFE_INTEGER));
+            newSorting.splice(0, newSorting.length - ((_table$options$maxMul = table.options.maxMultiSortColCount) != null ? _table$options$maxMul : Number.MAX_SAFE_INTEGER));
           } else if (sortAction === 'toggle' && old != null && old.length) {
             // This flips (or sets) the
             newSorting = old.map(d => {
@@ -2611,9 +2581,9 @@ const Sorting = {
         });
       },
       getNextSortingOrder: () => {
-        var _ref2, _column$columnDef$sor;
+        var _ref, _column$columnDef$sor;
 
-        const sortDescFirst = (_ref2 = (_column$columnDef$sor = column.columnDef.sortDescFirst) != null ? _column$columnDef$sor : instance.options.sortDescFirst) != null ? _ref2 : column.getAutoSortDir() === 'desc';
+        const sortDescFirst = (_ref = (_column$columnDef$sor = column.columnDef.sortDescFirst) != null ? _column$columnDef$sor : table.options.sortDescFirst) != null ? _ref : column.getAutoSortDir() === 'desc';
         const firstSortDirection = sortDescFirst ? 'desc' : 'asc';
         const isSorted = column.getIsSorted();
 
@@ -2628,59 +2598,59 @@ const Sorting = {
         }
       },
       getCanSort: () => {
-        var _column$columnDef$ena, _instance$options$ena3;
+        var _column$columnDef$ena, _table$options$enable3;
 
-        return ((_column$columnDef$ena = column.columnDef.enableSorting) != null ? _column$columnDef$ena : true) && ((_instance$options$ena3 = instance.options.enableSorting) != null ? _instance$options$ena3 : true) && !!column.accessorFn;
+        return ((_column$columnDef$ena = column.columnDef.enableSorting) != null ? _column$columnDef$ena : true) && ((_table$options$enable3 = table.options.enableSorting) != null ? _table$options$enable3 : true) && !!column.accessorFn;
       },
       getCanMultiSort: () => {
-        var _ref3, _column$columnDef$ena2;
+        var _ref2, _column$columnDef$ena2;
 
-        return (_ref3 = (_column$columnDef$ena2 = column.columnDef.enableMultiSort) != null ? _column$columnDef$ena2 : instance.options.enableMultiSort) != null ? _ref3 : !!column.accessorFn;
+        return (_ref2 = (_column$columnDef$ena2 = column.columnDef.enableMultiSort) != null ? _column$columnDef$ena2 : table.options.enableMultiSort) != null ? _ref2 : !!column.accessorFn;
       },
       getIsSorted: () => {
-        var _instance$getState$so;
+        var _table$getState$sorti;
 
-        const columnSort = (_instance$getState$so = instance.getState().sorting) == null ? void 0 : _instance$getState$so.find(d => d.id === column.id);
+        const columnSort = (_table$getState$sorti = table.getState().sorting) == null ? void 0 : _table$getState$sorti.find(d => d.id === column.id);
         return !columnSort ? false : columnSort.desc ? 'desc' : 'asc';
       },
       getSortIndex: () => {
-        var _instance$getState$so2, _instance$getState$so3;
+        var _table$getState$sorti2, _table$getState$sorti3;
 
-        return (_instance$getState$so2 = (_instance$getState$so3 = instance.getState().sorting) == null ? void 0 : _instance$getState$so3.findIndex(d => d.id === column.id)) != null ? _instance$getState$so2 : -1;
+        return (_table$getState$sorti2 = (_table$getState$sorti3 = table.getState().sorting) == null ? void 0 : _table$getState$sorti3.findIndex(d => d.id === column.id)) != null ? _table$getState$sorti2 : -1;
       },
       clearSorting: () => {
         //clear sorting for just 1 column
-        instance.setSorting(old => old != null && old.length ? old.filter(d => d.id !== column.id) : []);
+        table.setSorting(old => old != null && old.length ? old.filter(d => d.id !== column.id) : []);
       },
       getToggleSortingHandler: () => {
         const canSort = column.getCanSort();
         return 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);
+          column.toggleSorting == null ? void 0 : column.toggleSorting(undefined, column.getCanMultiSort() ? table.options.isMultiSortEvent == null ? void 0 : table.options.isMultiSortEvent(e) : false);
         };
       }
     };
   },
-  createInstance: instance => {
+  createTable: table => {
     return {
-      setSorting: updater => instance.options.onSortingChange == null ? void 0 : instance.options.onSortingChange(updater),
+      setSorting: updater => table.options.onSortingChange == null ? void 0 : table.options.onSortingChange(updater),
       resetSorting: defaultState => {
-        var _instance$initialStat, _instance$initialStat2;
+        var _table$initialState$s, _table$initialState;
 
-        instance.setSorting(defaultState ? [] : (_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.sorting) != null ? _instance$initialStat : []);
+        table.setSorting(defaultState ? [] : (_table$initialState$s = (_table$initialState = table.initialState) == null ? void 0 : _table$initialState.sorting) != null ? _table$initialState$s : []);
       },
-      getPreSortedRowModel: () => instance.getGroupedRowModel(),
+      getPreSortedRowModel: () => table.getGroupedRowModel(),
       getSortedRowModel: () => {
-        if (!instance._getSortedRowModel && instance.options.getSortedRowModel) {
-          instance._getSortedRowModel = instance.options.getSortedRowModel(instance);
+        if (!table._getSortedRowModel && table.options.getSortedRowModel) {
+          table._getSortedRowModel = table.options.getSortedRowModel(table);
         }
 
-        if (instance.options.manualSorting || !instance._getSortedRowModel) {
-          return instance.getPreSortedRowModel();
+        if (table.options.manualSorting || !table._getSortedRowModel) {
+          return table.getPreSortedRowModel();
         }
 
-        return instance._getSortedRowModel();
+        return table._getSortedRowModel();
       }
     };
   }
@@ -2694,29 +2664,29 @@ const Visibility = {
       ...state
     };
   },
-  getDefaultOptions: instance => {
+  getDefaultOptions: table => {
     return {
-      onColumnVisibilityChange: makeStateUpdater('columnVisibility', instance)
+      onColumnVisibilityChange: makeStateUpdater('columnVisibility', table)
     };
   },
-  createColumn: (column, instance) => {
+  createColumn: (column, table) => {
     return {
       toggleVisibility: value => {
         if (column.getCanHide()) {
-          instance.setColumnVisibility(old => ({ ...old,
+          table.setColumnVisibility(old => ({ ...old,
             [column.id]: value != null ? value : !column.getIsVisible()
           }));
         }
       },
       getIsVisible: () => {
-        var _instance$getState$co, _instance$getState$co2;
+        var _table$getState$colum, _table$getState$colum2;
 
-        return (_instance$getState$co = (_instance$getState$co2 = instance.getState().columnVisibility) == null ? void 0 : _instance$getState$co2[column.id]) != null ? _instance$getState$co : true;
+        return (_table$getState$colum = (_table$getState$colum2 = table.getState().columnVisibility) == null ? void 0 : _table$getState$colum2[column.id]) != null ? _table$getState$colum : true;
       },
       getCanHide: () => {
-        var _column$columnDef$ena, _instance$options$ena;
+        var _column$columnDef$ena, _table$options$enable;
 
-        return ((_column$columnDef$ena = column.columnDef.enableHiding) != null ? _column$columnDef$ena : true) && ((_instance$options$ena = instance.options.enableHiding) != null ? _instance$options$ena : true);
+        return ((_column$columnDef$ena = column.columnDef.enableHiding) != null ? _column$columnDef$ena : true) && ((_table$options$enable = table.options.enableHiding) != null ? _table$options$enable : true);
       },
       getToggleVisibilityHandler: () => {
         return e => {
@@ -2725,69 +2695,69 @@ const Visibility = {
       }
     };
   },
-  createRow: (row, instance) => {
+  createRow: (row, table) => {
     return {
-      _getAllVisibleCells: memo(() => [row.getAllCells(), instance.getState().columnVisibility], cells => {
+      _getAllVisibleCells: memo(() => [row.getAllCells(), table.getState().columnVisibility], cells => {
         return cells.filter(cell => cell.column.getIsVisible());
       }, {
         key: process.env.NODE_ENV === 'production' && 'row._getAllVisibleCells',
         debug: () => {
-          var _instance$options$deb;
+          var _table$options$debugA;
 
-          return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugRows;
+          return (_table$options$debugA = table.options.debugAll) != null ? _table$options$debugA : table.options.debugRows;
         }
       }),
       getVisibleCells: memo(() => [row.getLeftVisibleCells(), row.getCenterVisibleCells(), row.getRightVisibleCells()], (left, center, right) => [...left, ...center, ...right], {
         key: process.env.NODE_ENV === 'development' && 'row.getVisibleCells',
         debug: () => {
-          var _instance$options$deb2;
+          var _table$options$debugA2;
 
-          return (_instance$options$deb2 = instance.options.debugAll) != null ? _instance$options$deb2 : instance.options.debugRows;
+          return (_table$options$debugA2 = table.options.debugAll) != null ? _table$options$debugA2 : table.options.debugRows;
         }
       })
     };
   },
-  createInstance: instance => {
+  createTable: table => {
     const makeVisibleColumnsMethod = (key, getColumns) => {
       return memo(() => [getColumns(), getColumns().filter(d => d.getIsVisible()).map(d => d.id).join('_')], columns => {
         return columns.filter(d => d.getIsVisible == null ? void 0 : d.getIsVisible());
       }, {
         key,
         debug: () => {
-          var _instance$options$deb3;
+          var _table$options$debugA3;
 
-          return (_instance$options$deb3 = instance.options.debugAll) != null ? _instance$options$deb3 : instance.options.debugColumns;
+          return (_table$options$debugA3 = table.options.debugAll) != null ? _table$options$debugA3 : table.options.debugColumns;
         }
       });
     };
 
     return {
-      getVisibleFlatColumns: makeVisibleColumnsMethod('getVisibleFlatColumns', () => instance.getAllFlatColumns()),
-      getVisibleLeafColumns: makeVisibleColumnsMethod('getVisibleLeafColumns', () => instance.getAllLeafColumns()),
-      getLeftVisibleLeafColumns: makeVisibleColumnsMethod('getLeftVisibleLeafColumns', () => instance.getLeftLeafColumns()),
-      getRightVisibleLeafColumns: makeVisibleColumnsMethod('getRightVisibleLeafColumns', () => instance.getRightLeafColumns()),
-      getCenterVisibleLeafColumns: makeVisibleColumnsMethod('getCenterVisibleLeafColumns', () => instance.getCenterLeafColumns()),
-      setColumnVisibility: updater => instance.options.onColumnVisibilityChange == null ? void 0 : instance.options.onColumnVisibilityChange(updater),
+      getVisibleFlatColumns: makeVisibleColumnsMethod('getVisibleFlatColumns', () => table.getAllFlatColumns()),
+      getVisibleLeafColumns: makeVisibleColumnsMethod('getVisibleLeafColumns', () => table.getAllLeafColumns()),
+      getLeftVisibleLeafColumns: makeVisibleColumnsMethod('getLeftVisibleLeafColumns', () => table.getLeftLeafColumns()),
+      getRightVisibleLeafColumns: makeVisibleColumnsMethod('getRightVisibleLeafColumns', () => table.getRightLeafColumns()),
+      getCenterVisibleLeafColumns: makeVisibleColumnsMethod('getCenterVisibleLeafColumns', () => table.getCenterLeafColumns()),
+      setColumnVisibility: updater => table.options.onColumnVisibilityChange == null ? void 0 : table.options.onColumnVisibilityChange(updater),
       resetColumnVisibility: defaultState => {
-        var _instance$initialStat;
+        var _table$initialState$c;
 
-        instance.setColumnVisibility(defaultState ? {} : (_instance$initialStat = instance.initialState.columnVisibility) != null ? _instance$initialStat : {});
+        table.setColumnVisibility(defaultState ? {} : (_table$initialState$c = table.initialState.columnVisibility) != null ? _table$initialState$c : {});
       },
       toggleAllColumnsVisible: value => {
         var _value;
 
-        value = (_value = value) != null ? _value : !instance.getIsAllColumnsVisible();
-        instance.setColumnVisibility(instance.getAllLeafColumns().reduce((obj, column) => ({ ...obj,
+        value = (_value = value) != null ? _value : !table.getIsAllColumnsVisible();
+        table.setColumnVisibility(table.getAllLeafColumns().reduce((obj, column) => ({ ...obj,
           [column.id]: !value ? !(column.getCanHide != null && column.getCanHide()) : value
         }), {}));
       },
-      getIsAllColumnsVisible: () => !instance.getAllLeafColumns().some(column => !(column.getIsVisible != null && column.getIsVisible())),
-      getIsSomeColumnsVisible: () => instance.getAllLeafColumns().some(column => column.getIsVisible == null ? void 0 : column.getIsVisible()),
+      getIsAllColumnsVisible: () => !table.getAllLeafColumns().some(column => !(column.getIsVisible != null && column.getIsVisible())),
+      getIsSomeColumnsVisible: () => table.getAllLeafColumns().some(column => column.getIsVisible == null ? void 0 : column.getIsVisible()),
       getToggleAllColumnsVisibilityHandler: () => {
         return e => {
           var _target;
 
-          instance.toggleAllColumnsVisible((_target = e.target) == null ? void 0 : _target.checked);
+          table.toggleAllColumnsVisible((_target = e.target) == null ? void 0 : _target.checked);
         };
       }
     };
@@ -2796,24 +2766,24 @@ const Visibility = {
 
 const features = [Headers, Visibility, Ordering, Pinning, Filters, Sorting, Grouping, Expanding, Pagination, RowSelection, ColumnSizing]; //
 
-function createTableInstance(options) {
+function createTable(options) {
   var _options$initialState;
 
   if (options.debugAll || options.debugTable) {
     console.info('Creating Table Instance...');
   }
 
-  let instance = {
+  let table = {
     _features: features
   };
 
-  const defaultOptions = instance._features.reduce((obj, feature) => {
-    return Object.assign(obj, feature.getDefaultOptions == null ? void 0 : feature.getDefaultOptions(instance));
+  const defaultOptions = table._features.reduce((obj, feature) => {
+    return Object.assign(obj, feature.getDefaultOptions == null ? void 0 : feature.getDefaultOptions(table));
   }, {});
 
   const mergeOptions = options => {
-    if (instance.options.mergeOptions) {
-      return instance.options.mergeOptions(defaultOptions, options);
+    if (table.options.mergeOptions) {
+      return table.options.mergeOptions(defaultOptions, options);
     }
 
     return { ...defaultOptions,
@@ -2826,7 +2796,7 @@ function createTableInstance(options) {
     ...((_options$initialState = options.initialState) != null ? _options$initialState : {})
   };
 
-  instance._features.forEach(feature => {
+  table._features.forEach(feature => {
     var _feature$getInitialSt;
 
     initialState = (_feature$getInitialSt = feature.getInitialState == null ? void 0 : feature.getInitialState(initialState)) != null ? _feature$getInitialSt : initialState;
@@ -2859,48 +2829,37 @@ function createTableInstance(options) {
       }
     },
     reset: () => {
-      instance.setState(instance.initialState);
+      table.setState(table.initialState);
     },
     setOptions: updater => {
-      const newOptions = functionalUpdate(updater, instance.options);
-      instance.options = mergeOptions(newOptions);
-    },
-    _render: (template, props) => {
-      if (typeof instance.options.render === 'function') {
-        return instance.options.render(template, props);
-      }
-
-      if (typeof template === 'function') {
-        return template(props);
-      }
-
-      return template;
+      const newOptions = functionalUpdate(updater, table.options);
+      table.options = mergeOptions(newOptions);
     },
     getState: () => {
-      return instance.options.state;
+      return table.options.state;
     },
     setState: updater => {
-      instance.options.onStateChange == null ? void 0 : instance.options.onStateChange(updater);
+      table.options.onStateChange == null ? void 0 : table.options.onStateChange(updater);
     },
     _getRowId: (row, index, parent) => {
-      var _instance$options$get;
+      var _table$options$getRow;
 
-      return (_instance$options$get = instance.options.getRowId == null ? void 0 : instance.options.getRowId(row, index, parent)) != null ? _instance$options$get : "" + (parent ? [parent.id, index].join('.') : index);
+      return (_table$options$getRow = table.options.getRowId == null ? void 0 : table.options.getRowId(row, index, parent)) != null ? _table$options$getRow : "" + (parent ? [parent.id, index].join('.') : index);
     },
     getCoreRowModel: () => {
-      if (!instance._getCoreRowModel) {
-        instance._getCoreRowModel = instance.options.getCoreRowModel(instance);
+      if (!table._getCoreRowModel) {
+        table._getCoreRowModel = table.options.getCoreRowModel(table);
       }
 
-      return instance._getCoreRowModel();
+      return table._getCoreRowModel();
     },
     // The final calls start at the bottom of the model,
     // expanded rows, which then work their way up
     getRowModel: () => {
-      return instance.getPaginationRowModel();
+      return table.getPaginationRowModel();
     },
     getRow: id => {
-      const row = instance.getRowModel().rowsById[id];
+      const row = table.getRowModel().rowsById[id];
 
       if (!row) {
         if (process.env.NODE_ENV !== 'production') {
@@ -2912,7 +2871,7 @@ function createTableInstance(options) {
 
       return row;
     },
-    _getDefaultColumnDef: memo(() => [instance.options.defaultColumn], defaultColumn => {
+    _getDefaultColumnDef: memo(() => [table.options.defaultColumn], defaultColumn => {
       var _defaultColumn;
 
       defaultColumn = (_defaultColumn = defaultColumn) != null ? _defaultColumn : {};
@@ -2920,32 +2879,32 @@ function createTableInstance(options) {
         header: props => props.header.column.id,
         footer: props => props.header.column.id,
         cell: props => {
-          var _props$getValue$toStr, _props$getValue;
+          var _toString, _props$renderValue;
 
-          return (_props$getValue$toStr = (_props$getValue = props.getValue()) == null ? void 0 : _props$getValue.toString == null ? void 0 : _props$getValue.toString()) != null ? _props$getValue$toStr : null;
+          return (_toString = (_props$renderValue = props.renderValue()) == null ? void 0 : _props$renderValue.toString == null ? void 0 : _props$renderValue.toString()) != null ? _toString : null;
         },
-        ...instance._features.reduce((obj, feature) => {
+        ...table._features.reduce((obj, feature) => {
           return Object.assign(obj, feature.getDefaultColumnDef == null ? void 0 : feature.getDefaultColumnDef());
         }, {}),
         ...defaultColumn
       };
     }, {
       debug: () => {
-        var _instance$options$deb;
+        var _table$options$debugA;
 
-        return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugColumns;
+        return (_table$options$debugA = table.options.debugAll) != null ? _table$options$debugA : table.options.debugColumns;
       },
       key: process.env.NODE_ENV === 'development' && 'getDefaultColumnDef'
     }),
-    _getColumnDefs: () => instance.options.columns,
-    getAllColumns: memo(() => [instance._getColumnDefs()], columnDefs => {
+    _getColumnDefs: () => table.options.columns,
+    getAllColumns: memo(() => [table._getColumnDefs()], columnDefs => {
       const recurseColumns = function (columnDefs, parent, depth) {
         if (depth === void 0) {
           depth = 0;
         }
 
         return columnDefs.map(columnDef => {
-          const column = createColumn(instance, columnDef, depth, parent);
+          const column = createColumn(table, columnDef, depth, parent);
           column.columns = columnDef.columns ? recurseColumns(columnDef.columns, column, depth + 1) : [];
           return column;
         });
@@ -2955,24 +2914,24 @@ function createTableInstance(options) {
     }, {
       key: process.env.NODE_ENV === 'development' && 'getAllColumns',
       debug: () => {
-        var _instance$options$deb2;
+        var _table$options$debugA2;
 
-        return (_instance$options$deb2 = instance.options.debugAll) != null ? _instance$options$deb2 : instance.options.debugColumns;
+        return (_table$options$debugA2 = table.options.debugAll) != null ? _table$options$debugA2 : table.options.debugColumns;
       }
     }),
-    getAllFlatColumns: memo(() => [instance.getAllColumns()], allColumns => {
+    getAllFlatColumns: memo(() => [table.getAllColumns()], allColumns => {
       return allColumns.flatMap(column => {
         return column.getFlatColumns();
       });
     }, {
       key: process.env.NODE_ENV === 'development' && 'getAllFlatColumns',
       debug: () => {
-        var _instance$options$deb3;
+        var _table$options$debugA3;
 
-        return (_instance$options$deb3 = instance.options.debugAll) != null ? _instance$options$deb3 : instance.options.debugColumns;
+        return (_table$options$debugA3 = table.options.debugAll) != null ? _table$options$debugA3 : table.options.debugColumns;
       }
     }),
-    _getAllFlatColumnsById: memo(() => [instance.getAllFlatColumns()], flatColumns => {
+    _getAllFlatColumnsById: memo(() => [table.getAllFlatColumns()], flatColumns => {
       return flatColumns.reduce((acc, column) => {
         acc[column.id] = column;
         return acc;
@@ -2980,24 +2939,24 @@ function createTableInstance(options) {
     }, {
       key: process.env.NODE_ENV === 'development' && 'getAllFlatColumnsById',
       debug: () => {
-        var _instance$options$deb4;
+        var _table$options$debugA4;
 
-        return (_instance$options$deb4 = instance.options.debugAll) != null ? _instance$options$deb4 : instance.options.debugColumns;
+        return (_table$options$debugA4 = table.options.debugAll) != null ? _table$options$debugA4 : table.options.debugColumns;
       }
     }),
-    getAllLeafColumns: memo(() => [instance.getAllColumns(), instance._getOrderColumnsFn()], (allColumns, orderColumns) => {
+    getAllLeafColumns: memo(() => [table.getAllColumns(), table._getOrderColumnsFn()], (allColumns, orderColumns) => {
       let leafColumns = allColumns.flatMap(column => column.getLeafColumns());
       return orderColumns(leafColumns);
     }, {
       key: process.env.NODE_ENV === 'development' && 'getAllLeafColumns',
       debug: () => {
-        var _instance$options$deb5;
+        var _table$options$debugA5;
 
-        return (_instance$options$deb5 = instance.options.debugAll) != null ? _instance$options$deb5 : instance.options.debugColumns;
+        return (_table$options$debugA5 = table.options.debugAll) != null ? _table$options$debugA5 : table.options.debugColumns;
       }
     }),
     getColumn: columnId => {
-      const column = instance._getAllFlatColumnsById()[columnId];
+      const column = table._getAllFlatColumnsById()[columnId];
 
       if (!column) {
         if (process.env.NODE_ENV !== 'production') {
@@ -3010,76 +2969,20 @@ function createTableInstance(options) {
       return column;
     }
   };
-  Object.assign(instance, coreInstance);
+  Object.assign(table, coreInstance);
 
-  instance._features.forEach(feature => {
-    return Object.assign(instance, feature.createInstance == null ? void 0 : feature.createInstance(instance));
+  table._features.forEach(feature => {
+    return Object.assign(table, feature.createTable == null ? void 0 : feature.createTable(table));
   });
 
-  return instance;
-}
-
-//
-function createTableFactory(opts) {
-  return () => createTable(undefined, undefined, opts);
-} // A lot of returns in here are `as any` for a reason. Unless you
-// can find a better way to do this, then don't worry about them
-
-function createTable(_, __, options) {
-  const table = {
-    generics: undefined,
-    options: options != null ? options : {
-      render: (() => {
-        throw new Error('');
-      })()
-    },
-    // setGenerics: () => table as any,
-    setRowType: () => table,
-    setTableMetaType: () => table,
-    setColumnMetaType: () => table,
-    setFilterMetaType: () => table,
-    setOptions: newOptions => createTable(_, __, { ...options,
-      ...newOptions
-    }),
-    createDisplayColumn: column => ({ ...column,
-      columnDefType: 'display'
-    }),
-    createGroup: column => ({ ...column,
-      columnDefType: 'group'
-    }),
-    createDataColumn: (accessor, column) => {
-      column = { ...column,
-        columnDefType: 'data',
-        id: column.id
-      };
-
-      if (typeof accessor === 'string') {
-        var _column$id;
-
-        return { ...column,
-          id: (_column$id = column.id) != null ? _column$id : accessor,
-          accessorKey: accessor
-        };
-      }
-
-      if (typeof accessor === 'function') {
-        return { ...column,
-          accessorFn: accessor
-        };
-      }
-
-      throw new Error('Invalid accessor');
-    },
-    createOptions: options => options
-  };
   return table;
 }
 
-function createCell(instance, row, column, columnId) {
+function createCell(table, row, column, columnId) {
   const getRenderValue = () => {
     var _cell$getValue;
 
-    return (_cell$getValue = cell.getValue()) != null ? _cell$getValue : instance.options.renderFallbackValue;
+    return (_cell$getValue = cell.getValue()) != null ? _cell$getValue : table.options.renderFallbackValue;
   };
 
   const cell = {
@@ -3087,25 +2990,25 @@ function createCell(instance, row, column, columnId) {
     row,
     column,
     getValue: () => row.getValue(columnId),
-    renderCell: () => {
-      return column.columnDef.cell ? instance._render(column.columnDef.cell, {
-        instance,
-        column,
-        row,
-        cell: cell,
-        getValue: getRenderValue
-      }) : null;
-    }
+    renderValue: getRenderValue,
+    getContext: () => ({
+      table,
+      column,
+      row,
+      cell: cell,
+      getValue: cell.getValue,
+      renderValue: cell.renderValue
+    })
   };
 
-  instance._features.forEach(feature => {
-    Object.assign(cell, feature.createCell == null ? void 0 : feature.createCell(cell, column, row, instance));
+  table._features.forEach(feature => {
+    Object.assign(cell, feature.createCell == null ? void 0 : feature.createCell(cell, column, row, table));
   }, {});
 
   return cell;
 }
 
-const createRow = (instance, id, original, rowIndex, depth, subRows) => {
+const createRow = (table, id, original, rowIndex, depth, subRows) => {
   let row = {
     id,
     index: rowIndex,
@@ -3117,7 +3020,7 @@ const createRow = (instance, id, original, rowIndex, depth, subRows) => {
         return row._valuesCache[columnId];
       }
 
-      const column = instance.getColumn(columnId);
+      const column = table.getColumn(columnId);
 
       if (!column.accessorFn) {
         return undefined;
@@ -3126,18 +3029,23 @@ const createRow = (instance, id, original, rowIndex, depth, subRows) => {
       row._valuesCache[columnId] = column.accessorFn(row.original, rowIndex);
       return row._valuesCache[columnId];
     },
+    renderValue: columnId => {
+      var _row$getValue;
+
+      return (_row$getValue = row.getValue(columnId)) != null ? _row$getValue : table.options.renderFallbackValue;
+    },
     subRows: subRows != null ? subRows : [],
     getLeafRows: () => flattenBy(row.subRows, d => d.subRows),
-    getAllCells: memo(() => [instance.getAllLeafColumns()], leafColumns => {
+    getAllCells: memo(() => [table.getAllLeafColumns()], leafColumns => {
       return leafColumns.map(column => {
-        return createCell(instance, row, column, column.id);
+        return createCell(table, row, column, column.id);
       });
     }, {
       key: process.env.NODE_ENV === 'development' && 'row.getAllCells',
       debug: () => {
-        var _instance$options$deb;
+        var _table$options$debugA;
 
-        return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugRows;
+        return (_table$options$debugA = table.options.debugAll) != null ? _table$options$debugA : table.options.debugRows;
       }
     }),
     _getAllCellsByColumnId: memo(() => [row.getAllCells()], allCells => {
@@ -3148,23 +3056,23 @@ const createRow = (instance, id, original, rowIndex, depth, subRows) => {
     }, {
       key: process.env.NODE_ENV === 'production' && 'row.getAllCellsByColumnId',
       debug: () => {
-        var _instance$options$deb2;
+        var _table$options$debugA2;
 
-        return (_instance$options$deb2 = instance.options.debugAll) != null ? _instance$options$deb2 : instance.options.debugRows;
+        return (_table$options$debugA2 = table.options.debugAll) != null ? _table$options$debugA2 : table.options.debugRows;
       }
     })
   };
 
-  for (let i = 0; i < instance._features.length; i++) {
-    const feature = instance._features[i];
-    Object.assign(row, feature == null ? void 0 : feature.createRow == null ? void 0 : feature.createRow(row, instance));
+  for (let i = 0; i < table._features.length; i++) {
+    const feature = table._features[i];
+    Object.assign(row, feature == null ? void 0 : feature.createRow == null ? void 0 : feature.createRow(row, table));
   }
 
   return row;
 };
 
 function getCoreRowModel() {
-  return instance => memo(() => [instance.options.data], data => {
+  return table => memo(() => [table.options.data], data => {
     const rowModel = {
       rows: [],
       flatRows: [],
@@ -3186,18 +3094,18 @@ function getCoreRowModel() {
         //   }
         // }
         // Make the row
-        const row = createRow(instance, instance._getRowId(originalRows[i], i, parent), originalRows[i], i, depth); // Keep track of every row in a flat array
+        const row = createRow(table, table._getRowId(originalRows[i], i, parent), originalRows[i], i, depth); // Keep track of every row in a flat array
 
         rowModel.flatRows.push(row); // Also keep track of every row by its ID
 
-        rowModel.rowsById[row.id] = row; // Push instance row into parent
+        rowModel.rowsById[row.id] = row; // Push table row into parent
 
         rows.push(row); // Get the original subrows
 
-        if (instance.options.getSubRows) {
+        if (table.options.getSubRows) {
           var _row$originalSubRows;
 
-          row.originalSubRows = instance.options.getSubRows(originalRows[i], i); // Then recursively access them
+          row.originalSubRows = table.options.getSubRows(originalRows[i], i); // Then recursively access them
 
           if ((_row$originalSubRows = row.originalSubRows) != null && _row$originalSubRows.length) {
             row.subRows = accessRows(row.originalSubRows, depth + 1, row);
@@ -3213,24 +3121,24 @@ function getCoreRowModel() {
   }, {
     key: process.env.NODE_ENV === 'development' && 'getRowModel',
     debug: () => {
-      var _instance$options$deb;
+      var _table$options$debugA;
 
-      return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugTable;
+      return (_table$options$debugA = table.options.debugAll) != null ? _table$options$debugA : table.options.debugTable;
     },
     onChange: () => {
-      instance._autoResetPageIndex();
+      table._autoResetPageIndex();
     }
   });
 }
 
-function filterRows(rows, filterRowImpl, instance) {
-  if (instance.options.filterFromLeafRows) {
-    return filterRowModelFromLeafs(rows, filterRowImpl, instance);
+function filterRows(rows, filterRowImpl, table) {
+  if (table.options.filterFromLeafRows) {
+    return filterRowModelFromLeafs(rows, filterRowImpl, table);
   }
 
-  return filterRowModelFromRoot(rows, filterRowImpl, instance);
+  return filterRowModelFromRoot(rows, filterRowImpl, table);
 }
-function filterRowModelFromLeafs(rowsToFilter, filterRow, instance) {
+function filterRowModelFromLeafs(rowsToFilter, filterRow, table) {
   const newFilteredFlatRows = [];
   const newFilteredRowsById = {};
 
@@ -3244,7 +3152,7 @@ function filterRowModelFromLeafs(rowsToFilter, filterRow, instance) {
       let row = rowsToFilter[i];
 
       if ((_row$subRows = row.subRows) != null && _row$subRows.length) {
-        const newRow = createRow(instance, row.id, row.original, row.index, row.depth);
+        const newRow = createRow(table, row.id, row.original, row.index, row.depth);
         newRow.columnFilters = row.columnFilters;
         newRow.subRows = recurseFilterRows(row.subRows);
 
@@ -3271,7 +3179,7 @@ function filterRowModelFromLeafs(rowsToFilter, filterRow, instance) {
     rowsById: newFilteredRowsById
   };
 }
-function filterRowModelFromRoot(rowsToFilter, filterRow, instance) {
+function filterRowModelFromRoot(rowsToFilter, filterRow, table) {
   const newFilteredFlatRows = [];
   const newFilteredRowsById = {}; // Filters top level and nested rows
 
@@ -3288,7 +3196,7 @@ function filterRowModelFromRoot(rowsToFilter, filterRow, instance) {
         var _row$subRows2;
 
         if ((_row$subRows2 = row.subRows) != null && _row$subRows2.length) {
-          const newRow = createRow(instance, row.id, row.original, row.index, row.depth);
+          const newRow = createRow(table, row.id, row.original, row.index, row.depth);
           newRow.subRows = recurseFilterRows(row.subRows);
           row = newRow;
         }
@@ -3310,7 +3218,7 @@ function filterRowModelFromRoot(rowsToFilter, filterRow, instance) {
 }
 
 function getFilteredRowModel() {
-  return instance => memo(() => [instance.getPreFilteredRowModel(), instance.getState().columnFilters, instance.getState().globalFilter], (rowModel, columnFilters, globalFilter) => {
+  return table => memo(() => [table.getPreFilteredRowModel(), table.getState().columnFilters, table.getState().globalFilter], (rowModel, columnFilters, globalFilter) => {
     if (!rowModel.rows.length || !(columnFilters != null && columnFilters.length) && !globalFilter) {
       for (let i = 0; i < rowModel.flatRows.length; i++) {
         rowModel.flatRows[i].columnFilters = {};
@@ -3325,7 +3233,7 @@ function getFilteredRowModel() {
     (columnFilters != null ? columnFilters : []).forEach(d => {
       var _filterFn$resolveFilt;
 
-      const column = instance.getColumn(d.id);
+      const column = table.getColumn(d.id);
 
       if (!column) {
         if (process.env.NODE_ENV !== 'production') {
@@ -3350,8 +3258,8 @@ function getFilteredRowModel() {
       });
     });
     const filterableIds = columnFilters.map(d => d.id);
-    const globalFilterFn = instance.getGlobalFilterFn();
-    const globallyFilterableColumns = instance.getAllLeafColumns().filter(column => column.getCanGlobalFilter());
+    const globalFilterFn = table.getGlobalFilterFn();
+    const globallyFilterableColumns = table.getAllLeafColumns().filter(column => column.getCanGlobalFilter());
 
     if (globalFilter && globalFilterFn && globallyFilterableColumns.length) {
       filterableIds.push('__global__');
@@ -3415,22 +3323,22 @@ function getFilteredRowModel() {
     }; // Filter final rows using all of the active filters
 
 
-    return filterRows(rowModel.rows, filterRowsImpl, instance);
+    return filterRows(rowModel.rows, filterRowsImpl, table);
   }, {
     key: process.env.NODE_ENV === 'development' && 'getFilteredRowModel',
     debug: () => {
-      var _instance$options$deb;
+      var _table$options$debugA;
 
-      return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugTable;
+      return (_table$options$debugA = table.options.debugAll) != null ? _table$options$debugA : table.options.debugTable;
     },
     onChange: () => {
-      instance._autoResetPageIndex();
+      table._autoResetPageIndex();
     }
   });
 }
 
 function getFacetedRowModel() {
-  return (instance, columnId) => memo(() => [instance.getPreFilteredRowModel(), instance.getState().columnFilters, instance.getState().globalFilter, instance.getFilteredRowModel()], (preRowModel, columnFilters, globalFilter) => {
+  return (table, columnId) => memo(() => [table.getPreFilteredRowModel(), table.getState().columnFilters, table.getState().globalFilter, table.getFilteredRowModel()], (preRowModel, columnFilters, globalFilter) => {
     if (!preRowModel.rows.length || !(columnFilters != null && columnFilters.length) && !globalFilter) {
       return preRowModel;
     }
@@ -3448,20 +3356,20 @@ function getFacetedRowModel() {
       return true;
     };
 
-    return filterRows(preRowModel.rows, filterRowsImpl, instance);
+    return filterRows(preRowModel.rows, filterRowsImpl, table);
   }, {
     key: process.env.NODE_ENV === 'development' && 'getFacetedRowModel_' + columnId,
     debug: () => {
-      var _instance$options$deb;
+      var _table$options$debugA;
 
-      return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugTable;
+      return (_table$options$debugA = table.options.debugAll) != null ? _table$options$debugA : table.options.debugTable;
     },
     onChange: () => {}
   });
 }
 
 function getFacetedUniqueValues() {
-  return (instance, columnId) => memo(() => [instance.getColumn(columnId).getFacetedRowModel()], facetedRowModel => {
+  return (table, columnId) => memo(() => [table.getColumn(columnId).getFacetedRowModel()], facetedRowModel => {
     let facetedUniqueValues = new Map();
 
     for (let i = 0; i < facetedRowModel.flatRows.length; i++) {
@@ -3482,16 +3390,16 @@ function getFacetedUniqueValues() {
   }, {
     key: process.env.NODE_ENV === 'development' && 'getFacetedUniqueValues_' + columnId,
     debug: () => {
-      var _instance$options$deb;
+      var _table$options$debugA;
 
-      return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugTable;
+      return (_table$options$debugA = table.options.debugAll) != null ? _table$options$debugA : table.options.debugTable;
     },
     onChange: () => {}
   });
 }
 
 function getFacetedMinMaxValues() {
-  return (instance, columnId) => memo(() => [instance.getColumn(columnId).getFacetedRowModel()], facetedRowModel => {
+  return (table, columnId) => memo(() => [table.getColumn(columnId).getFacetedRowModel()], facetedRowModel => {
     var _facetedRowModel$flat;
 
     const firstValue = (_facetedRowModel$flat = facetedRowModel.flatRows[0]) == null ? void 0 : _facetedRowModel$flat.getValue(columnId);
@@ -3518,27 +3426,27 @@ function getFacetedMinMaxValues() {
   }, {
     key: process.env.NODE_ENV === 'development' && 'getFacetedMinMaxValues_' + columnId,
     debug: () => {
-      var _instance$options$deb;
+      var _table$options$debugA;
 
-      return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugTable;
+      return (_table$options$debugA = table.options.debugAll) != null ? _table$options$debugA : table.options.debugTable;
     },
     onChange: () => {}
   });
 }
 
 function getSortedRowModel() {
-  return instance => memo(() => [instance.getState().sorting, instance.getPreSortedRowModel()], (sorting, rowModel) => {
+  return table => memo(() => [table.getState().sorting, table.getPreSortedRowModel()], (sorting, rowModel) => {
     if (!rowModel.rows.length || !(sorting != null && sorting.length)) {
       return rowModel;
     }
 
-    const sortingState = instance.getState().sorting;
+    const sortingState = table.getState().sorting;
     const sortedFlatRows = []; // Filter out sortings that correspond to non existing columns
 
-    const availableSorting = sortingState.filter(sort => instance.getColumn(sort.id).getCanSort());
+    const availableSorting = sortingState.filter(sort => table.getColumn(sort.id).getCanSort());
     const columnInfoById = {};
     availableSorting.forEach(sortEntry => {
-      const column = instance.getColumn(sortEntry.id);
+      const column = table.getColumn(sortEntry.id);
       columnInfoById[sortEntry.id] = {
         sortUndefined: column.columnDef.sortUndefined,
         invertSorting: column.columnDef.invertSorting,
@@ -3608,24 +3516,24 @@ function getSortedRowModel() {
   }, {
     key: process.env.NODE_ENV === 'development' && 'getSortedRowModel',
     debug: () => {
-      var _instance$options$deb;
+      var _table$options$debugA;
 
-      return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugTable;
+      return (_table$options$debugA = table.options.debugAll) != null ? _table$options$debugA : table.options.debugTable;
     },
     onChange: () => {
-      instance._autoResetPageIndex();
+      table._autoResetPageIndex();
     }
   });
 }
 
 function getGroupedRowModel() {
-  return instance => memo(() => [instance.getState().grouping, instance.getPreGroupedRowModel()], (grouping, rowModel) => {
+  return table => memo(() => [table.getState().grouping, table.getPreGroupedRowModel()], (grouping, rowModel) => {
     if (!rowModel.rows.length || !grouping.length) {
       return rowModel;
     } // Filter the grouping list down to columns that exist
 
 
-    const existingGrouping = grouping.filter(columnId => instance.getColumn(columnId));
+    const existingGrouping = grouping.filter(columnId => table.getColumn(columnId));
     const groupedFlatRows = [];
     const groupedRowsById = {}; // const onlyGroupedFlatRows: Row[] = [];
     // const onlyGroupedRowsById: Record<RowId, Row> = {};
@@ -3655,7 +3563,7 @@ function getGroupedRowModel() {
         const subRows = groupUpRecursively(groupedRows, depth + 1, id); // Flatten the leaf rows of the rows in this group
 
         const leafRows = depth ? flattenBy(groupedRows, row => row.subRows) : groupedRows;
-        const row = createRow(instance, id, undefined, index, depth);
+        const row = createRow(table, id, undefined, index, depth);
         Object.assign(row, {
           groupingColumnId: columnId,
           groupingValue,
@@ -3682,7 +3590,7 @@ function getGroupedRowModel() {
             } // Aggregate the values
 
 
-            const column = instance.getColumn(columnId);
+            const column = table.getColumn(columnId);
             const aggregateFn = column.getAggregationFn();
 
             if (aggregateFn) {
@@ -3725,15 +3633,15 @@ function getGroupedRowModel() {
   }, {
     key: process.env.NODE_ENV === 'development' && 'getGroupedRowModel',
     debug: () => {
-      var _instance$options$deb;
+      var _table$options$debugA;
 
-      return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugTable;
+      return (_table$options$debugA = table.options.debugAll) != null ? _table$options$debugA : table.options.debugTable;
     },
     onChange: () => {
-      instance._queue(() => {
-        instance._autoResetExpanded();
+      table._queue(() => {
+        table._autoResetExpanded();
 
-        instance._autoResetPageIndex();
+        table._autoResetPageIndex();
       });
     }
   });
@@ -3756,7 +3664,7 @@ function groupBy(rows, columnId) {
 }
 
 function getExpandedRowModel() {
-  return instance => memo(() => [instance.getState().expanded, instance.getPreExpandedRowModel(), instance.options.paginateExpandedRows], (expanded, rowModel, paginateExpandedRows) => {
+  return table => memo(() => [table.getState().expanded, table.getPreExpandedRowModel(), table.options.paginateExpandedRows], (expanded, rowModel, paginateExpandedRows) => {
     if (!rowModel.rows.length || // Do not expand if rows are not included in pagination
     !paginateExpandedRows || expanded !== true && !Object.keys(expanded != null ? expanded : {}).length) {
       return rowModel;
@@ -3766,13 +3674,13 @@ function getExpandedRowModel() {
   }, {
     key: process.env.NODE_ENV === 'development' && 'getExpandedRowModel',
     debug: () => {
-      var _instance$options$deb;
+      var _table$options$debugA;
 
-      return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugTable;
+      return (_table$options$debugA = table.options.debugAll) != null ? _table$options$debugA : table.options.debugTable;
     }
   });
 }
-function expandRows(rowModel, instance) {
+function expandRows(rowModel, table) {
   const expandedRows = [];
 
   const handleRow = row => {
@@ -3794,7 +3702,7 @@ function expandRows(rowModel, instance) {
 }
 
 function getPaginationRowModel(opts) {
-  return instance => memo(() => [instance.getState().pagination, instance.getPrePaginationRowModel()], (pagination, rowModel) => {
+  return table => memo(() => [table.getState().pagination, table.getPrePaginationRowModel()], (pagination, rowModel) => {
     if (!rowModel.rows.length) {
       return rowModel;
     }
@@ -3813,7 +3721,7 @@ function getPaginationRowModel(opts) {
     rows = rows.slice(pageStart, pageEnd);
     let paginatedRowModel;
 
-    if (!instance.options.paginateExpandedRows) {
+    if (!table.options.paginateExpandedRows) {
       paginatedRowModel = expandRows({
         rows,
         flatRows,
@@ -3842,12 +3750,12 @@ function getPaginationRowModel(opts) {
   }, {
     key: process.env.NODE_ENV === 'development' && 'getPaginationRowModel',
     debug: () => {
-      var _instance$options$deb;
+      var _table$options$debugA;
 
-      return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugTable;
+      return (_table$options$debugA = table.options.debugAll) != null ? _table$options$debugA : table.options.debugTable;
     }
   });
 }
 
-export { ColumnSizing, Expanding, Filters, Grouping, Headers, Ordering, Pagination, Pinning, RowSelection, Sorting, Visibility, aggregationFns, buildHeaderGroups, createColumn, createRow, createTableFactory, createTableInstance, defaultColumnSizing, expandRows, filterFns, flattenBy, functionalUpdate, getCoreRowModel, getExpandedRowModel, getFacetedMinMaxValues, getFacetedRowModel, getFacetedUniqueValues, getFilteredRowModel, getGroupedRowModel, getPaginationRowModel, getSortedRowModel, isFunction, isRowSelected, makeStateUpdater, memo, noop, orderColumns, passiveEventSupported, reSplitAlphaNumeric, selectRowsFn, shouldAutoRemoveFilter, sortingFns };
+export { ColumnSizing, Expanding, Filters, Grouping, Headers, Ordering, Pagination, Pinning, RowSelection, Sorting, Visibility, aggregationFns, buildHeaderGroups, createColumn, createRow, createTable, defaultColumnSizing, expandRows, filterFns, flattenBy, functionalUpdate, getCoreRowModel, getExpandedRowModel, getFacetedMinMaxValues, getFacetedRowModel, getFacetedUniqueValues, getFilteredRowModel, getGroupedRowModel, getPaginationRowModel, getSortedRowModel, isFunction, isRowSelected, isSubRowSelected, makeStateUpdater, memo, noop, orderColumns, passiveEventSupported, reSplitAlphaNumeric, selectRowsFn, shouldAutoRemoveFilter, sortingFns };
 //# sourceMappingURL=index.js.map