Merge branch 'canary' into ts42

Author: nstepien

src/DataGrid.tsx

@@ -267,7 +267,7 @@ function DataGrid<R, SR>({
     expandedGroupIds
   });
 
-  const hasGroups = groupBy.length > 0 && rowGrouper;
+  const hasGroups = groupBy.length > 0 && typeof rowGrouper === 'function';
   const minColIdx = hasGroups ? -1 : 0;
 
   // Cell drag is not supported on a treegrid

src/GroupCell.tsx

@@ -62,7 +62,7 @@ function GroupCell<R, SR>({
       }}
       onClick={isLevelMatching ? toggleGroup : undefined}
     >
-      {column.groupFormatter && (!column.rowGroup || groupColumnIndex === column.idx) && (
+      {(!column.rowGroup || groupColumnIndex === column.idx) && (
         <column.groupFormatter
           groupKey={groupKey}
           childRows={childRows}

src/hooks/useViewportColumns.ts

@@ -32,21 +32,23 @@ export function useViewportColumns<R, SR>({
     let lastFrozenColumnIndex = -1;
 
     const columns = rawColumns.map(rawColumn => {
-      const isGroup = rawGroupBy?.includes(rawColumn.key);
+      const rowGroup = rawGroupBy?.includes(rawColumn.key) ?? false;
+      // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+      const frozen = rowGroup || rawColumn.frozen || false;
 
       const column: CalculatedColumn<R, SR> = {
         ...rawColumn,
         idx: 0,
-        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-        frozen: isGroup || rawColumn.frozen || false,
+        frozen,
         isLastFrozenColumn: false,
-        rowGroup: isGroup,
+        rowGroup,
         sortable: rawColumn.sortable ?? defaultSortable,
         resizable: rawColumn.resizable ?? defaultResizable,
-        formatter: rawColumn.formatter ?? defaultFormatter
+        formatter: rawColumn.formatter ?? defaultFormatter,
+        groupFormatter: rawColumn.groupFormatter ?? ToggleGroupFormatter
       };
 
-      if (column.frozen) {
+      if (frozen) {
         lastFrozenColumnIndex++;
       }
 
@@ -81,16 +83,15 @@ export function useViewportColumns<R, SR>({
     columns.forEach((column, idx) => {
       column.idx = idx;
 
-      if (idx === lastFrozenColumnIndex) {
-        column.isLastFrozenColumn = true;
-      }
-
       if (column.rowGroup) {
         groupBy.push(column.key);
-        column.groupFormatter ??= ToggleGroupFormatter;
       }
     });
 
+    if (lastFrozenColumnIndex !== -1) {
+      columns[lastFrozenColumnIndex].isLastFrozenColumn = true;
+    }
+
     return {
       columns,
       lastFrozenColumnIndex,

src/types.ts

@@ -62,8 +62,9 @@ export interface CalculatedColumn<TRow, TSummaryRow = unknown> extends Column<TR
   sortable: boolean;
   frozen: boolean;
   isLastFrozenColumn: boolean;
-  rowGroup?: boolean;
+  rowGroup: boolean;
   formatter: React.ComponentType<FormatterProps<TRow, TSummaryRow>>;
+  groupFormatter: React.ComponentType<GroupFormatterProps<TRow, TSummaryRow>>;
 }
 
 export interface ColumnMetric {