Merge pull request #1825 from frmachao/fix_by_machao

fix two issues
gregnb · Feb 20, 2022 · b8a6059 · b8a6059
2 parents b50437d + 8a65431
commit b8a6059
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/components/TableBody.js b/src/components/TableBody.js
@@ -320,6 +320,7 @@ class TableBody extends React.Component {
         ) : (
           <TableBodyRow options={options}>
             <TableBodyCell
+              isEmpty={true}
               colSpan={options.selectableRows !== 'none' || options.expandableRows ? visibleColCnt + 1 : visibleColCnt}
               options={options}
               colIndex={0}

diff --git a/src/components/TableBodyCell.js b/src/components/TableBodyCell.js
@@ -32,7 +32,7 @@ const useStyles = makeStyles(
         display: 'inline-block',
         fontSize: '16px',
         height: 'auto',
-        width: 'calc(50%)',
+        width: props=>props.isEmpty?'calc(100%)':'calc(50%)',
         boxSizing: 'border-box',
         '&:last-child': {
           borderBottom: 'none',
@@ -94,7 +94,7 @@ const useStyles = makeStyles(
 );
 
 function TableBodyCell(props) {
-  const classes = useStyles();
+  const classes = useStyles(props);
   const {
     children,
     colIndex,
@@ -172,7 +172,7 @@ function TableBodyCell(props) {
 
   var innerCells;
   if (
-    ['standard', 'scrollMaxHeight', 'scrollFullHeight', 'scrollFullHeightFullWidth'].indexOf(options.responsive) !== -1
+    ['standard', 'scrollMaxHeight', 'scrollFullHeight', 'scrollFullHeightFullWidth'].indexOf(options.responsive) !== -1||props.isEmpty
   ) {
     innerCells = cells.slice(1, 2);
   } else {

diff --git a/src/components/TableHeadCell.js b/src/components/TableHeadCell.js
@@ -120,7 +120,7 @@ const TableHeadCell = ({
     classes: { root: classes.sortLabelRoot },
     tabIndex: -1,
     active: sortActive,
-    hideSortIcon: true,
+    hideSortIcon: false,
     ...(ariaSortDirection ? { direction: sortDirection } : {}),
   };