material-react-table 1.0.4 → 1.0.6

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.4",
+  "version": "1.0.6",
   "license": "MIT",
   "name": "material-react-table",
   "description": "A fully featured Material UI V5 implementation of TanStack React Table V8, written from the ground up in TypeScript.",

package/src/column.utils.ts

@@ -21,19 +21,18 @@ export const getColumnId = <TData extends Record<string, any> = {}>(
 export const getAllLeafColumnDefs = <TData extends Record<string, any> = {}>(
   columns: MRT_ColumnDef<TData>[],
 ): MRT_ColumnDef<TData>[] => {
-  let lowestLevelColumns: MRT_ColumnDef<TData>[] = columns;
-  let currentCols: MRT_ColumnDef<TData>[] | undefined = columns;
-  while (!!currentCols?.length && currentCols.some((col) => col.columns)) {
-    const nextCols: MRT_ColumnDef<TData>[] = currentCols
-      .filter((col) => !!col.columns)
-      .map((col) => col.columns)
-      .flat() as MRT_ColumnDef<TData>[];
-    if (nextCols.every((col) => !col?.columns)) {
-      lowestLevelColumns = [...lowestLevelColumns, ...nextCols];
-    }
-    currentCols = nextCols;
-  }
-  return lowestLevelColumns.filter((col) => !col.columns);
+  const allLeafColumnDefs: MRT_ColumnDef<TData>[] = [];
+  const getLeafColumns = (cols: MRT_ColumnDef<TData>[]) => {
+    cols.forEach((col) => {
+      if (col.columns) {
+        getLeafColumns(col.columns);
+      } else {
+        allLeafColumnDefs.push(col);
+      }
+    });
+  };
+  getLeafColumns(columns);
+  return allLeafColumnDefs;
 };
 
 export const prepareColumns = <TData extends Record<string, any> = {}>({
@@ -120,9 +119,10 @@ export const getLeadingDisplayColumnIds = <
 ) =>
   [
     (props.enableRowDragging || props.enableRowOrdering) && 'mrt-row-drag',
-    ((props.positionActionsColumn === 'first' && props.enableRowActions) ||
-      (props.enableEditing &&
-        ['row', 'modal'].includes(props.editingMode ?? ''))) &&
+    props.positionActionsColumn === 'first' &&
+      (props.enableRowActions ||
+        (props.enableEditing &&
+          ['row', 'modal'].includes(props.editingMode ?? ''))) &&
       'mrt-row-actions',
     props.positionExpandColumn === 'first' &&
       showExpandColumn(props) &&
@@ -136,9 +136,10 @@ export const getTrailingDisplayColumnIds = <
 >(
   props: MaterialReactTableProps<TData>,
 ) => [
-  ((props.positionActionsColumn === 'last' && props.enableRowActions) ||
-    (props.enableEditing &&
-      ['row', 'modal'].includes(props.editingMode ?? ''))) &&
+  props.positionActionsColumn === 'last' &&
+    (props.enableRowActions ||
+      (props.enableEditing &&
+        ['row', 'modal'].includes(props.editingMode ?? ''))) &&
     'mrt-row-actions',
   props.positionExpandColumn === 'last' &&
     showExpandColumn(props) &&