Skip to content

Commit dd69794

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Minor fixes.
1 parent dbf6c29 commit dd69794

File tree

5 files changed

+10
-2
lines changed

5 files changed

+10
-2
lines changed

projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1581,7 +1581,7 @@ export class IgxGridForOfDirective<T> extends IgxForOfDirective<T> implements On
15811581
const dimension = this.igxForScrollOrientation === 'horizontal' ?
15821582
this.igxForSizePropName : 'height';
15831583
if (dimension === 'height') {
1584-
size = parseInt(this.igxForItemSize, 10) || 0;
1584+
size = item[this.igxForSizePropName] || parseInt(this.igxForItemSize, 10) || 0;
15851585
if (item && item.summaries) {
15861586
size = item.max;
15871587
} else if (item && item.groups && item.height) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
let-rowIndex="index" [igxForScrollOrientation]="'vertical'" [igxForScrollContainer]='verticalScroll'
2626
[igxForContainerSize]='calcHeight'
2727
[igxForItemSize]="renderedRowHeight"
28+
[igxForSizePropName]='getPropName(dim)'
2829
#verticalRowDimScrollContainer>
2930
<igx-pivot-row-dimension-content role='row' class="igx-grid-thead" [grid]="this"
3031
[dimension]='dim'

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,4 +1233,8 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
12331233
});
12341234
return cols;
12351235
}
1236+
1237+
public getPropName(dim: IPivotDimension) {
1238+
return dim.memberName + this.pivotKeys.rowDimensionSeparator + 'height';
1239+
}
12361240
}

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.pipes.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ export class IgxPivotCellMergingPipe implements PipeTransform {
128128
groupData.forEach((gr, ind) => {
129129
if (ind === 0) {
130130
gr[prevDim.dimension.memberName + pivotKeys.rowDimensionSeparator + 'first'] = true;
131+
gr[prevDimRoot.memberName + pivotKeys.rowDimensionSeparator + 'height'] = groupData.length * this.grid.renderedRowHeight;
132+
} else {
133+
gr[prevDimRoot.memberName + pivotKeys.rowDimensionSeparator + 'height'] = 1;
131134
}
132135
gr[prevDim.dimension.memberName + pivotKeys.rowDimensionSeparator + 'rowSpan'] = groupData.length;
133136
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ export class IgxPivotRowDimensionContentComponent extends IgxGridHeaderRowCompon
118118
}
119119

120120
get headerHeight() {
121-
return this.rowSpan * this.grid.renderedRowHeight;
121+
return this.rowSpan * this.grid.rowHeight;
122122
}
123123

124124
get isFirst() {

0 commit comments

Comments
 (0)