material-react-table 0.6.2 → 0.6.3

package/dist/MaterialReactTable.d.ts

@@ -5,19 +5,19 @@ import { MRT_Localization } from './localization';
 import { MRT_Icons } from './icons';
 import { MRT_FILTER_TYPE } from './enums';
 export declare type MRT_TableOptions<D extends {} = {}> = TableOptions<D> & UseExpandedOptions<D> & UseFiltersOptions<D> & UseGlobalFiltersOptions<D> & UseGroupByOptions<D> & UsePaginationOptions<D> & UseResizeColumnsOptions<D> & UseRowSelectOptions<D> & UseRowStateOptions<D> & UseSortByOptions<D> & {
-    columns: (Column<D> & MRT_ColumnInterface)[];
+    columns: MRT_ColumnInterface[];
     data: D[];
     initialState?: Partial<MRT_TableState>;
 };
 export declare type MRT_TableInstance<D extends {} = {}> = TableInstance<D> & UseTableInstanceProps<D> & UseColumnOrderInstanceProps<D> & UseExpandedInstanceProps<D> & UseFiltersInstanceProps<D> & UseGlobalFiltersInstanceProps<D> & UseGroupByInstanceProps<D> & UsePaginationInstanceProps<D> & UseRowSelectInstanceProps<D> & UseRowStateInstanceProps<D> & UseSortByInstanceProps<D> & {
     columns: (Column<D> & MRT_ColumnInstance<D>)[];
-    headerGroups: MRT_HeaderGroup<D>[];
     footerGroups: MRT_HeaderGroup<D>[];
-    state: MRT_TableState<D>;
-    rows: MRT_Row<D>[];
+    getToggleAllRowsExpandedProps: () => void;
+    headerGroups: MRT_HeaderGroup<D>[];
     page: MRT_Row<D>[];
     resetResizing: () => void;
-    getToggleAllRowsExpandedProps: () => void;
+    rows: MRT_Row<D>[];
+    state: MRT_TableState<D>;
 };
 export declare type MRT_ColumnInterface<D extends {} = {}> = ColumnInterface<D> & UseFiltersColumnOptions<D> & UseGlobalFiltersColumnOptions<D> & UseGroupByColumnOptions<D> & UseResizeColumnsColumnOptions<D> & UseSortByColumnOptions<D> & {
     Edit?: ({ cell, onChange, }: {
@@ -29,8 +29,8 @@ export declare type MRT_ColumnInterface<D extends {} = {}> = ColumnInterface<D>
     }) => ReactNode;
     Footer?: string;
     Header?: string;
-    accessor: string;
-    columns?: (Column<D> & MRT_ColumnInterface<D>)[];
+    accessor?: string;
+    columns?: MRT_ColumnInterface<D>[];
     disableFilters?: boolean;
     editable?: boolean;
     filter?: MRT_FilterType | string | FilterType<D>;
@@ -38,7 +38,7 @@ export declare type MRT_ColumnInterface<D extends {} = {}> = ColumnInterface<D>
         text: string;
         value: string;
     })[];
-    filterTypes: MRT_FILTER_TYPE[];
+    filterTypes?: (MRT_FILTER_TYPE | string)[];
     muiTableBodyCellEditTextFieldProps?: TextFieldProps | ((cell: MRT_Cell<D>) => TextFieldProps);
     muiTableBodyCellProps?: TableCellProps | ((cell: MRT_Cell<D>) => TableCellProps);
     muiTableFooterCellProps?: TableCellProps | ((column: Column<D>) => TableCellProps);

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

@@ -104,6 +104,35 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   return target;
 }
 
+var findLowestLevelCols = function findLowestLevelCols(columns) {
+  var lowestLevelColumns = columns;
+  var currentCols = columns;
+
+  while (!!((_currentCols = currentCols) != null && _currentCols.length) && currentCols.some(function (col) {
+    return col.columns;
+  })) {
+    var _currentCols;
+
+    var nextCols = currentCols.filter(function (col) {
+      return !!col.columns;
+    }).map(function (col) {
+      return col.columns;
+    }).flat();
+
+    if (nextCols.every(function (col) {
+      return !(col != null && col.columns);
+    })) {
+      lowestLevelColumns = [].concat(lowestLevelColumns, nextCols);
+    }
+
+    currentCols = nextCols;
+  }
+
+  return lowestLevelColumns.filter(function (col) {
+    return !col.columns;
+  });
+};
+
 var MaterialReactTableContext = /*#__PURE__*/function () {
   return React.createContext({});
 }();
@@ -134,35 +163,8 @@ var MaterialReactTableProvider = function MaterialReactTableProvider(props) {
       showSearch = _useState5[0],
       setShowSearch = _useState5[1];
 
-  var findLowestLevelCols = React.useCallback(function () {
-    var lowestLevelColumns = props.columns;
-    var currentCols = props.columns;
-
-    while (!!currentCols.length && currentCols.some(function (col) {
-      return col.columns;
-    })) {
-      var nextCols = currentCols.filter(function (col) {
-        return !!col.columns;
-      }).map(function (col) {
-        return col.columns;
-      }).flat();
-
-      if (nextCols.every(function (col) {
-        return !col.columns;
-      })) {
-        lowestLevelColumns = [].concat(lowestLevelColumns, nextCols);
-      }
-
-      currentCols = nextCols;
-    }
-
-    return lowestLevelColumns.filter(function (col) {
-      return !col.columns;
-    });
-  }, [props.columns]);
-
   var _useState6 = React.useState(function () {
-    return Object.assign.apply(Object, [{}].concat(findLowestLevelCols().map(function (c) {
+    return Object.assign.apply(Object, [{}].concat(findLowestLevelCols(props.columns).map(function (c) {
       var _ref, _c$filter, _props$initialState5, _props$initialState5$, _ref2;
 
       return _ref2 = {}, _ref2[c.accessor] = (_ref = (_c$filter = c.filter) != null ? _c$filter : props == null ? void 0 : (_props$initialState5 = props.initialState) == null ? void 0 : (_props$initialState5$ = _props$initialState5.filters) == null ? void 0 : _props$initialState5$[c.accessor]) != null ? _ref : !!c.filterSelectOptions ? 'equals' : 'fuzzy', _ref2;
@@ -187,10 +189,20 @@ var MaterialReactTableProvider = function MaterialReactTableProvider(props) {
   var columns = React.useMemo(function () {
     return applyFiltersToColumns(props.columns);
   }, [props.columns, applyFiltersToColumns]);
+  var data = React.useMemo(function () {
+    return !props.isLoading || !!props.data.length ? props.data : [].concat(Array(10)).map(function (_) {
+      return Object.assign.apply(Object, [{}].concat(findLowestLevelCols(props.columns).map(function (c) {
+        var _ref3;
+
+        return _ref3 = {}, _ref3[c.accessor] = null, _ref3;
+      })));
+    });
+  }, [props.data, props.isLoading]);
   var tableInstance = reactTable.useTable.apply(void 0, [// @ts-ignore
   _extends({}, props, {
     // @ts-ignore
     columns: columns,
+    data: data,
     useControlledState: function useControlledState(state) {
       return React.useMemo(function () {
         return _extends({}, state, {
@@ -850,15 +862,16 @@ var MRT_ColumnActionMenu = function MRT_ColumnActionMenu(_ref) {
     setAnchorEl(null);
   };
 
+  var handleShowAllColumns = function handleShowAllColumns() {
+    tableInstance.toggleHideAllColumns(false);
+    setAnchorEl(null);
+  };
+
   var handleOpenFilterModeMenu = function handleOpenFilterModeMenu(event) {
     event.stopPropagation();
     setFilterMenuAnchorEl(event.currentTarget);
   };
 
-  var handleShowAllColumns = function handleShowAllColumns() {
-    tableInstance.toggleHideAllColumns(false);
-  };
-
   var handleOpenShowHideColumnsMenu = function handleOpenShowHideColumnsMenu(event) {
     event.stopPropagation();
     setShowHideColumnsMenuAnchorEl(event.currentTarget);
@@ -2420,9 +2433,7 @@ var MRT_TableBody = function MRT_TableBody() {
   });
 
   return React__default.createElement(material.TableBody, Object.assign({}, tableBodyProps, {
-    sx: _extends({
-      overflowY: 'hidden'
-    }, tableBodyProps == null ? void 0 : tableBodyProps.sx)
+    sx: _extends({}, tableBodyProps == null ? void 0 : tableBodyProps.sx)
   }), rows.map(function (row) {
     tableInstance.prepareRow(row);
     return React__default.createElement(MRT_TableBodyRow, {
@@ -2782,7 +2793,7 @@ var MRT_TablePagination = function MRT_TablePagination() {
     showLastButton: tableInstance.rows.length / tableInstance.state.pageSize > 2
   }, tablePaginationProps, {
     sx: _extends({
-      p: 0,
+      m: '0 0.5rem',
       position: 'relative',
       zIndex: 2
     }, tablePaginationProps == null ? void 0 : tablePaginationProps.sx)
@@ -2844,6 +2855,34 @@ var MRT_ToolbarAlertBanner = function MRT_ToolbarAlertBanner() {
   }, selectMessage, groupedByMessage)));
 };
 
+var MRT_LinearProgressBar = function MRT_LinearProgressBar() {
+  var _useMRT = useMRT(),
+      muiLinearProgressProps = _useMRT.muiLinearProgressProps,
+      isFetching = _useMRT.isFetching,
+      isLoading = _useMRT.isLoading,
+      tableInstance = _useMRT.tableInstance;
+
+  var linearProgressProps = muiLinearProgressProps instanceof Function ? muiLinearProgressProps(tableInstance) : muiLinearProgressProps;
+  return React__default.createElement(material.Collapse, {
+    "in": isFetching || isLoading,
+    unmountOnExit: true
+  }, React__default.createElement(material.LinearProgress, Object.assign({
+    "aria-label": "Loading",
+    "aria-busy": "true"
+  }, linearProgressProps)));
+};
+
+var commonToolbarStyles = function commonToolbarStyles(theme, tableInstance) {
+  return {
+    backgroundColor: theme.palette.background["default"],
+    backgroundImage: "linear-gradient(" + material.alpha(theme.palette.common.white, 0.05) + "," + material.alpha(theme.palette.common.white, 0.05) + ")",
+    display: 'grid',
+    opacity: tableInstance.state.fullScreen ? 0.95 : 1,
+    p: '0 !important',
+    width: '100%',
+    zIndex: 1
+  };
+};
 var MRT_ToolbarTop = function MRT_ToolbarTop() {
   var _renderToolbarCustomA;
 
@@ -2864,15 +2903,9 @@ var MRT_ToolbarTop = function MRT_ToolbarTop() {
   }, toolbarProps, {
     sx: function sx(theme) {
       return _extends({
-        backgroundColor: theme.palette.background["default"],
-        backgroundImage: "linear-gradient(" + material.alpha(theme.palette.common.white, 0.05) + "," + material.alpha(theme.palette.common.white, 0.05) + ")",
-        display: 'grid',
-        p: '0 !important',
         position: tableInstance.state.fullScreen ? 'sticky' : undefined,
-        top: tableInstance.state.fullScreen ? '0' : undefined,
-        width: '100%',
-        zIndex: 1
-      }, toolbarProps == null ? void 0 : toolbarProps.sx);
+        top: tableInstance.state.fullScreen ? '0' : undefined
+      }, commonToolbarStyles(theme, tableInstance), toolbarProps == null ? void 0 : toolbarProps.sx);
     }
   }), positionToolbarAlertBanner === 'top' && React__default.createElement(MRT_ToolbarAlertBanner, null), React__default.createElement(material.Box, {
     sx: {
@@ -2887,7 +2920,7 @@ var MRT_ToolbarTop = function MRT_ToolbarTop() {
       position: 'relative',
       zIndex: 3
     }
-  }, !disableGlobalFilter && React__default.createElement(MRT_SearchTextField, null), !hideToolbarInternalActions && positionToolbarActions === 'top' && React__default.createElement(MRT_ToolbarInternalButtons, null))), React__default.createElement("div", null, !manualPagination && ['top', 'both'].includes(positionPagination != null ? positionPagination : '') && React__default.createElement(MRT_TablePagination, null)));
+  }, !disableGlobalFilter && React__default.createElement(MRT_SearchTextField, null), !hideToolbarInternalActions && positionToolbarActions === 'top' && React__default.createElement(MRT_ToolbarInternalButtons, null))), React__default.createElement("div", null, !manualPagination && ['top', 'both'].includes(positionPagination != null ? positionPagination : '') && React__default.createElement(MRT_TablePagination, null)), React__default.createElement(MRT_LinearProgressBar, null));
 };
 
 var MRT_ToolbarBottom = function MRT_ToolbarBottom() {
@@ -2906,53 +2939,37 @@ var MRT_ToolbarBottom = function MRT_ToolbarBottom() {
   }, toolbarProps, {
     sx: function sx(theme) {
       return _extends({
-        backgroundColor: theme.palette.background["default"],
-        backgroundImage: "linear-gradient(" + material.alpha(theme.palette.common.white, 0.05) + "," + material.alpha(theme.palette.common.white, 0.05) + ")",
         bottom: tableInstance.state.fullScreen ? '0' : undefined,
-        display: 'flex',
-        justifyContent: 'space-between',
-        overflowY: 'hidden',
-        p: '0 0.5rem !important',
-        position: tableInstance.state.fullScreen ? 'fixed' : undefined,
-        width: 'calc(100% - 1rem)',
-        zIndex: 1
-      }, toolbarProps == null ? void 0 : toolbarProps.sx);
+        position: tableInstance.state.fullScreen ? 'fixed' : undefined
+      }, commonToolbarStyles(theme, tableInstance), toolbarProps == null ? void 0 : toolbarProps.sx);
+    }
+  }), React__default.createElement(MRT_LinearProgressBar, null), React__default.createElement(material.Box, {
+    sx: {
+      display: 'flex',
+      justifyContent: 'space-between',
+      width: '100%'
     }
-  }), !hideToolbarInternalActions && positionToolbarActions === 'bottom' ? React__default.createElement(MRT_ToolbarInternalButtons, null) : React__default.createElement("span", null), positionToolbarAlertBanner === 'bottom' && React__default.createElement(MRT_ToolbarAlertBanner, null), !manualPagination && ['bottom', 'both'].includes(positionPagination != null ? positionPagination : '') && React__default.createElement(MRT_TablePagination, null));
+  }, !hideToolbarInternalActions && positionToolbarActions === 'bottom' ? React__default.createElement(MRT_ToolbarInternalButtons, null) : React__default.createElement("span", null), positionToolbarAlertBanner === 'bottom' && React__default.createElement(MRT_ToolbarAlertBanner, null), !manualPagination && ['bottom', 'both'].includes(positionPagination != null ? positionPagination : '') && React__default.createElement(MRT_TablePagination, null)));
 };
 
 var MRT_TableContainer = function MRT_TableContainer() {
   var _useMRT = useMRT(),
       hideToolbarBottom = _useMRT.hideToolbarBottom,
       hideToolbarTop = _useMRT.hideToolbarTop,
-      isFetching = _useMRT.isFetching,
-      isLoading = _useMRT.isLoading,
-      muiLinearProgressProps = _useMRT.muiLinearProgressProps,
       muiTableContainerProps = _useMRT.muiTableContainerProps,
       tableInstance = _useMRT.tableInstance;
 
   var fullScreen = tableInstance.state.fullScreen;
-  var originalBodyOverflowStyle = React.useRef();
-  React.useEffect(function () {
-    if (typeof window !== 'undefined') {
-      var _document, _document$body, _document$body$style;
-
-      originalBodyOverflowStyle.current = (_document = document) == null ? void 0 : (_document$body = _document.body) == null ? void 0 : (_document$body$style = _document$body.style) == null ? void 0 : _document$body$style.overflow;
-    }
-  }, []);
   React.useEffect(function () {
     if (typeof window !== 'undefined') {
       if (fullScreen) {
         document.body.style.overflow = 'hidden';
       } else {
-        var _originalBodyOverflow;
-
-        document.body.style.overflow = (_originalBodyOverflow = originalBodyOverflowStyle.current) != null ? _originalBodyOverflow : 'auto';
+        document.body.style.overflow = 'auto';
       }
     }
   }, [fullScreen]);
   var tableContainerProps = muiTableContainerProps instanceof Function ? muiTableContainerProps(tableInstance) : muiTableContainerProps;
-  var linearProgressProps = muiLinearProgressProps instanceof Function ? muiLinearProgressProps(tableInstance) : muiLinearProgressProps;
   return React__default.createElement(material.TableContainer, Object.assign({
     component: material.Paper
   }, tableContainerProps, {
@@ -2961,6 +2978,7 @@ var MRT_TableContainer = function MRT_TableContainer() {
       height: fullScreen ? '100%' : undefined,
       left: fullScreen ? '0' : undefined,
       m: fullScreen ? '0' : undefined,
+      overflowY: 'hidden',
       position: fullScreen ? 'fixed' : undefined,
       right: fullScreen ? '0' : undefined,
       top: fullScreen ? '0' : undefined,
@@ -2968,10 +2986,7 @@ var MRT_TableContainer = function MRT_TableContainer() {
       width: fullScreen ? '100vw' : undefined,
       zIndex: fullScreen ? 1200 : 1
     }, tableContainerProps == null ? void 0 : tableContainerProps.sx)
-  }), !hideToolbarTop && React__default.createElement(MRT_ToolbarTop, null), React__default.createElement(material.Collapse, {
-    "in": isFetching || isLoading,
-    unmountOnExit: true
-  }, React__default.createElement(material.LinearProgress, Object.assign({}, linearProgressProps))), React__default.createElement(material.Box, {
+  }), !hideToolbarTop && React__default.createElement(MRT_ToolbarTop, null), React__default.createElement(material.Box, {
     sx: {
       maxWidth: '100%',
       overflowX: 'auto'
@@ -3076,10 +3091,13 @@ var MaterialReactTable = (function (_ref) {
       positionToolbarAlertBanner = _ref$positionToolbarA2 === void 0 ? 'top' : _ref$positionToolbarA2,
       rest = _objectWithoutPropertiesLoose(_ref, _excluded);
 
-  return React__default.createElement(MaterialReactTableProvider, Object.assign({
+  return React__default.createElement(MaterialReactTableProvider //@ts-ignore
+  , Object.assign({
+    //@ts-ignore
     defaultColumn: defaultColumn,
-    // @ts-ignore
+    //@ts-ignore
     filterTypes: _extends({}, defaultFilterFNs, filterTypes),
+    //@ts-ignore
     globalFilter: globalFilter,
     icons: _extends({}, MRT_Default_Icons, icons),
     localization: _extends({}, MRT_DefaultLocalization_EN, localization),