fix(grid): reset scrollAmount value #6369

hanastasov · hanastasov · commit 78254c84f32e · 2020-01-10T13:31:37.000+02:00
diff --git a/projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.ts b/projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.ts
@@ -329,9 +329,6 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
             this.scrollComponent.nativeElement.scrollLeft = val;
         } else if (this.scrollComponent) {
             this.scrollComponent.nativeElement.scrollTop = val;
-            // Need to set value for scrollAmount here, because
-            // Firefox does not fire the scrollComponent scroll event handler
-            this.scrollComponent.scrollAmount = val;
         }
     }
 
@@ -1180,6 +1177,9 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
             this.scrollComponent.size = this._calcHeight();
             if ( this.scrollComponent.size <= parseInt(this.igxForContainerSize, 10)) {
                 this.scrollPosition = 0;
+                // Need to reset the scrollAmount value here, because
+                // Firefox will not fire the scrollComponent scroll event handler
+                this.scrollComponent.scrollAmount = 0;
             }
         }
         if (scrollable !== this.isScrollable()) {

Original file line number	Diff line number	Diff line change
`@@ -329,9 +329,6 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr`
`329`	`329`	`this.scrollComponent.nativeElement.scrollLeft = val;`
`330`	`330`	`} else if (this.scrollComponent) {`
`331`	`331`	`this.scrollComponent.nativeElement.scrollTop = val;`
`332`		`- // Need to set value for scrollAmount here, because`
`333`		`- // Firefox does not fire the scrollComponent scroll event handler`
`334`		`- this.scrollComponent.scrollAmount = val;`
`335`	`332`	`}`
`336`	`333`	`}`
`337`	`334`
`@@ -1180,6 +1177,9 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr`
`1180`	`1177`	`this.scrollComponent.size = this._calcHeight();`
`1181`	`1178`	`if ( this.scrollComponent.size <= parseInt(this.igxForContainerSize, 10)) {`
`1182`	`1179`	`this.scrollPosition = 0;`
	`1180`	`+ // Need to reset the scrollAmount value here, because`
	`1181`	`+ // Firefox will not fire the scrollComponent scroll event handler`
	`1182`	`+ this.scrollComponent.scrollAmount = 0;`
`1183`	`1183`	`}`
`1184`	`1184`	`}`
`1185`	`1185`	`if (scrollable !== this.isScrollable()) {`