Skip to content

Commit 5b3b57d

Browse files
MKirovaMKirova
authored andcommitted
fix(igxHierarchicalGrid): Fix issue when dynamically adding row islands and columns.
1 parent 7498e03 commit 5b3b57d

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,8 +1108,8 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti
11081108
const nestedColumns = childLayouts.map((layout) => layout.columnList.toArray());
11091109
const colsArray = [].concat.apply([], nestedColumns);
11101110
const colLength = this.columnList.length;
1111-
if (colsArray.length > 0) {
1112-
const topCols = this.columnList.filter((item) => colsArray.indexOf(item) === -1);
1111+
const topCols = this.columnList.filter((item) => colsArray.indexOf(item) === -1);
1112+
if (topCols.length > 0) {
11131113
this.updateColumns(topCols);
11141114
if (recalcColSizes && this.columns.length !== colLength) {
11151115
this.calculateGridSizes(false);

src/app/hierarchical-grid/hierarchical-grid.sample.html

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,17 @@ <h4 class="sample-title">Sample two</h4>
140140
<h4 class="sample-title">Sample three (batch editing)</h4>
141141
<div class="sample-actions">
142142
<button igxButton="raised" (click)='riToggle = !riToggle'>Change row islands runtime</button>
143+
<button igxButton="raised" (click)="columnsReady = !columnsReady">Toggle columns</button>
144+
<button igxButton="raised" (click)="layoutsReady = !layoutsReady">Toggle child layouts</button>
143145
</div>
144146
<igx-hierarchical-grid [batchEditing]="true"
145-
[rowEditable]="true" [primaryKey]="'ID'" [data]="localData" [autoGenerate]="true" [height]="'600px'" [width]="'800px'" #hGrid2>
146-
147-
<igx-row-island [key]="'childData'" [primaryKey]="'ID'" [autoGenerate]="true" [rowSelection]='selectionMode' [batchEditing]="true" [rowEditable]="true"
147+
[rowEditable]="true" [primaryKey]="'ID'" [data]="localData" [height]="'600px'" [width]="'800px'" #hGrid2>
148+
<igx-column *ngIf="columnsReady" field="ID"></igx-column>
149+
<igx-column *ngIf="columnsReady" field="ProductName"></igx-column>
150+
<igx-row-island *ngIf="layoutsReady" [key]="'childData'" [primaryKey]="'ID'" [rowSelection]='selectionMode' [batchEditing]="true" [rowEditable]="true"
148151
[allowFiltering]="true">
152+
<igx-column field="ID"></igx-column>
153+
<igx-column field="ChildLevels"></igx-column>
149154
<div *ngIf='riToggle'>
150155
<igx-row-island [key]="'childData'" [autoGenerate]="true" [rowSelection]='selectionMode' [batchEditing]="true" [rowEditable]="true"
151156
[allowFiltering]="true"></igx-row-island>

src/app/hierarchical-grid/hierarchical-grid.sample.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ import {
1414
templateUrl: 'hierarchical-grid.sample.html'
1515
})
1616
export class HierarchicalGridSampleComponent implements AfterViewInit {
17+
public columnsReady = false;
18+
public layoutsReady = false;
1719
@ViewChild('layout1', { static: true })
1820
private layout1: IgxRowIslandComponent;
1921

2022
@ViewChild('hGrid2', { static: true })
2123
private hGrid2: IgxHierarchicalGridComponent;
22-
2324
public localData = [];
2425
public localData1 = [];
2526
public data1 = [];

0 commit comments

Comments
 (0)