Skip to content

Commit 43f63ac

Browse files
committed
fix(uiGridHeader): Recalc all explicit heights
Any time we are refreshing the canvas and headers have explicit heights, we need to remove them and then recalculate as altered settings may change the necessary height. Fixes #3136
1 parent 2cd2266 commit 43f63ac

File tree

2 files changed

+140
-128
lines changed

2 files changed

+140
-128
lines changed

src/js/core/directives/ui-grid-render-container.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,9 @@
133133

134134
var viewportHeight = rowContainer.getViewportHeight();
135135

136-
var headerViewportWidth = colContainer.getHeaderViewportWidth();
137-
var footerViewportWidth = colContainer.getHeaderViewportWidth();
136+
var headerViewportWidth,
137+
footerViewportWidth;
138+
headerViewportWidth = footerViewportWidth = colContainer.getHeaderViewportWidth();
138139

139140
// Set canvas dimensions
140141
ret += '\n .grid' + uiGridCtrl.grid.id + ' .ui-grid-render-container-' + $scope.containerId + ' .ui-grid-canvas { width: ' + canvasWidth + 'px; height: ' + canvasHeight + 'px; }';
@@ -144,6 +145,9 @@
144145
if (renderContainer.explicitHeaderCanvasHeight) {
145146
ret += '\n .grid' + uiGridCtrl.grid.id + ' .ui-grid-render-container-' + $scope.containerId + ' .ui-grid-header-canvas { height: ' + renderContainer.explicitHeaderCanvasHeight + 'px; }';
146147
}
148+
else {
149+
ret += '\n .grid' + uiGridCtrl.grid.id + ' .ui-grid-render-container-' + $scope.containerId + ' .ui-grid-header-canvas { height: inherit; }';
150+
}
147151

148152
ret += '\n .grid' + uiGridCtrl.grid.id + ' .ui-grid-render-container-' + $scope.containerId + ' .ui-grid-viewport { width: ' + viewportWidth + 'px; height: ' + viewportHeight + 'px; }';
149153
ret += '\n .grid' + uiGridCtrl.grid.id + ' .ui-grid-render-container-' + $scope.containerId + ' .ui-grid-header-viewport { width: ' + headerViewportWidth + 'px; }';

0 commit comments

Comments
 (0)