Skip to content

Commit de67880

Browse files
authored
Merge branch 'master' into vslavov/ng-add-depenendencies-explicit
2 parents 6f88f0a + 6c947c1 commit de67880

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,12 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
102102
}
103103

104104
focusTbody(event) {
105-
if (!this.activeNode) {
105+
if (!this.activeNode || !this.activeNode.row) {
106106
this.activeNode = {
107-
row: null,
108-
column: null
107+
row: 0,
108+
column: 0
109109
};
110+
110111
}
111112

112113
super.focusTbody(event);

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
@@ -12,7 +12,7 @@
1212
<span *ngIf="hasMovableColumns && draggedColumn && pinnedColumns.length > 0"
1313
[igxColumnMovingDrop]="headerContainer" [attr.droppable]="true" id="left"
1414
class="igx-grid__scroll-on-drag-pinned" [style.left.px]="pinnedWidth"></span>
15-
<div #headerHierarchyExpander (click)="toggleAll()" [hidden]='!hasExpandableChildren || !hasVisibleColumns' [ngClass]="{
15+
<div #headerHierarchyExpander (click)="toggleAll()" (mousedown)='$event.preventDefault()' [hidden]='!hasExpandableChildren || !hasVisibleColumns' [ngClass]="{
1616
'igx-grid__hierarchical-expander igx-grid__hierarchical-expander--header': hasExpandableChildren,
1717
'igx-grid__hierarchical-expander--push': filteringService.isFilterRowVisible,
1818
'igx-grid__hierarchical-expander--no-border': isRowSelectable || rowDraggable

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div (click)="expanderClick($event)" [ngClass]="expanderClassResolved" *ngIf="hasChildren" #expander>
1+
<div (click)="expanderClick($event)" (mousedown)='$event.preventDefault()' [ngClass]="expanderClassResolved" *ngIf="hasChildren" #expander>
22
<ng-container *ngTemplateOutlet="iconTemplate; context: { $implicit: this }">
33
</ng-container>
44
</div>

0 commit comments

Comments
 (0)