@redsift/table 10.3.0-muiv5-alpha.5 → 10.3.0-muiv5-alpha.7

package/index.js

@@ -1,8 +1,8 @@
-import { GRID_DETAIL_PANEL_TOGGLE_COL_DEF, getGridNumericOperators as getGridNumericOperators$1, GridFilterInputMultipleValue, getGridStringOperators as getGridStringOperators$1, GridToolbarContainer, GridToolbarFilterButton, GridToolbarColumnsButton, GridToolbarDensitySelector, GridToolbarExport, gridVisibleSortedRowIdsSelector, gridPaginatedVisibleSortedGridRowEntriesSelector, gridPaginatedVisibleSortedGridRowIdsSelector, gridFilteredSortedRowEntriesSelector, gridFilteredSortedRowIdsSelector, useGridApiRef, DataGridPro } from '@mui/x-data-grid-pro';
+import { GRID_DETAIL_PANEL_TOGGLE_COL_DEF, getGridNumericOperators as getGridNumericOperators$1, GridFilterInputMultipleValue, getGridStringOperators as getGridStringOperators$1, GridToolbarContainer, GridToolbarFilterButton, GridToolbarColumnsButton, GridToolbarDensitySelector, GridToolbarExport, gridVisibleSortedRowIdsSelector, useGridApiRef, DataGridPro, gridPaginatedVisibleSortedGridRowEntriesSelector, gridPaginatedVisibleSortedGridRowIdsSelector, gridFilteredSortedRowEntriesSelector, gridFilteredSortedRowIdsSelector } from '@mui/x-data-grid-pro';
 export { getGridBooleanOperators, getGridDateOperators, getGridSingleSelectOperators } from '@mui/x-data-grid-pro';
 import * as React from 'react';
 import React__default, { Children, isValidElement, cloneElement, useLayoutEffect, useEffect, useRef, forwardRef, useContext, useState, useCallback, createElement, useMemo } from 'react';
-import { Icon, baseContainer, Theme, AppContainerContext, useTheme as useTheme$4, useId as useId$2, partitionComponents, isComponent, Flexbox, TextField as TextField$2, Button, Switch, Text, ButtonsColorPalette, IconButton as IconButton$2, Checkbox, LinkButton, ThemeProvider as ThemeProvider$4, RedsiftColorBlueN, RedsiftColorNeutralXDarkGrey, RedsiftColorNeutralWhite, Shield } from '@redsift/design-system';
+import { Icon, baseContainer, Theme, AppContainerContext, useTheme as useTheme$4, useId as useId$2, partitionComponents, isComponent, Flexbox, TextField as TextField$2, Button, Switch, Text, ButtonsColorPalette, IconButton as IconButton$2, Checkbox, ThemeProvider as ThemeProvider$4, LinkButton, RedsiftColorBlueN, RedsiftColorNeutralXDarkGrey, RedsiftColorNeutralWhite, Shield } from '@redsift/design-system';
 import { mdiSync, mdiFilterVariant, mdiViewColumn, mdiChevronUp, mdiChevronDown, mdiViewHeadline, mdiViewSequential, mdiViewStream, mdiChevronRight, mdiTrayArrowDown } from '@redsift/icons';
 import emStyled from '@emotion/styled';
 import { Global, ThemeContext as ThemeContext$3, keyframes } from '@emotion/react';
@@ -17870,6 +17870,76 @@ class LicenseInfo {
   }
 }
 
+/**
+ * Component style.
+ */
+const StyledDataGrid = styled$3.div`
+  ${_ref => {
+  let {
+    $height
+  } = _ref;
+  return $height ? css`
+          height: ${$height};
+        ` : '';
+}}
+
+  width: 100%;
+
+  .MuiDataGrid-root {
+    font-family: var(--redsift-typography-datagrid-header-font-family);
+    border: none;
+  }
+
+  .MuiDataGrid-row {
+    font-family: var(--redsift-typography-datagrid-cell-font-family);
+    font-size: var(--redsift-typography-datagrid-cell-font-size);
+    font-weight: var(--redsift-typography-datagrid-cell-font-weight);
+  }
+
+  .MuiDataGrid-columnHeaderTitle {
+    font-family: var(--redsift-typography-datagrid-header-font-family);
+    font-size: var(--redsift-typography-datagrid-header-font-size);
+    font-weight: var(--redsift-typography-datagrid-header-font-weight);
+  }
+
+  .MuiDataGrid-columnHeaders {
+    border-bottom-color: var(--redsift-color-primary-n);
+  }
+
+  .MuiDataGrid-columnSeparator {
+    display: none;
+  }
+
+  .MuiTablePagination-root {
+    .MuiTablePagination-selectLabel {
+      font-family: var(--redsift-typography-datagrid-header-font-family);
+    }
+    .MuiTablePagination-displayedRows {
+      font-family: var(--redsift-typography-datagrid-cell-font-family);
+    }
+
+    .MuiInputBase-root {
+      font-family: var(--redsift-typography-datagrid-cell-font-family);
+    }
+  }
+
+  .Mui-checked {
+    color: var(--redsift-color-primary-n);
+  }
+
+  .MuiDataGrid-rowCount {
+    font-family: var(--redsift-typography-datagrid-cell-font-family);
+  }
+
+  .MuiTablePagination-displayedRows {
+    font-family: var(--redsift-typography-datagrid-cell-font-family);
+  }
+
+  .MuiBadge-standard {
+    font-family: var(--redsift-typography-datagrid-cell-font-family);
+  }
+`;
+
 /**
  * Component style.
  */
@@ -21451,34 +21521,6 @@ const useInteractions = function (propsList) {
   }), [getReferenceProps, getFloatingProps, getItemProps]);
 };
 
-const TooltipContext = /*#__PURE__*/React__default.createContext(null);
-
-/**
- * Context props.
- */
-
-/**
- * Component variant.
- */
-const TooltipPlacement = {
-  top: 'top',
-  right: 'right',
-  bottom: 'bottom',
-  left: 'left',
-  'top-start': 'top-start',
-  'top-end': 'top-end',
-  'right-start': 'right-start',
-  'right-end': 'right-end',
-  'bottom-start': 'bottom-start',
-  'bottom-end': 'bottom-end',
-  'left-start': 'left-start',
-  'left-end': 'left-end'
-};
-
-/**
- * Component props.
- */
-
 /**
  * Component style.
  */
@@ -21602,7 +21644,6 @@ const StyledTooltipContent = styled$3.div`
 
 const COMPONENT_NAME$5 = 'TooltipContent';
 const CLASSNAME$5 = 'redsift-tooltip-content';
-const DEFAULT_PROPS$4 = {};
 
 /**
  * The TooltipContent component.
@@ -21668,12 +21709,10 @@ const TooltipContent = /*#__PURE__*/forwardRef((props, ref) => {
   }, children)));
 });
 TooltipContent.className = CLASSNAME$5;
-TooltipContent.defaultProps = DEFAULT_PROPS$4;
 TooltipContent.displayName = COMPONENT_NAME$5;
 
 const COMPONENT_NAME$4 = 'TooltipTrigger';
 const CLASSNAME$4 = 'redsift-tooltip-trigger';
-const DEFAULT_PROPS$3 = {};
 
 /**
  * The TooltipTrigger component.
@@ -21709,9 +21748,36 @@ const TooltipTrigger = /*#__PURE__*/forwardRef((props, ref) => {
   }, getReferenceProps(props)), children);
 });
 TooltipTrigger.className = CLASSNAME$4;
-TooltipTrigger.defaultProps = DEFAULT_PROPS$3;
 TooltipTrigger.displayName = COMPONENT_NAME$4;
 
+const TooltipContext = /*#__PURE__*/React__default.createContext(null);
+
+/**
+ * Context props.
+ */
+
+/**
+ * Component variant.
+ */
+const TooltipPlacement = {
+  top: 'top',
+  right: 'right',
+  bottom: 'bottom',
+  left: 'left',
+  'top-start': 'top-start',
+  'top-end': 'top-end',
+  'right-start': 'right-start',
+  'right-end': 'right-end',
+  'bottom-start': 'bottom-start',
+  'bottom-end': 'bottom-end',
+  'left-start': 'left-start',
+  'left-end': 'left-end'
+};
+
+/**
+ * Component props.
+ */
+
 function useTooltip(_ref) {
   let {
     color,
@@ -21782,25 +21848,21 @@ const ThemeProvider = ThemeContext.Provider;
 
 const COMPONENT_NAME$3 = 'Tooltip';
 const CLASSNAME$3 = 'redsift-tooltip';
-const DEFAULT_PROPS$2 = {
-  delay: 500,
-  placement: TooltipPlacement.top
-};
 
 /**
  * The Tooltip component.
  */
 const BaseTooltip = props => {
   const {
-    color,
     children,
+    color,
     defaultOpen,
-    delay,
+    delay = 500,
     isOpen,
     onOpen,
-    placement,
-    tooltipId,
+    placement = TooltipPlacement.top,
     theme: propsTheme,
+    tooltipId,
     triggerClassName
   } = props;
   const theme = useTheme$4 ? useTheme$4(propsTheme) : undefined;
@@ -21825,7 +21887,6 @@ const BaseTooltip = props => {
   }, trigger && isComponent('TooltipTrigger')(trigger) ? trigger : null, content && isComponent('TooltipContent')(content) ? content : null));
 };
 BaseTooltip.className = CLASSNAME$3;
-BaseTooltip.defaultProps = DEFAULT_PROPS$2;
 BaseTooltip.displayName = COMPONENT_NAME$3;
 const Tooltip = Object.assign(BaseTooltip, {
   Trigger: TooltipTrigger,
@@ -21859,24 +21920,6 @@ const StyledGridToolbarFilterSemanticField = styled$3.form`
 const _excluded$e = ["className", "nlpFilterConfig", "onFilterModelChange", "dateFormat", "defaultModel", "defaultFilter", "disablePower", "localeText"];
 const COMPONENT_NAME$2 = 'GridToolbarFilterSemanticField';
 const CLASSNAME$2 = 'redsift-datagrid-toolbar-nlp-filter-field';
-const DEFAULT_PROPS$1 = {
-  dateFormat: 'yyyy-mm-dd',
-  defaultModel: 'gpt-4-0613',
-  defaultFilter: {
-    items: [],
-    linkOperator: 'and'
-  },
-  disablePower: false,
-  localeText: {
-    textLabel: 'Semantic filtering',
-    textPlaceholder: 'Describe here how you would like to filter this datagrid.',
-    buttonAriaLabel: 'Submit',
-    buttonText: 'Run',
-    powerText: 'Power mode',
-    powerTooltipContent: 'The Power mode can get better results but is slower.',
-    errorText: 'Unable to find a valid filter, please try again with a more specific prompt.'
-  }
-};
 const DEFAULT_OPERATORS = {
   string: ['contains', 'equals', 'startsWith', 'endsWith', 'isEmpty', 'isNotEmpty', 'isAnyOf'],
   number: ['=', '!=', '>', '>=', '<', '<=', 'isEmpty', 'isNotEmpty', 'isAnyOf'],
@@ -21950,10 +21993,13 @@ const GridToolbarFilterSemanticField = /*#__PURE__*/forwardRef((props, ref) => {
       className,
       nlpFilterConfig,
       onFilterModelChange,
-      dateFormat = DEFAULT_PROPS$1.dateFormat,
-      defaultModel = DEFAULT_PROPS$1.defaultModel,
-      defaultFilter = DEFAULT_PROPS$1.defaultFilter,
-      disablePower = DEFAULT_PROPS$1.disablePower,
+      dateFormat = 'yyyy-mm-dd',
+      defaultModel = 'gpt-4-0613',
+      defaultFilter = {
+        items: [],
+        linkOperator: 'and'
+      },
+      disablePower = false,
       localeText
     } = props,
     forwardedProps = _objectWithoutProperties(props, _excluded$e);
@@ -21965,7 +22011,15 @@ const GridToolbarFilterSemanticField = /*#__PURE__*/forwardRef((props, ref) => {
     powerText,
     powerTooltipContent,
     errorText
-  } = _objectSpread2(_objectSpread2({}, DEFAULT_PROPS$1.localeText), localeText);
+  } = _objectSpread2({
+    textLabel: 'Semantic filtering',
+    textPlaceholder: 'Describe here how you would like to filter this datagrid.',
+    buttonAriaLabel: 'Submit',
+    buttonText: 'Run',
+    powerText: 'Power mode',
+    powerTooltipContent: 'The Power mode can get better results but is slower.',
+    errorText: 'Unable to find a valid filter, please try again with a more specific prompt.'
+  }, localeText);
   const [prompt, setPrompt] = useState('');
   const modelRef = useRef(defaultModel);
   const showErrorRef = useRef(false);
@@ -22034,7 +22088,6 @@ const GridToolbarFilterSemanticField = /*#__PURE__*/forwardRef((props, ref) => {
   }, errorText));
 });
 GridToolbarFilterSemanticField.className = CLASSNAME$2;
-GridToolbarFilterSemanticField.defaultProps = DEFAULT_PROPS$1;
 GridToolbarFilterSemanticField.displayName = COMPONENT_NAME$2;
 
 /**
@@ -22097,7 +22150,33 @@ const Toolbar$3 = props => {
   }, semanticFilterProps ? /*#__PURE__*/React__default.createElement(GridToolbarFilterSemanticField, semanticFilterProps) : null)));
 };
 
-const _excluded$d = ["children", "color", "onClick", "startIcon"];
+const _excluded$d = ["displayName"];
+const muiIconToDSIcon = {
+  ColumnFilteredIcon: mdiFilterVariant,
+  ColumnSelectorIcon: mdiViewColumn,
+  ColumnSortedAscendingIcon: mdiChevronUp,
+  ColumnSortedDescendingIcon: mdiChevronDown,
+  DensityCompactIcon: mdiViewHeadline,
+  DensityStandardIcon: mdiViewSequential,
+  DensityComfortableIcon: mdiViewStream,
+  DetailPanelCollapseIcon: mdiChevronDown,
+  DetailPanelExpandIcon: mdiChevronRight,
+  ExportIcon: mdiTrayArrowDown,
+  OpenFilterButtonIcon: mdiFilterVariant
+};
+const BaseIcon = /*#__PURE__*/forwardRef((props, ref) => {
+  const {
+      displayName
+    } = props,
+    forwardedProps = _objectWithoutProperties(props, _excluded$d);
+  return /*#__PURE__*/React__default.createElement(Icon, _extends$2({}, forwardedProps, forwardedProps.inputProps, {
+    ref: ref,
+    size: forwardedProps.fontSize,
+    icon: muiIconToDSIcon[displayName]
+  }));
+});
+
+const _excluded$c = ["children", "color", "onClick", "startIcon"];
 const BaseButton = /*#__PURE__*/forwardRef((props, ref) => {
   var _props$className;
   const {
@@ -22106,7 +22185,7 @@ const BaseButton = /*#__PURE__*/forwardRef((props, ref) => {
       onClick,
       startIcon
     } = props,
-    forwardedProps = _objectWithoutProperties(props, _excluded$d);
+    forwardedProps = _objectWithoutProperties(props, _excluded$c);
   const color = Object.keys(ButtonsColorPalette).includes(propsColor) ? propsColor : 'primary';
   if ((_props$className = props.className) !== null && _props$className !== void 0 && _props$className.includes('redsift-condensed')) {
     return /*#__PURE__*/React__default.createElement(IconButton$2, _extends$2({}, forwardedProps, {
@@ -22132,7 +22211,7 @@ const BaseButton = /*#__PURE__*/forwardRef((props, ref) => {
   }), children);
 });
 
-const _excluded$c = ["checked", "indeterminate", "disabled", "onChange"];
+const _excluded$b = ["checked", "indeterminate", "disabled", "onChange"];
 const BaseCheckbox = /*#__PURE__*/forwardRef((props, ref) => {
   const {
       checked,
@@ -22140,7 +22219,7 @@ const BaseCheckbox = /*#__PURE__*/forwardRef((props, ref) => {
       disabled,
       onChange
     } = props,
-    forwardedProps = _objectWithoutProperties(props, _excluded$c);
+    forwardedProps = _objectWithoutProperties(props, _excluded$b);
   return /*#__PURE__*/React__default.createElement(Checkbox, _extends$2({}, forwardedProps, forwardedProps.inputProps, {
     isSelected: checked && !indeterminate,
     isDisabled: disabled,
@@ -22150,32 +22229,6 @@ const BaseCheckbox = /*#__PURE__*/forwardRef((props, ref) => {
   }));
 });
 
-const _excluded$b = ["displayName"];
-const muiIconToDSIcon = {
-  ColumnFilteredIcon: mdiFilterVariant,
-  ColumnSelectorIcon: mdiViewColumn,
-  ColumnSortedAscendingIcon: mdiChevronUp,
-  ColumnSortedDescendingIcon: mdiChevronDown,
-  DensityCompactIcon: mdiViewHeadline,
-  DensityStandardIcon: mdiViewSequential,
-  DensityComfortableIcon: mdiViewStream,
-  DetailPanelCollapseIcon: mdiChevronDown,
-  DetailPanelExpandIcon: mdiChevronRight,
-  ExportIcon: mdiTrayArrowDown,
-  OpenFilterButtonIcon: mdiFilterVariant
-};
-const BaseIcon = /*#__PURE__*/forwardRef((props, ref) => {
-  const {
-      displayName
-    } = props,
-    forwardedProps = _objectWithoutProperties(props, _excluded$b);
-  return /*#__PURE__*/React__default.createElement(Icon, _extends$2({}, forwardedProps, forwardedProps.inputProps, {
-    ref: ref,
-    size: forwardedProps.fontSize,
-    icon: muiIconToDSIcon[displayName]
-  }));
-});
-
 const _excluded$a = ["anchorEl", "component", "components", "componentsProps", "container", "disablePortal", "keepMounted", "modifiers", "open", "placement", "popperOptions", "popperRef", "transition", "slots", "slotProps"];
 const PopperRoot = styled$1(BasePopper$1, {
   name: 'MuiPopper',
@@ -22377,86 +22430,6 @@ const BasePopper = /*#__PURE__*/forwardRef((props, ref) => {
   }));
 });
 
-const defaultSxStyle = {
-  '.MuiDataGrid-columnHeaders': {
-    flexDirection: 'column',
-    alignItems: 'normal'
-  },
-  '.MuiDataGrid-selectedRowCount': {
-    margin: 'none'
-  }
-};
-
-/**
- * Component style.
- */
-const StyledDataGrid = styled$3.div`
-  ${_ref => {
-  let {
-    $height
-  } = _ref;
-  return $height ? css`
-          height: ${$height};
-        ` : '';
-}}
-
-  width: 100%;
-
-  .MuiDataGrid-root {
-    font-family: var(--redsift-typography-datagrid-header-font-family);
-    border: none;
-  }
-
-  .MuiDataGrid-row {
-    font-family: var(--redsift-typography-datagrid-cell-font-family);
-    font-size: var(--redsift-typography-datagrid-cell-font-size);
-    font-weight: var(--redsift-typography-datagrid-cell-font-weight);
-  }
-
-  .MuiDataGrid-columnHeaderTitle {
-    font-family: var(--redsift-typography-datagrid-header-font-family);
-    font-size: var(--redsift-typography-datagrid-header-font-size);
-    font-weight: var(--redsift-typography-datagrid-header-font-weight);
-  }
-
-  .MuiDataGrid-columnHeaders {
-    border-bottom-color: var(--redsift-color-primary-n);
-  }
-
-  .MuiDataGrid-columnSeparator {
-    display: none;
-  }
-
-  .MuiTablePagination-root {
-    .MuiTablePagination-selectLabel {
-      font-family: var(--redsift-typography-datagrid-header-font-family);
-    }
-    .MuiTablePagination-displayedRows {
-      font-family: var(--redsift-typography-datagrid-cell-font-family);
-    }
-
-    .MuiInputBase-root {
-      font-family: var(--redsift-typography-datagrid-cell-font-family);
-    }
-  }
-
-  .Mui-checked {
-    color: var(--redsift-color-primary-n);
-  }
-
-  .MuiDataGrid-rowCount {
-    font-family: var(--redsift-typography-datagrid-cell-font-family);
-  }
-
-  .MuiTablePagination-displayedRows {
-    font-family: var(--redsift-typography-datagrid-cell-font-family);
-  }
-
-  .MuiBadge-standard {
-    font-family: var(--redsift-typography-datagrid-cell-font-family);
-  }
-`;
-
 function Ripple(props) {
   const {
     className,
@@ -24615,161 +24588,10 @@ process.env.NODE_ENV !== "production" ? TablePagination.propTypes /* remove-prop
 } : void 0;
 var TablePagination$1 = TablePagination;
 
-const ControlledPagination$1 = _ref => {
-  let {
-    apiRef,
-    selectionStatus,
-    setSelectionStatusType,
-    selectionStatusType,
-    displaySelection,
-    displayPagination,
-    page,
-    onPageChange,
-    pageSize,
-    onPageSizeChange,
-    displayRowsPerPage,
-    rowsPerPageOptions,
-    paginationProps,
-    rowCount
-  } = _ref;
-  const totalNumberOfRowsInTable = rowCount;
-  const totalRowsLabel = `${selectionStatus.numberOfSelectedRows} row${selectionStatus.numberOfSelectedRows > 1 ? 's' : ''} selected`;
-  const pageRowsLabel = `All ${selectionStatus.numberOfSelectedRowsInPage} selectable rows on this page are selected${selectionStatus.numberOfSelectedRows != selectionStatus.numberOfSelectedRowsInPage ? ` (${selectionStatus.numberOfSelectedRows} row${selectionStatus.numberOfSelectedRows > 1 ? 's' : ''} selected in total)` : ''}.`;
-  return /*#__PURE__*/React__default.createElement(Flexbox, {
-    flexDirection: "row",
-    alignItems: "center",
-    justifyContent: "space-between",
-    marginBottom: "7px"
-  }, displaySelection ? /*#__PURE__*/React__default.createElement(React__default.Fragment, null, selectionStatusType === 'table' ? /*#__PURE__*/React__default.createElement(Text, {
-    fontSize: "14px"
-  }, "All selectable rows in the table are selected.", ' ', /*#__PURE__*/React__default.createElement(LinkButton, {
-    onClick: () => {
-      setSelectionStatusType('none');
-      apiRef.current.selectRows([], false, true);
-    }
-  }, "Clear selection.")) : selectionStatus.type === 'page' && selectionStatus.numberOfSelectedRowsInPage != 0 ? /*#__PURE__*/React__default.createElement(Text, {
-    fontSize: "14px"
-  }, pageRowsLabel, ' ', /*#__PURE__*/React__default.createElement(LinkButton, {
-    onClick: () => {
-      setSelectionStatusType('table');
-    }
-  }, "Select all selectable rows in the table.")) : selectionStatus.type === 'other' ? /*#__PURE__*/React__default.createElement(Text, {
-    fontSize: "14px"
-  }, totalRowsLabel) : /*#__PURE__*/React__default.createElement(Text, null)) : null, displayPagination ? /*#__PURE__*/React__default.createElement(TablePagination$1, _extends$2({
-    component: "div",
-    count: totalNumberOfRowsInTable,
-    page: page,
-    onPageChange: (event, newPage) => onPageChange(newPage),
-    rowsPerPage: pageSize,
-    onRowsPerPageChange: event => {
-      onPageSizeChange(parseInt(event.target.value, 10));
-    },
-    rowsPerPageOptions: displayRowsPerPage ? rowsPerPageOptions : []
-  }, paginationProps)) : null);
-};
-
-const onServerSideSelectionStatusChange = _ref => {
-  let {
-    newSelectionModel,
-    apiRef,
-    selectionStatus,
-    selectionStatusType,
-    setSelectionStatusType,
-    isRowSelectable,
-    page,
-    pageSize
-  } = _ref;
-  const selectableRowsInPage = isRowSelectable ? gridPaginatedVisibleSortedGridRowEntriesSelector(apiRef).filter(_ref2 => {
-    let {
-      model
-    } = _ref2;
-    return isRowSelectable({
-      row: model
-    });
-  }).map(_ref3 => {
-    let {
-      id
-    } = _ref3;
-    return id;
-  }) : gridPaginatedVisibleSortedGridRowIdsSelector(apiRef);
-  const numberOfSelectableRowsInPage = selectableRowsInPage.length;
-  const numberOfSelectedRows = newSelectionModel.length;
-  const selectedRowsInPage = selectableRowsInPage.filter(rowId => newSelectionModel.includes(rowId));
-  const numberOfSelectedRowsInPage = selectedRowsInPage.length;
-  const isSamePage = (selectionStatus === null || selectionStatus === void 0 ? void 0 : selectionStatus.current.page) == page;
-  const isSamePageSize = (selectionStatus === null || selectionStatus === void 0 ? void 0 : selectionStatus.current.pageSize) == pageSize;
-  if (selectionStatusType === 'table') {
-    // if we just move across page or pageSize
-    if (!isSamePage || !isSamePageSize) {
-      selectionStatus.current = {
-        type: 'table',
-        numberOfSelectedRows,
-        numberOfSelectedRowsInPage,
-        page,
-        pageSize
-      };
-    }
-    // if we selected all selectable rows (as effect of the previous if condition)
-    else if (numberOfSelectedRows > 0) {
-      setSelectionStatusType('none');
-      selectionStatus.current = {
-        type: 'none',
-        numberOfSelectedRows,
-        numberOfSelectedRowsInPage,
-        page,
-        pageSize
-      };
-      apiRef.current.selectRows([], false, true);
-    }
-    return;
-  }
-  if (selectionStatusType === 'page' && isSamePage && isSamePageSize && numberOfSelectedRowsInPage === numberOfSelectableRowsInPage) {
-    setSelectionStatusType('none');
-    selectionStatus.current = {
-      type: 'none',
-      numberOfSelectedRows,
-      numberOfSelectedRowsInPage,
-      page,
-      pageSize
-    };
-    setTimeout(() => {
-      apiRef.current.selectRows(selectedRowsInPage, false, false);
-    }, 0);
-    return;
-  }
-  if (numberOfSelectedRowsInPage === numberOfSelectableRowsInPage && numberOfSelectableRowsInPage != 0) {
-    setSelectionStatusType('page');
-    selectionStatus.current = {
-      type: 'page',
-      numberOfSelectedRows,
-      numberOfSelectedRowsInPage,
-      page,
-      pageSize
-    };
-    return;
-  }
-  if (numberOfSelectedRows > 0) {
-    setSelectionStatusType('other');
-    selectionStatus.current = {
-      type: 'other',
-      numberOfSelectedRows,
-      numberOfSelectedRowsInPage,
-      page,
-      pageSize
-    };
-    return;
-  }
-  setSelectionStatusType('none');
-  selectionStatus.current = {
-    type: 'none',
-    numberOfSelectedRows,
-    numberOfSelectedRowsInPage,
-    page,
-    pageSize
-  };
-  return;
-};
-
+const _excluded$1 = ["hideToolbar", "RenderedToolbar", "filterModel", "onFilterModelChange", "pagination", "ControlledPagination", "paginationPlacement", "selectionStatus", "apiRef", "isRowSelectable", "page", "onPageChange", "pageSize", "onPageSizeChange", "rowsPerPageOptions", "paginationProps", "paginationMode", "rowCount"],
+  _excluded2 = ["apiRef", "autoHeight", "className", "components", "componentsProps", "filterModel", "height", "hideToolbar", "initialState", "isRowSelectable", "license", "onFilterModelChange", "onPageChange", "onPageSizeChange", "selectionModel", "onSelectionModelChange", "page", "pageSize", "pagination", "paginationPlacement", "paginationProps", "rows", "rowsPerPageOptions", "sx", "theme", "paginationMode", "rowCount"];
+const COMPONENT_NAME$1 = 'DataGrid';
+const CLASSNAME$1 = 'redsift-datagrid';
 const getSelectableRowsInTable = (apiRef, isRowSelectable) => {
   return isRowSelectable && typeof isRowSelectable === 'function' ? gridFilteredSortedRowEntriesSelector(apiRef).filter(_ref => {
     let {
@@ -24785,8 +24607,7 @@ const getSelectableRowsInTable = (apiRef, isRowSelectable) => {
     return id;
   }) : gridFilteredSortedRowIdsSelector(apiRef);
 };
-
-const ControlledPagination = _ref => {
+const ControlledPagination = _ref3 => {
   let {
     displaySelection = false,
     displayRowsPerPage = false,
@@ -24800,7 +24621,7 @@ const ControlledPagination = _ref => {
     rowsPerPageOptions,
     isRowSelectable,
     paginationProps
-  } = _ref;
+  } = _ref3;
   const filteredRowsInTable = getSelectableRowsInTable(apiRef);
   const selectableRowsInTable = getSelectableRowsInTable(apiRef, isRowSelectable);
   const numberOfFilteredRowsInTable = filteredRowsInTable.length;
@@ -24836,26 +24657,54 @@ const ControlledPagination = _ref => {
     rowsPerPageOptions: displayRowsPerPage ? rowsPerPageOptions : []
   }, paginationProps)) : null);
 };
-
-const _excluded$1 = ["hideToolbar", "RenderedToolbar", "filterModel", "onFilterModelChange", "pagination", "paginationPlacement", "selectionStatus", "selectionStatusType", "setSelectionStatusType", "apiRef", "isRowSelectable", "page", "onPageChange", "pageSize", "onPageSizeChange", "rowsPerPageOptions", "paginationProps", "paginationMode", "rowCount"],
-  _excluded2 = ["apiRef", "autoHeight", "className", "components", "componentsProps", "filterModel", "height", "hideToolbar", "initialState", "isRowSelectable", "license", "onFilterModelChange", "onPageChange", "onPageSizeChange", "selectionModel", "onSelectionModelChange", "page", "pageSize", "pagination", "paginationPlacement", "paginationProps", "rows", "rowsPerPageOptions", "sx", "theme", "paginationMode", "rowCount", "onSelectionStatusChange", "isPreviousData"];
-const COMPONENT_NAME$1 = 'DataGrid';
-const CLASSNAME$1 = 'redsift-datagrid';
-const DEFAULT_PROPS = {
-  license: process.env.MUI_LICENSE_KEY,
-  paginationPlacement: 'both'
+const ServerSideControlledPagination = _ref4 => {
+  let {
+    selectionStatus,
+    displaySelection,
+    displayPagination,
+    page,
+    onPageChange,
+    pageSize,
+    onPageSizeChange,
+    displayRowsPerPage,
+    rowsPerPageOptions,
+    paginationProps,
+    rowCount
+  } = _ref4;
+  const totalNumberOfRowsInTable = rowCount;
+  const totalRowsLabel = `${selectionStatus.numberOfSelectedRows} row${selectionStatus.numberOfSelectedRows > 1 ? 's' : ''} selected`;
+  const pageRowsLabel = `All ${selectionStatus.numberOfSelectedRowsInPage} selectable rows on this page are selected${selectionStatus.numberOfSelectedRows != selectionStatus.numberOfSelectedRowsInPage ? ` (${selectionStatus.numberOfSelectedRows} row${selectionStatus.numberOfSelectedRows > 1 ? 's' : ''} selected in total)` : ''}.`;
+  return /*#__PURE__*/React__default.createElement(Flexbox, {
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "space-between",
+    marginBottom: "7px"
+  }, displaySelection ? /*#__PURE__*/React__default.createElement(React__default.Fragment, null, selectionStatus.type === 'page' && selectionStatus.numberOfSelectedRowsInPage != 0 ? /*#__PURE__*/React__default.createElement(Text, {
+    fontSize: "14px"
+  }, pageRowsLabel) : selectionStatus.type === 'other' ? /*#__PURE__*/React__default.createElement(Text, {
+    fontSize: "14px"
+  }, totalRowsLabel) : /*#__PURE__*/React__default.createElement(Text, null)) : null, displayPagination ? /*#__PURE__*/React__default.createElement(TablePagination$1, _extends$2({
+    component: "div",
+    count: totalNumberOfRowsInTable,
+    page: page,
+    onPageChange: (event, newPage) => onPageChange(newPage),
+    rowsPerPage: pageSize,
+    onRowsPerPageChange: event => {
+      onPageSizeChange(parseInt(event.target.value, 10));
+    },
+    rowsPerPageOptions: displayRowsPerPage ? rowsPerPageOptions : []
+  }, paginationProps)) : null);
 };
-const Toolbar = _ref => {
+const Toolbar = _ref5 => {
   let {
       hideToolbar,
       RenderedToolbar,
       filterModel,
       onFilterModelChange,
       pagination,
+      ControlledPagination,
       paginationPlacement,
       selectionStatus,
-      selectionStatusType,
-      setSelectionStatusType,
       apiRef,
       isRowSelectable,
       page,
@@ -24866,19 +24715,16 @@ const Toolbar = _ref => {
       paginationProps,
       paginationMode = 'client',
       rowCount
-    } = _ref,
-    forwardedProps = _objectWithoutProperties(_ref, _excluded$1);
+    } = _ref5,
+    forwardedProps = _objectWithoutProperties(_ref5, _excluded$1);
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, !hideToolbar ? /*#__PURE__*/React__default.createElement(RenderedToolbar, _extends$2({}, forwardedProps, {
     filterModel: filterModel,
     onFilterModelChange: onFilterModelChange
-  })) : null, pagination ? paginationMode === 'server' ? /*#__PURE__*/React__default.createElement(ControlledPagination$1, {
-    apiRef: apiRef,
+  })) : null, pagination ? paginationMode == 'server' ? /*#__PURE__*/React__default.createElement(ServerSideControlledPagination, {
     displaySelection: true,
     displayRowsPerPage: false,
     displayPagination: ['top', 'both'].includes(paginationPlacement),
     selectionStatus: selectionStatus.current,
-    setSelectionStatusType: setSelectionStatusType,
-    selectionStatusType: selectionStatusType,
     page: page,
     onPageChange: onPageChange,
     pageSize: pageSize,
@@ -24901,6 +24747,61 @@ const Toolbar = _ref => {
     paginationProps: paginationProps
   }) : null);
 };
+const onServerSideSelectionStatusChange = (newSelectionModel, apiRef, selectionStatus, isRowSelectable, page, pageSize) => {
+  const selectableRowsInPage = isRowSelectable ? gridPaginatedVisibleSortedGridRowEntriesSelector(apiRef).filter(_ref6 => {
+    let {
+      model
+    } = _ref6;
+    return isRowSelectable({
+      row: model
+    });
+  }).map(_ref7 => {
+    let {
+      id
+    } = _ref7;
+    return id;
+  }) : gridPaginatedVisibleSortedGridRowIdsSelector(apiRef);
+  const numberOfSelectableRowsInPage = selectableRowsInPage.length;
+  const numberOfSelectedRows = newSelectionModel.length;
+  const selectedRowsInPage = selectableRowsInPage.filter(rowId => newSelectionModel.includes(rowId));
+  const numberOfSelectedRowsInPage = selectedRowsInPage.length;
+  const isSamePage = (selectionStatus === null || selectionStatus === void 0 ? void 0 : selectionStatus.current.page) == page;
+  const isSamePageSize = (selectionStatus === null || selectionStatus === void 0 ? void 0 : selectionStatus.current.pageSize) == pageSize;
+
+  // if previous status is `page`,
+  // if page and pageSize didn't change
+  // and all the rows are selected, deselect all row
+  if (selectionStatus.current.type === 'page' && isSamePage && isSamePageSize && numberOfSelectedRowsInPage === numberOfSelectableRowsInPage) {
+    setTimeout(() => {
+      apiRef.current.selectRows(selectedRowsInPage, false, false);
+    }, 0);
+  }
+  if (numberOfSelectedRowsInPage === numberOfSelectableRowsInPage && numberOfSelectableRowsInPage != 0) {
+    selectionStatus.current = {
+      type: 'page',
+      numberOfSelectedRows,
+      numberOfSelectedRowsInPage,
+      page,
+      pageSize
+    };
+  } else if (numberOfSelectedRows > 0) {
+    selectionStatus.current = {
+      type: 'other',
+      numberOfSelectedRows,
+      numberOfSelectedRowsInPage,
+      page,
+      pageSize
+    };
+  } else {
+    selectionStatus.current = {
+      type: 'none',
+      numberOfSelectedRows,
+      numberOfSelectedRowsInPage,
+      page,
+      pageSize
+    };
+  }
+};
 const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
   var _initialState$paginat, _initialState$paginat2;
   const datagridRef = ref || useRef();
@@ -24915,7 +24816,7 @@ const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
       hideToolbar,
       initialState,
       isRowSelectable,
-      license,
+      license = process.env.MUI_LICENSE_KEY,
       onFilterModelChange: propsOnFilterModelChange,
       onPageChange: propsOnPageChange,
       onPageSizeChange: propsOnPageSizeChange,
@@ -24924,16 +24825,14 @@ const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
       page: propsPage,
       pageSize: propsPageSize,
       pagination,
-      paginationPlacement,
+      paginationPlacement = 'both',
       paginationProps,
       rows,
       rowsPerPageOptions,
       sx,
       theme: propsTheme,
       paginationMode = 'client',
-      rowCount,
-      onSelectionStatusChange: propsOnSelectionStatusChange,
-      isPreviousData
+      rowCount
     } = props,
     forwardedProps = _objectWithoutProperties(props, _excluded2);
   const theme = useTheme$4(propsTheme);
@@ -24959,9 +24858,8 @@ const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
   }, [propsSelectionModel]);
   const [page, setPage] = React__default.useState((initialState === null || initialState === void 0 ? void 0 : (_initialState$paginat = initialState.pagination) === null || _initialState$paginat === void 0 ? void 0 : _initialState$paginat.page) || propsPage || 0);
   const [pageSize, setPageSize] = React__default.useState((initialState === null || initialState === void 0 ? void 0 : (_initialState$paginat2 = initialState.pagination) === null || _initialState$paginat2 === void 0 ? void 0 : _initialState$paginat2.pageSize) || propsPageSize || (rowsPerPageOptions === null || rowsPerPageOptions === void 0 ? void 0 : rowsPerPageOptions[0]) || 100);
-  const [selectionStatusType, setSelectionStatusType] = useState('none');
   const selectionStatus = useRef({
-    type: selectionStatusType,
+    type: 'none',
     numberOfSelectedRows: 0,
     numberOfSelectedRowsInPage: 0,
     page,
@@ -24992,40 +24890,17 @@ const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
       setPageSize(propsPageSize);
     }
   }, [propsPageSize]);
-  useEffect(() => {
-    if (propsOnSelectionStatusChange) {
-      propsOnSelectionStatusChange(selectionStatusType);
-    }
-  }, [selectionStatusType]);
 
   // in server-side pagination we want to update the selection status
   // every time we navigate between pages, resize our page or select something
   useEffect(() => {
-    if (paginationMode === 'server') {
-      onServerSideSelectionStatusChange({
-        newSelectionModel: Array.isArray(selectionModel) ? selectionModel : [selectionModel],
-        apiRef,
-        selectionStatus,
-        selectionStatusType,
-        setSelectionStatusType,
-        isRowSelectable,
-        page,
-        pageSize
-      });
+    if (paginationMode == 'server') {
+      onServerSideSelectionStatusChange(Array.isArray(selectionModel) ? selectionModel : [selectionModel], apiRef, selectionStatus, isRowSelectable, page, pageSize);
     }
   }, [selectionModel, page, pageSize]);
-  useEffect(() => {
-    if (paginationMode === 'server' && selectionStatusType === 'table' && !isPreviousData) {
-      const selectableRowsInPage = getSelectableRowsInTable(apiRef, isRowSelectable);
-      setTimeout(() => {
-        apiRef.current.selectRows(selectableRowsInPage, false, true);
-      }, 0);
-    }
-  }, [isPreviousData]);
   if (!Array.isArray(rows)) {
     return null;
   }
-  const isServerTableSelection = paginationMode === 'server' && selectionStatusType === 'table';
   const muiTheme = useMemo(() => createTheme({
     palette: {
       mode: theme,
@@ -25092,7 +24967,7 @@ const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
       }, props))
     }, components), {}, {
       Toolbar: Toolbar,
-      Pagination: props => pagination ? paginationMode === 'server' ? /*#__PURE__*/React__default.createElement(ControlledPagination$1, _extends$2({}, props, {
+      Pagination: props => pagination ? paginationMode == 'server' ? /*#__PURE__*/React__default.createElement(ServerSideControlledPagination, _extends$2({}, props, {
         displaySelection: false,
         displayRowsPerPage: ['bottom', 'both'].includes(paginationPlacement),
         displayPagination: ['bottom', 'both'].includes(paginationPlacement),
@@ -25129,10 +25004,9 @@ const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
         filterModel,
         onFilterModelChange,
         pagination,
+        ControlledPagination: paginationMode == 'server' ? ServerSideControlledPagination : ControlledPagination,
         paginationPlacement,
         selectionStatus,
-        selectionStatusType,
-        setSelectionStatusType,
         apiRef,
         isRowSelectable,
         page,
@@ -25147,45 +25021,45 @@ const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
     }),
     filterModel: filterModel,
     initialState: initialState,
-    isRowSelectable: !isServerTableSelection ? isRowSelectable : () => false,
+    isRowSelectable: isRowSelectable,
     onFilterModelChange: onFilterModelChange,
     pagination: pagination,
     paginationMode: paginationMode,
-    keepNonExistentRowsSelected: paginationMode === 'server',
+    keepNonExistentRowsSelected: paginationMode == 'server',
     rows: rows,
     rowsPerPageOptions: rowsPerPageOptions,
     page: page,
     onPageChange: onPageChange,
     pageSize: pageSize,
     onPageSizeChange: onPageSizeChange,
-    selectionModel: isServerTableSelection ? getSelectableRowsInTable(apiRef, isRowSelectable) : selectionModel,
+    selectionModel: selectionModel,
     onSelectionModelChange: (newSelectionModel, details) => {
       if (pagination && paginationMode != 'server') {
-        const selectableRowsInPage = isRowSelectable ? gridPaginatedVisibleSortedGridRowEntriesSelector(apiRef).filter(_ref2 => {
+        const selectableRowsInPage = isRowSelectable ? gridPaginatedVisibleSortedGridRowEntriesSelector(apiRef).filter(_ref8 => {
           let {
             model
-          } = _ref2;
+          } = _ref8;
           return isRowSelectable({
             row: model
           });
-        }).map(_ref3 => {
+        }).map(_ref9 => {
           let {
             id
-          } = _ref3;
+          } = _ref9;
           return id;
         }) : gridPaginatedVisibleSortedGridRowIdsSelector(apiRef);
         const numberOfSelectableRowsInPage = selectableRowsInPage.length;
-        const selectableRowsInTable = isRowSelectable ? gridFilteredSortedRowEntriesSelector(apiRef).filter(_ref4 => {
+        const selectableRowsInTable = isRowSelectable ? gridFilteredSortedRowEntriesSelector(apiRef).filter(_ref10 => {
           let {
             model
-          } = _ref4;
+          } = _ref10;
           return isRowSelectable({
             row: model
           });
-        }).map(_ref5 => {
+        }).map(_ref11 => {
           let {
             id
-          } = _ref5;
+          } = _ref11;
           return id;
         }) : gridFilteredSortedRowIdsSelector(apiRef);
         const numberOfSelectableRowsInTable = selectableRowsInTable.length;
@@ -25196,25 +25070,21 @@ const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
           }, 0);
         }
         if (numberOfSelectedRows === numberOfSelectableRowsInPage && numberOfSelectableRowsInPage < numberOfSelectableRowsInTable) {
-          setSelectionStatusType('page');
           selectionStatus.current = {
             type: 'page',
             numberOfSelectedRows
           };
         } else if (numberOfSelectedRows === numberOfSelectableRowsInTable && numberOfSelectableRowsInPage < numberOfSelectableRowsInTable) {
-          setSelectionStatusType('table');
           selectionStatus.current = {
             type: 'table',
             numberOfSelectedRows
           };
         } else if (numberOfSelectedRows > 0) {
-          setSelectionStatusType('other');
           selectionStatus.current = {
             type: 'other',
             numberOfSelectedRows
           };
         } else {
-          setSelectionStatusType('none');
           selectionStatus.current = {
             type: 'none',
             numberOfSelectedRows
@@ -25223,11 +25093,18 @@ const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
       }
       onSelectionModelChange === null || onSelectionModelChange === void 0 ? void 0 : onSelectionModelChange(newSelectionModel, details);
     },
-    sx: _objectSpread2(_objectSpread2({}, sx), defaultSxStyle)
+    sx: _objectSpread2(_objectSpread2({}, sx), {}, {
+      '.MuiDataGrid-columnHeaders': {
+        flexDirection: 'column',
+        alignItems: 'normal'
+      },
+      '.MuiDataGrid-selectedRowCount': {
+        margin: 'none'
+      }
+    })
   })))));
 });
 DataGrid.className = CLASSNAME$1;
-DataGrid.defaultProps = DEFAULT_PROPS;
 DataGrid.displayName = COMPONENT_NAME$1;
 
 const StyledTextCell = styled$3.div`