Merge branch 'master' into mkirova/fix-10895

Author: dkamburov

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

@@ -1413,14 +1413,19 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
     }
 
 
-    private _adjustScrollPositionAfterSizeChange(sizeDiff) {
+    protected _adjustScrollPositionAfterSizeChange(sizeDiff) {
         // if data has been changed while container is scrolled
         // should update scroll top/left according to change so that same startIndex is in view
         if (Math.abs(sizeDiff) > 0 && this.scrollPosition > 0) {
             this.recalcUpdateSizes();
-            const offset = parseInt(this.dc.instance._viewContainer.element.nativeElement.style.top, 10);
+            const offset = this.igxForScrollOrientation === 'horizontal' ?
+             parseInt(this.dc.instance._viewContainer.element.nativeElement.style.left, 10) :
+             parseInt(this.dc.instance._viewContainer.element.nativeElement.style.top, 10);
             const newSize = this.sizesCache[this.state.startIndex] - offset;
-            this.scrollPosition = newSize === this.scrollPosition ? newSize + 1 : newSize;
+            this.scrollPosition = newSize;
+            if (this.scrollPosition !== newSize) {
+                this.scrollComponent.scrollAmount = newSize;
+            }
         }
     }
 
@@ -1575,8 +1580,11 @@ export class IgxGridForOfDirective<T> extends IgxForOfDirective<T> implements On
                 }
                 this.syncService.setMaster(this);
                 this.igxForContainerSize = args.containerSize;
-                this._updateSizeCache(changes);
+                const sizeDiff = this._updateSizeCache(changes);
                 this._applyChanges();
+                if (sizeDiff) {
+                    this._adjustScrollPositionAfterSizeChange(sizeDiff);
+                }
                 this._updateScrollOffset();
                 this.dataChanged.emit();
             }
@@ -1652,8 +1660,10 @@ export class IgxGridForOfDirective<T> extends IgxForOfDirective<T> implements On
 
     protected _updateSizeCache(changes: IterableChanges<T> = null) {
         if (this.igxForScrollOrientation === 'horizontal') {
-            this.initSizesCache(this.igxForOf);
-            return;
+            const oldSize = this.sizesCache[this.sizesCache.length - 1];
+            const newSize = this.initSizesCache(this.igxForOf);
+            const diff = oldSize - newSize;
+            return diff;
         }
 
         const oldHeight = this.heightCache.length > 0 ? this.heightCache.reduce((acc, val) => acc + val) : 0;
@@ -1681,6 +1691,7 @@ export class IgxGridForOfDirective<T> extends IgxForOfDirective<T> implements On
                 }
             });
         }
+        return diff;
     }
 
     protected handleCacheChanges(changes: IterableChanges<T>) {