Merge pull request #7512 from IgniteUI/ddincheva/clearCellFocus

Remove cell focus leftovers

Author: rkaraivanov

projects/igniteui-angular/src/lib/grids/api.service.ts

@@ -588,12 +588,6 @@ export class GridBaseAPIService <T extends IgxGridBaseDirective & GridType> {
         if (grid.rowEditable) {
             grid.endEdit(true);
         }
-        const eventKey = event && (event as any).key ? (event as any).key.toLowerCase() : null;
-        if (eventKey && this.isToggleKey(eventKey)) {
-            (this.grid as any).zone.onStable.pipe(debounceTime(30)).pipe(first()).subscribe(() => {
-                this.focusActiveCell(rowID);
-            });
-        }
     }
 
     public get_rec_by_id(rowID) {
@@ -608,16 +602,4 @@ export class GridBaseAPIService <T extends IgxGridBaseDirective & GridType> {
         return ROW_COLLAPSE_KEYS.has(key) || ROW_EXPAND_KEYS.has(key);
     }
 
-    private focusActiveCell(rowID) {
-        // persist focused cell
-        const isVirtualized = !this.grid.verticalScrollContainer.dc.instance.notVirtual;
-        const el = this.grid.selectionService.activeElement;
-        if (isVirtualized && el) {
-            const cell = this.get_cell_by_key(rowID, this.grid.visibleColumns[el.column].field);
-            if (cell) {
-                cell.nativeElement.focus();
-            }
-        }
-    }
-
 }

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

@@ -68,7 +68,6 @@ export class IgxGridExpandableCellComponent extends IgxGridCellComponent impleme
      */
     public onIndicatorFocus() {
         this.gridAPI.submit_value();
-        this.nativeElement.focus();
     }
 
     /**

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

@@ -3,8 +3,6 @@ import {
     Component,
     HostBinding,
     Input,
-    Output,
-    EventEmitter,
     forwardRef,
     OnInit,
     TemplateRef,
@@ -18,7 +16,7 @@ import { IgxTreeGridAPIService } from './tree-grid-api.service';
 import { IgxGridBaseDirective } from '../grid-base.directive';
 import { GridBaseAPIService } from '../api.service';
 import { ITreeGridRecord } from './tree-grid.interfaces';
-import { IRowToggleEventArgs, IPinRowEventArgs } from '../common/events';
+import { IRowToggleEventArgs } from '../common/events';
 import { HierarchicalTransaction, HierarchicalState, TransactionType } from '../../services/transaction/transaction';
 import { IgxHierarchicalTransactionService } from '../../services/index';
 import { IgxFilteringService } from '../filtering/grid-filtering.service';
@@ -28,7 +26,6 @@ import { mergeObjects } from '../../core/utils';
 import { first, takeUntil } from 'rxjs/operators';
 import { IgxRowLoadingIndicatorTemplateDirective } from './tree-grid.directives';
 import { IgxForOfSyncService, IgxForOfScrollSyncService } from '../../directives/for-of/for_of.sync.service';
-import { IgxDragIndicatorIconDirective } from '../row-drag.directive';
 import { IgxGridNavigationService } from '../grid-navigation.service';
 import { GridType } from '../common/grid.interface';
 import { IgxColumnComponent } from '../columns/column.component';
@@ -375,16 +372,6 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy
                     this.loadingRows.delete(parentID);
                     this.addChildRows(children, parentID);
                     this.notifyChanges();
-
-                    requestAnimationFrame(() => {
-                        const cellID = this.selectionService.activeElement;
-                        if (cellID) {
-                            const cell = this._gridAPI.get_cell_by_index(cellID.row, cellID.column);
-                            if (cell) {
-                                cell.nativeElement.focus();
-                            }
-                        }
-                    });
                 });
             }
         }