Skip to content

Commit 9660905

Browse files
committed
Merge branch 'ddincheva/focuslessKBNav' of https://github.com/IgniteUI/igniteui-angular into ddincheva/focuslessKBNav
2 parents 0fb98aa + 1c88e30 commit 9660905

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,10 @@ export class IgxGridNavigationService {
256256
if (!this.isToggleKey(key) || !row) { return; }
257257

258258
if (!row.expanded && ROW_EXPAND_KEYS.has(key)) {
259-
!row.rowID ? row.toggle() :
259+
row.rowID === undefined ? row.toggle() :
260260
this.grid.gridAPI.set_row_expansion_state(row.rowID, true, event);
261261
} else if (row.expanded && ROW_COLLAPSE_KEYS.has(key)) {
262-
!row.rowID ? row.toggle() :
262+
row.rowID === undefined ? row.toggle() :
263263
this.grid.gridAPI.set_row_expansion_state(row.rowID, false, event);
264264
}
265265
this.grid.notifyChanges();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
<div class="igx-grid__scroll-end" [style.float]='"right"' [style.width.px]='pinnedWidth' [style.min-width.px]='pinnedWidth' [hidden]="pinnedWidth === 0 || isPinningToStart"></div>
228228
</div>
229229

230-
<div class="igx-grid__footer" tabindex="0" #footer>
230+
<div class="igx-grid__footer" #footer>
231231
<ng-content select="igx-grid-footer"></ng-content>
232232
<ng-container *ngIf="paging && totalRecords">
233233
<ng-container

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
@@ -158,7 +158,7 @@
158158
<div class="igx-grid__scroll-end" [style.float]='"right"' [style.width.px]='pinnedWidth' [style.min-width.px]='pinnedWidth' [hidden]="pinnedWidth === 0 || isPinningToStart"></div>
159159
</div>
160160

161-
<div class="igx-grid__footer" tabindex="0" #footer>
161+
<div class="igx-grid__footer" #footer>
162162
<ng-content select="igx-grid-footer"></ng-content>
163163
<ng-container *ngIf="paging && totalRecords">
164164
<ng-container

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
@@ -133,7 +133,7 @@
133133
<div class="igx-grid__scroll-end" [style.float]='"right"' [style.width.px]='pinnedWidth' [style.min-width.px]='pinnedWidth' [hidden]="pinnedWidth === 0 || isPinningToStart"></div>
134134
</div>
135135

136-
<div class="igx-grid__footer" tabindex="0" #footer>
136+
<div class="igx-grid__footer" #footer>
137137
<ng-content select="igx-grid-footer"></ng-content>
138138
<ng-container *ngIf="paging && totalRecords">
139139
<ng-container

0 commit comments

Comments
 (0)