@tanstack/react-table 8.7.0 → 8.7.2

package/build/umd/index.development.js

@@ -75,7 +75,7 @@
       subArr.forEach(item => {
         flat.push(item);
         const children = getChildren(item);
-        if (children != null && children.length) {
+        if (children?.length) {
           recurse(children);
         }
       });
@@ -98,9 +98,9 @@
       let resultTime;
       if (opts.key && opts.debug) resultTime = Date.now();
       result = fn(...newDeps);
-      opts == null ? void 0 : opts.onChange == null ? void 0 : opts.onChange(result);
+      opts?.onChange?.(result);
       if (opts.key && opts.debug) {
-        if (opts != null && opts.debug()) {
+        if (opts?.debug()) {
           const depEndTime = Math.round((Date.now() - depTime) * 100) / 100;
           const resultEndTime = Math.round((Date.now() - resultTime) * 100) / 100;
           const resultFpsPercentage = resultEndTime / 16;
@@ -114,7 +114,7 @@
           console.info(`%c⏱ ${pad(resultEndTime, 5)} /${pad(depEndTime, 5)} ms`, `
             font-size: .6rem;
             font-weight: bold;
-            color: hsl(${Math.max(0, Math.min(120 - 120 * resultFpsPercentage, 120))}deg 100% 31%);`, opts == null ? void 0 : opts.key);
+            color: hsl(${Math.max(0, Math.min(120 - 120 * resultFpsPercentage, 120))}deg 100% 31%);`, opts?.key);
         }
       }
       return result;
@@ -163,8 +163,7 @@
       columnDef: resolvedColumnDef,
       columns: [],
       getFlatColumns: memo(() => [true], () => {
-        var _column$columns;
-        return [column, ...((_column$columns = column.columns) == null ? void 0 : _column$columns.flatMap(d => d.getFlatColumns()))];
+        return [column, ...column.columns?.flatMap(d => d.getFlatColumns())];
       }, {
         key: "development" === 'production' ,
         debug: () => {
@@ -173,8 +172,7 @@
         }
       }),
       getLeafColumns: memo(() => [table._getOrderColumnsFn()], orderColumns => {
-        var _column$columns2;
-        if ((_column$columns2 = column.columns) != null && _column$columns2.length) {
+        if (column.columns?.length) {
           let leafColumns = column.columns.flatMap(column => column.getLeafColumns());
           return orderColumns(leafColumns);
         }
@@ -188,7 +186,7 @@
       })
     };
     column = table._features.reduce((obj, feature) => {
-      return Object.assign(obj, feature.createColumn == null ? void 0 : feature.createColumn(column, table));
+      return Object.assign(obj, feature.createColumn?.(column, table));
     }, column);
 
     // Yes, we have to convert table to uknown, because we know more than the compiler here.
@@ -229,7 +227,7 @@
       })
     };
     table._features.forEach(feature => {
-      Object.assign(header, feature.createHeader == null ? void 0 : feature.createHeader(header, table));
+      Object.assign(header, feature.createHeader?.(header, table));
     });
     return header;
   }
@@ -240,9 +238,9 @@
 
         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 leftColumns = (_left$map$filter = left?.map(columnId => leafColumns.find(d => d.id === columnId)).filter(Boolean)) != null ? _left$map$filter : [];
+          const rightColumns = (_right$map$filter = right?.map(columnId => leafColumns.find(d => d.id === columnId)).filter(Boolean)) != null ? _right$map$filter : [];
+          const centerColumns = leafColumns.filter(column => !left?.includes(column.id) && !right?.includes(column.id));
           const headerGroups = buildHeaderGroups(allColumns, [...leftColumns, ...centerColumns, ...rightColumns], table);
           return headerGroups;
         }, {
@@ -253,7 +251,7 @@
           }
         }),
         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)));
+          leafColumns = leafColumns.filter(column => !left?.includes(column.id) && !right?.includes(column.id));
           return buildHeaderGroups(allColumns, leafColumns, table, 'center');
         }, {
           key: 'getCenterHeaderGroups',
@@ -264,7 +262,7 @@
         }),
         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 : [];
+          const orderedLeafColumns = (_left$map$filter2 = left?.map(columnId => leafColumns.find(d => d.id === columnId)).filter(Boolean)) != null ? _left$map$filter2 : [];
           return buildHeaderGroups(allColumns, orderedLeafColumns, table, 'left');
         }, {
           key: 'getLeftHeaderGroups',
@@ -275,7 +273,7 @@
         }),
         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 : [];
+          const orderedLeafColumns = (_right$map$filter2 = right?.map(columnId => leafColumns.find(d => d.id === columnId)).filter(Boolean)) != null ? _right$map$filter2 : [];
           return buildHeaderGroups(allColumns, orderedLeafColumns, table, 'right');
         }, {
           key: 'getRightHeaderGroups',
@@ -371,10 +369,7 @@
         // Leaf Headers
 
         getCenterLeafHeaders: memo(() => [table.getCenterFlatHeaders()], flatHeaders => {
-          return flatHeaders.filter(header => {
-            var _header$subHeaders;
-            return !((_header$subHeaders = header.subHeaders) != null && _header$subHeaders.length);
-          });
+          return flatHeaders.filter(header => !header.subHeaders?.length);
         }, {
           key: 'getCenterLeafHeaders',
           debug: () => {
@@ -383,10 +378,7 @@
           }
         }),
         getLeftLeafHeaders: memo(() => [table.getLeftFlatHeaders()], flatHeaders => {
-          return flatHeaders.filter(header => {
-            var _header$subHeaders2;
-            return !((_header$subHeaders2 = header.subHeaders) != null && _header$subHeaders2.length);
-          });
+          return flatHeaders.filter(header => !header.subHeaders?.length);
         }, {
           key: 'getLeftLeafHeaders',
           debug: () => {
@@ -395,10 +387,7 @@
           }
         }),
         getRightLeafHeaders: memo(() => [table.getRightFlatHeaders()], flatHeaders => {
-          return flatHeaders.filter(header => {
-            var _header$subHeaders3;
-            return !((_header$subHeaders3 = header.subHeaders) != null && _header$subHeaders3.length);
-          });
+          return flatHeaders.filter(header => !header.subHeaders?.length);
         }, {
           key: 'getRightLeafHeaders',
           debug: () => {
@@ -407,8 +396,8 @@
           }
         }),
         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 => {
+          var _left$0$headers, _center$0$headers, _right$0$headers;
+          return [...((_left$0$headers = left[0]?.headers) != null ? _left$0$headers : []), ...((_center$0$headers = center[0]?.headers) != null ? _center$0$headers : []), ...((_right$0$headers = right[0]?.headers) != null ? _right$0$headers : [])].map(header => {
             return header.getLeafHeaders();
           }).flat();
         }, {
@@ -422,7 +411,7 @@
     }
   };
   function buildHeaderGroups(allColumns, columnsToGroup, table, headerFamily) {
-    var _headerGroups$0$heade, _headerGroups$;
+    var _headerGroups$0$heade;
     // Find the max depth of the columns:
     // build the leaf column row
     // build each buffer row going up
@@ -436,8 +425,7 @@
       }
       maxDepth = Math.max(maxDepth, depth);
       columns.filter(column => column.getIsVisible()).forEach(column => {
-        var _column$columns;
-        if ((_column$columns = column.columns) != null && _column$columns.length) {
+        if (column.columns?.length) {
           findMaxDepth(column.columns, depth + 1);
         }
       }, 0);
@@ -471,13 +459,13 @@
           column = headerToGroup.column;
           isPlaceholder = true;
         }
-        if (latestPendingParentHeader && (latestPendingParentHeader == null ? void 0 : latestPendingParentHeader.column) === column) {
+        if (latestPendingParentHeader && 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(table, column, {
-            id: [headerFamily, depth, column.id, headerToGroup == null ? void 0 : headerToGroup.id].filter(Boolean).join('_'),
+            id: [headerFamily, depth, column.id, headerToGroup?.id].filter(Boolean).join('_'),
             isPlaceholder,
             placeholderId: isPlaceholder ? `${pendingParentHeaders.filter(d => d.column === column).length}` : undefined,
             depth,
@@ -538,7 +526,7 @@
         };
       });
     };
-    recurseHeadersForSpans((_headerGroups$0$heade = (_headerGroups$ = headerGroups[0]) == null ? void 0 : _headerGroups$.headers) != null ? _headerGroups$0$heade : []);
+    recurseHeadersForSpans((_headerGroups$0$heade = headerGroups[0]?.headers) != null ? _headerGroups$0$heade : []);
     return headerGroups;
   }
 
@@ -638,7 +626,7 @@
             if (!canResize) {
               return;
             }
-            e.persist == null ? void 0 : e.persist();
+            e.persist?.();
             if (isTouchStartEvent(e)) {
               // lets not respond to multiple touches (e.g. 2 or 3 fingers)
               if (e.touches && e.touches.length > 1) {
@@ -648,15 +636,15 @@
             const startSize = header.getSize();
             const columnSizingStart = header ? header.getLeafHeaders().map(d => [d.column.id, d.column.getSize()]) : [[column.id, column.getSize()]];
             const clientX = isTouchStartEvent(e) ? Math.round(e.touches[0].clientX) : e.clientX;
+            const newColumnSizing = {};
             const updateOffset = (eventType, clientXPos) => {
               if (typeof clientXPos !== 'number') {
                 return;
               }
-              let newColumnSizing = {};
               table.setColumnSizingInfo(old => {
                 var _old$startOffset, _old$startSize;
-                const deltaOffset = clientXPos - ((_old$startOffset = old == null ? void 0 : old.startOffset) != null ? _old$startOffset : 0);
-                const deltaPercentage = Math.max(deltaOffset / ((_old$startSize = old == null ? void 0 : old.startSize) != null ? _old$startSize : 0), -0.999999);
+                const deltaOffset = clientXPos - ((_old$startOffset = old?.startOffset) != null ? _old$startOffset : 0);
+                const deltaPercentage = Math.max(deltaOffset / ((_old$startSize = old?.startSize) != null ? _old$startSize : 0), -0.999999);
                 old.columnSizingStart.forEach(_ref3 => {
                   let [columnId, headerSize] = _ref3;
                   newColumnSizing[columnId] = Math.round(Math.max(headerSize + headerSize * deltaPercentage, 0) * 100) / 100;
@@ -705,14 +693,13 @@
                 return false;
               },
               upHandler: e => {
-                var _e$touches$;
                 document.removeEventListener('touchmove', touchEvents.moveHandler);
                 document.removeEventListener('touchend', touchEvents.upHandler);
                 if (e.cancelable) {
                   e.preventDefault();
                   e.stopPropagation();
                 }
-                onEnd((_e$touches$ = e.touches[0]) == null ? void 0 : _e$touches$.clientX);
+                onEnd(e.touches[0]?.clientX);
               }
             };
             const passiveIfSupported = passiveEventSupported() ? {
@@ -740,8 +727,8 @@
     },
     createTable: table => {
       return {
-        setColumnSizing: updater => table.options.onColumnSizingChange == null ? void 0 : table.options.onColumnSizingChange(updater),
-        setColumnSizingInfo: updater => table.options.onColumnSizingInfoChange == null ? void 0 : table.options.onColumnSizingInfoChange(updater),
+        setColumnSizing: updater => table.options.onColumnSizingChange?.(updater),
+        setColumnSizingInfo: updater => table.options.onColumnSizingInfoChange?.(updater),
         resetColumnSizing: defaultState => {
           var _table$initialState$c;
           table.setColumnSizing(defaultState ? {} : (_table$initialState$c = table.initialState.columnSizing) != null ? _table$initialState$c : {});
@@ -751,26 +738,26 @@
           table.setColumnSizingInfo(defaultState ? getDefaultColumnSizingInfoState() : (_table$initialState$c2 = table.initialState.columnSizingInfo) != null ? _table$initialState$c2 : getDefaultColumnSizingInfoState());
         },
         getTotalSize: () => {
-          var _table$getHeaderGroup, _table$getHeaderGroup2;
-          return (_table$getHeaderGroup = (_table$getHeaderGroup2 = table.getHeaderGroups()[0]) == null ? void 0 : _table$getHeaderGroup2.headers.reduce((sum, header) => {
+          var _table$getHeaderGroup;
+          return (_table$getHeaderGroup = table.getHeaderGroups()[0]?.headers.reduce((sum, header) => {
             return sum + header.getSize();
           }, 0)) != null ? _table$getHeaderGroup : 0;
         },
         getLeftTotalSize: () => {
-          var _table$getLeftHeaderG, _table$getLeftHeaderG2;
-          return (_table$getLeftHeaderG = (_table$getLeftHeaderG2 = table.getLeftHeaderGroups()[0]) == null ? void 0 : _table$getLeftHeaderG2.headers.reduce((sum, header) => {
+          var _table$getLeftHeaderG;
+          return (_table$getLeftHeaderG = table.getLeftHeaderGroups()[0]?.headers.reduce((sum, header) => {
             return sum + header.getSize();
           }, 0)) != null ? _table$getLeftHeaderG : 0;
         },
         getCenterTotalSize: () => {
-          var _table$getCenterHeade, _table$getCenterHeade2;
-          return (_table$getCenterHeade = (_table$getCenterHeade2 = table.getCenterHeaderGroups()[0]) == null ? void 0 : _table$getCenterHeade2.headers.reduce((sum, header) => {
+          var _table$getCenterHeade;
+          return (_table$getCenterHeade = table.getCenterHeaderGroups()[0]?.headers.reduce((sum, header) => {
             return sum + header.getSize();
           }, 0)) != null ? _table$getCenterHeade : 0;
         },
         getRightTotalSize: () => {
-          var _table$getRightHeader, _table$getRightHeader2;
-          return (_table$getRightHeader = (_table$getRightHeader2 = table.getRightHeaderGroups()[0]) == null ? void 0 : _table$getRightHeader2.headers.reduce((sum, header) => {
+          var _table$getRightHeader;
+          return (_table$getRightHeader = table.getRightHeaderGroups()[0]?.headers.reduce((sum, header) => {
             return sum + header.getSize();
           }, 0)) != null ? _table$getRightHeader : 0;
         }
@@ -837,7 +824,7 @@
             });
           }
         },
-        setExpanded: updater => table.options.onExpandedChange == null ? void 0 : table.options.onExpandedChange(updater),
+        setExpanded: updater => table.options.onExpandedChange?.(updater),
         toggleAllRowsExpanded: expanded => {
           if (expanded != null ? expanded : !table.getIsAllRowsExpanded()) {
             table.setExpanded(true);
@@ -846,15 +833,15 @@
           }
         },
         resetExpanded: defaultState => {
-          var _table$initialState$e, _table$initialState;
-          table.setExpanded(defaultState ? {} : (_table$initialState$e = (_table$initialState = table.initialState) == null ? void 0 : _table$initialState.expanded) != null ? _table$initialState$e : {});
+          var _table$initialState$e;
+          table.setExpanded(defaultState ? {} : (_table$initialState$e = table.initialState?.expanded) != null ? _table$initialState$e : {});
         },
         getCanSomeRowsExpand: () => {
           return table.getRowModel().flatRows.some(row => row.getCanExpand());
         },
         getToggleAllRowsExpandedHandler: () => {
           return e => {
-            e.persist == null ? void 0 : e.persist();
+            e.persist?.();
             table.toggleAllRowsExpanded();
           };
         },
@@ -907,7 +894,7 @@
         toggleExpanded: expanded => {
           table.setExpanded(old => {
             var _expanded;
-            const exists = old === true ? true : !!(old != null && old[row.id]);
+            const exists = old === true ? true : !!old?.[row.id];
             let oldExpanded = {};
             if (old === true) {
               Object.keys(table.getRowModel().rowsById).forEach(rowId => {
@@ -936,11 +923,11 @@
         getIsExpanded: () => {
           var _table$options$getIsR;
           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]));
+          return !!((_table$options$getIsR = table.options.getIsRowExpanded?.(row)) != null ? _table$options$getIsR : expanded === true || expanded?.[row.id]);
         },
         getCanExpand: () => {
-          var _table$options$getRow, _table$options$enable, _row$subRows;
-          return (_table$options$getRow = table.options.getRowCanExpand == null ? void 0 : table.options.getRowCanExpand(row)) != null ? _table$options$getRow : ((_table$options$enable = table.options.enableExpanding) != null ? _table$options$enable : true) && !!((_row$subRows = row.subRows) != null && _row$subRows.length);
+          var _table$options$getRow, _table$options$enable;
+          return (_table$options$getRow = table.options.getRowCanExpand?.(row)) != null ? _table$options$getRow : ((_table$options$enable = table.options.enableExpanding) != null ? _table$options$enable : true) && !!row.subRows?.length;
         },
         getToggleExpandedHandler: () => {
           const canExpand = row.getCanExpand();
@@ -954,40 +941,30 @@
   };
 
   const includesString = (row, columnId, filterValue) => {
-    var _row$getValue;
     const search = filterValue.toLowerCase();
-    return Boolean((_row$getValue = row.getValue(columnId)) == null ? void 0 : _row$getValue.toLowerCase().includes(search));
+    return Boolean(row.getValue(columnId)?.toLowerCase().includes(search));
   };
   includesString.autoRemove = val => testFalsey(val);
   const includesStringSensitive = (row, columnId, filterValue) => {
-    var _row$getValue2;
-    return Boolean((_row$getValue2 = row.getValue(columnId)) == null ? void 0 : _row$getValue2.includes(filterValue));
+    return Boolean(row.getValue(columnId)?.includes(filterValue));
   };
   includesStringSensitive.autoRemove = val => testFalsey(val);
   const equalsString = (row, columnId, filterValue) => {
-    var _row$getValue3;
-    return ((_row$getValue3 = row.getValue(columnId)) == null ? void 0 : _row$getValue3.toLowerCase()) === filterValue.toLowerCase();
+    return row.getValue(columnId)?.toLowerCase() === filterValue.toLowerCase();
   };
   equalsString.autoRemove = val => testFalsey(val);
   const arrIncludes = (row, columnId, filterValue) => {
-    var _row$getValue4;
-    return (_row$getValue4 = row.getValue(columnId)) == null ? void 0 : _row$getValue4.includes(filterValue);
+    return row.getValue(columnId)?.includes(filterValue);
   };
-  arrIncludes.autoRemove = val => testFalsey(val) || !(val != null && val.length);
+  arrIncludes.autoRemove = val => testFalsey(val) || !val?.length;
   const arrIncludesAll = (row, columnId, filterValue) => {
-    return !filterValue.some(val => {
-      var _row$getValue5;
-      return !((_row$getValue5 = row.getValue(columnId)) != null && _row$getValue5.includes(val));
-    });
+    return !filterValue.some(val => !row.getValue(columnId)?.includes(val));
   };
-  arrIncludesAll.autoRemove = val => testFalsey(val) || !(val != null && val.length);
+  arrIncludesAll.autoRemove = val => testFalsey(val) || !val?.length;
   const arrIncludesSome = (row, columnId, filterValue) => {
-    return filterValue.some(val => {
-      var _row$getValue6;
-      return (_row$getValue6 = row.getValue(columnId)) == null ? void 0 : _row$getValue6.includes(val);
-    });
+    return filterValue.some(val => row.getValue(columnId)?.includes(val));
   };
-  arrIncludesSome.autoRemove = val => testFalsey(val) || !(val != null && val.length);
+  arrIncludesSome.autoRemove = val => testFalsey(val) || !val?.length;
   const equals = (row, columnId, filterValue) => {
     return row.getValue(columnId) === filterValue;
   };
@@ -1060,8 +1037,7 @@
         maxLeafRowFilterDepth: 100,
         globalFilterFn: 'auto',
         getColumnCanGlobalFilter: column => {
-          var _table$getCoreRowMode, _table$getCoreRowMode2;
-          const value = (_table$getCoreRowMode = table.getCoreRowModel().flatRows[0]) == null ? void 0 : (_table$getCoreRowMode2 = _table$getCoreRowMode._getAllCellsByColumnId()[column.id]) == null ? void 0 : _table$getCoreRowMode2.getValue();
+          const value = table.getCoreRowModel().flatRows[0]?._getAllCellsByColumnId()[column.id]?.getValue();
           return typeof value === 'string' || typeof value === 'number';
         }
       };
@@ -1070,7 +1046,7 @@
       return {
         getAutoFilterFn: () => {
           const firstRow = table.getCoreRowModel().flatRows[0];
-          const value = firstRow == null ? void 0 : firstRow.getValue(column.id);
+          const value = firstRow?.getValue(column.id);
           if (typeof value === 'string') {
             return filterFns.includesString;
           }
@@ -1089,10 +1065,9 @@
           return filterFns.weakEquals;
         },
         getFilterFn: () => {
-          var _table$options$filter, _table$options$filter2;
-          return isFunction(column.columnDef.filterFn) ? column.columnDef.filterFn : column.columnDef.filterFn === 'auto' ? column.getAutoFilterFn()
-          // @ts-ignore
-          : (_table$options$filter = (_table$options$filter2 = table.options.filterFns) == null ? void 0 : _table$options$filter2[column.columnDef.filterFn]) != null ? _table$options$filter : filterFns[column.columnDef.filterFn];
+          var _table$options$filter;
+          return isFunction(column.columnDef.filterFn) ? column.columnDef.filterFn : column.columnDef.filterFn === 'auto' ? column.getAutoFilterFn() : // @ts-ignore
+          (_table$options$filter = table.options.filterFns?.[column.columnDef.filterFn]) != null ? _table$options$filter : filterFns[column.columnDef.filterFn];
         },
         getCanFilter: () => {
           var _column$columnDef$ena, _table$options$enable, _table$options$enable2;
@@ -1100,27 +1075,24 @@
         },
         getCanGlobalFilter: () => {
           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) && ((_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;
+          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?.(column)) != null ? _table$options$getCol : true) && !!column.accessorFn;
         },
         getIsFiltered: () => column.getFilterIndex() > -1,
-        getFilterValue: () => {
-          var _table$getState$colum, _table$getState$colum2;
-          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;
-        },
+        getFilterValue: () => table.getState().columnFilters?.find(d => d.id === column.id)?.value,
         getFilterIndex: () => {
-          var _table$getState$colum3, _table$getState$colum4;
-          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;
+          var _table$getState$colum;
+          return (_table$getState$colum = table.getState().columnFilters?.findIndex(d => d.id === column.id)) != null ? _table$getState$colum : -1;
         },
         setFilterValue: value => {
           table.setColumnFilters(old => {
             const filterFn = column.getFilterFn();
-            const previousfilter = old == null ? void 0 : old.find(d => d.id === column.id);
+            const previousfilter = old?.find(d => d.id === column.id);
             const newFilter = functionalUpdate(value, previousfilter ? previousfilter.value : undefined);
 
             //
             if (shouldAutoRemoveFilter(filterFn, newFilter, column)) {
               var _old$filter;
-              return (_old$filter = old == null ? void 0 : old.filter(d => d.id !== column.id)) != null ? _old$filter : [];
+              return (_old$filter = old?.filter(d => d.id !== column.id)) != null ? _old$filter : [];
             }
             const newFilterObj = {
               id: column.id,
@@ -1128,14 +1100,14 @@
             };
             if (previousfilter) {
               var _old$map;
-              return (_old$map = old == null ? void 0 : old.map(d => {
+              return (_old$map = old?.map(d => {
                 if (d.id === column.id) {
                   return newFilterObj;
                 }
                 return d;
               })) != null ? _old$map : [];
             }
-            if (old != null && old.length) {
+            if (old?.length) {
               return [...old, newFilterObj];
             }
             return [newFilterObj];
@@ -1179,19 +1151,17 @@
           return filterFns.includesString;
         },
         getGlobalFilterFn: () => {
-          var _table$options$filter3, _table$options$filter4;
+          var _table$options$filter2;
           const {
             globalFilterFn: globalFilterFn
           } = table.options;
-          return isFunction(globalFilterFn) ? globalFilterFn : globalFilterFn === 'auto' ? table.getGlobalAutoFilterFn()
-          // @ts-ignore
-          : (_table$options$filter3 = (_table$options$filter4 = table.options.filterFns) == null ? void 0 : _table$options$filter4[globalFilterFn]) != null ? _table$options$filter3 : filterFns[globalFilterFn];
+          return isFunction(globalFilterFn) ? globalFilterFn : globalFilterFn === 'auto' ? table.getGlobalAutoFilterFn() : // @ts-ignore
+          (_table$options$filter2 = table.options.filterFns?.[globalFilterFn]) != null ? _table$options$filter2 : filterFns[globalFilterFn];
         },
         setColumnFilters: updater => {
           const leafColumns = table.getAllLeafColumns();
           const updateFn = old => {
-            var _functionalUpdate;
-            return (_functionalUpdate = functionalUpdate(updater, old)) == null ? void 0 : _functionalUpdate.filter(filter => {
+            return functionalUpdate(updater, old)?.filter(filter => {
               const column = leafColumns.find(d => d.id === filter.id);
               if (column) {
                 const filterFn = column.getFilterFn();
@@ -1202,17 +1172,17 @@
               return true;
             });
           };
-          table.options.onColumnFiltersChange == null ? void 0 : table.options.onColumnFiltersChange(updateFn);
+          table.options.onColumnFiltersChange?.(updateFn);
         },
         setGlobalFilter: updater => {
-          table.options.onGlobalFilterChange == null ? void 0 : table.options.onGlobalFilterChange(updater);
+          table.options.onGlobalFilterChange?.(updater);
         },
         resetGlobalFilter: defaultState => {
           table.setGlobalFilter(defaultState ? undefined : table.initialState.globalFilter);
         },
         resetColumnFilters: defaultState => {
-          var _table$initialState$c, _table$initialState;
-          table.setColumnFilters(defaultState ? [] : (_table$initialState$c = (_table$initialState = table.initialState) == null ? void 0 : _table$initialState.columnFilters) != null ? _table$initialState$c : []);
+          var _table$initialState$c;
+          table.setColumnFilters(defaultState ? [] : (_table$initialState$c = table.initialState?.columnFilters) != null ? _table$initialState$c : []);
         },
         getPreFilteredRowModel: () => table.getCoreRowModel(),
         getFilteredRowModel: () => {
@@ -1350,8 +1320,8 @@
     getDefaultColumnDef: () => {
       return {
         aggregatedCell: props => {
-          var _toString, _props$getValue;
-          return (_toString = (_props$getValue = props.getValue()) == null ? void 0 : _props$getValue.toString == null ? void 0 : _props$getValue.toString()) != null ? _toString : null;
+          var _toString;
+          return (_toString = props.getValue()?.toString?.()) != null ? _toString : null;
         },
         aggregationFn: 'auto'
       };
@@ -1373,7 +1343,7 @@
         toggleGrouping: () => {
           table.setGrouping(old => {
             // Find any existing grouping for this column
-            if (old != null && old.includes(column.id)) {
+            if (old?.includes(column.id)) {
               return old.filter(d => d !== column.id);
             }
             return [...(old != null ? old : []), column.id];
@@ -1384,13 +1354,9 @@
           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 _table$getState$group;
-          return (_table$getState$group = table.getState().grouping) == null ? void 0 : _table$getState$group.includes(column.id);
-        },
-        getGroupedIndex: () => {
-          var _table$getState$group2;
-          return (_table$getState$group2 = table.getState().grouping) == null ? void 0 : _table$getState$group2.indexOf(column.id);
+          return table.getState().grouping?.includes(column.id);
         },
+        getGroupedIndex: () => table.getState().grouping?.indexOf(column.id),
         getToggleGroupingHandler: () => {
           const canGroup = column.getCanGroup();
           return () => {
@@ -1400,7 +1366,7 @@
         },
         getAutoAggregationFn: () => {
           const firstRow = table.getCoreRowModel().flatRows[0];
-          const value = firstRow == null ? void 0 : firstRow.getValue(column.id);
+          const value = firstRow?.getValue(column.id);
           if (typeof value === 'number') {
             return aggregationFns.sum;
           }
@@ -1409,20 +1375,20 @@
           }
         },
         getAggregationFn: () => {
-          var _table$options$aggreg, _table$options$aggreg2;
+          var _table$options$aggreg;
           if (!column) {
             throw new Error();
           }
-          return isFunction(column.columnDef.aggregationFn) ? column.columnDef.aggregationFn : column.columnDef.aggregationFn === 'auto' ? column.getAutoAggregationFn() : (_table$options$aggreg = (_table$options$aggreg2 = table.options.aggregationFns) == null ? void 0 : _table$options$aggreg2[column.columnDef.aggregationFn]) != null ? _table$options$aggreg : aggregationFns[column.columnDef.aggregationFn];
+          return isFunction(column.columnDef.aggregationFn) ? column.columnDef.aggregationFn : column.columnDef.aggregationFn === 'auto' ? column.getAutoAggregationFn() : (_table$options$aggreg = table.options.aggregationFns?.[column.columnDef.aggregationFn]) != null ? _table$options$aggreg : aggregationFns[column.columnDef.aggregationFn];
         }
       };
     },
     createTable: table => {
       return {
-        setGrouping: updater => table.options.onGroupingChange == null ? void 0 : table.options.onGroupingChange(updater),
+        setGrouping: updater => table.options.onGroupingChange?.(updater),
         resetGrouping: defaultState => {
-          var _table$initialState$g, _table$initialState;
-          table.setGrouping(defaultState ? [] : (_table$initialState$g = (_table$initialState = table.initialState) == null ? void 0 : _table$initialState.grouping) != null ? _table$initialState$g : []);
+          var _table$initialState$g;
+          table.setGrouping(defaultState ? [] : (_table$initialState$g = table.initialState?.grouping) != null ? _table$initialState$g : []);
         },
         getPreGroupedRowModel: () => table.getFilteredRowModel(),
         getGroupedRowModel: () => {
@@ -1446,15 +1412,12 @@
       return {
         getIsGrouped: () => column.getIsGrouped() && column.id === row.groupingColumnId,
         getIsPlaceholder: () => !cell.getIsGrouped() && column.getIsGrouped(),
-        getIsAggregated: () => {
-          var _row$subRows;
-          return !cell.getIsGrouped() && !cell.getIsPlaceholder() && !!((_row$subRows = row.subRows) != null && _row$subRows.length);
-        }
+        getIsAggregated: () => !cell.getIsGrouped() && !cell.getIsPlaceholder() && !!row.subRows?.length
       };
     }
   };
   function orderColumns(leafColumns, grouping, groupedColumnMode) {
-    if (!(grouping != null && grouping.length) || !groupedColumnMode) {
+    if (!grouping?.length || !groupedColumnMode) {
       return leafColumns;
     }
     const nonGroupingColumns = leafColumns.filter(col => !grouping.includes(col.id));
@@ -1481,7 +1444,7 @@
     },
     createTable: table => {
       return {
-        setColumnOrder: updater => table.options.onColumnOrderChange == null ? void 0 : table.options.onColumnOrderChange(updater),
+        setColumnOrder: updater => table.options.onColumnOrderChange?.(updater),
         resetColumnOrder: defaultState => {
           var _table$initialState$c;
           table.setColumnOrder(defaultState ? [] : (_table$initialState$c = table.initialState.columnOrder) != null ? _table$initialState$c : []);
@@ -1492,7 +1455,7 @@
           let orderedColumns = [];
 
           // If there is no order, return the normal columns
-          if (!(columnOrder != null && columnOrder.length)) {
+          if (!columnOrder?.length) {
             orderedColumns = columns;
           } else {
             const columnOrderCopy = [...columnOrder];
@@ -1537,7 +1500,7 @@
         ...state,
         pagination: {
           ...getDefaultPaginationState(),
-          ...(state == null ? void 0 : state.pagination)
+          ...state?.pagination
         }
       };
     },
@@ -1572,7 +1535,7 @@
             let newState = functionalUpdate(updater, old);
             return newState;
           };
-          return table.options.onPaginationChange == null ? void 0 : table.options.onPaginationChange(safeUpdater);
+          return table.options.onPaginationChange?.(safeUpdater);
         },
         resetPagination: defaultState => {
           var _table$initialState$p;
@@ -1590,12 +1553,12 @@
           });
         },
         resetPageIndex: defaultState => {
-          var _table$initialState$p2, _table$initialState, _table$initialState$p3;
-          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);
+          var _table$initialState$p2;
+          table.setPageIndex(defaultState ? defaultPageIndex : (_table$initialState$p2 = table.initialState?.pagination?.pageIndex) != null ? _table$initialState$p2 : defaultPageIndex);
         },
         resetPageSize: defaultState => {
-          var _table$initialState$p4, _table$initialState2, _table$initialState2$;
-          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);
+          var _table$initialState$p3;
+          table.setPageSize(defaultState ? defaultPageSize : (_table$initialState$p3 = table.initialState?.pagination?.pageSize) != null ? _table$initialState$p3 : defaultPageSize);
         },
         setPageSize: updater => {
           table.setPagination(old => {
@@ -1700,20 +1663,20 @@
             if (position === 'right') {
               var _old$left, _old$right;
               return {
-                left: ((_old$left = old == null ? void 0 : old.left) != null ? _old$left : []).filter(d => !(columnIds != null && columnIds.includes(d))),
-                right: [...((_old$right = old == null ? void 0 : old.right) != null ? _old$right : []).filter(d => !(columnIds != null && columnIds.includes(d))), ...columnIds]
+                left: ((_old$left = old?.left) != null ? _old$left : []).filter(d => !columnIds?.includes(d)),
+                right: [...((_old$right = old?.right) != null ? _old$right : []).filter(d => !columnIds?.includes(d)), ...columnIds]
               };
             }
             if (position === 'left') {
               var _old$left2, _old$right2;
               return {
-                left: [...((_old$left2 = old == null ? void 0 : old.left) != null ? _old$left2 : []).filter(d => !(columnIds != null && columnIds.includes(d))), ...columnIds],
-                right: ((_old$right2 = old == null ? void 0 : old.right) != null ? _old$right2 : []).filter(d => !(columnIds != null && columnIds.includes(d)))
+                left: [...((_old$left2 = old?.left) != null ? _old$left2 : []).filter(d => !columnIds?.includes(d)), ...columnIds],
+                right: ((_old$right2 = old?.right) != null ? _old$right2 : []).filter(d => !columnIds?.includes(d))
               };
             }
             return {
-              left: ((_old$left3 = old == null ? void 0 : old.left) != null ? _old$left3 : []).filter(d => !(columnIds != null && columnIds.includes(d))),
-              right: ((_old$right3 = old == null ? void 0 : old.right) != null ? _old$right3 : []).filter(d => !(columnIds != null && columnIds.includes(d)))
+              left: ((_old$left3 = old?.left) != null ? _old$left3 : []).filter(d => !columnIds?.includes(d)),
+              right: ((_old$right3 = old?.right) != null ? _old$right3 : []).filter(d => !columnIds?.includes(d))
             };
           });
         },
@@ -1730,14 +1693,14 @@
             left,
             right
           } = 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));
+          const isLeft = leafColumnIds.some(d => left?.includes(d));
+          const isRight = leafColumnIds.some(d => right?.includes(d));
           return isLeft ? 'left' : isRight ? 'right' : false;
         },
         getPinnedIndex: () => {
-          var _table$getState$colum, _table$getState$colum2, _table$getState$colum3;
+          var _table$getState$colum;
           const position = column.getIsPinned();
-          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;
+          return position ? (_table$getState$colum = table.getState().columnPinning?.[position]?.indexOf(column.id)) != null ? _table$getState$colum : -1 : 0;
         }
       };
     },
@@ -1783,19 +1746,17 @@
     },
     createTable: table => {
       return {
-        setColumnPinning: updater => table.options.onColumnPinningChange == null ? void 0 : table.options.onColumnPinningChange(updater),
+        setColumnPinning: updater => table.options.onColumnPinningChange?.(updater),
         resetColumnPinning: defaultState => {
-          var _table$initialState$c, _table$initialState;
-          return table.setColumnPinning(defaultState ? getDefaultPinningState() : (_table$initialState$c = (_table$initialState = table.initialState) == null ? void 0 : _table$initialState.columnPinning) != null ? _table$initialState$c : getDefaultPinningState());
+          var _table$initialState$c;
+          return table.setColumnPinning(defaultState ? getDefaultPinningState() : (_table$initialState$c = table.initialState?.columnPinning) != null ? _table$initialState$c : getDefaultPinningState());
         },
         getIsSomeColumnsPinned: position => {
-          var _pinningState$positio;
           const pinningState = table.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.left?.length || pinningState.right?.length);
           }
-          return Boolean((_pinningState$positio = pinningState[position]) == null ? void 0 : _pinningState$positio.length);
+          return Boolean(pinningState[position]?.length);
         },
         getLeftLeafColumns: memo(() => [table.getAllLeafColumns(), table.getState().columnPinning.left], (allColumns, left) => {
           return (left != null ? left : []).map(columnId => allColumns.find(column => column.id === columnId)).filter(Boolean);
@@ -1852,7 +1813,7 @@
 
     createTable: table => {
       return {
-        setRowSelection: updater => table.options.onRowSelectionChange == null ? void 0 : table.options.onRowSelectionChange(updater),
+        setRowSelection: updater => table.options.onRowSelectionChange?.(updater),
         resetRowSelection: defaultState => {
           var _table$initialState$r;
           return table.setRowSelection(defaultState ? {} : (_table$initialState$r = table.initialState.rowSelection) != null ? _table$initialState$r : {});
@@ -2118,16 +2079,14 @@
         getToggleSelectedHandler: () => {
           const canSelect = row.getCanSelect();
           return e => {
-            var _target;
             if (!canSelect) return;
-            row.toggleSelected((_target = e.target) == null ? void 0 : _target.checked);
+            row.toggleSelected(e.target?.checked);
           };
         }
       };
     }
   };
   const mutateRowIsSelected = (selectedRowIds, id, value, table) => {
-    var _row$subRows;
     const row = table.getRow(id);
 
     // const isGrouped = row.getIsGrouped()
@@ -2148,7 +2107,7 @@
     }
     // }
 
-    if ((_row$subRows = row.subRows) != null && _row$subRows.length && row.getCanSelectSubRows()) {
+    if (row.subRows?.length && row.getCanSelectSubRows()) {
       row.subRows.forEach(row => mutateRowIsSelected(selectedRowIds, row.id, value, table));
     }
   };
@@ -2160,13 +2119,12 @@
     // Filters top level and nested rows
     const recurseRows = function (rows, depth) {
       return rows.map(row => {
-        var _row$subRows2;
         const isSelected = isRowSelected(row, rowSelection);
         if (isSelected) {
           newSelectedFlatRows.push(row);
           newSelectedRowsById[row.id] = row;
         }
-        if ((_row$subRows2 = row.subRows) != null && _row$subRows2.length) {
+        if (row.subRows?.length) {
           row = {
             ...row,
             subRows: recurseRows(row.subRows)
@@ -2340,7 +2298,7 @@
           const firstRows = table.getFilteredRowModel().flatRows.slice(10);
           let isString = false;
           for (const row of firstRows) {
-            const value = row == null ? void 0 : row.getValue(column.id);
+            const value = row?.getValue(column.id);
             if (Object.prototype.toString.call(value) === '[object Date]') {
               return sortingFns.datetime;
             }
@@ -2358,18 +2316,18 @@
         },
         getAutoSortDir: () => {
           const firstRow = table.getFilteredRowModel().flatRows[0];
-          const value = firstRow == null ? void 0 : firstRow.getValue(column.id);
+          const value = firstRow?.getValue(column.id);
           if (typeof value === 'string') {
             return 'asc';
           }
           return 'desc';
         },
         getSortingFn: () => {
-          var _table$options$sortin, _table$options$sortin2;
+          var _table$options$sortin;
           if (!column) {
             throw new Error();
           }
-          return isFunction(column.columnDef.sortingFn) ? column.columnDef.sortingFn : column.columnDef.sortingFn === 'auto' ? column.getAutoSortingFn() : (_table$options$sortin = (_table$options$sortin2 = table.options.sortingFns) == null ? void 0 : _table$options$sortin2[column.columnDef.sortingFn]) != null ? _table$options$sortin : sortingFns[column.columnDef.sortingFn];
+          return isFunction(column.columnDef.sortingFn) ? column.columnDef.sortingFn : column.columnDef.sortingFn === 'auto' ? column.getAutoSortingFn() : (_table$options$sortin = table.options.sortingFns?.[column.columnDef.sortingFn]) != null ? _table$options$sortin : sortingFns[column.columnDef.sortingFn];
         },
         toggleSorting: (desc, multi) => {
           // if (column.columns.length) {
@@ -2386,8 +2344,8 @@
           const hasManualValue = typeof desc !== 'undefined' && desc !== null;
           table.setSorting(old => {
             // Find any existing sorting for this column
-            const existingSorting = old == null ? void 0 : old.find(d => d.id === column.id);
-            const existingIndex = old == null ? void 0 : old.findIndex(d => d.id === column.id);
+            const existingSorting = old?.find(d => d.id === column.id);
+            const existingIndex = old?.findIndex(d => d.id === column.id);
             let newSorting = [];
 
             // What should we do with this sort action?
@@ -2395,7 +2353,7 @@
             let nextDesc = hasManualValue ? desc : nextSortingOrder === 'desc';
 
             // Multi-mode
-            if (old != null && old.length && column.getCanMultiSort() && multi) {
+            if (old?.length && column.getCanMultiSort() && multi) {
               if (existingSorting) {
                 sortAction = 'toggle';
               } else {
@@ -2403,7 +2361,7 @@
               }
             } else {
               // Normal mode
-              if (old != null && old.length && existingIndex !== old.length - 1) {
+              if (old?.length && existingIndex !== old.length - 1) {
                 sortAction = 'replace';
               } else if (existingSorting) {
                 sortAction = 'toggle';
@@ -2481,34 +2439,33 @@
           return (_ref2 = (_column$columnDef$ena2 = column.columnDef.enableMultiSort) != null ? _column$columnDef$ena2 : table.options.enableMultiSort) != null ? _ref2 : !!column.accessorFn;
         },
         getIsSorted: () => {
-          var _table$getState$sorti;
-          const columnSort = (_table$getState$sorti = table.getState().sorting) == null ? void 0 : _table$getState$sorti.find(d => d.id === column.id);
+          const columnSort = table.getState().sorting?.find(d => d.id === column.id);
           return !columnSort ? false : columnSort.desc ? 'desc' : 'asc';
         },
         getSortIndex: () => {
-          var _table$getState$sorti2, _table$getState$sorti3;
-          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;
+          var _table$getState$sorti;
+          return (_table$getState$sorti = table.getState().sorting?.findIndex(d => d.id === column.id)) != null ? _table$getState$sorti : -1;
         },
         clearSorting: () => {
           //clear sorting for just 1 column
-          table.setSorting(old => old != null && old.length ? old.filter(d => d.id !== column.id) : []);
+          table.setSorting(old => 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() ? table.options.isMultiSortEvent == null ? void 0 : table.options.isMultiSortEvent(e) : false);
+            e.persist?.();
+            column.toggleSorting?.(undefined, column.getCanMultiSort() ? table.options.isMultiSortEvent?.(e) : false);
           };
         }
       };
     },
     createTable: table => {
       return {
-        setSorting: updater => table.options.onSortingChange == null ? void 0 : table.options.onSortingChange(updater),
+        setSorting: updater => table.options.onSortingChange?.(updater),
         resetSorting: defaultState => {
-          var _table$initialState$s, _table$initialState;
-          table.setSorting(defaultState ? [] : (_table$initialState$s = (_table$initialState = table.initialState) == null ? void 0 : _table$initialState.sorting) != null ? _table$initialState$s : []);
+          var _table$initialState$s;
+          table.setSorting(defaultState ? [] : (_table$initialState$s = table.initialState?.sorting) != null ? _table$initialState$s : []);
         },
         getPreSortedRowModel: () => table.getGroupedRowModel(),
         getSortedRowModel: () => {
@@ -2549,8 +2506,8 @@
           }
         },
         getIsVisible: () => {
-          var _table$getState$colum, _table$getState$colum2;
-          return (_table$getState$colum = (_table$getState$colum2 = table.getState().columnVisibility) == null ? void 0 : _table$getState$colum2[column.id]) != null ? _table$getState$colum : true;
+          var _table$getState$colum;
+          return (_table$getState$colum = table.getState().columnVisibility?.[column.id]) != null ? _table$getState$colum : true;
         },
         getCanHide: () => {
           var _column$columnDef$ena, _table$options$enable;
@@ -2558,7 +2515,7 @@
         },
         getToggleVisibilityHandler: () => {
           return e => {
-            column.toggleVisibility == null ? void 0 : column.toggleVisibility(e.target.checked);
+            column.toggleVisibility?.(e.target.checked);
           };
         }
       };
@@ -2586,7 +2543,7 @@
     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());
+          return columns.filter(d => d.getIsVisible?.());
         }, {
           key,
           debug: () => {
@@ -2601,7 +2558,7 @@
         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),
+        setColumnVisibility: updater => table.options.onColumnVisibilityChange?.(updater),
         resetColumnVisibility: defaultState => {
           var _table$initialState$c;
           table.setColumnVisibility(defaultState ? {} : (_table$initialState$c = table.initialState.columnVisibility) != null ? _table$initialState$c : {});
@@ -2611,15 +2568,14 @@
           value = (_value = value) != null ? _value : !table.getIsAllColumnsVisible();
           table.setColumnVisibility(table.getAllLeafColumns().reduce((obj, column) => ({
             ...obj,
-            [column.id]: !value ? !(column.getCanHide != null && column.getCanHide()) : value
+            [column.id]: !value ? !column.getCanHide?.() : value
           }), {}));
         },
-        getIsAllColumnsVisible: () => !table.getAllLeafColumns().some(column => !(column.getIsVisible != null && column.getIsVisible())),
-        getIsSomeColumnsVisible: () => table.getAllLeafColumns().some(column => column.getIsVisible == null ? void 0 : column.getIsVisible()),
+        getIsAllColumnsVisible: () => !table.getAllLeafColumns().some(column => !column.getIsVisible?.()),
+        getIsSomeColumnsVisible: () => table.getAllLeafColumns().some(column => column.getIsVisible?.()),
         getToggleAllColumnsVisibilityHandler: () => {
           return e => {
-            var _target;
-            table.toggleAllColumnsVisible((_target = e.target) == null ? void 0 : _target.checked);
+            table.toggleAllColumnsVisible(e.target?.checked);
           };
         }
       };
@@ -2639,7 +2595,7 @@
       _features: features
     };
     const defaultOptions = table._features.reduce((obj, feature) => {
-      return Object.assign(obj, feature.getDefaultOptions == null ? void 0 : feature.getDefaultOptions(table));
+      return Object.assign(obj, feature.getDefaultOptions?.(table));
     }, {});
     const mergeOptions = options => {
       if (table.options.mergeOptions) {
@@ -2657,7 +2613,7 @@
     };
     table._features.forEach(feature => {
       var _feature$getInitialSt;
-      initialState = (_feature$getInitialSt = feature.getInitialState == null ? void 0 : feature.getInitialState(initialState)) != null ? _feature$getInitialSt : initialState;
+      initialState = (_feature$getInitialSt = feature.getInitialState?.(initialState)) != null ? _feature$getInitialSt : initialState;
     });
     const queued = [];
     let queuedTimeout = false;
@@ -2696,11 +2652,11 @@
         return table.options.state;
       },
       setState: updater => {
-        table.options.onStateChange == null ? void 0 : table.options.onStateChange(updater);
+        table.options.onStateChange?.(updater);
       },
       _getRowId: (row, index, parent) => {
         var _table$options$getRow;
-        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}`;
+        return (_table$options$getRow = table.options.getRowId?.(row, index, parent)) != null ? _table$options$getRow : `${parent ? [parent.id, index].join('.') : index}`;
       },
       getCoreRowModel: () => {
         if (!table._getCoreRowModel) {
@@ -2739,11 +2695,11 @@
           },
           // footer: props => props.header.column.id,
           cell: props => {
-            var _props$renderValue$to, _props$renderValue;
-            return (_props$renderValue$to = (_props$renderValue = props.renderValue()) == null ? void 0 : _props$renderValue.toString == null ? void 0 : _props$renderValue.toString()) != null ? _props$renderValue$to : null;
+            var _props$renderValue$to;
+            return (_props$renderValue$to = props.renderValue()?.toString?.()) != null ? _props$renderValue$to : null;
           },
           ...table._features.reduce((obj, feature) => {
-            return Object.assign(obj, feature.getDefaultColumnDef == null ? void 0 : feature.getDefaultColumnDef());
+            return Object.assign(obj, feature.getDefaultColumnDef?.());
           }, {}),
           ...defaultColumn
         };
@@ -2821,7 +2777,7 @@
     };
     Object.assign(table, coreInstance);
     table._features.forEach(feature => {
-      return Object.assign(table, feature.createTable == null ? void 0 : feature.createTable(table));
+      return Object.assign(table, feature.createTable?.(table));
     });
     return table;
   }
@@ -2850,7 +2806,7 @@
       })
     };
     table._features.forEach(feature => {
-      Object.assign(cell, feature.createCell == null ? void 0 : feature.createCell(cell, column, row, table));
+      Object.assign(cell, feature.createCell?.(cell, column, row, table));
     }, {});
     return cell;
   }
@@ -2921,7 +2877,7 @@
     };
     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));
+      Object.assign(row, feature?.createRow?.(row, table));
     }
     return row;
   };
@@ -3015,11 +2971,10 @@
 
           // Get the original subrows
           if (table.options.getSubRows) {
-            var _row$originalSubRows;
             row.originalSubRows = table.options.getSubRows(originalRows[i], i);
 
             // Then recursively access them
-            if ((_row$originalSubRows = row.originalSubRows) != null && _row$originalSubRows.length) {
+            if (row.originalSubRows?.length) {
               row.subRows = accessRows(row.originalSubRows, depth + 1, row);
             }
           }
@@ -3059,11 +3014,10 @@
 
       // Filter from children up first
       for (let i = 0; i < rowsToFilter.length; i++) {
-        var _row$subRows;
         let row = rowsToFilter[i];
         const newRow = createRow(table, row.id, row.original, row.index, row.depth);
         newRow.columnFilters = row.columnFilters;
-        if ((_row$subRows = row.subRows) != null && _row$subRows.length && depth < maxDepth) {
+        if (row.subRows?.length && depth < maxDepth) {
           newRow.subRows = recurseFilterRows(row.subRows, depth + 1);
           row = newRow;
           if (filterRow(row) && !newRow.subRows.length) {
@@ -3115,8 +3069,7 @@
         let row = rowsToFilter[i];
         const pass = filterRow(row);
         if (pass) {
-          var _row$subRows2;
-          if ((_row$subRows2 = row.subRows) != null && _row$subRows2.length && depth < maxDepth) {
+          if (row.subRows?.length && depth < maxDepth) {
             const newRow = createRow(table, row.id, row.original, row.index, row.depth);
             newRow.subRows = recurseFilterRows(row.subRows, depth + 1);
             row = newRow;
@@ -3137,7 +3090,7 @@
 
   function getFilteredRowModel() {
     return table => memo(() => [table.getPreFilteredRowModel(), table.getState().columnFilters, table.getState().globalFilter], (rowModel, columnFilters, globalFilter) => {
-      if (!rowModel.rows.length || !(columnFilters != null && columnFilters.length) && !globalFilter) {
+      if (!rowModel.rows.length || !columnFilters?.length && !globalFilter) {
         for (let i = 0; i < rowModel.flatRows.length; i++) {
           rowModel.flatRows[i].columnFilters = {};
           rowModel.flatRows[i].columnFiltersMeta = {};
@@ -3164,7 +3117,7 @@
         resolvedColumnFilters.push({
           id: d.id,
           filterFn,
-          resolvedValue: (_filterFn$resolveFilt = filterFn.resolveFilterValue == null ? void 0 : filterFn.resolveFilterValue(d.value)) != null ? _filterFn$resolveFilt : d.value
+          resolvedValue: (_filterFn$resolveFilt = filterFn.resolveFilterValue?.(d.value)) != null ? _filterFn$resolveFilt : d.value
         });
       });
       const filterableIds = columnFilters.map(d => d.id);
@@ -3177,7 +3130,7 @@
           resolvedGlobalFilters.push({
             id: column.id,
             filterFn: globalFilterFn,
-            resolvedValue: (_globalFilterFn$resol = globalFilterFn.resolveFilterValue == null ? void 0 : globalFilterFn.resolveFilterValue(globalFilter)) != null ? _globalFilterFn$resol : globalFilter
+            resolvedValue: (_globalFilterFn$resol = globalFilterFn.resolveFilterValue?.(globalFilter)) != null ? _globalFilterFn$resol : globalFilter
           });
         });
       }
@@ -3242,7 +3195,7 @@
 
   function getFacetedRowModel() {
     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) {
+      if (!preRowModel.rows.length || !columnFilters?.length && !globalFilter) {
         return preRowModel;
       }
       const filterableIds = [...columnFilters.map(d => d.id).filter(d => d !== columnId), globalFilter ? '__global__' : undefined].filter(Boolean);
@@ -3294,8 +3247,7 @@
 
   function getFacetedMinMaxValues() {
     return (table, columnId) => memo(() => [table.getColumn(columnId).getFacetedRowModel()], facetedRowModel => {
-      var _facetedRowModel$flat;
-      const firstValue = (_facetedRowModel$flat = facetedRowModel.flatRows[0]) == null ? void 0 : _facetedRowModel$flat.getUniqueValues(columnId);
+      const firstValue = facetedRowModel.flatRows[0]?.getUniqueValues(columnId);
       if (typeof firstValue === 'undefined') {
         return undefined;
       }
@@ -3324,7 +3276,7 @@
 
   function getSortedRowModel() {
     return table => memo(() => [table.getState().sorting, table.getPreSortedRowModel()], (sorting, rowModel) => {
-      if (!rowModel.rows.length || !(sorting != null && sorting.length)) {
+      if (!rowModel.rows.length || !sorting?.length) {
         return rowModel;
       }
       const sortingState = table.getState().sorting;
@@ -3350,7 +3302,7 @@
             var _sortEntry$desc;
             const sortEntry = availableSorting[i];
             const columnInfo = columnInfoById[sortEntry.id];
-            const isDesc = (_sortEntry$desc = sortEntry == null ? void 0 : sortEntry.desc) != null ? _sortEntry$desc : false;
+            const isDesc = (_sortEntry$desc = sortEntry?.desc) != null ? _sortEntry$desc : false;
             if (columnInfo.sortUndefined) {
               const aValue = rowA.getValue(sortEntry.id);
               const bValue = rowB.getValue(sortEntry.id);
@@ -3378,9 +3330,8 @@
 
         // If there are sub-rows, sort them
         sortedData.forEach(row => {
-          var _row$subRows;
           sortedFlatRows.push(row);
-          if ((_row$subRows = row.subRows) != null && _row$subRows.length) {
+          if (row.subRows?.length) {
             row.subRows = sortData(row.subRows);
           }
         });
@@ -3566,9 +3517,8 @@
   function expandRows(rowModel) {
     const expandedRows = [];
     const handleRow = row => {
-      var _row$subRows;
       expandedRows.push(row);
-      if ((_row$subRows = row.subRows) != null && _row$subRows.length && row.getIsExpanded()) {
+      if (row.subRows?.length && row.getIsExpanded()) {
         row.subRows.forEach(handleRow);
       }
     };
@@ -3678,7 +3628,7 @@
       // state.
       onStateChange: updater => {
         setState(updater);
-        options.onStateChange == null ? void 0 : options.onStateChange(updater);
+        options.onStateChange?.(updater);
       }
     }));
     return tableRef.current;