Fix batched rendering when mcvp adjustment changes

Author: janicduplessis

packages/virtualized-lists/Lists/VirtualizedList.js

@@ -544,6 +544,10 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
       );
 
       if (maintainVisibleContentPositionAdjustment != null) {
+        console.log(
+          'maintainVisibleContentPositionAdjustment',
+          maintainVisibleContentPositionAdjustment,
+        );
         renderMask.addCells({
           first:
             cellsAroundViewport.first +
@@ -1133,7 +1137,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
     }
   }
 
-  componentDidUpdate(prevProps: Props) {
+  componentDidUpdate(prevProps: Props, prevState: State) {
     const {data, extraData} = this.props;
     if (data !== prevProps.data || extraData !== prevProps.extraData) {
       // clear the viewableIndices cache to also trigger
@@ -1155,6 +1159,15 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
     if (hiPriInProgress) {
       this._hiPriInProgress = false;
     }
+
+    // Make sure to cancel any pending updates if maintainVisibleContentPositionAdjustment
+    // changed since they are now invalid.
+    if (
+      prevState.maintainVisibleContentPositionAdjustment !==
+      this.state.maintainVisibleContentPositionAdjustment
+    ) {
+      this._updateCellsToRenderBatcher.dispose({abort: true});
+    }
   }
 
   _averageCellLength = 0;