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

package/build/stats-html.html

@@ -2669,7 +2669,7 @@ var drawChart = (function (exports) {
   </script>
   <script>
     /*<!--*/
-    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.production.js","children":[{"name":"packages","children":[{"name":"table-core/build/esm/index.js","uid":"1e4f-163"},{"name":"svelte-table/src","children":[{"uid":"1e4f-165","name":"placeholder.svelte"},{"uid":"1e4f-167","name":"render-component.ts"},{"uid":"1e4f-169","name":"index.ts"}]}]}]}],"isRoot":true},"nodeParts":{"1e4f-163":{"renderedLength":140240,"gzipLength":23956,"brotliLength":0,"mainUid":"1e4f-162"},"1e4f-165":{"renderedLength":925,"gzipLength":444,"brotliLength":0,"mainUid":"1e4f-164"},"1e4f-167":{"renderedLength":1365,"gzipLength":519,"brotliLength":0,"mainUid":"1e4f-166"},"1e4f-169":{"renderedLength":2729,"gzipLength":868,"brotliLength":0,"mainUid":"1e4f-168"}},"nodeMetas":{"1e4f-162":{"id":"/packages/table-core/build/esm/index.js","moduleParts":{"index.production.js":"1e4f-163"},"imported":[],"importedBy":[{"uid":"1e4f-168"}]},"1e4f-164":{"id":"/packages/svelte-table/src/placeholder.svelte","moduleParts":{"index.production.js":"1e4f-165"},"imported":[{"uid":"1e4f-170"}],"importedBy":[{"uid":"1e4f-168"}]},"1e4f-166":{"id":"/packages/svelte-table/src/render-component.ts","moduleParts":{"index.production.js":"1e4f-167"},"imported":[{"uid":"1e4f-170"}],"importedBy":[{"uid":"1e4f-168"}]},"1e4f-168":{"id":"/packages/svelte-table/src/index.ts","moduleParts":{"index.production.js":"1e4f-169"},"imported":[{"uid":"1e4f-162"},{"uid":"1e4f-164"},{"uid":"1e4f-170"},{"uid":"1e4f-171"},{"uid":"1e4f-166"}],"importedBy":[],"isEntry":true},"1e4f-170":{"id":"svelte/internal","moduleParts":{},"imported":[],"importedBy":[{"uid":"1e4f-168"},{"uid":"1e4f-164"},{"uid":"1e4f-166"}],"isExternal":true},"1e4f-171":{"id":"svelte/store","moduleParts":{},"imported":[],"importedBy":[{"uid":"1e4f-168"}],"isExternal":true}},"env":{"rollup":"2.70.2"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
+    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.production.js","children":[{"name":"packages","children":[{"name":"table-core/build/esm/index.js","uid":"0e3b-163"},{"name":"svelte-table/src","children":[{"uid":"0e3b-165","name":"placeholder.svelte"},{"uid":"0e3b-167","name":"render-component.ts"},{"uid":"0e3b-169","name":"index.ts"}]}]}]}],"isRoot":true},"nodeParts":{"0e3b-163":{"renderedLength":141154,"gzipLength":24074,"brotliLength":0,"mainUid":"0e3b-162"},"0e3b-165":{"renderedLength":925,"gzipLength":444,"brotliLength":0,"mainUid":"0e3b-164"},"0e3b-167":{"renderedLength":1365,"gzipLength":519,"brotliLength":0,"mainUid":"0e3b-166"},"0e3b-169":{"renderedLength":2729,"gzipLength":868,"brotliLength":0,"mainUid":"0e3b-168"}},"nodeMetas":{"0e3b-162":{"id":"/packages/table-core/build/esm/index.js","moduleParts":{"index.production.js":"0e3b-163"},"imported":[],"importedBy":[{"uid":"0e3b-168"}]},"0e3b-164":{"id":"/packages/svelte-table/src/placeholder.svelte","moduleParts":{"index.production.js":"0e3b-165"},"imported":[{"uid":"0e3b-170"}],"importedBy":[{"uid":"0e3b-168"}]},"0e3b-166":{"id":"/packages/svelte-table/src/render-component.ts","moduleParts":{"index.production.js":"0e3b-167"},"imported":[{"uid":"0e3b-170"}],"importedBy":[{"uid":"0e3b-168"}]},"0e3b-168":{"id":"/packages/svelte-table/src/index.ts","moduleParts":{"index.production.js":"0e3b-169"},"imported":[{"uid":"0e3b-162"},{"uid":"0e3b-164"},{"uid":"0e3b-170"},{"uid":"0e3b-171"},{"uid":"0e3b-166"}],"importedBy":[],"isEntry":true},"0e3b-170":{"id":"svelte/internal","moduleParts":{},"imported":[],"importedBy":[{"uid":"0e3b-168"},{"uid":"0e3b-164"},{"uid":"0e3b-166"}],"isExternal":true},"0e3b-171":{"id":"svelte/store","moduleParts":{},"imported":[],"importedBy":[{"uid":"0e3b-168"}],"isExternal":true}},"env":{"rollup":"2.70.2"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
 
     const run = () => {
       const width = window.innerWidth;

package/build/stats-react.json

@@ -11,21 +11,21 @@
             "children": [
               {
                 "name": "table-core/build/esm/index.js",
-                "uid": "1e4f-173"
+                "uid": "0e3b-173"
               },
               {
                 "name": "svelte-table/src",
                 "children": [
                   {
-                    "uid": "1e4f-175",
+                    "uid": "0e3b-175",
                     "name": "placeholder.svelte"
                   },
                   {
-                    "uid": "1e4f-177",
+                    "uid": "0e3b-177",
                     "name": "render-component.ts"
                   },
                   {
-                    "uid": "1e4f-179",
+                    "uid": "0e3b-179",
                     "name": "index.ts"
                   }
                 ]
@@ -38,125 +38,125 @@
     "isRoot": true
   },
   "nodeParts": {
-    "1e4f-173": {
-      "renderedLength": 140240,
-      "gzipLength": 23956,
+    "0e3b-173": {
+      "renderedLength": 141154,
+      "gzipLength": 24074,
       "brotliLength": 0,
-      "mainUid": "1e4f-172"
+      "mainUid": "0e3b-172"
     },
-    "1e4f-175": {
+    "0e3b-175": {
       "renderedLength": 925,
       "gzipLength": 444,
       "brotliLength": 0,
-      "mainUid": "1e4f-174"
+      "mainUid": "0e3b-174"
     },
-    "1e4f-177": {
+    "0e3b-177": {
       "renderedLength": 1365,
       "gzipLength": 519,
       "brotliLength": 0,
-      "mainUid": "1e4f-176"
+      "mainUid": "0e3b-176"
     },
-    "1e4f-179": {
+    "0e3b-179": {
       "renderedLength": 2729,
       "gzipLength": 868,
       "brotliLength": 0,
-      "mainUid": "1e4f-178"
+      "mainUid": "0e3b-178"
     }
   },
   "nodeMetas": {
-    "1e4f-172": {
+    "0e3b-172": {
       "id": "/packages/table-core/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "1e4f-173"
+        "index.production.js": "0e3b-173"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "1e4f-178"
+          "uid": "0e3b-178"
         }
       ]
     },
-    "1e4f-174": {
+    "0e3b-174": {
       "id": "/packages/svelte-table/src/placeholder.svelte",
       "moduleParts": {
-        "index.production.js": "1e4f-175"
+        "index.production.js": "0e3b-175"
       },
       "imported": [
         {
-          "uid": "1e4f-180"
+          "uid": "0e3b-180"
         }
       ],
       "importedBy": [
         {
-          "uid": "1e4f-178"
+          "uid": "0e3b-178"
         }
       ]
     },
-    "1e4f-176": {
+    "0e3b-176": {
       "id": "/packages/svelte-table/src/render-component.ts",
       "moduleParts": {
-        "index.production.js": "1e4f-177"
+        "index.production.js": "0e3b-177"
       },
       "imported": [
         {
-          "uid": "1e4f-180"
+          "uid": "0e3b-180"
         }
       ],
       "importedBy": [
         {
-          "uid": "1e4f-178"
+          "uid": "0e3b-178"
         }
       ]
     },
-    "1e4f-178": {
+    "0e3b-178": {
       "id": "/packages/svelte-table/src/index.ts",
       "moduleParts": {
-        "index.production.js": "1e4f-179"
+        "index.production.js": "0e3b-179"
       },
       "imported": [
         {
-          "uid": "1e4f-172"
+          "uid": "0e3b-172"
         },
         {
-          "uid": "1e4f-174"
+          "uid": "0e3b-174"
         },
         {
-          "uid": "1e4f-180"
+          "uid": "0e3b-180"
         },
         {
-          "uid": "1e4f-181"
+          "uid": "0e3b-181"
         },
         {
-          "uid": "1e4f-176"
+          "uid": "0e3b-176"
         }
       ],
       "importedBy": [],
       "isEntry": true
     },
-    "1e4f-180": {
+    "0e3b-180": {
       "id": "svelte/internal",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "1e4f-178"
+          "uid": "0e3b-178"
         },
         {
-          "uid": "1e4f-174"
+          "uid": "0e3b-174"
         },
         {
-          "uid": "1e4f-176"
+          "uid": "0e3b-176"
         }
       ],
       "isExternal": true
     },
-    "1e4f-181": {
+    "0e3b-181": {
       "id": "svelte/store",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "1e4f-178"
+          "uid": "0e3b-178"
         }
       ],
       "isExternal": true

package/build/types/index.d.ts

@@ -1,4 +1,4 @@
-import { PartialKeys, Table, TableGenerics, TableOptions } from '@tanstack/table-core';
+import { Table, TableGenerics, TableOptions } from '@tanstack/table-core';
 import { Readable } from 'svelte/store';
 export { renderComponent } from './render-component';
 export * from '@tanstack/table-core';
@@ -8,4 +8,4 @@ export declare const createTable: () => Table<{
     Rendered: any;
 }>;
 declare type ReadableOrVal<T> = T | Readable<T>;
-export declare function createTableInstance<TGenerics extends TableGenerics>(table: Table<TGenerics>, options: ReadableOrVal<PartialKeys<Omit<TableOptions<TGenerics>, 'render'>, 'state' | 'onStateChange'>>): Readable<import("@tanstack/table-core").TableInstance<TGenerics>>;
+export declare function createTableInstance<TGenerics extends TableGenerics>(table: Table<TGenerics>, options: ReadableOrVal<TableOptions<TGenerics>>): Readable<import("@tanstack/table-core").TableInstance<TGenerics>>;

package/build/umd/index.development.js

@@ -105,7 +105,7 @@
   const Columns = {
     createInstance: instance => {
       return {
-        getDefaultColumn: memo(() => [instance.options.defaultColumn], defaultColumn => {
+        getDefaultColumnDef: memo(() => [instance.options.defaultColumnDef], defaultColumn => {
           var _defaultColumn;
 
           defaultColumn = (_defaultColumn = defaultColumn) != null ? _defaultColumn : {};
@@ -118,7 +118,7 @@
               return (_props$getValue$toStr = (_props$getValue$toStr2 = (_props$getValue = props.getValue()).toString) == null ? void 0 : _props$getValue$toStr2.call(_props$getValue)) != null ? _props$getValue$toStr : null;
             },
             ...instance._features.reduce((obj, feature) => {
-              return Object.assign(obj, feature.getDefaultColumn == null ? void 0 : feature.getDefaultColumn());
+              return Object.assign(obj, feature.getDefaultColumnDef == null ? void 0 : feature.getDefaultColumnDef());
             }, {}),
             ...defaultColumn
           };
@@ -128,13 +128,16 @@
 
             return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugColumns;
           },
-          key: 'getDefaultColumn'
+          key: 'getDefaultColumnDef'
         }),
         getColumnDefs: () => instance.options.columns,
         createColumn: (columnDef, depth, parent) => {
           var _ref, _columnDef$id;
 
-          const defaultColumn = instance.getDefaultColumn();
+          const defaultColumnDef = instance.getDefaultColumnDef();
+          columnDef = { ...defaultColumnDef,
+            ...columnDef
+          };
           let id = (_ref = (_columnDef$id = columnDef.id) != null ? _columnDef$id : columnDef.accessorKey) != null ? _ref : typeof columnDef.header === 'string' ? columnDef.header : undefined;
           let accessorFn;
 
@@ -150,8 +153,7 @@
             }
           }
 
-          let column = { ...defaultColumn,
-            ...columnDef,
+          let column = { ...columnDef,
             id: "" + id,
             accessorFn,
             parent: parent,
@@ -385,7 +387,7 @@
             row,
             column,
             getValue: () => row.getValue(columnId),
-            renderCell: () => column.cell ? instance._render(column.cell, {
+            renderCell: () => column.columnDef.cell ? instance._render(column.columnDef.cell, {
               instance,
               column,
               row,
@@ -440,7 +442,7 @@
   });
 
   const ColumnSizing = {
-    getDefaultColumn: () => {
+    getDefaultColumnDef: () => {
       return defaultColumnSizing;
     },
     getInitialState: state => {
@@ -460,10 +462,10 @@
     createColumn: (column, instance) => {
       return {
         getSize: () => {
-          var _column$minSize, _ref, _column$maxSize;
+          var _column$columnDef$min, _ref, _column$columnDef$max;
 
           const columnSize = instance.getState().columnSizing[column.id];
-          return Math.min(Math.max((_column$minSize = column.minSize) != null ? _column$minSize : defaultColumnSizing.minSize, (_ref = columnSize != null ? columnSize : column.size) != null ? _ref : defaultColumnSizing.size), (_column$maxSize = column.maxSize) != null ? _column$maxSize : defaultColumnSizing.maxSize);
+          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();
@@ -486,9 +488,9 @@
           });
         },
         getCanResize: () => {
-          var _column$enableResizin, _instance$options$ena;
+          var _column$columnDef$ena, _instance$options$ena;
 
-          return ((_column$enableResizin = column.enableResizing) != null ? _column$enableResizin : true) && ((_instance$options$ena = instance.options.enableColumnResizing) != null ? _instance$options$ena : true);
+          return ((_column$columnDef$ena = column.columnDef.enableResizing) != null ? _column$columnDef$ena : true) && ((_instance$options$ena = instance.options.enableColumnResizing) != null ? _instance$options$ena : true);
         },
         getIsResizing: () => {
           return instance.getState().columnSizingInfo.isResizingColumn === column.id;
@@ -945,7 +947,7 @@
 
   //
   const Filters = {
-    getDefaultColumn: () => {
+    getDefaultColumnDef: () => {
       return {
         filterFn: 'auto'
       };
@@ -988,6 +990,10 @@
             return filterFns.inNumberRange;
           }
 
+          if (typeof value === 'boolean') {
+            return filterFns.equals;
+          }
+
           if (value !== null && typeof value === 'object') {
             return filterFns.equals;
           }
@@ -1005,14 +1011,14 @@
           return isFunction(column.filterFn) ? column.filterFn : column.filterFn === 'auto' ? column.getAutoFilterFn() : (_ref = userFilterFns == null ? void 0 : userFilterFns[column.filterFn]) != null ? _ref : filterFns[column.filterFn];
         },
         getCanFilter: () => {
-          var _column$enableColumnF, _instance$options$ena, _instance$options$ena2;
+          var _column$columnDef$ena, _instance$options$ena, _instance$options$ena2;
 
-          return ((_column$enableColumnF = column.enableColumnFilter) != null ? _column$enableColumnF : true) && ((_instance$options$ena = instance.options.enableColumnFilters) != null ? _instance$options$ena : true) && ((_instance$options$ena2 = instance.options.enableFilters) != null ? _instance$options$ena2 : true) && !!column.accessorFn;
+          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;
         },
         getCanGlobalFilter: () => {
-          var _column$enableGlobalF, _instance$options$ena3, _instance$options$ena4, _instance$options$get;
+          var _column$columnDef$ena2, _instance$options$ena3, _instance$options$ena4, _instance$options$get;
 
-          return ((_column$enableGlobalF = column.enableGlobalFilter) != null ? _column$enableGlobalF : true) && ((_instance$options$ena3 = instance.options.enableGlobalFilter) != null ? _instance$options$ena3 : true) && ((_instance$options$ena4 = instance.options.enableFilters) != null ? _instance$options$ena4 : true) && ((_instance$options$get = instance.options.getColumnCanGlobalFilter == null ? void 0 : instance.options.getColumnCanGlobalFilter(column)) != null ? _instance$options$get : true) && !!column.accessorFn;
+          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;
         },
         getIsFiltered: () => column.getFilterIndex() > -1,
         getFilterValue: () => {
@@ -1290,7 +1296,7 @@
 
   //
   const Grouping = {
-    getDefaultColumn: () => {
+    getDefaultColumnDef: () => {
       return {
         aggregationFn: 'auto'
       };
@@ -1320,9 +1326,9 @@
           });
         },
         getCanGroup: () => {
-          var _ref, _ref2, _ref3, _column$enableGroupin;
+          var _ref, _ref2, _ref3, _column$columnDef$ena;
 
-          return (_ref = (_ref2 = (_ref3 = (_column$enableGroupin = column.enableGrouping) != null ? _column$enableGroupin : 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 : instance.options.enableGrouping) != null ? _ref2 : true) != null ? _ref : !!column.accessorFn;
         },
         getIsGrouped: () => {
           var _instance$getState$gr;
@@ -1406,9 +1412,9 @@
           return !cell.getIsGrouped() && !cell.getIsPlaceholder() && ((_row$subRows = row.subRows) == null ? void 0 : _row$subRows.length) > 1;
         },
         renderAggregatedCell: () => {
-          var _column$aggregatedCel;
+          var _column$columnDef$agg;
 
-          const template = (_column$aggregatedCel = column.aggregatedCell) != null ? _column$aggregatedCel : column.cell;
+          const template = (_column$columnDef$agg = column.columnDef.aggregatedCell) != null ? _column$columnDef$agg : column.columnDef.cell;
           return template ? instance._render(template, {
             instance,
             column,
@@ -1715,9 +1721,9 @@
         getCanPin: () => {
           const leafColumns = column.getLeafColumns();
           return leafColumns.some(d => {
-            var _d$enablePinning, _instance$options$ena;
+            var _d$columnDef$enablePi, _instance$options$ena;
 
-            return ((_d$enablePinning = d.enablePinning) != null ? _d$enablePinning : true) && ((_instance$options$ena = instance.options.enablePinning) != null ? _instance$options$ena : true);
+            return ((_d$columnDef$enablePi = d.columnDef.enablePinning) != null ? _d$columnDef$enablePi : true) && ((_instance$options$ena = instance.options.enablePinning) != null ? _instance$options$ena : true);
           });
         },
         getIsPinned: () => {
@@ -1787,12 +1793,18 @@
 
           return instance.setColumnPinning(defaultState ? getDefaultPinningState() : (_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.columnPinning) != null ? _instance$initialStat : getDefaultPinningState());
         },
-        getIsSomeColumnsPinned: () => {
-          const {
-            left,
-            right
-          } = instance.getState().columnPinning;
-          return Boolean((left == null ? void 0 : left.length) || (right == null ? void 0 : right.length));
+        getIsSomeColumnsPinned: position => {
+          var _pinningState$positio;
+
+          const pinningState = instance.getState().columnPinning;
+
+          if (!position) {
+            var _pinningState$left, _pinningState$right;
+
+            return Boolean(((_pinningState$left = pinningState.left) == null ? void 0 : _pinningState$left.length) || ((_pinningState$right = pinningState.right) == null ? void 0 : _pinningState$right.length));
+          }
+
+          return Boolean((_pinningState$positio = pinningState[position]) == null ? void 0 : _pinningState$positio.length);
         },
         getLeftLeafColumns: memo(() => [instance.getAllLeafColumns(), instance.getState().columnPinning.left], (allColumns, left) => {
           return (left != null ? left : []).map(columnId => allColumns.find(column => column.id === columnId)).filter(Boolean);
@@ -2318,7 +2330,7 @@
         ...state
       };
     },
-    getDefaultColumn: () => {
+    getDefaultColumnDef: () => {
       return {
         sortingFn: 'auto'
       };
@@ -2378,7 +2390,7 @@
             throw new Error();
           }
 
-          return isFunction(column.sortingFn) ? column.sortingFn : column.sortingFn === 'auto' ? column.getAutoSortingFn() : (_ref = userSortingFn == null ? void 0 : userSortingFn[column.sortingFn]) != null ? _ref : sortingFns[column.sortingFn];
+          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];
         },
         toggleSorting: (desc, multi) => {
           // if (column.columns.length) {
@@ -2390,7 +2402,7 @@
           //   return
           // }
           instance.setSorting(old => {
-            var _ref2, _column$sortDescFirst, _instance$options$ena, _instance$options$ena2;
+            var _ref2, _column$columnDef$sor, _instance$options$ena, _instance$options$ena2;
 
             // Find any existing sorting for this column
             const existingSorting = old == null ? void 0 : old.find(d => d.id === column.id);
@@ -2417,7 +2429,7 @@
               }
             }
 
-            const sortDescFirst = (_ref2 = (_column$sortDescFirst = column.sortDescFirst) != null ? _column$sortDescFirst : instance.options.sortDescFirst) != null ? _ref2 : column.getAutoSortDir() === 'desc'; // Handle toggle states that will remove the sorting
+            const sortDescFirst = (_ref2 = (_column$columnDef$sor = column.columnDef.sortDescFirst) != null ? _column$columnDef$sor : instance.options.sortDescFirst) != null ? _ref2 : column.getAutoSortDir() === 'desc'; // Handle toggle states that will remove the sorting
 
             if (sortAction === 'toggle' && ( // Must be toggling
             (_instance$options$ena = instance.options.enableSortingRemoval) != null ? _instance$options$ena : true) && // If enableSortRemove, enable in general
@@ -2461,14 +2473,14 @@
           });
         },
         getCanSort: () => {
-          var _column$enableSorting, _instance$options$ena3;
+          var _column$columnDef$ena, _instance$options$ena3;
 
-          return ((_column$enableSorting = column.enableSorting) != null ? _column$enableSorting : 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) && ((_instance$options$ena3 = instance.options.enableSorting) != null ? _instance$options$ena3 : true) && !!column.accessorFn;
         },
         getCanMultiSort: () => {
-          var _ref3, _column$enableMultiSo;
+          var _ref3, _column$columnDef$ena2;
 
-          return (_ref3 = (_column$enableMultiSo = column.enableMultiSort) != null ? _column$enableMultiSo : instance.options.enableMultiSort) != null ? _ref3 : !!column.accessorFn;
+          return (_ref3 = (_column$columnDef$ena2 = column.columnDef.enableMultiSort) != null ? _column$columnDef$ena2 : instance.options.enableMultiSort) != null ? _ref3 : !!column.accessorFn;
         },
         getIsSorted: () => {
           var _instance$getState$so;
@@ -2532,7 +2544,7 @@
         onColumnVisibilityChange: makeStateUpdater('columnVisibility', instance)
       };
     },
-    getDefaultColumn: () => {
+    getDefaultColumnDef: () => {
       return {
         defaultIsVisible: true
       };
@@ -2552,9 +2564,9 @@
           return (_instance$getState$co = (_instance$getState$co2 = instance.getState().columnVisibility) == null ? void 0 : _instance$getState$co2[column.id]) != null ? _instance$getState$co : true;
         },
         getCanHide: () => {
-          var _column$enableHiding, _instance$options$ena;
+          var _column$columnDef$ena, _instance$options$ena;
 
-          return ((_column$enableHiding = column.enableHiding) != null ? _column$enableHiding : true) && ((_instance$options$ena = instance.options.enableHiding) != null ? _instance$options$ena : true);
+          return ((_column$columnDef$ena = column.columnDef.enableHiding) != null ? _column$columnDef$ena : true) && ((_instance$options$ena = instance.options.enableHiding) != null ? _instance$options$ena : true);
         },
         getToggleVisibilityHandler: () => {
           return e => {
@@ -2665,12 +2677,12 @@
               recurseHeader(header);
               return leafHeaders;
             },
-            renderHeader: () => column.header ? instance._render(column.header, {
+            renderHeader: () => column.columnDef.header ? instance._render(column.columnDef.header, {
               instance,
               header: header,
               column
             }) : null,
-            renderFooter: () => column.footer ? instance._render(column.footer, {
+            renderFooter: () => column.columnDef.footer ? instance._render(column.columnDef.footer, {
               instance,
               header: header,
               column
@@ -3178,7 +3190,7 @@
           throw new Error('');
         })()
       },
-      setGenerics: () => table,
+      // setGenerics: () => table as any,
       setRowType: () => table,
       setTableMetaType: () => table,
       setColumnMetaType: () => table,
@@ -3214,7 +3226,8 @@
         }
 
         throw new Error('Invalid accessor');
-      }
+      },
+      createOptions: options => options
     };
     return table;
   }
@@ -3611,8 +3624,8 @@
       availableSorting.forEach(sortEntry => {
         const column = instance.getColumn(sortEntry.id);
         columnInfoById[sortEntry.id] = {
-          sortUndefined: column.sortUndefined,
-          invertSorting: column.invertSorting,
+          sortUndefined: column.columnDef.sortUndefined,
+          invertSorting: column.columnDef.invertSorting,
           sortingFn: column.getSortingFn()
         };
       });
@@ -3760,8 +3773,8 @@
                 row.groupingValuesCache[columnId] = aggregateFn(() => leafRows.map(row => {
                   let columnValue = row.getValue(columnId);
 
-                  if (!depth && column.aggregateValue) {
-                    columnValue = column.aggregateValue(columnValue);
+                  if (!depth && column.columnDef.aggregateValue) {
+                    columnValue = column.columnDef.aggregateValue(columnValue);
                   }
 
                   return columnValue;