Skip to content

Commit 792433f

Browse files
authored
Merge branch 'master' into nalipiev/schematics-10.2
2 parents 583830f + e3a09dc commit 792433f

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-add-row-ui.spec.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,5 +110,22 @@ describe('IgxTreeGrid - Add Row UI #tGrid', () => {
110110
// should have same parent record.
111111
expect(addedRow.treeRow.parent).toBe(row.treeRow.parent);
112112
});
113+
114+
it('should allow adding row to empty grid', () => {
115+
treeGrid.data = [];
116+
fix.detectChanges();
117+
118+
expect(treeGrid.rowList.length).toBe(0);
119+
120+
// begin add row for empty grid
121+
treeGrid.beginAddRowByIndex(null, -1);
122+
fix.detectChanges();
123+
endTransition();
124+
125+
treeGrid.endEdit(true);
126+
fix.detectChanges();
127+
128+
expect(treeGrid.rowList.length).toBe(1);
129+
});
113130
});
114131
});

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,9 +526,9 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy
526526
protected _getParentRecordId() {
527527
if (this.addRowParent.asChild) {
528528
return super._getParentRecordId();
529-
} else {
529+
} else if (this.addRowParent.rowID !== null && this.addRowParent.rowID !== undefined) {
530530
const spawnedForRecord = this._gridAPI.get_rec_by_id(this.addRowParent.rowID);
531-
return spawnedForRecord.parent?.rowID;
531+
return spawnedForRecord?.parent?.rowID;
532532
}
533533
}
534534

0 commit comments

Comments
 (0)