Merge branch 'master' into update-10-1

Author: Lipata

projects/igniteui-angular/src/lib/grids/cell.component.ts

@@ -756,6 +756,10 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
      * @internal
      */
     pointerenter = (event: PointerEvent) => {
+        const isHierarchicalGrid =  this.grid.nativeElement.tagName.toLowerCase() === 'igx-hierarchical-grid';
+        if (isHierarchicalGrid && (!this.grid.navigation.activeNode.gridID || this.grid.navigation.activeNode.gridID !== this.gridID)) {
+            return;
+        }
         const dragMode = this.selectionService.pointerEnter(this.selectionNode, event);
         if (dragMode) {
             this.grid.cdr.detectChanges();
@@ -767,7 +771,9 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
      * @internal
      */
     pointerup = (event: PointerEvent) => {
-        if (!isLeftClick(event)) { return; }
+        const isHierarchicalGrid =  this.grid.nativeElement.tagName.toLowerCase() === 'igx-hierarchical-grid';
+        if (!isLeftClick(event) || (isHierarchicalGrid && (!this.grid.navigation.activeNode.gridID ||
+        this.grid.navigation.activeNode.gridID !== this.gridID))) { return; }
         if (this.selectionService.pointerUp(this.selectionNode, this.grid.onRangeSelection)) {
             this.grid.cdr.detectChanges();
         }

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

@@ -45,9 +45,10 @@ export class IgxHierarchicalGridCellComponent extends IgxGridCellComponent imple
     // TODO: Extend the new selection service to avoid complete traversal
     _clearAllHighlights() {
         [this._rootGrid, ...this._rootGrid.getChildGrids(true)].forEach(grid => {
-            grid.selectionService.clear();
             if (grid !== this.grid && grid.navigation.activeNode) {
                 grid.navigation.clearActivation();
+                grid.selectionService.initKeyboardState();
+                grid.selectionService.clear();
             }
 
             grid.selectionService.activeElement = null;
@@ -79,6 +80,7 @@ export class IgxHierarchicalGridCellComponent extends IgxGridCellComponent imple
             const parentRowID = parentGrid.hgridAPI.getParentRowId(childGrid);
             parentGrid.highlightedRowID = parentRowID;
         }
+        this.grid.navigation.activeNode.gridID = this.gridID;
         super.activate(event);
     }
 }

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

@@ -240,9 +240,9 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
         const nextColumnIndex = columnIndex <= lastVisibleIndex ? columnIndex : lastVisibleIndex;
         this._pendingNavigation = true;
         const cbFunc = (args) => {
-            args.target.grid.tbody.nativeElement.focus();
             this._pendingNavigation = false;
             cb(args);
+            args.target.grid.tbody.nativeElement.focus();
         };
         this.grid.parent.navigation.navigateInBody(targetRowIndex, nextColumnIndex, cbFunc);
     }