Merge branch '10.2.x' into iganchev/update-interface-10.x.x

Author: Lipata

projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.ts

@@ -19,6 +19,7 @@ import { AbsoluteScrollStrategy, AutoPositionStrategy } from '../../../services/
 import { IgxColumnComponent } from '../../columns/column.component';
 import { GridType } from '../../common/grid.interface';
 import { DataUtil } from './../../../data-operations/data-util';
+import { IActiveNode } from '../../grid-navigation.service';
 
 /**
  * @hidden
@@ -132,7 +133,7 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
     /**
      * @hidden @internal
      */
-    public lastActiveNode;
+    public lastActiveNode = {} as IActiveNode;
 
     private _positionSettings = {
         horizontalStartPoint: HorizontalAlignment.Right,

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

@@ -220,7 +220,7 @@ export class IgxGridNavigationService {
 
     focusTbody(event) {
         const gridRows = this.grid.verticalScrollContainer.totalItemCount ?? this.grid.dataView.length;
-        if (gridRows < 1) { this.activeNode = null; return; }
+        if (gridRows < 1) { this.activeNode = {} as IActiveNode; return; }
         if (!Object.keys(this.activeNode).length || this.activeNode.row < 0 || this.activeNode.row > gridRows - 1) {
             const hasLastActiveNode = Object.keys(this.lastActiveNode).length;
             const shouldClearSelection = hasLastActiveNode && (this.lastActiveNode.row < 0 || this.lastActiveNode.row > gridRows - 1);

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

@@ -18,6 +18,8 @@ import {
     IgxGridAdvancedFilteringBindingComponent
 } from '../../test-utils/grid-samples.spec';
 import { ControlsFunction } from '../../test-utils/controls-functions.spec';
+import { IgxHierGridExternalAdvancedFilteringComponent } from '../../test-utils/hierarchical-grid-components.spec';
+import { IgxHierarchicalGridModule, IgxHierarchicalGridComponent } from '../hierarchical-grid/public_api';
 
 const ADVANCED_FILTERING_OPERATOR_LINE_AND_CSS_CLASS = 'igx-filter-tree__line--and';
 const ADVANCED_FILTERING_OPERATOR_LINE_OR_CSS_CLASS = 'igx-filter-tree__line--or';
@@ -35,11 +37,13 @@ describe('IgxGrid - Advanced Filtering #grid - ', () => {
                 IgxGridAdvancedFilteringColumnGroupComponent,
                 IgxGridAdvancedFilteringComponent,
                 IgxGridExternalAdvancedFilteringComponent,
-                IgxGridAdvancedFilteringBindingComponent
+                IgxGridAdvancedFilteringBindingComponent,
+                IgxHierGridExternalAdvancedFilteringComponent
             ],
             imports: [
                 NoopAnimationsModule,
-                IgxGridModule]
+                IgxGridModule,
+                IgxHierarchicalGridModule]
         }).compileComponents();
     }));
 
@@ -2669,6 +2673,28 @@ describe('IgxGrid - Advanced Filtering #grid - ', () => {
             expect(grid.rowList.length).toBe(1);
             expect(GridFunctions.getCurrentCellFromGrid(grid, 0, 1).value).toBe('Ignite UI for JavaScript');
         }));
+
+        it('Should allow hosting Advanced Filtering dialog outside of the hierarchical grid without any console errors.', fakeAsync(() => {
+            fix = TestBed.createComponent(IgxHierGridExternalAdvancedFilteringComponent);
+            const hgrid: IgxHierarchicalGridComponent = fix.componentInstance.hgrid;
+            fix.detectChanges();
+            spyOn(console, 'error');
+
+            const advFilterDialog = fix.nativeElement.querySelector('.igx-advanced-filter');
+            const applyFilterButton: any = Array.from(advFilterDialog.querySelectorAll('button'))
+                .find((b: any) => b.innerText.toLowerCase() === 'apply');
+
+            applyFilterButton.click();
+            tick(100);
+            fix.detectChanges();
+
+            UIInteractions.simulatePointerEvent('pointerenter',
+                hgrid.nativeElement.querySelectorAll('igx-hierarchical-grid-cell')[0], 5, 5);
+            fix.detectChanges();
+
+            expect(console.error).not.toHaveBeenCalled();
+        }));
+
     });
 
     describe('Expression tree bindings - ', () => {

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

@@ -2421,6 +2421,32 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
             expect(colOperands[0].nativeElement.innerText).toEqual('AND');
             expect(colIndicator.length).toEqual(0);
         }));
+
+        it('UI focusing grid\'s body content does not throw a console error after filtering. (issue 8930)', fakeAsync(() => {
+            spyOn(console, 'error');
+            GridFunctions.clickFilterCellChipUI(fix, 'ProductName');
+            fix.detectChanges();
+
+            GridFunctions.applyFilter('Jav', fix);
+            tick(DEBOUNCETIME);
+            fix.detectChanges();
+
+            GridFunctions.applyFilter('xy', fix);
+            tick(DEBOUNCETIME);
+            fix.detectChanges();
+
+            const tBodyContent = GridFunctions.getGridContent(fix);
+            tBodyContent.triggerEventHandler('focus', null);
+
+            const filterUIRow = fix.debugElement.query(By.css(FILTER_UI_ROW));
+            GridFunctions.removeFilterChipByIndex(1, filterUIRow);
+            tick();
+            fix.detectChanges();
+
+            tBodyContent.triggerEventHandler('focus', null);
+            tick();
+            expect(console.error).not.toHaveBeenCalled();
+        }));
     });
 
     describe(null, () => {

projects/igniteui-angular/src/lib/test-utils/hierarchical-grid-components.spec.ts

@@ -235,3 +235,30 @@ export class IgxHierarchicalGridActionStripComponent extends IgxHierarchicalGrid
     @ViewChild('actionStrip2', { read: IgxActionStripComponent, static: true })
     public actionStripChild: IgxActionStripComponent;
 }
+
+@Component({
+    template: `
+    <igx-hierarchical-grid #grid1 [data]="data" [height]="'300px'" [width]="'700px'" #hierarchicalGrid [primaryKey]="'ID'">
+        <igx-column field="ID" ></igx-column>
+        <igx-column field="ChildLevels"></igx-column>
+        <igx-column field="ProductName"></igx-column>
+        <igx-row-island [key]="'childData'" #rowIsland [primaryKey]="'ID'" [rowSelection]="'single'">
+            <igx-column field="ID"> </igx-column>
+            <igx-column field="ChildLevels"></igx-column>
+            <igx-column field="ProductName"></igx-column>
+            <igx-row-island [key]="'childData'" #rowIsland2 [primaryKey]="'ID'" [rowSelection]="'none'">
+                <igx-column field="ID"></igx-column>
+                <igx-column field="ChildLevels"></igx-column>
+                <igx-column field="ProductName"></igx-column>
+            </igx-row-island>
+        </igx-row-island>
+    </igx-hierarchical-grid>
+    <igx-advanced-filtering-dialog [grid]="grid1">
+    </igx-advanced-filtering-dialog>`
+})
+export class IgxHierGridExternalAdvancedFilteringComponent extends IgxHierarchicalGridTestBaseComponent {
+    // @ViewChild('hierarchicalGrid', { read: IgxHierarchicalGridComponent, static: true })
+    // public hgrid: IgxHierarchicalGridComponent;
+
+    public data = SampleTestData.generateHGridData(5, 3);
+}