Merge branch 'master' of https://github.com/material-table-core/core

material-table-core · Jul 2, 2021 · eef03a0 · eef03a0
2 parents b4b04c6 + cfcdd22
commit eef03a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/components/MTableHeader/index.js b/src/components/MTableHeader/index.js
@@ -30,14 +30,15 @@ export function MTableHeader({ onColumnResized, ...props }) {
   const handleMouseMove = React.useCallback(
     // Use usecallback to prevent triggering theuse effect too much
     (e) => {
-      if (!resizingColumnDef) {
-        return;
-      }
+      if (!resizingColumnDef) return;
       let additionalWidth = lastAdditionalWidth + e.clientX - lastX;
       additionalWidth = Math.min(
         resizingColumnDef.maxWidth || additionalWidth,
         additionalWidth
       );
+      let th = e.target.closest('th');
+      let currentWidth = +window.getComputedStyle(th).width.slice(0, -2);
+      if (currentWidth <= resizingColumnDef.minWidth) return;
       if (resizingColumnDef.tableData.additionalWidth !== additionalWidth) {
         onColumnResized(resizingColumnDef.tableData.id, additionalWidth);
       }

diff --git a/src/components/m-table-body-row.js b/src/components/m-table-body-row.js
@@ -158,16 +158,16 @@ export default function MTableBodyRow(props) {
     const selectionWidth = CommonValues.selectionMaxWidth(
       props,
       props.treeDataMaxLevel
-    );
+    ) || 0;
 
     const styles =
       size === 'medium'
         ? {
-            marginLeft: props.level * 9
+            marginLeft: props.level * 9 || 0
           }
         : {
             padding: '4px',
-            marginLeft: 5 + props.level * 9
+            marginLeft: 5 + props.level * 9 || 0
           };
 
     return (