material-react-table 0.8.9 → 0.8.12

package/dist/material-react-table.cjs.development.js

@@ -87,6 +87,7 @@ var MRT_DefaultLocalization_EN = {
   pinToLeft: 'Pin to left',
   pinToRight: 'Pin to right',
   resetColumnSize: 'Reset column size',
+  resetOrder: 'Reset order',
   rowActions: 'Row Actions',
   rowNumber: '#',
   rowNumbers: 'Row Numbers',
@@ -373,6 +374,12 @@ var MRT_FilterOptionMenu = function MRT_FilterOptionMenu(_ref) {
       currentFilterFns = _getState.currentFilterFns,
       currentGlobalFilterFn = _getState.currentGlobalFilterFn;
 
+  var _ref2 = header != null ? header : {},
+      column = _ref2.column;
+
+  var _ref3 = column != null ? column : {},
+      columnDef = _ref3.columnDef;
+
   var filterOptions = React.useMemo(function () {
     return [{
       option: MRT_FILTER_OPTION.FUZZY,
@@ -430,12 +437,12 @@ var MRT_FilterOptionMenu = function MRT_FilterOptionMenu(_ref) {
       divider: false,
       fn: notEmpty
     }].filter(function (filterType) {
-      return header ? !header.column.enabledColumnFilterOptions || header.column.enabledColumnFilterOptions.includes(filterType.option) : (!enabledGlobalFilterOptions || enabledGlobalFilterOptions.includes(filterType.option)) && [MRT_FILTER_OPTION.FUZZY, MRT_FILTER_OPTION.CONTAINS].includes(filterType.option);
+      return columnDef ? !columnDef.enabledColumnFilterOptions || columnDef.enabledColumnFilterOptions.includes(filterType.option) : (!enabledGlobalFilterOptions || enabledGlobalFilterOptions.includes(filterType.option)) && [MRT_FILTER_OPTION.FUZZY, MRT_FILTER_OPTION.CONTAINS].includes(filterType.option);
     });
   }, []);
 
   var handleSelectFilterType = function handleSelectFilterType(value) {
-    if (header) {
+    if (header && column) {
       setCurrentFilterFns(function (prev) {
         var _extends2;
 
@@ -443,11 +450,11 @@ var MRT_FilterOptionMenu = function MRT_FilterOptionMenu(_ref) {
       });
 
       if ([MRT_FILTER_OPTION.EMPTY, MRT_FILTER_OPTION.NOT_EMPTY].includes(value)) {
-        header.column.setFilterValue(' ');
+        column.setFilterValue(' ');
       } else if (value === MRT_FILTER_OPTION.BETWEEN) {
-        header.column.setFilterValue(['', '']);
+        column.setFilterValue(['', '']);
       } else {
-        header.column.setFilterValue('');
+        column.setFilterValue('');
       }
     } else {
       setCurrentGlobalFilterFn(value);
@@ -471,11 +478,11 @@ var MRT_FilterOptionMenu = function MRT_FilterOptionMenu(_ref) {
     MenuListProps: {
       dense: isDensePadding
     }
-  }, filterOptions.map(function (_ref2, index) {
-    var option = _ref2.option,
-        label = _ref2.label,
-        divider = _ref2.divider,
-        fn = _ref2.fn;
+  }, filterOptions.map(function (_ref4, index) {
+    var option = _ref4.option,
+        label = _ref4.label,
+        divider = _ref4.divider,
+        fn = _ref4.fn;
     return React__default.createElement(material.MenuItem, {
       divider: divider,
       key: index,
@@ -551,12 +558,14 @@ var MRT_ShowHideColumnsMenuItems = function MRT_ShowHideColumnsMenuItems(_ref) {
   var _getState = getState(),
       columnVisibility = _getState.columnVisibility;
 
-  var switchChecked = column.columnDefType !== 'group' && column.getIsVisible() || column.columnDefType === 'group' && column.getLeafColumns().some(function (col) {
+  var columnDef = column.columnDef,
+      columnDefType = column.columnDefType;
+  var switchChecked = columnDefType !== 'group' && column.getIsVisible() || columnDefType === 'group' && column.getLeafColumns().some(function (col) {
     return col.getIsVisible();
   });
 
   var handleToggleColumnHidden = function handleToggleColumnHidden(column) {
-    if (column.columnDefType === 'group') {
+    if (columnDefType === 'group') {
       var _column$columns;
 
       column == null ? void 0 : (_column$columns = column.columns) == null ? void 0 : _column$columns.forEach == null ? void 0 : _column$columns.forEach(function (childColumn) {
@@ -588,14 +597,15 @@ var MRT_ShowHideColumnsMenuItems = function MRT_ShowHideColumnsMenuItems(_ref) {
     componentsProps: {
       typography: {
         sx: {
-          marginBottom: 0
+          marginBottom: 0,
+          opacity: columnDefType !== 'display' ? 1 : 0.5
         }
       }
     },
     checked: switchChecked,
     control: React__default.createElement(material.Switch, null),
     disabled: isSubMenu && switchChecked || !column.getCanHide(),
-    label: column.columnDef.header,
+    label: columnDef.header,
     onChange: function onChange() {
       return handleToggleColumnHidden(column);
     }
@@ -615,44 +625,47 @@ var MRT_ShowHideColumnsMenu = function MRT_ShowHideColumnsMenu(_ref) {
       setAnchorEl = _ref.setAnchorEl,
       tableInstance = _ref.tableInstance;
   var getAllColumns = tableInstance.getAllColumns,
+      getAllLeafColumns = tableInstance.getAllLeafColumns,
       getIsAllColumnsVisible = tableInstance.getIsAllColumnsVisible,
-      getIsSomeColumnsVisible = tableInstance.getIsSomeColumnsVisible,
       getIsSomeColumnsPinned = tableInstance.getIsSomeColumnsPinned,
+      getIsSomeColumnsVisible = tableInstance.getIsSomeColumnsVisible,
       getState = tableInstance.getState,
       toggleAllColumnsVisible = tableInstance.toggleAllColumnsVisible,
-      getAllLeafColumns = tableInstance.getAllLeafColumns,
       _tableInstance$option = tableInstance.options,
       localization = _tableInstance$option.localization,
-      enablePinning = _tableInstance$option.enablePinning;
+      enablePinning = _tableInstance$option.enablePinning,
+      enableColumnOrdering = _tableInstance$option.enableColumnOrdering;
 
   var _getState = getState(),
-      isDensePadding = _getState.isDensePadding;
+      isDensePadding = _getState.isDensePadding,
+      columnOrder = _getState.columnOrder,
+      columnPinning = _getState.columnPinning;
 
   var hideAllColumns = function hideAllColumns() {
     getAllLeafColumns().filter(function (col) {
-      return col.enableHiding !== false;
+      return col.columnDef.enableHiding !== false;
     }).forEach(function (col) {
       return col.toggleVisibility(false);
     });
   };
 
-  var allDisplayColumns = React.useMemo(function () {
-    return getAllColumns().filter(function (col) {
-      return col.columnDefType === 'display';
-    });
-  }, [getAllColumns()]);
-  var allDataColumns = React.useMemo(function () {
-    var dataColumns = getAllColumns().filter(function (col) {
-      return col.columnDefType !== 'display';
-    });
-    return getIsSomeColumnsPinned() ? [].concat(dataColumns.filter(function (c) {
-      return c.getIsPinned() === 'left';
-    }), [null], dataColumns.filter(function (c) {
-      return c.getIsPinned() === false;
-    }), [null], dataColumns.filter(function (c) {
-      return c.getIsPinned() === 'right';
-    })) : dataColumns;
-  }, [getAllColumns(), getState().columnPinning, getIsSomeColumnsPinned()]);
+  var allColumns = React.useMemo(function () {
+    var columns = getAllColumns();
+
+    if (columnOrder.length > 0 && !columns.some(function (col) {
+      return col.columnDefType === 'group';
+    })) {
+      var _columnOrder$map;
+
+      return (_columnOrder$map = columnOrder.map(function (colId) {
+        return columns.find(function (col) {
+          return col.id === colId;
+        });
+      })) != null ? _columnOrder$map : columns;
+    }
+
+    return columns;
+  }, [getAllColumns(), columnOrder, columnPinning]);
   return React__default.createElement(material.Menu, {
     anchorEl: anchorEl,
     open: !!anchorEl,
@@ -672,7 +685,11 @@ var MRT_ShowHideColumnsMenu = function MRT_ShowHideColumnsMenu(_ref) {
   }, !isSubMenu && React__default.createElement(material.Button, {
     disabled: !getIsSomeColumnsVisible(),
     onClick: hideAllColumns
-  }, localization.hideAll), !isSubMenu && enablePinning && React__default.createElement(material.Button, {
+  }, localization.hideAll), !isSubMenu && enableColumnOrdering && React__default.createElement(material.Button, {
+    onClick: function onClick() {
+      return tableInstance.resetColumnOrder();
+    }
+  }, localization.resetOrder), !isSubMenu && enablePinning && React__default.createElement(material.Button, {
     disabled: !getIsSomeColumnsPinned(),
     onClick: function onClick() {
       return tableInstance.resetColumnPinning(true);
@@ -682,22 +699,13 @@ var MRT_ShowHideColumnsMenu = function MRT_ShowHideColumnsMenu(_ref) {
     onClick: function onClick() {
       return toggleAllColumnsVisible(true);
     }
-  }, localization.showAll)), React__default.createElement(material.Divider, null), allDisplayColumns.map(function (column, index) {
+  }, localization.showAll)), React__default.createElement(material.Divider, null), allColumns.map(function (column, index) {
     return React__default.createElement(MRT_ShowHideColumnsMenuItems, {
       column: column,
       isSubMenu: isSubMenu,
       key: index + "-" + column.id,
       tableInstance: tableInstance
     });
-  }), React__default.createElement(material.Divider, null), allDataColumns.map(function (column, index) {
-    return column ? React__default.createElement(MRT_ShowHideColumnsMenuItems, {
-      column: column,
-      isSubMenu: isSubMenu,
-      key: index + "-" + column.id,
-      tableInstance: tableInstance
-    }) : React__default.createElement(material.Divider, {
-      key: index + "-divider"
-    });
   }));
 };
 
@@ -743,6 +751,7 @@ var MRT_ColumnActionMenu = function MRT_ColumnActionMenu(_ref) {
       localization = _tableInstance$option.localization,
       setShowFilters = tableInstance.setShowFilters;
   var column = header.column;
+  var columnDef = column.columnDef;
 
   var _getState = getState(),
       columnSizing = _getState.columnSizing,
@@ -849,7 +858,7 @@ var MRT_ColumnActionMenu = function MRT_ColumnActionMenu(_ref) {
     sx: commonMenuItemStyles$1
   }, React__default.createElement(material.Box, {
     sx: commonListItemStyles
-  }, React__default.createElement(material.ListItemIcon, null, React__default.createElement(SortIcon, null)), (_localization$sortByC = localization.sortByColumnAsc) == null ? void 0 : _localization$sortByC.replace('{column}', String(column.columnDef.header)))), React__default.createElement(material.MenuItem, {
+  }, React__default.createElement(material.ListItemIcon, null, React__default.createElement(SortIcon, null)), (_localization$sortByC = localization.sortByColumnAsc) == null ? void 0 : _localization$sortByC.replace('{column}', String(columnDef.header)))), React__default.createElement(material.MenuItem, {
     divider: enableColumnFilters || enableGrouping || enableHiding,
     key: 2,
     disabled: column.getIsSorted() === 'desc',
@@ -861,7 +870,7 @@ var MRT_ColumnActionMenu = function MRT_ColumnActionMenu(_ref) {
     style: {
       transform: 'rotate(180deg) scaleX(-1)'
     }
-  })), (_localization$sortByC2 = localization.sortByColumnDesc) == null ? void 0 : _localization$sortByC2.replace('{column}', String(column.columnDef.header))))], enableColumnFilters && column.getCanFilter() && [React__default.createElement(material.MenuItem, {
+  })), (_localization$sortByC2 = localization.sortByColumnDesc) == null ? void 0 : _localization$sortByC2.replace('{column}', String(columnDef.header))))], enableColumnFilters && column.getCanFilter() && [React__default.createElement(material.MenuItem, {
     disabled: !column.getFilterValue(),
     key: 0,
     onClick: handleClearFilter,
@@ -875,7 +884,7 @@ var MRT_ColumnActionMenu = function MRT_ColumnActionMenu(_ref) {
     sx: commonMenuItemStyles$1
   }, React__default.createElement(material.Box, {
     sx: commonListItemStyles
-  }, React__default.createElement(material.ListItemIcon, null, React__default.createElement(FilterListIcon, null)), (_localization$filterB = localization.filterByColumn) == null ? void 0 : _localization$filterB.replace('{column}', String(column.columnDef.header))), !column.filterSelectOptions && React__default.createElement(material.IconButton, {
+  }, React__default.createElement(material.ListItemIcon, null, React__default.createElement(FilterListIcon, null)), (_localization$filterB = localization.filterByColumn) == null ? void 0 : _localization$filterB.replace('{column}', String(columnDef.header))), !columnDef.filterSelectOptions && React__default.createElement(material.IconButton, {
     onClick: handleOpenFilterModeMenu,
     onMouseEnter: handleOpenFilterModeMenu,
     size: "small",
@@ -896,7 +905,7 @@ var MRT_ColumnActionMenu = function MRT_ColumnActionMenu(_ref) {
     sx: commonMenuItemStyles$1
   }, React__default.createElement(material.Box, {
     sx: commonListItemStyles
-  }, React__default.createElement(material.ListItemIcon, null, React__default.createElement(DynamicFeedIcon, null)), (_localization = localization[column.getIsGrouped() ? 'ungroupByColumn' : 'groupByColumn']) == null ? void 0 : _localization.replace('{column}', String(column.columnDef.header))))], enablePinning && column.getCanPin() && [React__default.createElement(material.MenuItem, {
+  }, React__default.createElement(material.ListItemIcon, null, React__default.createElement(DynamicFeedIcon, null)), (_localization = localization[column.getIsGrouped() ? 'ungroupByColumn' : 'groupByColumn']) == null ? void 0 : _localization.replace('{column}', String(columnDef.header))))], enablePinning && column.getCanPin() && [React__default.createElement(material.MenuItem, {
     disabled: column.getIsPinned() === 'left' || !column.getCanPin(),
     key: 0,
     onClick: function onClick() {
@@ -940,13 +949,13 @@ var MRT_ColumnActionMenu = function MRT_ColumnActionMenu(_ref) {
   }, React__default.createElement(material.Box, {
     sx: commonListItemStyles
   }, React__default.createElement(material.ListItemIcon, null, React__default.createElement(RestartAltIcon, null)), localization.resetColumnSize))], enableHiding && [React__default.createElement(material.MenuItem, {
-    disabled: column.enableHiding === false,
+    disabled: columnDef.enableHiding === false,
     key: 0,
     onClick: handleHideColumn,
     sx: commonMenuItemStyles$1
   }, React__default.createElement(material.Box, {
     sx: commonListItemStyles
-  }, React__default.createElement(material.ListItemIcon, null, React__default.createElement(VisibilityOffIcon, null)), (_localization$hideCol = localization.hideColumn) == null ? void 0 : _localization$hideCol.replace('{column}', String(column.columnDef.header)))), React__default.createElement(material.MenuItem, {
+  }, React__default.createElement(material.ListItemIcon, null, React__default.createElement(VisibilityOffIcon, null)), (_localization$hideCol = localization.hideColumn) == null ? void 0 : _localization$hideCol.replace('{column}', String(columnDef.header)))), React__default.createElement(material.MenuItem, {
     disabled: !Object.values(columnVisibility).filter(function (visible) {
       return !visible;
     }).length,
@@ -955,7 +964,7 @@ var MRT_ColumnActionMenu = function MRT_ColumnActionMenu(_ref) {
     sx: commonMenuItemStyles$1
   }, React__default.createElement(material.Box, {
     sx: commonListItemStyles
-  }, React__default.createElement(material.ListItemIcon, null, React__default.createElement(ViewColumnIcon, null)), (_localization$showAll = localization.showAllColumns) == null ? void 0 : _localization$showAll.replace('{column}', String(column.columnDef.header))), React__default.createElement(material.IconButton, {
+  }, React__default.createElement(material.ListItemIcon, null, React__default.createElement(ViewColumnIcon, null)), (_localization$showAll = localization.showAllColumns) == null ? void 0 : _localization$showAll.replace('{column}', String(columnDef.header))), React__default.createElement(material.IconButton, {
     onClick: handleOpenShowHideColumnsMenu,
     onMouseEnter: handleOpenShowHideColumnsMenu,
     size: "small",
@@ -5519,7 +5528,7 @@ var MRT_ToolbarBottom = function MRT_ToolbarBottom(_ref) {
 };
 
 var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
-  var _localization$filterB, _localization$filterM, _localization$, _localization$clearFi, _column$filterSelectO;
+  var _localization$filterB, _localization$filterM, _localization$, _localization$clearFi, _columnDef$filterSele;
 
   var header = _ref.header,
       inputIndex = _ref.inputIndex,
@@ -5534,6 +5543,7 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
       muiTableHeadCellFilterTextFieldProps = _tableInstance$option.muiTableHeadCellFilterTextFieldProps,
       setCurrentFilterFns = tableInstance.setCurrentFilterFns;
   var column = header.column;
+  var columnDef = column.columnDef;
 
   var _getState = getState(),
       currentFilterFns = _getState.currentFilterFns;
@@ -5546,10 +5556,10 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
     column: column,
     tableInstance: tableInstance
   }) : muiTableHeadCellFilterTextFieldProps;
-  var mcTableHeadCellFilterTextFieldProps = column.muiTableHeadCellFilterTextFieldProps instanceof Function ? column.muiTableHeadCellFilterTextFieldProps({
+  var mcTableHeadCellFilterTextFieldProps = columnDef.muiTableHeadCellFilterTextFieldProps instanceof Function ? columnDef.muiTableHeadCellFilterTextFieldProps({
     column: column,
     tableInstance: tableInstance
-  }) : column.muiTableHeadCellFilterTextFieldProps;
+  }) : columnDef.muiTableHeadCellFilterTextFieldProps;
 
   var textFieldProps = _extends({}, mTableHeadCellFilterTextFieldProps, mcTableHeadCellFilterTextFieldProps);
 
@@ -5599,8 +5609,8 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
     });
   };
 
-  if (column.Filter) {
-    return React__default.createElement(React__default.Fragment, null, column.Filter == null ? void 0 : column.Filter({
+  if (columnDef.Filter) {
+    return React__default.createElement(React__default.Fragment, null, columnDef.Filter == null ? void 0 : columnDef.Filter({
       header: header,
       tableInstance: tableInstance
     }));
@@ -5608,10 +5618,10 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
 
   var filterId = "mrt-" + idPrefix + "-" + header.id + "-filter-text-field" + (inputIndex != null ? inputIndex : '');
   var filterFn = currentFilterFns == null ? void 0 : currentFilterFns[header.id];
-  var isSelectFilter = !!column.filterSelectOptions;
+  var isSelectFilter = !!columnDef.filterSelectOptions;
   var filterChipLabel = !(filterFn instanceof Function) && [MRT_FILTER_OPTION.EMPTY, MRT_FILTER_OPTION.NOT_EMPTY].includes(filterFn) ? //@ts-ignore
   localization["filter" + (filterFn.charAt(0).toUpperCase() + filterFn.slice(1))] : '';
-  var filterPlaceholder = inputIndex === undefined ? (_localization$filterB = localization.filterByColumn) == null ? void 0 : _localization$filterB.replace('{column}', String(column.columnDef.header)) : inputIndex === 0 ? localization.min : inputIndex === 1 ? localization.max : '';
+  var filterPlaceholder = inputIndex === undefined ? (_localization$filterB = localization.filterByColumn) == null ? void 0 : _localization$filterB.replace('{column}', String(columnDef.header)) : inputIndex === 0 ? localization.min : inputIndex === 1 ? localization.max : '';
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(material.TextField, Object.assign({
     fullWidth: true,
     id: filterId,
@@ -5688,7 +5698,7 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
     sx: _extends({
       m: '-0.25rem',
       p: 0,
-      minWidth: !filterChipLabel ? '6rem' : 'auto',
+      minWidth: !filterChipLabel ? '8rem' : 'auto',
       width: 'calc(100% + 0.5rem)',
       mt: isSelectFilter && !filterValue ? '-1rem' : undefined,
       '&	.MuiSelect-icon': {
@@ -5699,7 +5709,7 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
     divider: true,
     disabled: !filterValue,
     value: ""
-  }, localization.clearFilter), column == null ? void 0 : (_column$filterSelectO = column.filterSelectOptions) == null ? void 0 : _column$filterSelectO.map(function (option) {
+  }, localization.clearFilter), columnDef == null ? void 0 : (_columnDef$filterSele = columnDef.filterSelectOptions) == null ? void 0 : _columnDef$filterSele.map(function (option) {
     var value;
     var text;
 
@@ -5789,8 +5799,9 @@ var MRT_TableHeadCellFilterLabel = function MRT_TableHeadCellFilterLabel(_ref) {
       showFilters = _getState.showFilters;
 
   var column = header.column;
+  var columnDef = column.columnDef;
   var filterFn = (_getState2 = getState()) == null ? void 0 : (_getState2$currentFil = _getState2.currentFilterFns) == null ? void 0 : _getState2$currentFil[header.id];
-  var filterTooltip = !!column.getFilterValue() ? localization.filteringByColumn.replace('{column}', String(column.columnDef.header)).replace('{filterType}', filterFn instanceof Function ? '' : // @ts-ignore
+  var filterTooltip = !!column.getFilterValue() ? localization.filteringByColumn.replace('{column}', String(columnDef.header)).replace('{filterType}', filterFn instanceof Function ? '' : // @ts-ignore
   localization["filter" + (filterFn.charAt(0).toUpperCase() + filterFn.slice(1))]).replace('{filterValue}', "\"" + (Array.isArray(column.getFilterValue()) ? column.getFilterValue().join("\" " + localization.and + " \"") : column.getFilterValue()) + "\"").replace('" "', '') : localization.showHideFilters;
   return React__default.createElement(material.Tooltip, {
     arrow: true,
@@ -5857,6 +5868,7 @@ var MRT_TableHeadCellResizeHandle = function MRT_TableHeadCellResizeHandle(_ref)
       showFilters = _getState.showFilters;
 
   var column = header.column;
+  var columnDefType = column.columnDefType;
   return React__default.createElement(material.Divider, {
     flexItem: true,
     orientation: "vertical",
@@ -5868,7 +5880,7 @@ var MRT_TableHeadCellResizeHandle = function MRT_TableHeadCellResizeHandle(_ref)
         borderRadius: '2px',
         borderRightWidth: '2px',
         cursor: 'col-resize',
-        height: showFilters && column.columnDefType === 'data' ? '4rem' : '2rem',
+        height: showFilters && columnDefType === 'data' ? '4rem' : '2rem',
         opacity: 0.8,
         position: 'absolute',
         right: '1px',
@@ -5895,7 +5907,8 @@ var MRT_TableHeadCellSortLabel = function MRT_TableHeadCellSortLabel(_ref) {
       tableInstance = _ref.tableInstance;
   var localization = tableInstance.options.localization;
   var column = header.column;
-  var sortTooltip = !!column.getIsSorted() ? column.getIsSorted() === 'desc' ? localization.sortedByColumnDesc.replace('{column}', column.columnDef.header) : localization.sortedByColumnAsc.replace('{column}', column.columnDef.header) : localization.unsorted;
+  var columnDef = column.columnDef;
+  var sortTooltip = !!column.getIsSorted() ? column.getIsSorted() === 'desc' ? localization.sortedByColumnDesc.replace('{column}', columnDef.header) : localization.sortedByColumnAsc.replace('{column}', columnDef.header) : localization.unsorted;
   return React__default.createElement(material.Tooltip, {
     arrow: true,
     placement: "top",
@@ -5915,6 +5928,7 @@ var MRT_ToggleColumnActionMenuButton = function MRT_ToggleColumnActionMenuButton
       localization = _tableInstance$option.localization,
       muiTableHeadCellColumnActionsButtonProps = _tableInstance$option.muiTableHeadCellColumnActionsButtonProps;
   var column = header.column;
+  var columnDef = column.columnDef;
 
   var _useState = React.useState(null),
       anchorEl = _useState[0],
@@ -5930,10 +5944,10 @@ var MRT_ToggleColumnActionMenuButton = function MRT_ToggleColumnActionMenuButton
     column: column,
     tableInstance: tableInstance
   }) : muiTableHeadCellColumnActionsButtonProps;
-  var mcTableHeadCellColumnActionsButtonProps = column.muiTableHeadCellColumnActionsButtonProps instanceof Function ? column.muiTableHeadCellColumnActionsButtonProps({
+  var mcTableHeadCellColumnActionsButtonProps = columnDef.muiTableHeadCellColumnActionsButtonProps instanceof Function ? columnDef.muiTableHeadCellColumnActionsButtonProps({
     column: column,
     tableInstance: tableInstance
-  }) : column.muiTableHeadCellColumnActionsButtonProps;
+  }) : columnDef.muiTableHeadCellColumnActionsButtonProps;
 
   var iconButtonProps = _extends({}, mTableHeadCellColumnActionsButtonProps, mcTableHeadCellColumnActionsButtonProps);
 
@@ -5968,7 +5982,7 @@ var MRT_ToggleColumnActionMenuButton = function MRT_ToggleColumnActionMenuButton
 };
 
 var MRT_TableHeadCell = function MRT_TableHeadCell(_ref) {
-  var _column$columnDef$Hea, _column$columnDef, _column$minSize, _column$columnDef$hea, _column$columnDef$hea2;
+  var _columnDef$Header, _columnDef$minSize, _columnDef$header$len, _columnDef$header;
 
   var dragRef = _ref.dragRef,
       dropRef = _ref.dropRef,
@@ -5989,21 +6003,23 @@ var MRT_TableHeadCell = function MRT_TableHeadCell(_ref) {
       isDensePadding = _getState.isDensePadding;
 
   var column = header.column;
+  var columnDef = column.columnDef,
+      columnDefType = column.columnDefType;
   var mTableHeadCellProps = muiTableHeadCellProps instanceof Function ? muiTableHeadCellProps({
     column: column,
     tableInstance: tableInstance
   }) : muiTableHeadCellProps;
-  var mcTableHeadCellProps = column.muiTableHeadCellProps instanceof Function ? column.muiTableHeadCellProps({
+  var mcTableHeadCellProps = columnDef.muiTableHeadCellProps instanceof Function ? columnDef.muiTableHeadCellProps({
     column: column,
     tableInstance: tableInstance
-  }) : column.muiTableHeadCellProps;
+  }) : columnDef.muiTableHeadCellProps;
 
   var tableCellProps = _extends({}, mTableHeadCellProps, mcTableHeadCellProps);
 
-  var headerElement = (_column$columnDef$Hea = (_column$columnDef = column.columnDef) == null ? void 0 : _column$columnDef.Header == null ? void 0 : _column$columnDef.Header({
+  var headerElement = (columnDef == null ? void 0 : columnDef.Header) instanceof Function ? columnDef == null ? void 0 : columnDef.Header == null ? void 0 : columnDef.Header({
     header: header,
     tableInstance: tableInstance
-  })) != null ? _column$columnDef$Hea : header.renderHeader();
+  }) : (_columnDef$Header = columnDef == null ? void 0 : columnDef.Header) != null ? _columnDef$Header : header.renderHeader();
 
   var getIsLastLeftPinnedColumn = function getIsLastLeftPinnedColumn() {
     return column.getIsPinned() === 'left' && tableInstance.getLeftLeafHeaders().length - 1 === column.getPinnedIndex();
@@ -6018,40 +6034,40 @@ var MRT_TableHeadCell = function MRT_TableHeadCell(_ref) {
   };
 
   return React__default.createElement(material.TableCell, Object.assign({
-    align: column.columnDefType === 'group' ? 'center' : 'left',
+    align: columnDefType === 'group' ? 'center' : 'left',
     colSpan: header.colSpan
   }, tableCellProps, {
-    ref: column.columnDefType === 'data' ? dropRef : undefined,
+    ref: columnDefType === 'data' ? dropRef : undefined,
     sx: function sx(theme) {
       return _extends({
-        backgroundColor: column.getIsPinned() && column.columnDefType !== 'group' ? material.alpha(material.lighten(theme.palette.background["default"], 0.04), 0.95) : 'inherit',
+        backgroundColor: column.getIsPinned() && columnDefType !== 'group' ? material.alpha(material.lighten(theme.palette.background["default"], 0.04), 0.95) : 'inherit',
         backgroundImage: 'inherit',
         boxShadow: getIsLastLeftPinnedColumn() ? "4px 0 4px -2px " + material.alpha(theme.palette.common.black, 0.1) : getIsFirstRightPinnedColumn() ? "-4px 0 4px -2px " + material.alpha(theme.palette.common.black, 0.1) : undefined,
         fontWeight: 'bold',
         height: '100%',
         left: column.getIsPinned() === 'left' ? column.getStart('left') + "px" : undefined,
         overflow: 'visible',
-        p: isDensePadding ? column.columnDefType === 'display' ? '0 0.5rem' : '0.5rem' : column.columnDefType === 'display' ? '0.5rem 0.75rem' : '1rem',
-        pb: column.columnDefType === 'display' ? 0 : undefined,
-        position: column.getIsPinned() && column.columnDefType !== 'group' ? 'sticky' : undefined,
-        pt: column.columnDefType === 'display' ? 0 : isDensePadding ? '0.75rem' : '1.25rem',
+        p: isDensePadding ? columnDefType === 'display' ? '0 0.5rem' : '0.5rem' : columnDefType === 'display' ? '0.5rem 0.75rem' : '1rem',
+        pb: columnDefType === 'display' ? 0 : undefined,
+        position: column.getIsPinned() && columnDefType !== 'group' ? 'sticky' : undefined,
+        pt: columnDefType !== 'data' ? 0 : isDensePadding ? '0.25' : '.5rem',
         right: column.getIsPinned() === 'right' ? getTotalRight() + "px" : undefined,
         transition: "all " + (enableColumnResizing ? 0 : '0.2s') + " ease-in-out",
         verticalAlign: 'text-top',
-        zIndex: column.getIsResizing() ? 3 : column.getIsPinned() && column.columnDefType !== 'group' ? 2 : 1
+        zIndex: column.getIsResizing() ? 3 : column.getIsPinned() && columnDefType !== 'group' ? 2 : 1
       }, tableCellProps == null ? void 0 : tableCellProps.sx);
     },
     style: {
       maxWidth: "min(" + column.getSize() + "px, fit-content)",
-      minWidth: "max(" + column.getSize() + "px, " + ((_column$minSize = column.minSize) != null ? _column$minSize : 30) + "px)",
+      minWidth: "max(" + column.getSize() + "px, " + ((_columnDef$minSize = columnDef.minSize) != null ? _columnDef$minSize : 30) + "px)",
       width: header.getSize()
     }
-  }), header.isPlaceholder ? null : column.columnDefType === 'display' ? headerElement : React__default.createElement(material.Box, {
+  }), header.isPlaceholder ? null : columnDefType === 'display' ? headerElement : React__default.createElement(material.Box, {
     ref: previewRef,
     sx: {
       alignItems: 'flex-start',
       display: 'flex',
-      justifyContent: column.columnDefType === 'group' ? 'center' : 'space-between',
+      justifyContent: columnDefType === 'group' ? 'center' : 'space-between',
       opacity: isDragging ? 0.5 : 1,
       width: '100%'
     }
@@ -6061,32 +6077,32 @@ var MRT_TableHeadCell = function MRT_TableHeadCell(_ref) {
     },
     sx: {
       alignItems: 'center',
-      cursor: column.getCanSort() && column.columnDefType !== 'group' ? 'pointer' : undefined,
+      cursor: column.getCanSort() && columnDefType !== 'group' ? 'pointer' : undefined,
       display: 'flex',
       flexWrap: 'nowrap',
-      whiteSpace: ((_column$columnDef$hea = (_column$columnDef$hea2 = column.columnDef.header) == null ? void 0 : _column$columnDef$hea2.length) != null ? _column$columnDef$hea : 0) < 24 ? 'nowrap' : 'normal'
+      whiteSpace: ((_columnDef$header$len = (_columnDef$header = columnDef.header) == null ? void 0 : _columnDef$header.length) != null ? _columnDef$header$len : 0) < 24 ? 'nowrap' : 'normal'
     }
-  }, headerElement, column.columnDefType === 'data' && column.getCanSort() && React__default.createElement(MRT_TableHeadCellSortLabel, {
+  }, headerElement, columnDefType === 'data' && column.getCanSort() && React__default.createElement(MRT_TableHeadCellSortLabel, {
     header: header,
     tableInstance: tableInstance
-  }), column.columnDefType === 'data' && enableColumnFilters && column.getCanFilter() && React__default.createElement(MRT_TableHeadCellFilterLabel, {
+  }), columnDefType === 'data' && enableColumnFilters && column.getCanFilter() && React__default.createElement(MRT_TableHeadCellFilterLabel, {
     header: header,
     tableInstance: tableInstance
   })), React__default.createElement(material.Box, {
     sx: {
       whiteSpace: 'nowrap'
     }
-  }, column.columnDefType === 'data' && (enableColumnOrdering && column.enableColumnOrdering !== false || enableGrouping && column.enableGrouping !== false) && React__default.createElement(MRT_TableHeadCellGrabHandle, {
+  }, columnDefType === 'data' && (enableColumnOrdering && columnDef.enableColumnOrdering !== false || enableGrouping && columnDef.enableGrouping !== false) && React__default.createElement(MRT_TableHeadCellGrabHandle, {
     header: header,
     ref: dragRef,
     tableInstance: tableInstance
-  }), (enableColumnActions || column.enableColumnActions) && column.enableColumnActions !== false && column.columnDefType !== 'group' && React__default.createElement(MRT_ToggleColumnActionMenuButton, {
+  }), (enableColumnActions || columnDef.enableColumnActions) && columnDef.enableColumnActions !== false && columnDefType !== 'group' && React__default.createElement(MRT_ToggleColumnActionMenuButton, {
     header: header,
     tableInstance: tableInstance
   })), column.getCanResize() && React__default.createElement(MRT_TableHeadCellResizeHandle, {
     header: header,
     tableInstance: tableInstance
-  })), column.columnDefType === 'data' && column.getCanFilter() && React__default.createElement(MRT_TableHeadCellFilterContainer, {
+  })), columnDefType === 'data' && column.getCanFilter() && React__default.createElement(MRT_TableHeadCellFilterContainer, {
     header: header,
     tableInstance: tableInstance
   }));
@@ -6104,19 +6120,23 @@ var MRT_DraggableTableHeadCell = function MRT_DraggableTableHeadCell(_ref) {
   var _getState = getState(),
       columnOrder = _getState.columnOrder;
 
-  var reorder = function reorder(item, newIndex) {
-    var currentIndex = item.index;
-    columnOrder.splice(newIndex, 0, columnOrder.splice(currentIndex, 1)[0]);
+  var reorder = function reorder(movingHeader, receivingHeader) {
+    if (movingHeader.column.getCanPin()) {
+      movingHeader.column.pin(receivingHeader.column.getIsPinned());
+    }
+
+    var currentIndex = movingHeader.index;
+    columnOrder.splice(receivingHeader.index, 0, columnOrder.splice(currentIndex, 1)[0]);
     setColumnOrder([].concat(columnOrder));
   };
 
   var _useDrop = useDrop({
     accept: 'header',
-    drop: function drop(item) {
-      return reorder(item, header.index);
+    drop: function drop(movingHeader) {
+      return reorder(movingHeader, header);
     }
   }),
-      drop = _useDrop[1];
+      dropRef = _useDrop[1];
 
   var _useDrag = useDrag({
     collect: function collect(monitor) {
@@ -6130,15 +6150,15 @@ var MRT_DraggableTableHeadCell = function MRT_DraggableTableHeadCell(_ref) {
     type: 'header'
   }),
       isDragging = _useDrag[0].isDragging,
-      drag = _useDrag[1],
-      preview = _useDrag[2];
+      dragRef = _useDrag[1],
+      previewRef = _useDrag[2];
 
   return React__default.createElement(MRT_TableHeadCell, {
-    dragRef: drag,
-    dropRef: drop,
+    dragRef: dragRef,
+    dropRef: dropRef,
     header: header,
     isDragging: isDragging,
-    previewRef: preview,
+    previewRef: previewRef,
     tableInstance: tableInstance
   });
 };
@@ -6209,10 +6229,11 @@ var MRT_EditCellTextField = function MRT_EditCellTextField(_ref) {
 
   var column = cell.column,
       row = cell.row;
+  var columnDef = column.columnDef;
 
   var handleChange = function handleChange(event) {
     setValue(event.target.value);
-    column.onCellEditChange == null ? void 0 : column.onCellEditChange({
+    columnDef.onCellEditChange == null ? void 0 : columnDef.onCellEditChange({
       event: event,
       cell: cell,
       tableInstance: tableInstance
@@ -6226,12 +6247,13 @@ var MRT_EditCellTextField = function MRT_EditCellTextField(_ref) {
 
   var handleBlur = function handleBlur(event) {
     if (getState().currentEditingRow) {
+      if (!row._valuesCache) row._valuesCache = {};
       row._valuesCache[column.id] = value;
       setCurrentEditingRow(_extends({}, getState().currentEditingRow));
     }
 
     setCurrentEditingCell(null);
-    column.onCellEditBlur == null ? void 0 : column.onCellEditBlur({
+    columnDef.onCellEditBlur == null ? void 0 : columnDef.onCellEditBlur({
       event: event,
       cell: cell,
       tableInstance: tableInstance
@@ -6247,15 +6269,15 @@ var MRT_EditCellTextField = function MRT_EditCellTextField(_ref) {
     cell: cell,
     tableInstance: tableInstance
   }) : muiTableBodyCellEditTextFieldProps;
-  var mcTableBodyCellEditTextFieldProps = column.muiTableBodyCellEditTextFieldProps instanceof Function ? column.muiTableBodyCellEditTextFieldProps({
+  var mcTableBodyCellEditTextFieldProps = columnDef.muiTableBodyCellEditTextFieldProps instanceof Function ? columnDef.muiTableBodyCellEditTextFieldProps({
     cell: cell,
     tableInstance: tableInstance
-  }) : column.muiTableBodyCellEditTextFieldProps;
+  }) : columnDef.muiTableBodyCellEditTextFieldProps;
 
   var textFieldProps = _extends({}, mTableBodyCellEditTextFieldProps, mcTableBodyCellEditTextFieldProps);
 
-  if (enableEditing && column.enableEditing !== false && column.Edit) {
-    return React__default.createElement(React__default.Fragment, null, column.Edit == null ? void 0 : column.Edit({
+  if (enableEditing && columnDef.enableEditing !== false && columnDef.Edit) {
+    return React__default.createElement(React__default.Fragment, null, columnDef.Edit == null ? void 0 : columnDef.Edit({
       cell: cell,
       tableInstance: tableInstance
     }));
@@ -6269,7 +6291,7 @@ var MRT_EditCellTextField = function MRT_EditCellTextField(_ref) {
     onClick: function onClick(e) {
       return e.stopPropagation();
     },
-    placeholder: column.columnDef.header,
+    placeholder: columnDef.header,
     value: value,
     variant: "standard"
   }, textFieldProps));
@@ -6282,6 +6304,8 @@ var MRT_CopyButton = function MRT_CopyButton(_ref) {
   var _tableInstance$option = tableInstance.options,
       localization = _tableInstance$option.localization,
       muiTableBodyCellCopyButtonProps = _tableInstance$option.muiTableBodyCellCopyButtonProps;
+  var column = cell.column;
+  var columnDef = column.columnDef;
 
   var _useState = React.useState(false),
       copied = _useState[0],
@@ -6299,10 +6323,10 @@ var MRT_CopyButton = function MRT_CopyButton(_ref) {
     cell: cell,
     tableInstance: tableInstance
   }) : muiTableBodyCellCopyButtonProps;
-  var mcTableBodyCellCopyButtonProps = cell.column.muiTableBodyCellCopyButtonProps instanceof Function ? cell.column.muiTableBodyCellCopyButtonProps({
+  var mcTableBodyCellCopyButtonProps = columnDef.muiTableBodyCellCopyButtonProps instanceof Function ? columnDef.muiTableBodyCellCopyButtonProps({
     cell: cell,
     tableInstance: tableInstance
-  }) : cell.column.muiTableBodyCellCopyButtonProps;
+  }) : columnDef.muiTableBodyCellCopyButtonProps;
 
   var buttonProps = _extends({}, mTableBodyCellCopyButtonProps, mcTableBodyCellCopyButtonProps);
 
@@ -6338,7 +6362,7 @@ var MRT_CopyButton = function MRT_CopyButton(_ref) {
 };
 
 var MRT_TableBodyCell = function MRT_TableBodyCell(_ref) {
-  var _column$minSize, _cell$column$columnDe, _cell$column$columnDe2, _row$subRows, _cell$column$columnDe3, _cell$column$columnDe4, _row$subRows$length, _row$subRows2;
+  var _columnDef$minSize, _columnDef$Cell, _row$subRows, _columnDef$Cell2, _row$subRows$length, _row$subRows2;
 
   var cell = _ref.cell,
       enableHover = _ref.enableHover,
@@ -6363,25 +6387,27 @@ var MRT_TableBodyCell = function MRT_TableBodyCell(_ref) {
 
   var column = cell.column,
       row = cell.row;
+  var columnDef = column.columnDef,
+      columnDefType = column.columnDefType;
   var mTableCellBodyProps = muiTableBodyCellProps instanceof Function ? muiTableBodyCellProps({
     cell: cell,
     tableInstance: tableInstance
   }) : muiTableBodyCellProps;
-  var mcTableCellBodyProps = column.muiTableBodyCellProps instanceof Function ? column.muiTableBodyCellProps({
+  var mcTableCellBodyProps = columnDef.muiTableBodyCellProps instanceof Function ? columnDef.muiTableBodyCellProps({
     cell: cell,
     tableInstance: tableInstance
-  }) : column.muiTableBodyCellProps;
+  }) : columnDef.muiTableBodyCellProps;
 
   var tableCellProps = _extends({}, mTableCellBodyProps, mcTableCellBodyProps);
 
   var skeletonWidth = React.useMemo(function () {
-    return column.columnDefType === 'display' ? column.getSize() / 2 : Math.random() * (column.getSize() - column.getSize() / 3) + column.getSize() / 3;
-  }, [column.columnDefType, column.getSize()]);
-  var isEditable = (enableEditing || column.enableEditing) && column.enableEditing !== false;
+    return columnDefType === 'display' ? column.getSize() / 2 : Math.random() * (column.getSize() - column.getSize() / 3) + column.getSize() / 3;
+  }, [columnDefType, column.getSize()]);
+  var isEditable = (enableEditing || columnDef.enableEditing) && columnDef.enableEditing !== false;
   var isEditing = isEditable && (editingMode === 'table' || (currentEditingRow == null ? void 0 : currentEditingRow.id) === row.id || (currentEditingCell == null ? void 0 : currentEditingCell.id) === cell.id);
 
   var handleDoubleClick = function handleDoubleClick(_event) {
-    if ((enableEditing || column.enableEditing) && column.enableEditing !== false && editingMode === 'cell') {
+    if ((enableEditing || columnDef.enableEditing) && columnDef.enableEditing !== false && editingMode === 'cell') {
       setCurrentEditingCell(cell);
       setTimeout(function () {
         var textField = document.getElementById("mrt-" + idPrefix + "-edit-cell-text-field-" + cell.id);
@@ -6422,7 +6448,7 @@ var MRT_TableBodyCell = function MRT_TableBodyCell(_ref) {
         boxShadow: getIsLastLeftPinnedColumn() ? "4px 0 4px -2px " + material.alpha(theme.palette.common.black, 0.1) : getIsFirstRightPinnedColumn() ? "-4px 0 4px -2px " + material.alpha(theme.palette.common.black, 0.1) : undefined,
         cursor: isEditable && editingMode === 'cell' ? 'pointer' : 'text',
         left: column.getIsPinned() === 'left' ? column.getStart('left') + "px" : undefined,
-        p: isDensePadding ? column.columnDefType === 'display' ? '0 0.5rem' : '0.5rem' : column.columnDefType === 'display' ? '0.5rem 0.75rem' : '1rem',
+        p: isDensePadding ? columnDefType === 'display' ? '0 0.5rem' : '0.5rem' : columnDefType === 'display' ? '0.5rem 0.75rem' : '1rem',
         pl: column.id === 'mrt-expand' ? row.depth + (isDensePadding ? 0.5 : 0.75) + "rem" : undefined,
         position: column.getIsPinned() ? 'sticky' : 'relative',
         right: column.getIsPinned() === 'right' ? getTotalRight() + "px" : undefined,
@@ -6436,29 +6462,29 @@ var MRT_TableBodyCell = function MRT_TableBodyCell(_ref) {
     },
     style: {
       maxWidth: "min(" + column.getSize() + "px, fit-content)",
-      minWidth: "max(" + column.getSize() + "px, " + ((_column$minSize = column.minSize) != null ? _column$minSize : 30) + "px)",
+      minWidth: "max(" + column.getSize() + "px, " + ((_columnDef$minSize = columnDef.minSize) != null ? _columnDef$minSize : 30) + "px)",
       width: column.getSize()
     }
   }), React__default.createElement(React__default.Fragment, null, isLoading || showSkeletons ? React__default.createElement(material.Skeleton, Object.assign({
     animation: "wave",
     height: 20,
     width: skeletonWidth
-  }, muiTableBodyCellSkeletonProps)) : column.columnDefType === 'display' ? column.columnDef.Cell == null ? void 0 : column.columnDef.Cell({
+  }, muiTableBodyCellSkeletonProps)) : columnDefType === 'display' ? columnDef.Cell == null ? void 0 : columnDef.Cell({
     cell: cell,
     tableInstance: tableInstance
   }) : cell.getIsPlaceholder() || row.getIsGrouped() && column.id !== row.groupingColumnId ? null : cell.getIsAggregated() ? cell.renderAggregatedCell() : isEditing ? React__default.createElement(MRT_EditCellTextField, {
     cell: cell,
     tableInstance: tableInstance
-  }) : (enableClickToCopy || column.enableClickToCopy) && column.enableClickToCopy !== false ? React__default.createElement(React__default.Fragment, null, React__default.createElement(MRT_CopyButton, {
+  }) : (enableClickToCopy || columnDef.enableClickToCopy) && columnDef.enableClickToCopy !== false ? React__default.createElement(React__default.Fragment, null, React__default.createElement(MRT_CopyButton, {
     cell: cell,
     tableInstance: tableInstance
-  }, React__default.createElement(React__default.Fragment, null, (_cell$column$columnDe = (_cell$column$columnDe2 = cell.column.columnDef) == null ? void 0 : _cell$column$columnDe2.Cell == null ? void 0 : _cell$column$columnDe2.Cell({
+  }, React__default.createElement(React__default.Fragment, null, (_columnDef$Cell = columnDef == null ? void 0 : columnDef.Cell == null ? void 0 : columnDef.Cell({
     cell: cell,
     tableInstance: tableInstance
-  })) != null ? _cell$column$columnDe : cell.renderCell())), row.getIsGrouped() && React__default.createElement(React__default.Fragment, null, " (", (_row$subRows = row.subRows) == null ? void 0 : _row$subRows.length, ")")) : React__default.createElement(React__default.Fragment, null, (_cell$column$columnDe3 = (_cell$column$columnDe4 = cell.column.columnDef) == null ? void 0 : _cell$column$columnDe4.Cell == null ? void 0 : _cell$column$columnDe4.Cell({
+  })) != null ? _columnDef$Cell : cell.renderCell())), row.getIsGrouped() && React__default.createElement(React__default.Fragment, null, " (", (_row$subRows = row.subRows) == null ? void 0 : _row$subRows.length, ")")) : React__default.createElement(React__default.Fragment, null, (_columnDef$Cell2 = columnDef == null ? void 0 : columnDef.Cell == null ? void 0 : columnDef.Cell({
     cell: cell,
     tableInstance: tableInstance
-  })) != null ? _cell$column$columnDe3 : cell.renderCell(), row.getIsGrouped() && React__default.createElement(React__default.Fragment, null, " (", (_row$subRows$length = (_row$subRows2 = row.subRows) == null ? void 0 : _row$subRows2.length) != null ? _row$subRows$length : '', ")"))));
+  })) != null ? _columnDef$Cell2 : cell.renderCell(), row.getIsGrouped() && React__default.createElement(React__default.Fragment, null, " (", (_row$subRows$length = (_row$subRows2 = row.subRows) == null ? void 0 : _row$subRows2.length) != null ? _row$subRows$length : '', ")"))));
 };
 
 var MRT_TableDetailPanel = function MRT_TableDetailPanel(_ref) {
@@ -6567,7 +6593,7 @@ var MRT_TableBody = function MRT_TableBody(_ref) {
 };
 
 var MRT_TableFooterCell = function MRT_TableFooterCell(_ref) {
-  var _ref2, _ref3, _column$columnDef$Foo;
+  var _ref2, _ref3, _columnDef$Footer;
 
   var footer = _ref.footer,
       tableInstance = _ref.tableInstance;
@@ -6580,19 +6606,21 @@ var MRT_TableFooterCell = function MRT_TableFooterCell(_ref) {
       isDensePadding = _getState.isDensePadding;
 
   var column = footer.column;
+  var columnDef = column.columnDef,
+      columnDefType = column.columnDefType;
   var mTableFooterCellProps = muiTableFooterCellProps instanceof Function ? muiTableFooterCellProps({
     column: column,
     tableInstance: tableInstance
   }) : muiTableFooterCellProps;
-  var mcTableFooterCellProps = column.muiTableFooterCellProps instanceof Function ? column.muiTableFooterCellProps({
+  var mcTableFooterCellProps = columnDef.muiTableFooterCellProps instanceof Function ? columnDef.muiTableFooterCellProps({
     column: column,
     tableInstance: tableInstance
-  }) : column.muiTableFooterCellProps;
+  }) : columnDef.muiTableFooterCellProps;
 
   var tableCellProps = _extends({}, mTableFooterCellProps, mcTableFooterCellProps);
 
   return React__default.createElement(material.TableCell, Object.assign({
-    align: column.columnDefType === 'group' ? 'center' : 'left',
+    align: columnDefType === 'group' ? 'center' : 'left',
     colSpan: footer.colSpan,
     variant: "head"
   }, tableCellProps, {
@@ -6609,10 +6637,10 @@ var MRT_TableFooterCell = function MRT_TableFooterCell(_ref) {
         verticalAlign: 'text-top'
       }, tableCellProps == null ? void 0 : tableCellProps.sx);
     }
-  }), React__default.createElement(React__default.Fragment, null, footer.isPlaceholder ? null : (_ref2 = (_ref3 = (_column$columnDef$Foo = column.columnDef.Footer == null ? void 0 : column.columnDef.Footer({
+  }), React__default.createElement(React__default.Fragment, null, footer.isPlaceholder ? null : columnDef.Footer instanceof Function ? columnDef.Footer == null ? void 0 : columnDef.Footer({
     footer: footer,
     tableInstance: tableInstance
-  })) != null ? _column$columnDef$Foo : column.columnDef.footer) != null ? _ref3 : footer.renderFooter()) != null ? _ref2 : null));
+  }) : (_ref2 = (_ref3 = (_columnDef$Footer = columnDef.Footer) != null ? _columnDef$Footer : columnDef.footer) != null ? _ref3 : footer.renderFooter()) != null ? _ref2 : null));
 };
 
 var MRT_TableFooterRow = function MRT_TableFooterRow(_ref) {
@@ -6622,8 +6650,8 @@ var MRT_TableFooterRow = function MRT_TableFooterRow(_ref) {
       tableInstance = _ref.tableInstance;
   var muiTableFooterRowProps = tableInstance.options.muiTableFooterRowProps; // if no content in row, skip row
 
-  if (!((_footerGroup$headers = footerGroup.headers) != null && _footerGroup$headers.some(function (h) {
-    return typeof h.column.columnDef.footer === 'string' && !!h.column.columnDef.footer || h.column.columnDef.Footer;
+  if (!((_footerGroup$headers = footerGroup.headers) != null && _footerGroup$headers.some(function (header) {
+    return typeof header.column.columnDef.footer === 'string' && !!header.column.columnDef.footer || header.column.columnDef.Footer;
   }))) return null;
   var tableRowProps = muiTableFooterRowProps instanceof Function ? muiTableFooterRowProps({
     footerGroup: footerGroup,
@@ -6814,7 +6842,7 @@ var createDisplayColumn = function createDisplayColumn(table, column) {
 };
 
 var MRT_TableRoot = function MRT_TableRoot(props) {
-  var _initialState$current, _initialState$current2, _initialState$isDense, _initialState$isFullS, _initialState$showFil, _initialState$showGlo, _initialState$paginat, _initialState$paginat2, _initialState$paginat3, _initialState$paginat4, _initialState$paginat5, _props$globalFilterFn, _props$state3, _props$state4;
+  var _initialState$current, _initialState$current2, _initialState$isDense, _initialState$isFullS, _initialState$showFil, _initialState$showGlo, _props$globalFilterFn, _props$state3, _props$state4;
 
   var _useState = React.useState(props.idPrefix),
       idPrefix = _useState[0],
@@ -6825,9 +6853,18 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
 
     return setIdPrefix((_props$idPrefix = props.idPrefix) != null ? _props$idPrefix : Math.random().toString(36).substring(2, 9));
   }, [props.idPrefix]);
+  var showActionColumn = props.enableRowActions || props.enableEditing && props.editingMode === 'row';
+  var showExpandColumn = props.enableExpanding || props.enableGrouping;
   var initialState = React.useMemo(function () {
+    var _props$initialState, _initState$columnOrde;
+
+    var initState = (_props$initialState = props.initialState) != null ? _props$initialState : {};
+    initState.columnOrder = ((_initState$columnOrde = initState == null ? void 0 : initState.columnOrder) != null ? _initState$columnOrde : props.enableColumnOrdering) ? [showActionColumn && 'mrt-row-actions', showExpandColumn && 'mrt-expand', props.enableRowSelection && 'mrt-select', props.enableRowNumbers && 'mrt-row-numbers'].concat(getAllLeafColumnDefs(props.columns).map(function (c) {
+      return c.id;
+    })).filter(Boolean) : [];
+
     if (!props.enablePersistentState || !props.idPrefix) {
-      return props.initialState;
+      return initState;
     }
 
     if (typeof window === 'undefined') {
@@ -6835,7 +6872,7 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
         console.error('The MRT Persistent Table State feature is not supported if using SSR, but you can wrap your <MaterialReactTable /> in a MUI <NoSsr> tags to let it work');
       }
 
-      return props.initialState;
+      return initState;
     }
 
     var storedState = props.persistentStateMode === 'localStorage' ? localStorage.getItem("mrt-" + idPrefix + "-table-state") : props.persistentStateMode === 'sessionStorage' ? sessionStorage.getItem("mrt-" + idPrefix + "-table-state") : '{}';
@@ -6844,11 +6881,11 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
       var parsedState = JSON.parse(storedState);
 
       if (parsedState) {
-        return _extends({}, props.initialState, parsedState);
+        return _extends({}, initState, parsedState);
       }
     }
 
-    return props.initialState;
+    return initState;
   }, []);
 
   var _useState2 = React.useState((_initialState$current = initialState == null ? void 0 : initialState.currentEditingCell) != null ? _initialState$current : null),
@@ -6875,27 +6912,19 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
       showGlobalFilter = _useState7[0],
       setShowGlobalFilter = _useState7[1];
 
-  var _useState8 = React.useState({
-    pageIndex: (_initialState$paginat = initialState == null ? void 0 : (_initialState$paginat2 = initialState.pagination) == null ? void 0 : _initialState$paginat2.pageIndex) != null ? _initialState$paginat : 0,
-    pageSize: (_initialState$paginat3 = initialState == null ? void 0 : (_initialState$paginat4 = initialState.pagination) == null ? void 0 : _initialState$paginat4.pageSize) != null ? _initialState$paginat3 : 10,
-    pageCount: initialState == null ? void 0 : (_initialState$paginat5 = initialState.pagination) == null ? void 0 : _initialState$paginat5.pageCount
-  }),
-      pagination = _useState8[0],
-      setPagination = _useState8[1];
-
-  var _useState9 = React.useState(function () {
+  var _useState8 = React.useState(function () {
     return Object.assign.apply(Object, [{}].concat(getAllLeafColumnDefs(props.columns).map(function (c) {
       var _ref, _c$filterFn, _initialState$current3, _c$filterSelectOption, _ref2;
 
       return _ref2 = {}, _ref2[c.id] = (_ref = (_c$filterFn = c.filterFn) != null ? _c$filterFn : initialState == null ? void 0 : (_initialState$current3 = initialState.currentFilterFns) == null ? void 0 : _initialState$current3[c.id]) != null ? _ref : !!((_c$filterSelectOption = c.filterSelectOptions) != null && _c$filterSelectOption.length) ? MRT_FILTER_OPTION.EQUALS : MRT_FILTER_OPTION.FUZZY, _ref2;
     })));
   }),
-      currentFilterFns = _useState9[0],
-      setCurrentFilterFns = _useState9[1];
+      currentFilterFns = _useState8[0],
+      setCurrentFilterFns = _useState8[1];
 
-  var _useState10 = React.useState((_props$globalFilterFn = props.globalFilterFn) != null ? _props$globalFilterFn : MRT_FILTER_OPTION.FUZZY),
-      currentGlobalFilterFn = _useState10[0],
-      setCurrentGlobalFilterFn = _useState10[1];
+  var _useState9 = React.useState((_props$globalFilterFn = props.globalFilterFn) != null ? _props$globalFilterFn : MRT_FILTER_OPTION.FUZZY),
+      currentGlobalFilterFn = _useState9[0],
+      setCurrentGlobalFilterFn = _useState9[1];
 
   var table = React.useMemo(function () {
     return reactTable.createTable();
@@ -6903,7 +6932,7 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
   var displayColumns = React.useMemo(function () {
     var _props$localization, _props$localization2, _props$localization3, _props$localization5;
 
-    return [(props.enableRowActions || props.enableEditing && props.editingMode === 'row') && createDisplayColumn(table, {
+    return [showActionColumn && createDisplayColumn(table, {
       Cell: function Cell(_ref3) {
         var cell = _ref3.cell;
         return React__default.createElement(MRT_ToggleRowActionMenuButton, {
@@ -6914,7 +6943,7 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
       header: (_props$localization = props.localization) == null ? void 0 : _props$localization.actions,
       id: 'mrt-row-actions',
       size: 60
-    }), (props.enableExpanding || props.enableGrouping) && createDisplayColumn(table, {
+    }), showExpandColumn && createDisplayColumn(table, {
       Cell: function Cell(_ref4) {
         var cell = _ref4.cell;
         return React__default.createElement(MRT_ExpandButton, {
@@ -6977,18 +7006,7 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
         return _ref7 = {}, _ref7[c.id] = null, _ref7;
       })));
     }) : props.data;
-  }, [props.data, (_props$state3 = props.state) == null ? void 0 : _props$state3.isLoading, (_props$state4 = props.state) == null ? void 0 : _props$state4.showSkeletons]);
-
-  var _useState11 = React.useState(function () {
-    var _initialState$columnO;
-
-    return ((_initialState$columnO = initialState == null ? void 0 : initialState.columnOrder) != null ? _initialState$columnO : props.enableColumnOrdering) ? getAllLeafColumnDefs(columns).map(function (c) {
-      return c.id;
-    }) : [];
-  }),
-      columnOrder = _useState11[0],
-      setColumnOrder = _useState11[1]; //@ts-ignore
-
+  }, [props.data, (_props$state3 = props.state) == null ? void 0 : _props$state3.isLoading, (_props$state4 = props.state) == null ? void 0 : _props$state4.showSkeletons]); //@ts-ignore
 
   var tableInstance = _extends({}, reactTable.useTableInstance(table, _extends({
     filterFns: defaultFilterFNs,
@@ -7003,13 +7021,7 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
       return row == null ? void 0 : row.subRows;
     },
     //@ts-ignore
-    globalFilterFn: currentGlobalFilterFn,
-    onColumnOrderChange: setColumnOrder,
-    onPaginationChange: function onPaginationChange(updater) {
-      return setPagination(function (old) {
-        return reactTable.functionalUpdate(updater, old);
-      });
-    }
+    globalFilterFn: currentGlobalFilterFn
   }, props, {
     //@ts-ignore
     columns: columns,
@@ -7017,15 +7029,12 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
     idPrefix: idPrefix,
     initialState: initialState,
     state: _extends({
-      columnOrder: columnOrder,
       currentEditingCell: currentEditingCell,
       currentEditingRow: currentEditingRow,
       currentFilterFns: currentFilterFns,
       currentGlobalFilterFn: currentGlobalFilterFn,
       isDensePadding: isDensePadding,
       isFullScreen: isFullScreen,
-      //@ts-ignore
-      pagination: pagination,
       showFilters: showFilters,
       showGlobalFilter: showGlobalFilter
     }, props.state)