Skip to content

Commit f0f6532

Browse files
authored
Merge branch 'master' into mkirova/fix-6411-9.0.x
2 parents a3e18b9 + 2ab8ba3 commit f0f6532

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5896,6 +5896,15 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
58965896
this.closeRowEditingOverlay();
58975897
}
58985898

5899+
/**
5900+
* @hidden
5901+
*/
5902+
public gridOutletKeyboardHandler(event) {
5903+
// TODO: This should be removed after grid keyboard refactoring
5904+
// call stopPropagation for keydown event for the outlet not to propagate event to the grid
5905+
event.stopPropagation();
5906+
}
5907+
58995908
// TODO: Refactor
59005909
/**
59015910
* Finishes the row transactions on the current row.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,4 +292,4 @@
292292

293293
<igx-grid-column-resizer *ngIf="colResizingService.showResizer"></igx-grid-column-resizer>
294294
<div class="igx-grid__loading-outlet" #igxLoadingOverlayOutlet igxOverlayOutlet></div>
295-
<div class="igx-grid__outlet" #igxFilteringOverlayOutlet igxOverlayOutlet></div>
295+
<div class="igx-grid__outlet" #igxFilteringOverlayOutlet igxOverlayOutlet (keydown)="gridOutletKeyboardHandler($event)"></div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,4 +232,4 @@
232232

233233
<igx-grid-column-resizer *ngIf="colResizingService.showResizer"></igx-grid-column-resizer>
234234
<div class="igx-grid__loading-outlet" #igxLoadingOverlayOutlet igxOverlayOutlet></div>
235-
<div class="igx-grid__outlet" #igxFilteringOverlayOutlet igxOverlayOutlet></div>
235+
<div class="igx-grid__outlet" #igxFilteringOverlayOutlet igxOverlayOutlet (keydown)="gridOutletKeyboardHandler($event)"></div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,4 +212,4 @@
212212

213213
<igx-grid-column-resizer *ngIf="colResizingService.showResizer"></igx-grid-column-resizer>
214214
<div class="igx-grid__loading-outlet" #igxLoadingOverlayOutlet igxOverlayOutlet></div>
215-
<div class="igx-grid__outlet" #igxFilteringOverlayOutlet igxOverlayOutlet></div>
215+
<div class="igx-grid__outlet" #igxFilteringOverlayOutlet igxOverlayOutlet (keydown)="gridOutletKeyboardHandler($event)"></div>

0 commit comments

Comments
 (0)