fix: Cherry-pick DH-21367: Fix shifting header group text (#2604)

Cherry-pick #2603

Author: vbabich

packages/grid/src/GridRenderer.ts

@@ -1387,7 +1387,7 @@ export class GridRenderer {
       let columnIndex = startIndex;
 
       while (columnIndex <= endIndex) {
-        const { columnCount } = metrics;
+        const { columnCount, calculatedColumnWidths } = metrics;
         const modelColumn = getOrThrow(modelColumns, columnIndex);
         const columnGroupName = model.textForColumnHeader(modelColumn, depth);
         const columnGroupColor = model.colorForColumnHeader(modelColumn, depth);
@@ -1420,6 +1420,7 @@ export class GridRenderer {
             const prevColumnWidth =
               userColumnWidths.get(prevModelIndex) ??
               allColumnWidths.get(prevColumnIndex) ??
+              calculatedColumnWidths.get(prevModelIndex) ??
               columnWidth;
 
             columnGroupLeft -= prevColumnWidth;