From b3101457a6de28d20dc96727d2286fcdf84d130a Mon Sep 17 00:00:00 2001
From: Luna Wei <luwe@fb.com>
Date: Wed, 17 Mar 2021 12:46:06 -0700
Subject: [PATCH] Remove windowSize defaultProps

Summary:
Changelog:
[Internal][Changed] -Remove windowSize from defaultProps as part of larger effort to remove defaultProps from VirtualizedList

Reviewed By: nadiia

Differential Revision: D26969589

fbshipit-source-id: da6215ee3876c8f186d59f91ef6fd94396366119
---
 Libraries/Lists/VirtualizedList.js              | 13 +++++++------
 .../__snapshots__/FlatList-test.js.snap         |  7 -------
 .../__snapshots__/SectionList-test.js.snap      |  5 -----
 .../__snapshots__/VirtualizedList-test.js.snap  | 17 -----------------
 .../VirtualizedSectionList-test.js.snap         | 11 -----------
 5 files changed, 7 insertions(+), 46 deletions(-)

diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
index 866333845a..7baa055b3d 100644
--- a/Libraries/Lists/VirtualizedList.js
+++ b/Libraries/Lists/VirtualizedList.js
@@ -290,7 +290,7 @@ type OptionalProps = {|
    * this number will reduce memory consumption and may improve performance, but will increase the
    * chance that fast scrolling may reveal momentary blank areas of unrendered content.
    */
-  windowSize: number,
+  windowSize?: ?number,
   /**
    * The legacy implementation is no longer supported.
    */
@@ -306,7 +306,6 @@ type Props = {|
 type DefaultProps = {|
   keyExtractor: (item: Item, index: number) => string,
   updateCellsBatchingPeriod: number,
-  windowSize: number,
 |};
 
 let _usedIndexForKey = false;
@@ -337,6 +336,10 @@ function scrollEventThrottleOrDefault(scrollEventThrottle: ?number) {
   return scrollEventThrottle ?? 50;
 }
 
+function windowSizeOrDefault(windowSize: ?number) {
+  return windowSize ?? 21;
+}
+
 /**
  * Base implementation for the more convenient [`<FlatList>`](https://reactnative.dev/docs/flatlist.html)
  * and [`<SectionList>`](https://reactnative.dev/docs/sectionlist.html) components, which are also better
@@ -593,7 +596,6 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       return String(index);
     },
     updateCellsBatchingPeriod: 50,
-    windowSize: 21, // multiples of length
   };
 
   _getCellKey(): string {
@@ -691,9 +693,8 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       'Components based on VirtualizedList must be wrapped with Animated.createAnimatedComponent ' +
         'to support native onScroll events with useNativeDriver',
     );
-
     invariant(
-      props.windowSize > 0,
+      windowSizeOrDefault(props.windowSize) > 0,
       'VirtualizedList: The windowSize prop must be present and set to a value greater than 0.',
     );
 
@@ -1753,7 +1754,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
               this.props.data,
               this.props.getItemCount,
               maxToRenderPerBatchOrDefault(this.props.maxToRenderPerBatch),
-              this.props.windowSize,
+              windowSizeOrDefault(this.props.windowSize),
               state,
               this._getFrameMetricsApprox,
               this._scrollMetrics,
diff --git a/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
index f4411ebd58..f518ae0c5d 100644
--- a/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
+++ b/Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
@@ -50,7 +50,6 @@ exports[`FlatList renders all the bells and whistles 1`] = `
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
   viewabilityConfigCallbackPairs={Array []}
-  windowSize={21}
 >
   <RCTRefreshControl />
   <View>
@@ -140,7 +139,6 @@ exports[`FlatList renders empty list 1`] = `
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
   viewabilityConfigCallbackPairs={Array []}
-  windowSize={21}
 >
   <View />
 </RCTScrollView>
@@ -164,7 +162,6 @@ exports[`FlatList renders null list 1`] = `
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
   viewabilityConfigCallbackPairs={Array []}
-  windowSize={21}
 >
   <View />
 </RCTScrollView>
@@ -201,7 +198,6 @@ exports[`FlatList renders simple list (multiple columns) 1`] = `
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
   viewabilityConfigCallbackPairs={Array []}
-  windowSize={21}
 >
   <View>
     <View
@@ -274,7 +270,6 @@ exports[`FlatList renders simple list 1`] = `
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
   viewabilityConfigCallbackPairs={Array []}
-  windowSize={21}
 >
   <View>
     <View
@@ -336,7 +331,6 @@ exports[`FlatList renders simple list using ListItemComponent (multiple columns)
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
   viewabilityConfigCallbackPairs={Array []}
-  windowSize={21}
 >
   <View>
     <View
@@ -409,7 +403,6 @@ exports[`FlatList renders simple list using ListItemComponent 1`] = `
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
   viewabilityConfigCallbackPairs={Array []}
-  windowSize={21}
 >
   <View>
     <View
diff --git a/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap
index 58c4398783..5492ffabdc 100644
--- a/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap
+++ b/Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap
@@ -35,7 +35,6 @@ exports[`SectionList rendering empty section headers is fine 1`] = `
     ]
   }
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -94,7 +93,6 @@ exports[`SectionList renders a footer when there is no data 1`] = `
     ]
   }
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -145,7 +143,6 @@ exports[`SectionList renders a footer when there is no data and no header 1`] =
     ]
   }
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -238,7 +235,6 @@ exports[`SectionList renders all the bells and whistles 1`] = `
     ]
   }
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <RCTRefreshControl />
   <View>
@@ -412,7 +408,6 @@ exports[`SectionList renders empty list 1`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View />
 </RCTScrollView>
diff --git a/Libraries/Lists/__tests__/__snapshots__/VirtualizedList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/VirtualizedList-test.js.snap
index a59c9d4e8b..129cb4cd6e 100644
--- a/Libraries/Lists/__tests__/__snapshots__/VirtualizedList-test.js.snap
+++ b/Libraries/Lists/__tests__/__snapshots__/VirtualizedList-test.js.snap
@@ -63,7 +63,6 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when all in initia
     ]
   }
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -205,7 +204,6 @@ exports[`VirtualizedList forwards correct stickyHeaderIndices when partially in
     ]
   }
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -282,7 +280,6 @@ exports[`VirtualizedList handles nested lists 1`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -315,7 +312,6 @@ exports[`VirtualizedList handles nested lists 1`] = `
         scrollEventThrottle={50}
         stickyHeaderIndices={Array []}
         updateCellsBatchingPeriod={50}
-        windowSize={21}
       >
         <View
           onLayout={[Function]}
@@ -365,7 +361,6 @@ exports[`VirtualizedList handles nested lists 1`] = `
         scrollEventThrottle={50}
         stickyHeaderIndices={Array []}
         updateCellsBatchingPeriod={50}
-        windowSize={21}
       >
         <View>
           <View
@@ -435,7 +430,6 @@ exports[`VirtualizedList handles separators correctly 1`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -512,7 +506,6 @@ exports[`VirtualizedList handles separators correctly 2`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -589,7 +582,6 @@ exports[`VirtualizedList handles separators correctly 3`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -1047,7 +1039,6 @@ exports[`VirtualizedList renders all the bells and whistles 1`] = `
     ]
   }
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <RCTRefreshControl />
   <View>
@@ -1204,7 +1195,6 @@ exports[`VirtualizedList renders empty list 1`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View />
 </RCTScrollView>
@@ -1230,7 +1220,6 @@ exports[`VirtualizedList renders empty list with empty component 1`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -1272,7 +1261,6 @@ exports[`VirtualizedList renders list with empty component 1`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -1303,7 +1291,6 @@ exports[`VirtualizedList renders null list 1`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View />
 </RCTScrollView>
@@ -1338,7 +1325,6 @@ exports[`VirtualizedList renders simple list 1`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -1398,7 +1384,6 @@ exports[`VirtualizedList renders simple list using ListItemComponent 1`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -1452,7 +1437,6 @@ exports[`VirtualizedList test getItem functionality where data is not an Array 1
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -1491,7 +1475,6 @@ exports[`VirtualizedList warns if both renderItem or ListItemComponent are speci
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
diff --git a/Libraries/Lists/__tests__/__snapshots__/VirtualizedSectionList-test.js.snap b/Libraries/Lists/__tests__/__snapshots__/VirtualizedSectionList-test.js.snap
index 9a7a50fa4d..35ddd4f5c9 100644
--- a/Libraries/Lists/__tests__/__snapshots__/VirtualizedSectionList-test.js.snap
+++ b/Libraries/Lists/__tests__/__snapshots__/VirtualizedSectionList-test.js.snap
@@ -31,7 +31,6 @@ exports[`VirtualizedSectionList handles nested lists 1`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -73,7 +72,6 @@ exports[`VirtualizedSectionList handles nested lists 1`] = `
         scrollEventThrottle={50}
         stickyHeaderIndices={Array []}
         updateCellsBatchingPeriod={50}
-        windowSize={21}
       >
         <View
           onLayout={[Function]}
@@ -136,7 +134,6 @@ exports[`VirtualizedSectionList handles nested lists 1`] = `
         scrollEventThrottle={50}
         stickyHeaderIndices={Array []}
         updateCellsBatchingPeriod={50}
-        windowSize={21}
       >
         <View>
           <View
@@ -236,7 +233,6 @@ exports[`VirtualizedSectionList handles separators correctly 1`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -371,7 +367,6 @@ exports[`VirtualizedSectionList handles separators correctly 2`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -506,7 +501,6 @@ exports[`VirtualizedSectionList handles separators correctly 3`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -674,7 +668,6 @@ exports[`VirtualizedSectionList renders all the bells and whistles 1`] = `
     ]
   }
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <RCTRefreshControl />
   <View>
@@ -871,7 +864,6 @@ exports[`VirtualizedSectionList renders empty list 1`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View />
 </RCTScrollView>
@@ -897,7 +889,6 @@ exports[`VirtualizedSectionList renders empty list with empty component 1`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -944,7 +935,6 @@ exports[`VirtualizedSectionList renders list with empty component 1`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View
@@ -1001,7 +991,6 @@ exports[`VirtualizedSectionList renders simple list 1`] = `
   scrollEventThrottle={50}
   stickyHeaderIndices={Array []}
   updateCellsBatchingPeriod={50}
-  windowSize={21}
 >
   <View>
     <View