Merge branch 'master' into igxDragDrop-directive

Author: SAndreeva

projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.ts

@@ -249,11 +249,11 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
         }
     }
 
-    public addScrollTop(addTop: number) {
+    public addScrollTop(addTop: number): boolean {
         if (addTop === 0 && this.igxForScrollOrientation === 'horizontal') {
-            return;
+            return false;
         }
-
+        const originalVirtScrollTop = this._virtScrollTop;
         const containerSize = parseInt(this.igxForContainerSize, 10);
         const maxVirtScrollTop = this._virtHeight - containerSize;
 
@@ -285,6 +285,7 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
             // Actual scroll position is not at the bottom, but virtual scroll is. Just update the acual scroll
             this.vh.instance.elementRef.nativeElement.scrollTop = maxRealScrollTop;
         }
+        return this._virtScrollTop !== originalVirtScrollTop;
     }
 
     public scrollTo(index) {

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

@@ -333,6 +333,13 @@ export class IgxGridCellComponent implements IGridBus, OnInit, OnDestroy, AfterV
         });
     }
 
+    private performVerticalScroll(amout: number, rowIndex: number) {
+        const scrolled = this.grid.verticalScrollContainer.addScrollTop(amout);
+        if (scrolled) {
+            this._focusNextCell(rowIndex, this.visibleColumnIndex);
+        }
+    }
+
     @HostListener('dblclick', ['$event'])
     public onDoubleClick(event) {
         if (this.column.editable) {
@@ -589,16 +596,14 @@ export class IgxGridCellComponent implements IGridBus, OnInit, OnDestroy, AfterV
                 && verticalScroll.scrollTop // the scrollbar is not at the first item
                 && target.row.element.nativeElement.offsetTop < this.grid.rowHeight) { // the target is in the first row
 
-                this.grid.verticalScrollContainer.addScrollTop(-this.grid.rowHeight);
-                this._focusNextCell(rowIndex, this.visibleColumnIndex);
+                this.performVerticalScroll(-this.grid.rowHeight, rowIndex);
             }
             target.nativeElement.focus();
         } else {
             const scrollOffset =
                 -parseInt(this.grid.verticalScrollContainer.dc.instance._viewContainer.element.nativeElement.style.top, 10);
             const scrollAmount = this.grid.rowHeight + scrollOffset;
-            this.grid.verticalScrollContainer.addScrollTop(-scrollAmount);
-            this._focusNextCell(this.rowIndex, this.visibleColumnIndex);
+            this.performVerticalScroll(-scrollAmount, this.rowIndex);
         }
     }
 
@@ -626,20 +631,17 @@ export class IgxGridCellComponent implements IGridBus, OnInit, OnDestroy, AfterV
             const targetEndTopOffset = target.row.element.nativeElement.offsetTop + this.grid.rowHeight + containerTopOffset;
             if (containerHeight && targetEndTopOffset > containerHeight) {
                 const scrollAmount = targetEndTopOffset - containerHeight;
-                this.grid.verticalScrollContainer.addScrollTop(scrollAmount);
-
-                this._focusNextCell(rowIndex, this.visibleColumnIndex);
+                this.performVerticalScroll(scrollAmount, rowIndex);
             } else {
                 target.nativeElement.focus();
             }
         } else {
-            const containerHeight = this.grid.calcHeight;
             const contentHeight = this.grid.verticalScrollContainer.dc.instance._viewContainer.element.nativeElement.offsetHeight;
             const scrollOffset = parseInt(this.grid.verticalScrollContainer.dc.instance._viewContainer.element.nativeElement.style.top, 10);
             const lastRowOffset = contentHeight + scrollOffset - this.grid.calcHeight;
             const scrollAmount = this.grid.rowHeight + lastRowOffset;
-            this.grid.verticalScrollContainer.addScrollTop(scrollAmount);
-            this._focusNextCell(this.rowIndex, this.visibleColumnIndex);
+
+            this.performVerticalScroll(scrollAmount, this.rowIndex);
         }
     }