@deephaven/grid 1.10.2-lerna-v9.0 → 1.12.0

package/dist/GridRenderer.js

@@ -1041,7 +1041,8 @@ export class GridRenderer {
       var columnIndex = startIndex;
       while (columnIndex <= endIndex) {
         var {
-          columnCount
+          columnCount,
+          calculatedColumnWidths
         } = metrics;
         var modelColumn = getOrThrow(modelColumns, columnIndex);
         var columnGroupName = model.textForColumnHeader(modelColumn, depth);
@@ -1054,25 +1055,25 @@ export class GridRenderer {
           // The group will be drawn as if it were a column with a max width of the bounds width
           var prevColumnIndex = columnIndex - 1;
           while (prevColumnIndex >= 0 && (columnGroupRight - columnGroupLeft < visibleWidth || columnGroupLeft > minX)) {
-            var _modelColumns$get, _ref3, _userColumnWidths$get;
+            var _modelColumns$get, _ref3, _ref4, _userColumnWidths$get;
             var prevModelIndex = (_modelColumns$get = modelColumns.get(prevColumnIndex)) !== null && _modelColumns$get !== void 0 ? _modelColumns$get : GridUtils.getModelIndex(prevColumnIndex, movedColumns);
             if (prevModelIndex == null || model.textForColumnHeader(prevModelIndex, depth) !== columnGroupName) {
               // Previous column not in the same group
               break;
             }
-            var prevColumnWidth = (_ref3 = (_userColumnWidths$get = userColumnWidths.get(prevModelIndex)) !== null && _userColumnWidths$get !== void 0 ? _userColumnWidths$get : allColumnWidths.get(prevColumnIndex)) !== null && _ref3 !== void 0 ? _ref3 : columnWidth;
+            var prevColumnWidth = (_ref3 = (_ref4 = (_userColumnWidths$get = userColumnWidths.get(prevModelIndex)) !== null && _userColumnWidths$get !== void 0 ? _userColumnWidths$get : allColumnWidths.get(prevColumnIndex)) !== null && _ref4 !== void 0 ? _ref4 : calculatedColumnWidths.get(prevModelIndex)) !== null && _ref3 !== void 0 ? _ref3 : columnWidth;
             columnGroupLeft -= prevColumnWidth;
             prevColumnIndex -= 1;
           }
           var nextColumnIndex = columnIndex + 1;
           while (nextColumnIndex < columnCount && (columnGroupRight - columnGroupLeft < visibleWidth || columnGroupRight < maxX)) {
-            var _modelColumns$get2, _ref4, _userColumnWidths$get2;
+            var _modelColumns$get2, _ref5, _userColumnWidths$get2;
             var nextModelIndex = (_modelColumns$get2 = modelColumns.get(nextColumnIndex)) !== null && _modelColumns$get2 !== void 0 ? _modelColumns$get2 : GridUtils.getModelIndex(nextColumnIndex, movedColumns);
             if (model.textForColumnHeader(nextModelIndex, depth) !== columnGroupName) {
               // Next column not in the same group
               break;
             }
-            var nextColumnWidth = (_ref4 = (_userColumnWidths$get2 = userColumnWidths.get(nextModelIndex)) !== null && _userColumnWidths$get2 !== void 0 ? _userColumnWidths$get2 : allColumnWidths.get(nextColumnIndex)) !== null && _ref4 !== void 0 ? _ref4 : columnWidth;
+            var nextColumnWidth = (_ref5 = (_userColumnWidths$get2 = userColumnWidths.get(nextModelIndex)) !== null && _userColumnWidths$get2 !== void 0 ? _userColumnWidths$get2 : allColumnWidths.get(nextColumnIndex)) !== null && _ref5 !== void 0 ? _ref5 : columnWidth;
             columnGroupRight += nextColumnWidth;
             nextColumnIndex += 1;
           }