chore(hGrid): address comments

Author: RivaIvanova

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-base.directive.ts

@@ -13,7 +13,6 @@ import {
     NgZone,
     Optional,
     Output,
-    QueryList,
     reflectComponentType,
     ViewContainerRef
 } from '@angular/core';
@@ -28,7 +27,7 @@ import { IgxHierarchicalGridNavigationService } from './hierarchical-grid-naviga
 import { IgxGridSummaryService } from '../summaries/grid-summary.service';
 import { IgxGridSelectionService } from '../selection/selection.service';
 import { IgxColumnResizingService } from '../resizing/resizing.service';
-import { ColumnType, GridType, IGX_GRID_SERVICE_BASE, IPathSegment } from '../common/grid.interface';
+import { GridType, IGX_GRID_SERVICE_BASE, IPathSegment } from '../common/grid.interface';
 import { IgxColumnGroupComponent } from '../columns/column-group.component';
 import { IgxColumnComponent } from '../columns/column.component';
 import { IForOfState } from '../../directives/for-of/for_of.directive';
@@ -211,7 +210,9 @@ export abstract class IgxHierarchicalGridBaseDirective extends IgxGridBaseDirect
             this.columns.forEach(column => {
                 if (column[output.propName]) {
                     column[output.propName].pipe(takeUntil(column.destroy$)).subscribe((args) => {
-                        const rowIslandColumn = this.getRowIslandColumn(column, this.parentIsland.childColumns);
+                        const rowIslandColumn = this.parentIsland.columnList.find((col) => col.field
+                            ? col.field === column.field
+                            : col.header === column.header);
                         rowIslandColumn[output.propName].emit({ args, owner: this });
                     });
                 }
@@ -275,32 +276,6 @@ export abstract class IgxHierarchicalGridBaseDirective extends IgxGridBaseDirect
         }
         return this.gridAPI.getChildGrid(path);
     }
-
-    private getRowIslandColumn(
-        target: ColumnType,
-        columns: QueryList<ColumnType>
-    ): ColumnType {
-        const targetField = target.field ?? target.header;
-        let result;
-
-        for (const col of columns) {
-            const colField = col.field ?? col.header;
-
-            if (colField === targetField) {
-                result = col;
-                break;
-            } else if (col.children) {
-                const column = this.getRowIslandColumn(target, col.children);
-
-                if (column) {
-                    result = column;
-                    break;
-                }
-            }
-        }
-
-        return result;
-    }
 }
 
 const flatten = (arr: any[]) => {

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

@@ -1731,23 +1731,25 @@ describe('Basic IgxHierarchicalGrid #hGrid', () => {
             const expandIcon = columnGroup2Header.queryAll(By.css('.igx-icon'))[0];
             const pinIcon = columnGroup2Header.queryAll(By.css('.igx-icon'))[1];
 
-            expect(columnGroup2.expanded).toBeFalsy();
-            expect(columnGroup2.pinned).toBeFalsy();
+            expect(columnGroup2.expanded).toBeFalse();
+            expect(columnGroup2.pinned).toBeFalse();
 
             UIInteractions.simulateClickEvent(expandIcon.nativeElement);
             fixture.detectChanges();
 
-            expect(columnGroup2.expanded).toBeTruthy();
+            expect(columnGroup2.expanded).toBeTrue();
 
             expect(fixture.componentInstance.expandedArgs).toBeDefined();
-            expect(fixture.componentInstance.expandedArgs).not.toBe(false);
+            expect(fixture.componentInstance.expandedArgs.args).toBeTrue();
             expect(fixture.componentInstance.hiddenArgs).toBeDefined();
+            expect(fixture.componentInstance.hiddenArgs.args).toBeTrue();
 
             UIInteractions.simulateClickEvent(pinIcon.nativeElement);
             fixture.detectChanges();
 
-            expect(columnGroup2.pinned).toBeTruthy();
+            expect(columnGroup2.pinned).toBeTrue();
             expect(fixture.componentInstance.pinnedArgs).toBeDefined();
+            expect(fixture.componentInstance.pinnedArgs.args).toBeTrue();
         });
     });
 });