material-react-table 1.0.4 → 1.0.6

package/dist/cjs/index.js

@@ -510,19 +510,19 @@ const MRT_GrabHandleButton = ({ iconButtonProps, onDragEnd, onDragStart, table,
 
 const getColumnId = (columnDef) => { var _a, _b, _c, _d; return (_d = (_a = columnDef.id) !== null && _a !== void 0 ? _a : (_c = (_b = columnDef.accessorKey) === null || _b === void 0 ? void 0 : _b.toString) === null || _c === void 0 ? void 0 : _c.call(_b)) !== null && _d !== void 0 ? _d : columnDef.header; };
 const getAllLeafColumnDefs = (columns) => {
-    let lowestLevelColumns = columns;
-    let currentCols = columns;
-    while (!!(currentCols === null || currentCols === void 0 ? void 0 : currentCols.length) && currentCols.some((col) => col.columns)) {
-        const nextCols = currentCols
-            .filter((col) => !!col.columns)
-            .map((col) => col.columns)
-            .flat();
-        if (nextCols.every((col) => !(col === null || col === void 0 ? void 0 : col.columns))) {
-            lowestLevelColumns = [...lowestLevelColumns, ...nextCols];
-        }
-        currentCols = nextCols;
-    }
-    return lowestLevelColumns.filter((col) => !col.columns);
+    const allLeafColumnDefs = [];
+    const getLeafColumns = (cols) => {
+        cols.forEach((col) => {
+            if (col.columns) {
+                getLeafColumns(col.columns);
+            }
+            else {
+                allLeafColumnDefs.push(col);
+            }
+        });
+    };
+    getLeafColumns(columns);
+    return allLeafColumnDefs;
 };
 const prepareColumns = ({ columnDefs, columnFilterFns, defaultDisplayColumn, filterFns, sortingFns, }) => columnDefs.map((columnDef) => {
     var _a, _b;
@@ -574,9 +574,10 @@ const getLeadingDisplayColumnIds = (props) => {
     var _a;
     return [
         (props.enableRowDragging || props.enableRowOrdering) && 'mrt-row-drag',
-        ((props.positionActionsColumn === 'first' && props.enableRowActions) ||
-            (props.enableEditing &&
-                ['row', 'modal'].includes((_a = props.editingMode) !== null && _a !== void 0 ? _a : ''))) &&
+        props.positionActionsColumn === 'first' &&
+            (props.enableRowActions ||
+                (props.enableEditing &&
+                    ['row', 'modal'].includes((_a = props.editingMode) !== null && _a !== void 0 ? _a : ''))) &&
             'mrt-row-actions',
         props.positionExpandColumn === 'first' &&
             showExpandColumn(props) &&
@@ -588,9 +589,10 @@ const getLeadingDisplayColumnIds = (props) => {
 const getTrailingDisplayColumnIds = (props) => {
     var _a;
     return [
-        ((props.positionActionsColumn === 'last' && props.enableRowActions) ||
-            (props.enableEditing &&
-                ['row', 'modal'].includes((_a = props.editingMode) !== null && _a !== void 0 ? _a : ''))) &&
+        props.positionActionsColumn === 'last' &&
+            (props.enableRowActions ||
+                (props.enableEditing &&
+                    ['row', 'modal'].includes((_a = props.editingMode) !== null && _a !== void 0 ? _a : ''))) &&
             'mrt-row-actions',
         props.positionExpandColumn === 'last' &&
             showExpandColumn(props) &&