Merge branch '8.2.x' into mkirova/fix-5204-master

Author: mpavlinov

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.selection.spec.ts

@@ -661,6 +661,15 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
             lastRow = childGrid.getRowByIndex(3);
             GridSelectionFunctions.verifyRowSelected(lastRow);
         });
+
+        it('should not select row on expander click.', () => {
+            const firstRow = hierarchicalGrid.getRowByIndex(0) as IgxHierarchicalRowComponent;
+            UIInteractions.clickElement(firstRow.expander);
+            fix.detectChanges();
+
+            // check row is not selected
+            GridSelectionFunctions.verifyRowSelected(firstRow, false);
+        });
     });
 
     describe('Row Selection CRUD', () => {

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

@@ -1,4 +1,4 @@
-<div (click)="toggle()" class="igx-grid__hierarchical-expander" [tabIndex]="tabindex" *ngIf="hasChildren" #expander>
+<div (click)="expanderClick($event)" class="igx-grid__hierarchical-expander" [tabIndex]="tabindex" *ngIf="hasChildren" #expander>
         <ng-container *ngTemplateOutlet="iconTemplate; context: { $implicit: this }">
         </ng-container>
 </div>

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

@@ -82,13 +82,21 @@ export class IgxHierarchicalRowComponent extends IgxRowComponent<IgxHierarchical
         return this.grid && this.grid.highlightedRowID === this.rowID;
     }
 
+    /**
+    * @hidden
+    */
+   public expanderClick(event) {
+        event.stopPropagation();
+        this.toggle();
+    }
+
     /**
      * Toggles the hierarchical row.
      * ```typescript
      * this.grid1.rowList.first.toggle()
      * ```
      */
-    public toggle(event?) {
+    public toggle() {
         if (this.added) {
             return;
         }