Skip to content

Commit d8cae88

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Allow overflow for headers that need to span multiple rows.
1 parent 922b2c2 commit d8cae88

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-header-row.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,13 @@
163163
</ng-container>
164164
</ng-container>
165165
<div [style.max-height.px]='maxContainerHeight'>
166-
<div class="igx-grid-thead__group" *ngFor='let dimLevelColumns of columnDimensionsByLevel' [style.width.px]='grid.unpinnedWidth'>
166+
<div style='overflow:visible;' [style.height.px]='grid.rowHeight' class="igx-grid-thead__group" *ngFor='let dimLevelColumns of columnDimensionsByLevel' [style.width.px]='grid.unpinnedWidth'>
167167
<ng-template igxGridFor #headerVirtualContainer let-column
168168
[igxGridForOf]="dimLevelColumns" [igxGridForOfUniqueSizeCache] = 'true' [igxForScrollContainer]="grid.parentVirtDir"
169169
[igxForContainerSize]="grid.unpinnedWidth" [igxForTrackBy]="grid.trackColumnChanges"
170170
[igxForSizePropName]="'calcPixelWidth'" [igxForScrollOrientation]="'horizontal'">
171171
<igx-grid-header-group [ngClass]="column.headerGroupClasses"
172+
[style.height.px]='calcHeight(column)'
172173
[ngStyle]="column.headerGroupStyles |igxHeaderGroupStyle:column:grid.pipeTrigger" [column]="column"
173174
[style.min-width]="column.calcWidth | igxHeaderGroupWidth:grid.defaultHeaderGroupMinWidth:hasMRL"
174175
[style.flex-basis]="column.calcWidth | igxHeaderGroupWidth:grid.defaultHeaderGroupMinWidth:hasMRL"

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-header-row.component.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { IgxGridForOfDirective } from '../../directives/for-of/for_of.directive'
1919
import { ISelectionEventArgs } from '../../drop-down/drop-down.common';
2020
import { IgxDropDownComponent } from '../../drop-down/drop-down.component';
2121
import { AbsoluteScrollStrategy, AutoPositionStrategy, OverlaySettings, PositionSettings, VerticalAlignment } from '../../services/public_api';
22-
import { IGX_GRID_BASE, PivotGridType } from '../common/grid.interface';
22+
import { ColumnType, IGX_GRID_BASE, PivotGridType } from '../common/grid.interface';
2323
import { IgxGridHeaderGroupComponent } from '../headers/grid-header-group.component';
2424
import { IgxGridHeaderRowComponent } from '../headers/grid-header-row.component';
2525
import { DropPosition } from '../moving/moving.service';
@@ -94,6 +94,10 @@ export class IgxPivotHeaderRowComponent extends IgxGridHeaderRowComponent implem
9494
return this.totalDepth * this.grid.renderedRowHeight;
9595
}
9696

97+
public calcHeight(col: ColumnType) {
98+
return !col.columnGroup && col.level < this.totalDepth ? (this.totalDepth - col.level) * this.grid.rowHeight : this.grid.rowHeight;
99+
}
100+
97101

98102
public populateColumnDimensionsByLevel() {
99103
const res = [];

0 commit comments

Comments
 (0)