Merge branch 'mkirova/fix-10934' of https://github.com/IgniteUI/igniteui-angular.git

Author: MKirova

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>) {

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.component.html

@@ -62,7 +62,7 @@
             </ng-template>
         </ng-template>
         <ng-template #record_template let-rowIndex="index" let-rowData>
-            <igx-pivot-row [pivotRowWidths]='pivotRowWidths' [gridID]="id" [index]="rowIndex" [data]="rowData"
+            <igx-pivot-row [style.min-height.px]="renderedRowHeight" [pivotRowWidths]='pivotRowWidths' [gridID]="id" [index]="rowIndex" [data]="rowData"
             [ngClass]="rowClasses | igxGridRowClasses:row:row.inEditMode:row.selected:row.dirty:row.deleted:row.dragging:rowIndex:hasColumnLayouts:false:pipeTrigger"
             [ngStyle]="rowStyles | igxGridRowStyles:rowData:rowIndex:pipeTrigger" #row>
             </igx-pivot-row>

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-header-row.component.html

@@ -119,7 +119,7 @@
         <!-- Column headers area -->
         <div class="igx-grid__tr" role="row" [style.width.px]="width">
             <div #pivotContainer class="igx-grid__tr-pivot igx-grid__tr-pivot--row-area"
-                 [style.min-width.px]="grid.pivotRowWidths - 1" (igxDragLeave)="onAreaDragLeave($event, rowArea)" igxDrop
+                 [style.width.px]="grid.pivotRowWidths - 1" (igxDragLeave)="onAreaDragLeave($event, rowArea)" igxDrop
                  (dropped)="onDimDrop($event, rowArea, 0)" (pointerdown)="$event.preventDefault()">
                 <!-- Row area -->
                 <igx-chips-area #rowArea droppable='true'>