Skip to content

Commit e46e7ae

Browse files
MKirovaMKirova
authored andcommitted
Fix build.
1 parent 54e0514 commit e46e7ae

File tree

5 files changed

+14
-19
lines changed

5 files changed

+14
-19
lines changed

projects/igniteui-angular/src/lib/grids/common/pipes.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { IgxTreeGridRowComponent } from '../tree-grid/tree-grid-row.component';
1313
import { IgxGridRowComponent } from '../grid/grid-row.component';
1414
import { IgxHierarchicalRowComponent } from '../hierarchical-grid/hierarchical-row.component';
1515
import { IgxSummaryOperand, IgxSummaryResult } from '../summaries/grid-summary';
16+
import { IgxPivotRowComponent } from '../pivot-grid/pivot-row.component';
1617

1718
interface CSSProp {
1819
[prop: string]: any;
@@ -71,7 +72,7 @@ export class IgxGridCellStylesPipe implements PipeTransform {
7172
}
7273
}
7374

74-
type _RowType = IgxGridRowComponent | IgxTreeGridRowComponent | IgxHierarchicalRowComponent;
75+
type _RowType = IgxGridRowComponent | IgxTreeGridRowComponent | IgxHierarchicalRowComponent | IgxPivotRowComponent;
7576

7677
/**
7778
* @hidden

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6081,6 +6081,16 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
60816081
return this.beginAddRowById(this.gridAPI.get_rec_id_by_index(index - 1, this.dataView));
60826082
}
60836083

6084+
/**
6085+
* @hidden
6086+
*/
6087+
public preventHeaderScroll(args) {
6088+
if (args.target.scrollLeft !== 0) {
6089+
(this.navigation as any).forOfDir().getScroll().scrollLeft = args.target.scrollLeft;
6090+
args.target.scrollLeft = 0;
6091+
}
6092+
}
6093+
60846094
protected beginAddRowForIndex(index: number, asChild: boolean = false) {
60856095
const row: IgxRowDirective<IgxGridBaseDirective & GridType> = index == null ?
60866096
null : this.rowList.find(r => r.index === index);
@@ -6091,8 +6101,6 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
60916101
}
60926102
}
60936103

6094-
6095-
60966104
protected _createColumn(col) {
60976105
let ref;
60986106
if (col instanceof IgxColumnGroupComponent) {

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -675,13 +675,6 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,
675675
this.notifyChanges(true);
676676
}
677677

678-
public preventHeaderScroll(args) {
679-
if (args.target.scrollLeft !== 0) {
680-
(this.navigation as any).forOfDir().getScroll().scrollLeft = args.target.scrollLeft;
681-
args.target.scrollLeft = 0;
682-
}
683-
}
684-
685678
/**
686679
* Returns if a group is expanded or not.
687680
*

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
let-rowIndex="index" [igxForScrollOrientation]="'vertical'" [igxForScrollContainer]='verticalScroll'
3737
[igxForContainerSize]='calcHeight'
3838
[igxForItemSize]="hasColumnLayouts ? rowHeight * multiRowLayoutRowSize + 1 : renderedRowHeight"
39-
[igxForTrackBy]='trackChanges'
40-
#verticalScrollContainer (chunkPreload)="dataLoading($event)">
39+
#verticalScrollContainer>
4140
<ng-template
4241
[igxTemplateOutlet]='recordTemplate'
4342
[igxTemplateOutletContext]='getContext(rowData, rowIndex)'
@@ -93,18 +92,12 @@
9392
<ng-template #emptyFilteredGrid>
9493
<span class="igx-grid__tbody-message" role="cell">
9594
<span>{{emptyFilteredGridMessage}}</span>
96-
<span *ngIf='showAddButton'>
97-
<ng-container *ngTemplateOutlet='addRowEmptyTemplate || defaultAddRowEmptyTemplate'></ng-container>
98-
</span>
9995
</span>
10096
</ng-template>
10197

10298
<ng-template #defaultEmptyGrid>
10399
<span class="igx-grid__tbody-message" role="cell">
104100
<span>{{emptyGridMessage}}</span>
105-
<span *ngIf='showAddButton'>
106-
<ng-container *ngTemplateOutlet='addRowEmptyTemplate || defaultAddRowEmptyTemplate'></ng-container>
107-
</span>
108101
</span>
109102
</ng-template>
110103

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
6767
* @hidden @internal
6868
*/
6969
@ViewChild('record_template', { read: TemplateRef, static: true })
70-
protected recordTemplate: TemplateRef<any>;
70+
public recordTemplate: TemplateRef<any>;
7171

7272
private _data;
7373
private _filteredData;

0 commit comments

Comments
 (0)