Skip to content

Commit f19e27e

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Fix styles in case only 1 level of hierarchy exists.
1 parent a155a0c commit f19e27e

File tree

4 files changed

+21
-4
lines changed

4 files changed

+21
-4
lines changed

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2881,6 +2881,15 @@
28812881
flex-direction: column;
28822882
}
28832883

2884+
%grid-thead--virtualizationWrapper {
2885+
height: 100%;
2886+
}
2887+
2888+
%grid-thead--virtualizationContainer {
2889+
overflow: visible;
2890+
height: 100%;
2891+
}
2892+
28842893
%igx-grid__tr-pivot {
28852894
display: flex;
28862895
align-items: center;

projects/igniteui-angular/src/lib/core/styles/components/grid/_header-row-component.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,14 @@
7777
@include m(pivot) {
7878
@extend %grid-thead--pivot !optional;
7979
}
80+
81+
@include m(virtualizationWrapper) {
82+
@extend %grid-thead--virtualizationWrapper !optional;
83+
}
84+
85+
@include m(virtualizationContainer) {
86+
@extend %grid-thead--virtualizationContainer !optional;
87+
}
8088
}
8189

8290
@include b(igx-grid-th) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,14 @@
162162
</igx-grid-header-group>
163163
</ng-container>
164164
</ng-container>
165-
<div [style.max-height.px]='maxContainerHeight'>
166-
<div style='overflow:visible;' [style.height.px]='grid.rowHeight' class="igx-grid-thead__group" *ngFor='let dimLevelColumns of columnDimensionsByLevel; let i = index' [style.width.px]='grid.unpinnedWidth'>
165+
<div class="igx-grid-thead--virtualizationWrapper" [style.max-height.px]='maxContainerHeight'>
166+
<div class="igx-grid-thead__group igx-grid-thead--virtualizationContainer" [style.height.px]='totalDepth > 1 ? grid.rowHeight : undefined' *ngFor='let dimLevelColumns of columnDimensionsByLevel; let i = index' [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, i)'
172+
[style.height.px]='totalDepth > 1 ? calcHeight(column, i) : undefined'
173173
[ngStyle]="column.headerGroupStyles |igxHeaderGroupStyle:column:grid.pipeTrigger" [column]="column"
174174
[style.min-width]="column.calcWidth | igxHeaderGroupWidth:grid.defaultHeaderGroupMinWidth:hasMRL"
175175
[style.flex-basis]="column.calcWidth | igxHeaderGroupWidth:grid.defaultHeaderGroupMinWidth:hasMRL"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export class IgxPivotHeaderRowComponent extends IgxGridHeaderRowComponent implem
9191
}
9292

9393
public get maxContainerHeight() {
94-
return this.totalDepth * this.grid.renderedRowHeight;
94+
return this.totalDepth > 1 ? this.totalDepth * this.grid.renderedRowHeight : undefined;
9595
}
9696

9797
public calcHeight(col: ColumnType, index: number) {

0 commit comments

Comments
 (0)