Skip to content

Commit f7e8e30

Browse files
authored
Merge branch '8.2.x' into mkirova/fix-6411
2 parents abddb2a + 2aa4677 commit f7e8e30

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5923,6 +5923,15 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
59235923
this.closeRowEditingOverlay();
59245924
}
59255925

5926+
/**
5927+
* @hidden
5928+
*/
5929+
public gridOutletKeyboardHandler(event) {
5930+
// TODO: This should be removed after grid keyboard refactoring
5931+
// call stopPropagation for keydown event for the outlet not to propagate event to the grid
5932+
event.stopPropagation();
5933+
}
5934+
59265935
// TODO: Refactor
59275936
/**
59285937
* 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
@@ -271,4 +271,4 @@
271271

272272
<igx-grid-column-resizer *ngIf="colResizingService.showResizer"></igx-grid-column-resizer>
273273
<div class="igx-grid__loading-outlet" #igxLoadingOverlayOutlet igxOverlayOutlet></div>
274-
<div class="igx-grid__outlet" #igxFilteringOverlayOutlet igxOverlayOutlet></div>
274+
<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
@@ -236,4 +236,4 @@
236236

237237
<igx-grid-column-resizer *ngIf="colResizingService.showResizer"></igx-grid-column-resizer>
238238
<div class="igx-grid__loading-outlet" #igxLoadingOverlayOutlet igxOverlayOutlet></div>
239-
<div class="igx-grid__outlet" #igxFilteringOverlayOutlet igxOverlayOutlet></div>
239+
<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)