Merge branch '8.2.x' into mvenkov/update-nav-drawer-for-server-side-rendering

wnvko · web-flow · commit c7b9b8d062bc · 2019-10-08T12:03:41.000+03:00
diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-navigation.service.ts b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-navigation.service.ts
@@ -68,6 +68,7 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
     }
 
     public navigateUp(rowElement, selectedNode: ISelectionNode) {
+        if (selectedNode.isSummaryRow) { return; }
         const prevElem = rowElement.previousElementSibling;
         const visibleColumnIndex = selectedNode.column;
         const currentRowIndex = selectedNode.row;
@@ -103,6 +104,7 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
         }
     }
     public navigateDown(rowElement, selectedNode: ISelectionNode) {
+        if (selectedNode.isSummaryRow) { return; }
         const nextElem = rowElement.nextElementSibling;
         const visibleColumnIndex = selectedNode.column;
         const currentRowIndex = selectedNode.row;

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`public navigateUp(rowElement, selectedNode: ISelectionNode) {`
	`71`	`+ if (selectedNode.isSummaryRow) { return; }`
`71`	`72`	`const prevElem = rowElement.previousElementSibling;`
`72`	`73`	`const visibleColumnIndex = selectedNode.column;`
`73`	`74`	`const currentRowIndex = selectedNode.row;`
`@@ -103,6 +104,7 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi`
`103`	`104`	`}`
`104`	`105`	`}`
`105`	`106`	`public navigateDown(rowElement, selectedNode: ISelectionNode) {`
	`107`	`+ if (selectedNode.isSummaryRow) { return; }`
`106`	`108`	`const nextElem = rowElement.nextElementSibling;`
`107`	`109`	`const visibleColumnIndex = selectedNode.column;`
`108`	`110`	`const currentRowIndex = selectedNode.row;`