material-react-table 0.13.2 → 0.14.1

package/dist/material-react-table.esm.js

@@ -631,6 +631,17 @@ var reorderColumn = function reorderColumn(movingColumn, receivingColumn, column
   columnOrder.splice(columnOrder.indexOf(receivingColumn.id), 0, columnOrder.splice(columnOrder.indexOf(movingColumn.id), 1)[0]);
   setColumnOrder([].concat(columnOrder));
 };
+var getLeadingDisplayColumnIds = function getLeadingDisplayColumnIds(props) {
+  return [(props.positionActionsColumn === 'first' && props.enableRowActions || props.enableEditing && props.editingMode === 'row') && 'mrt-row-actions', (props.enableExpanding || props.enableGrouping) && 'mrt-expand', props.enableRowSelection && 'mrt-select', props.enableRowNumbers && 'mrt-row-numbers'].filter(Boolean);
+};
+var getTrailingDisplayColumnIds = function getTrailingDisplayColumnIds(props) {
+  return [(props.positionActionsColumn === 'last' && props.enableRowActions || props.enableEditing && props.editingMode === 'row') && 'mrt-row-actions'];
+};
+var getDefaultColumnOrderIds = function getDefaultColumnOrderIds(props) {
+  return [].concat(getLeadingDisplayColumnIds(props), getAllLeafColumnDefs(props.columns).map(function (c) {
+    return c.id;
+  }), getTrailingDisplayColumnIds(props)).filter(Boolean);
+};
 
 var MRT_ShowHideColumnsMenuItems = function MRT_ShowHideColumnsMenuItems(_ref) {
   var _column$columns2;
@@ -816,7 +827,7 @@ var MRT_ShowHideColumnsMenu = function MRT_ShowHideColumnsMenu(_ref) {
     onClick: hideAllColumns
   }, localization.hideAll), !isSubMenu && enableColumnOrdering && React.createElement(Button, {
     onClick: function onClick() {
-      return instance.resetColumnOrder();
+      return instance.setColumnOrder(getDefaultColumnOrderIds(instance.options));
     }
   }, localization.resetOrder), !isSubMenu && enablePinning && React.createElement(Button, {
     disabled: !getIsSomeColumnsPinned(),
@@ -1600,7 +1611,7 @@ var MRT_SearchTextField = function MRT_SearchTextField(_ref) {
       }, React.createElement(Tooltip, {
         arrow: true,
         title: localization.changeSearchMode
-      }, React.createElement("span", null, React.createElement(IconButton, {
+      }, React.createElement(IconButton, {
         "aria-label": localization.changeSearchMode,
         onClick: handleGlobalFilterMenuOpen,
         size: "small",
@@ -1608,7 +1619,7 @@ var MRT_SearchTextField = function MRT_SearchTextField(_ref) {
           height: '1.75rem',
           width: '1.75rem'
         }
-      }, React.createElement(SearchIcon, null))))),
+      }, React.createElement(SearchIcon, null)))),
       endAdornment: React.createElement(InputAdornment, {
         position: "end"
       }, React.createElement(IconButton, {
@@ -1619,11 +1630,7 @@ var MRT_SearchTextField = function MRT_SearchTextField(_ref) {
         title: localization.clearSearch
       }, React.createElement(CloseIcon, null)))
     }
-  }, textFieldProps, {
-    sx: _extends({
-      justifySelf: 'end'
-    }, textFieldProps == null ? void 0 : textFieldProps.sx)
-  })), React.createElement(MRT_FilterOptionMenu, {
+  }, textFieldProps)), React.createElement(MRT_FilterOptionMenu, {
     anchorEl: anchorEl,
     setAnchorEl: setAnchorEl,
     instance: instance
@@ -1645,8 +1652,8 @@ var MRT_ToolbarInternalButtons = function MRT_ToolbarInternalButtons(_ref) {
       renderToolbarInternalActions = _instance$options.renderToolbarInternalActions;
   return React.createElement(Box, {
     sx: {
-      display: 'flex',
       alignItems: 'center',
+      display: 'flex',
       zIndex: 3
     }
   }, (_renderToolbarInterna = renderToolbarInternalActions == null ? void 0 : renderToolbarInternalActions({
@@ -1672,19 +1679,23 @@ var MRT_ToolbarInternalButtons = function MRT_ToolbarInternalButtons(_ref) {
 };
 
 var MRT_TablePagination = function MRT_TablePagination(_ref) {
-  var instance = _ref.instance;
+  var instance = _ref.instance,
+      position = _ref.position;
   var getPrePaginationRowModel = instance.getPrePaginationRowModel,
       getState = instance.getState,
       setPageIndex = instance.setPageIndex,
       setPageSize = instance.setPageSize,
-      muiTablePaginationProps = instance.options.muiTablePaginationProps;
+      _instance$options = instance.options,
+      muiTablePaginationProps = _instance$options.muiTablePaginationProps,
+      enableToolbarInternalActions = _instance$options.enableToolbarInternalActions;
 
   var _getState = getState(),
       _getState$pagination = _getState.pagination,
       _getState$pagination$ = _getState$pagination.pageSize,
       pageSize = _getState$pagination$ === void 0 ? 10 : _getState$pagination$,
       _getState$pagination$2 = _getState$pagination.pageIndex,
-      pageIndex = _getState$pagination$2 === void 0 ? 0 : _getState$pagination$2;
+      pageIndex = _getState$pagination$2 === void 0 ? 0 : _getState$pagination$2,
+      showGlobalFilter = _getState.showGlobalFilter;
 
   var tablePaginationProps = muiTablePaginationProps instanceof Function ? muiTablePaginationProps({
     instance: instance
@@ -1720,6 +1731,7 @@ var MRT_TablePagination = function MRT_TablePagination(_ref) {
   }, tablePaginationProps, {
     sx: _extends({
       m: '0 0.5rem',
+      mt: position === 'top' && enableToolbarInternalActions && !showGlobalFilter ? '3.5rem' : undefined,
       position: 'relative',
       zIndex: 2
     }, tablePaginationProps == null ? void 0 : tablePaginationProps.sx)
@@ -1822,12 +1834,11 @@ var commonToolbarStyles = function commonToolbarStyles(_ref) {
     overflow: 'hidden',
     p: '0 !important',
     transition: 'all 0.2s ease-in-out',
-    width: '100%',
     zIndex: 1
   };
 };
 var MRT_ToolbarTop = function MRT_ToolbarTop(_ref2) {
-  var _renderToolbarCustomA;
+  var _renderToolbarTopCust;
 
   var instance = _ref2.instance;
   var getState = instance.getState,
@@ -1835,13 +1846,12 @@ var MRT_ToolbarTop = function MRT_ToolbarTop(_ref2) {
       enableGlobalFilter = _instance$options.enableGlobalFilter,
       enablePagination = _instance$options.enablePagination,
       enableToolbarInternalActions = _instance$options.enableToolbarInternalActions,
-      tableId = _instance$options.tableId,
       muiTableToolbarTopProps = _instance$options.muiTableToolbarTopProps,
-      positionPagination = _instance$options.positionPagination,
       positionGlobalFilter = _instance$options.positionGlobalFilter,
-      positionToolbarActions = _instance$options.positionToolbarActions,
+      positionPagination = _instance$options.positionPagination,
       positionToolbarAlertBanner = _instance$options.positionToolbarAlertBanner,
-      renderToolbarCustomActions = _instance$options.renderToolbarCustomActions;
+      renderToolbarTopCustomActions = _instance$options.renderToolbarTopCustomActions,
+      tableId = _instance$options.tableId;
 
   var _getState = getState(),
       isFullScreen = _getState.isFullScreen,
@@ -1851,7 +1861,7 @@ var MRT_ToolbarTop = function MRT_ToolbarTop(_ref2) {
   var toolbarProps = muiTableToolbarTopProps instanceof Function ? muiTableToolbarTopProps({
     instance: instance
   }) : muiTableToolbarTopProps;
-  var stackAlertBanner = isMobile || positionToolbarAlertBanner === 'top' && (!!renderToolbarCustomActions || showGlobalFilter);
+  var stackAlertBanner = isMobile || positionToolbarAlertBanner === 'top' && (!!renderToolbarTopCustomActions || showGlobalFilter);
   return React.createElement(Toolbar, Object.assign({
     id: "mrt-" + tableId + "-toolbar-top",
     variant: "dense"
@@ -1870,23 +1880,27 @@ var MRT_ToolbarTop = function MRT_ToolbarTop(_ref2) {
   }), React.createElement(Box, {
     sx: {
       alignItems: 'flex-start',
+      boxSizing: 'border-box',
       display: 'flex',
       justifyContent: 'space-between',
       p: '0.5rem',
       position: stackAlertBanner ? 'relative' : 'absolute',
       right: 0,
       top: 0,
-      width: renderToolbarCustomActions ? '100%' : undefined
+      width: '100%'
     }
   }, enableGlobalFilter && positionGlobalFilter === 'left' && React.createElement(MRT_SearchTextField, {
     instance: instance
-  }), (_renderToolbarCustomA = renderToolbarCustomActions == null ? void 0 : renderToolbarCustomActions({
+  }), (_renderToolbarTopCust = renderToolbarTopCustomActions == null ? void 0 : renderToolbarTopCustomActions({
     instance: instance
-  })) != null ? _renderToolbarCustomA : React.createElement("span", null), enableToolbarInternalActions && positionToolbarActions === 'top' && React.createElement(MRT_ToolbarInternalButtons, {
+  })) != null ? _renderToolbarTopCust : React.createElement("span", null), enableToolbarInternalActions ? React.createElement(MRT_ToolbarInternalButtons, {
     instance: instance
-  })), React.createElement("div", null, enablePagination && ['top', 'both'].includes(positionPagination != null ? positionPagination : '') && React.createElement(MRT_TablePagination, {
+  }) : enableGlobalFilter && positionGlobalFilter === 'right' && React.createElement(MRT_SearchTextField, {
     instance: instance
-  })), React.createElement(MRT_LinearProgressBar, {
+  })), enablePagination && ['top', 'both'].includes(positionPagination != null ? positionPagination : '') && React.createElement(MRT_TablePagination, {
+    instance: instance,
+    position: "top"
+  }), React.createElement(MRT_LinearProgressBar, {
     alignTo: "bottom",
     instance: instance
   }));
@@ -1896,14 +1910,12 @@ var MRT_ToolbarBottom = function MRT_ToolbarBottom(_ref) {
   var instance = _ref.instance;
   var getState = instance.getState,
       _instance$options = instance.options,
-      enableToolbarInternalActions = _instance$options.enableToolbarInternalActions,
-      tableId = _instance$options.tableId,
       enablePagination = _instance$options.enablePagination,
       muiTableToolbarBottomProps = _instance$options.muiTableToolbarBottomProps,
       positionPagination = _instance$options.positionPagination,
-      positionToolbarActions = _instance$options.positionToolbarActions,
       positionToolbarAlertBanner = _instance$options.positionToolbarAlertBanner,
-      renderToolbarCustomActions = _instance$options.renderToolbarCustomActions;
+      renderToolbarBottomCustomActions = _instance$options.renderToolbarBottomCustomActions,
+      tableId = _instance$options.tableId;
 
   var _getState = getState(),
       isFullScreen = _getState.isFullScreen;
@@ -1912,7 +1924,7 @@ var MRT_ToolbarBottom = function MRT_ToolbarBottom(_ref) {
   var toolbarProps = muiTableToolbarBottomProps instanceof Function ? muiTableToolbarBottomProps({
     instance: instance
   }) : muiTableToolbarBottomProps;
-  var stackAlertBanner = isMobile || positionToolbarAlertBanner === 'bottom' && positionToolbarActions === 'bottom' || positionToolbarAlertBanner === 'bottom' && !!renderToolbarCustomActions && positionToolbarActions === 'bottom';
+  var stackAlertBanner = isMobile || positionToolbarAlertBanner === 'bottom' && !!renderToolbarBottomCustomActions;
   return React.createElement(Toolbar, Object.assign({
     id: "mrt-" + tableId + "-toolbar-bottom",
     variant: "dense"
@@ -1935,16 +1947,26 @@ var MRT_ToolbarBottom = function MRT_ToolbarBottom(_ref) {
     sx: {
       display: 'flex',
       justifyContent: 'space-between',
-      width: '100%',
+      width: '100%'
+    }
+  }, renderToolbarBottomCustomActions ? React.createElement(Box, {
+    sx: {
+      p: '0.5rem'
+    }
+  }, renderToolbarBottomCustomActions({
+    instance: instance
+  })) : React.createElement("span", null), React.createElement(Box, {
+    sx: {
+      display: 'flex',
+      justifyContent: 'flex-end',
       position: stackAlertBanner ? 'relative' : 'absolute',
       right: 0,
       top: 0
     }
-  }, enableToolbarInternalActions && positionToolbarActions === 'bottom' ? React.createElement(MRT_ToolbarInternalButtons, {
-    instance: instance
-  }) : React.createElement("span", null), enablePagination && ['bottom', 'both'].includes(positionPagination != null ? positionPagination : '') && React.createElement(MRT_TablePagination, {
-    instance: instance
-  })));
+  }, enablePagination && ['bottom', 'both'].includes(positionPagination != null ? positionPagination : '') && React.createElement(MRT_TablePagination, {
+    instance: instance,
+    position: "bottom"
+  }))));
 };
 
 var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
@@ -2794,6 +2816,7 @@ var MRT_TableBodyCell = function MRT_TableBodyCell(_ref) {
       muiTableBodyCellProps = _instance$options.muiTableBodyCellProps,
       muiTableBodyCellSkeletonProps = _instance$options.muiTableBodyCellSkeletonProps,
       onCellClick = _instance$options.onCellClick,
+      onRowClick = _instance$options.onRowClick,
       rowNumberMode = _instance$options.rowNumberMode,
       tableId = _instance$options.tableId,
       setColumnOrder = instance.setColumnOrder,
@@ -2880,7 +2903,7 @@ var MRT_TableBodyCell = function MRT_TableBodyCell(_ref) {
       return _extends({
         backgroundColor: column.getIsPinned() ? alpha(lighten(theme.palette.background["default"], 0.04), 0.95) : undefined,
         boxShadow: getIsLastLeftPinnedColumn() ? "4px 0 4px -2px " + alpha(theme.palette.common.black, 0.1) : getIsFirstRightPinnedColumn() ? "-4px 0 4px -2px " + alpha(theme.palette.common.black, 0.1) : undefined,
-        cursor: isEditable && editingMode === 'cell' ? 'pointer' : 'text',
+        cursor: isEditable && editingMode === 'cell' || onRowClick || onCellClick ? 'pointer' : 'text',
         left: column.getIsPinned() === 'left' ? column.getStart('left') + "px" : undefined,
         overflow: 'hidden',
         p: density === 'compact' ? columnDefType === 'display' ? '0 0.5rem' : '0.5rem' : density === 'comfortable' ? columnDefType === 'display' ? '0.5rem 0.75rem' : '1rem' : columnDefType === 'display' ? '1rem 1.25rem' : '1.5rem',
@@ -3276,7 +3299,7 @@ var MRT_TablePaper = function MRT_TablePaper(_ref) {
 };
 
 var MRT_TableRoot = function MRT_TableRoot(props) {
-  var _initialState$current, _initialState$current2, _initialState$density, _initialState$isFullS, _initialState$showFil, _initialState$showGlo, _props$globalFilterFn, _props$state3, _props$state4, _props$onCurrentEditi, _props$onCurrentEditi2, _props$onCurrentFilte, _props$onCurrentGloba, _props$onDensityChang, _props$onIsFullScreen, _props$onShowFiltersC, _props$onShowGlobalFi;
+  var _initialState$columnO, _initialState$current, _initialState$current2, _initialState$density, _initialState$isFullS, _initialState$showFil, _initialState$showGlo, _props$globalFilterFn, _props$state3, _props$state4, _props$onCurrentEditi, _props$onCurrentEditi2, _props$onCurrentFilte, _props$onCurrentGloba, _props$onDensityChang, _props$onIsFullScreen, _props$onShowFiltersC, _props$onShowGlobalFi;
 
   var _useState = useState(props.tableId),
       tableId = _useState[0],
@@ -3287,15 +3310,11 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
 
     return setIdPrefix((_props$tableId = props.tableId) != null ? _props$tableId : Math.random().toString(36).substring(2, 9));
   }, [props.tableId]);
-  var showActionColumn = props.enableRowActions || props.enableEditing && props.editingMode === 'row';
-  var showExpandColumn = props.enableExpanding || props.enableGrouping;
   var initialState = 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 || props.enableGrouping) ? [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) : [];
+    initState.columnOrder = (_initState$columnOrde = initState.columnOrder) != null ? _initState$columnOrde : getDefaultColumnOrderIds(props);
 
     if (!props.enablePersistentState || !props.tableId) {
       return initState;
@@ -3322,43 +3341,47 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
     return initState;
   }, []);
 
-  var _useState2 = useState((_initialState$current = initialState == null ? void 0 : initialState.currentEditingCell) != null ? _initialState$current : null),
-      currentEditingCell = _useState2[0],
-      setCurrentEditingCell = _useState2[1];
+  var _useState2 = useState((_initialState$columnO = initialState.columnOrder) != null ? _initialState$columnO : []),
+      columnOrder = _useState2[0],
+      setColumnOrder = _useState2[1];
+
+  var _useState3 = useState((_initialState$current = initialState == null ? void 0 : initialState.currentEditingCell) != null ? _initialState$current : null),
+      currentEditingCell = _useState3[0],
+      setCurrentEditingCell = _useState3[1];
 
-  var _useState3 = useState((_initialState$current2 = initialState == null ? void 0 : initialState.currentEditingRow) != null ? _initialState$current2 : null),
-      currentEditingRow = _useState3[0],
-      setCurrentEditingRow = _useState3[1];
+  var _useState4 = useState((_initialState$current2 = initialState == null ? void 0 : initialState.currentEditingRow) != null ? _initialState$current2 : null),
+      currentEditingRow = _useState4[0],
+      setCurrentEditingRow = _useState4[1];
 
-  var _useState4 = useState((_initialState$density = initialState == null ? void 0 : initialState.density) != null ? _initialState$density : 'comfortable'),
-      density = _useState4[0],
-      setDensity = _useState4[1];
+  var _useState5 = useState((_initialState$density = initialState == null ? void 0 : initialState.density) != null ? _initialState$density : 'comfortable'),
+      density = _useState5[0],
+      setDensity = _useState5[1];
 
-  var _useState5 = useState((_initialState$isFullS = initialState == null ? void 0 : initialState.isFullScreen) != null ? _initialState$isFullS : false),
-      isFullScreen = _useState5[0],
-      setIsFullScreen = _useState5[1];
+  var _useState6 = useState((_initialState$isFullS = initialState == null ? void 0 : initialState.isFullScreen) != null ? _initialState$isFullS : false),
+      isFullScreen = _useState6[0],
+      setIsFullScreen = _useState6[1];
 
-  var _useState6 = useState((_initialState$showFil = initialState == null ? void 0 : initialState.showFilters) != null ? _initialState$showFil : false),
-      showFilters = _useState6[0],
-      setShowFilters = _useState6[1];
+  var _useState7 = useState((_initialState$showFil = initialState == null ? void 0 : initialState.showFilters) != null ? _initialState$showFil : false),
+      showFilters = _useState7[0],
+      setShowFilters = _useState7[1];
 
-  var _useState7 = useState((_initialState$showGlo = initialState == null ? void 0 : initialState.showGlobalFilter) != null ? _initialState$showGlo : false),
-      showGlobalFilter = _useState7[0],
-      setShowGlobalFilter = _useState7[1];
+  var _useState8 = useState((_initialState$showGlo = initialState == null ? void 0 : initialState.showGlobalFilter) != null ? _initialState$showGlo : false),
+      showGlobalFilter = _useState8[0],
+      setShowGlobalFilter = _useState8[1];
 
-  var _useState8 = useState(function () {
+  var _useState9 = 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) ? 'equals' : 'fuzzy', _ref2;
     })));
   }),
-      currentFilterFns = _useState8[0],
-      setCurrentFilterFns = _useState8[1];
+      currentFilterFns = _useState9[0],
+      setCurrentFilterFns = _useState9[1];
 
-  var _useState9 = useState((_props$globalFilterFn = props.globalFilterFn) != null ? _props$globalFilterFn : 'fuzzy'),
-      currentGlobalFilterFn = _useState9[0],
-      setCurrentGlobalFilterFn = _useState9[1];
+  var _useState10 = useState((_props$globalFilterFn = props.globalFilterFn) != null ? _props$globalFilterFn : 'fuzzy'),
+      currentGlobalFilterFn = _useState10[0],
+      setCurrentGlobalFilterFn = _useState10[1];
 
   var table = useMemo(function () {
     return (// @ts-ignore
@@ -3375,16 +3398,14 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
         getSubRows: function getSubRows(row) {
           return row == null ? void 0 : row.subRows;
         },
-        tableId: tableId,
-        initialState: initialState
+        tableId: tableId
       })
     );
   }, []);
-
-  var _useMemo = useMemo(function () {
+  var displayColumns = useMemo(function () {
     var _props$localization, _props$localization2, _props$localization3, _props$localization5;
 
-    var leadingDisplayColumns = [showActionColumn && createDisplayColumn(table, {
+    return [columnOrder.includes('mrt-row-actions') && createDisplayColumn(table, {
       Cell: function Cell(_ref3) {
         var cell = _ref3.cell;
         return React.createElement(MRT_ToggleRowActionMenuButton, {
@@ -3397,7 +3418,7 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
       muiTableBodyCellProps: props.muiTableBodyCellProps,
       muiTableHeadCellProps: props.muiTableHeadCellProps,
       size: 70
-    }), showExpandColumn && createDisplayColumn(table, {
+    }), columnOrder.includes('mrt-expand') && createDisplayColumn(table, {
       Cell: function Cell(_ref4) {
         var cell = _ref4.cell;
         return React.createElement(MRT_ExpandButton, {
@@ -3415,7 +3436,7 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
       muiTableBodyCellProps: props.muiTableBodyCellProps,
       muiTableHeadCellProps: props.muiTableHeadCellProps,
       size: 50
-    }), props.enableRowSelection && createDisplayColumn(table, {
+    }), columnOrder.includes('mrt-select') && createDisplayColumn(table, {
       Cell: function Cell(_ref5) {
         var cell = _ref5.cell;
         return React.createElement(MRT_SelectCheckbox, {
@@ -3434,7 +3455,7 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
       muiTableBodyCellProps: props.muiTableBodyCellProps,
       muiTableHeadCellProps: props.muiTableHeadCellProps,
       size: 50
-    }), props.enableRowNumbers && createDisplayColumn(table, {
+    }), columnOrder.includes('mrt-row-numbers') && createDisplayColumn(table, {
       Cell: function Cell(_ref6) {
         var cell = _ref6.cell;
         return cell.row.index + 1;
@@ -3450,23 +3471,11 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
       muiTableHeadCellProps: props.muiTableHeadCellProps,
       size: 50
     })].filter(Boolean);
-    var trailingDisplayColumns = [];
-
-    if (props.enableRowActions && props.positionActionsColumn === 'last') {
-      trailingDisplayColumns.push.apply(trailingDisplayColumns, leadingDisplayColumns.splice(leadingDisplayColumns.findIndex(function (col) {
-        return col.id === 'mrt-row-actions';
-      }), 1));
-    }
-
-    return [leadingDisplayColumns, trailingDisplayColumns];
-  }, [props.editingMode, props.enableEditing, props.enableExpandAll, props.enableExpanding, props.enableGrouping, props.enableRowActions, props.enableRowNumbers, props.enableRowSelection, props.enableSelectAll, props.localization, props.muiTableBodyCellProps, props.muiTableHeadCellProps, props.positionActionsColumn, table]),
-      leadingDisplayColumns = _useMemo[0],
-      trailingDisplayColumns = _useMemo[1];
-
+  }, [columnOrder, props.editingMode, props.enableEditing, props.enableExpandAll, props.enableExpanding, props.enableGrouping, props.enableRowActions, props.enableRowNumbers, props.enableRowSelection, props.enableSelectAll, props.localization, props.muiTableBodyCellProps, props.muiTableHeadCellProps, props.positionActionsColumn, table]);
   var columns = useMemo(function () {
-    return [].concat(leadingDisplayColumns, props.columns.map(function (column) {
+    return [].concat(displayColumns, props.columns.map(function (column) {
       return column.columns ? createGroup(table, column, currentFilterFns) : createDataColumn(table, column, currentFilterFns);
-    }), trailingDisplayColumns);
+    }));
   }, [table, props.columns, currentFilterFns]);
   var data = useMemo(function () {
     var _props$state, _props$state2;
@@ -3480,13 +3489,17 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
     }) : props.data;
   }, [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 instance = _extends({}, useTableInstance(table, _extends({}, props, {
+  var instance = _extends({}, useTableInstance(table, _extends({
+    onColumnOrderChange: setColumnOrder
+  }, props, {
     //@ts-ignore
     columns: columns,
     data: data,
     //@ts-ignore
     globalFilterFn: currentGlobalFilterFn,
+    initialState: initialState,
     state: _extends({
+      columnOrder: columnOrder,
       currentEditingCell: currentEditingCell,
       currentEditingRow: currentEditingRow,
       currentFilterFns: currentFilterFns,
@@ -3547,7 +3560,7 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
   }));
 };
 
-var _excluded$5 = ["autoResetExpanded", "columnResizeMode", "defaultColumn", "editingMode", "enableColumnActions", "enableColumnFilters", "enableColumnOrdering", "enableColumnResizing", "enableDensityToggle", "enableExpandAll", "enableFilters", "enableFullScreenToggle", "enableGlobalFilter", "enableGrouping", "enableHiding", "enableMultiRowSelection", "enablePagination", "enablePinning", "enableSelectAll", "enableSorting", "enableStickyHeader", "enableTableFooter", "enableTableHead", "enableToolbarBottom", "enableToolbarInternalActions", "enableToolbarTop", "icons", "localization", "persistentStateMode", "positionActionsColumn", "positionPagination", "positionGlobalFilter", "positionToolbarActions", "positionToolbarAlertBanner", "rowNumberMode", "selectAllMode"];
+var _excluded$5 = ["autoResetExpanded", "columnResizeMode", "defaultColumn", "editingMode", "enableColumnActions", "enableColumnFilters", "enableColumnOrdering", "enableColumnResizing", "enableDensityToggle", "enableExpandAll", "enableFilters", "enableFullScreenToggle", "enableGlobalFilter", "enableGrouping", "enableHiding", "enableMultiRowSelection", "enablePagination", "enablePinning", "enableRowSelection", "enableSelectAll", "enableSorting", "enableStickyHeader", "enableTableFooter", "enableTableHead", "enableToolbarBottom", "enableToolbarInternalActions", "enableToolbarTop", "icons", "localization", "persistentStateMode", "positionActionsColumn", "positionGlobalFilter", "positionPagination", "positionToolbarAlertBanner", "rowNumberMode", "selectAllMode"];
 var MaterialReactTable = (function (_ref) {
   var _ref$autoResetExpande = _ref.autoResetExpanded,
       autoResetExpanded = _ref$autoResetExpande === void 0 ? false : _ref$autoResetExpande,
@@ -3589,6 +3602,8 @@ var MaterialReactTable = (function (_ref) {
       enablePagination = _ref$enablePagination === void 0 ? true : _ref$enablePagination,
       _ref$enablePinning = _ref.enablePinning,
       enablePinning = _ref$enablePinning === void 0 ? false : _ref$enablePinning,
+      _ref$enableRowSelecti = _ref.enableRowSelection,
+      enableRowSelection = _ref$enableRowSelecti === void 0 ? false : _ref$enableRowSelecti,
       _ref$enableSelectAll = _ref.enableSelectAll,
       enableSelectAll = _ref$enableSelectAll === void 0 ? true : _ref$enableSelectAll,
       _ref$enableSorting = _ref.enableSorting,
@@ -3611,14 +3626,12 @@ var MaterialReactTable = (function (_ref) {
       persistentStateMode = _ref$persistentStateM === void 0 ? 'sessionStorage' : _ref$persistentStateM,
       _ref$positionActionsC = _ref.positionActionsColumn,
       positionActionsColumn = _ref$positionActionsC === void 0 ? 'first' : _ref$positionActionsC,
-      _ref$positionPaginati = _ref.positionPagination,
-      positionPagination = _ref$positionPaginati === void 0 ? 'bottom' : _ref$positionPaginati,
       _ref$positionGlobalFi = _ref.positionGlobalFilter,
       positionGlobalFilter = _ref$positionGlobalFi === void 0 ? 'right' : _ref$positionGlobalFi,
-      _ref$positionToolbarA = _ref.positionToolbarActions,
-      positionToolbarActions = _ref$positionToolbarA === void 0 ? 'top' : _ref$positionToolbarA,
-      _ref$positionToolbarA2 = _ref.positionToolbarAlertBanner,
-      positionToolbarAlertBanner = _ref$positionToolbarA2 === void 0 ? 'top' : _ref$positionToolbarA2,
+      _ref$positionPaginati = _ref.positionPagination,
+      positionPagination = _ref$positionPaginati === void 0 ? 'bottom' : _ref$positionPaginati,
+      _ref$positionToolbarA = _ref.positionToolbarAlertBanner,
+      positionToolbarAlertBanner = _ref$positionToolbarA === void 0 ? 'top' : _ref$positionToolbarA,
       _ref$rowNumberMode = _ref.rowNumberMode,
       rowNumberMode = _ref$rowNumberMode === void 0 ? 'original' : _ref$rowNumberMode,
       _ref$selectAllMode = _ref.selectAllMode,
@@ -3644,6 +3657,7 @@ var MaterialReactTable = (function (_ref) {
     enableMultiRowSelection: enableMultiRowSelection,
     enablePagination: enablePagination,
     enablePinning: enablePinning,
+    enableRowSelection: enableRowSelection,
     enableSelectAll: enableSelectAll,
     enableSorting: enableSorting,
     enableStickyHeader: enableStickyHeader,
@@ -3658,7 +3672,6 @@ var MaterialReactTable = (function (_ref) {
     positionActionsColumn: positionActionsColumn,
     positionGlobalFilter: positionGlobalFilter,
     positionPagination: positionPagination,
-    positionToolbarActions: positionToolbarActions,
     positionToolbarAlertBanner: positionToolbarAlertBanner,
     rowNumberMode: rowNumberMode,
     selectAllMode: selectAllMode