Fix breaks if layout provider and data providers are changed in the s…

…ame pass (#401)
Flipkart · Aug 21, 2019 · 4387b3e · 4387b3e
1 parent 2b02129
commit 4387b3e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/core/VirtualRenderer.ts b/src/core/VirtualRenderer.ts
@@ -137,10 +137,11 @@ export default class VirtualRenderer {
 
     public refreshWithAnchor(): void {
         if (this._viewabilityTracker) {
-            const firstVisibleIndex = this._viewabilityTracker.findFirstLogicallyVisibleIndex();
+            let firstVisibleIndex = this._viewabilityTracker.findFirstLogicallyVisibleIndex();
             this._prepareViewabilityTracker();
             let offset = 0;
             if (this._layoutManager && this._params) {
+                firstVisibleIndex = Math.min(this._params.itemCount - 1, firstVisibleIndex);
                 const point = this._layoutManager.getOffsetForIndex(firstVisibleIndex);
                 this._scrollOnNextUpdate(point);
                 offset = this._params.isHorizontal ? point.x : point.y;