Skip to content

Commit 93de374

Browse files
committed
Merge branch 'ddincheva/focuslessKBNav' of https://github.com/IgniteUI/igniteui-angular into ddincheva/focuslessKBNav
2 parents 6943455 + a52b20f commit 93de374

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2807,7 +2807,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
28072807
return;
28082808
}
28092809

2810-
if (this.overlayService.getOverlayById(event.id).settings.outlet === this.outletDirective &&
2810+
if (this.overlayService.getOverlayById(event.id)?.settings.outlet === this.outletDirective &&
28112811
this.overlayIDs.indexOf(event.id) < 0) {
28122812
this.overlayIDs.push(event.id);
28132813
}

projects/igniteui-angular/src/lib/grids/grid/grid-row-editing.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2068,7 +2068,7 @@ fix.detectChanges();
20682068
grid.deleteRow(1);
20692069
tick(16);
20702070
fix.detectChanges();
2071-
spyOn(grid, 'endRowTransaction');
2071+
spyOn(grid, 'endRowTransaction').and.callThrough();
20722072

20732073
const firstCell = grid.getCellByColumn(2, 'ProductName');
20742074
UIInteractions.simulateDoubleClickAndSelectCellEvent(firstCell);

0 commit comments

Comments
 (0)