diff --git a/Libraries/Lists/VirtualizeUtils.js b/Libraries/Lists/VirtualizeUtils.js index c8ccb07cb30..9351505dcad 100644 --- a/Libraries/Lists/VirtualizeUtils.js +++ b/Libraries/Lists/VirtualizeUtils.js @@ -10,7 +10,7 @@ 'use strict'; -import invariant from 'invariant'; +import type {FrameMetricProps} from './VirtualizedListProps'; /** * Used to find the indices of the frames that overlap the given offsets. Useful for finding the @@ -95,8 +95,7 @@ export function newRangeCount( * biased in the direction of scroll. */ export function computeWindowedRenderLimits( - data: any, - getItemCount: (data: any) => number, + props: FrameMetricProps, maxToRenderPerBatch: number, windowSize: number, prev: { @@ -120,7 +119,7 @@ export function computeWindowedRenderLimits( first: number, last: number, } { - const itemCount = getItemCount(data); + const itemCount = props.getItemCount(props.data); if (itemCount === 0) { return prev; } diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js index 539e6565e1d..a0dc214d798 100644 --- a/Libraries/Lists/VirtualizedList.js +++ b/Libraries/Lists/VirtualizedList.js @@ -1553,8 +1553,7 @@ class VirtualizedList extends React.PureComponent { Math.abs(distanceFromEnd) < Number.EPSILON ) { newState = computeWindowedRenderLimits( - this.props.data, - this.props.getItemCount, + this.props, maxToRenderPerBatchOrDefault(this.props.maxToRenderPerBatch), windowSizeOrDefault(this.props.windowSize), state, diff --git a/Libraries/Lists/VirtualizedList_EXPERIMENTAL.js b/Libraries/Lists/VirtualizedList_EXPERIMENTAL.js index 34d15c86880..89d972ef55c 100644 --- a/Libraries/Lists/VirtualizedList_EXPERIMENTAL.js +++ b/Libraries/Lists/VirtualizedList_EXPERIMENTAL.js @@ -641,8 +641,7 @@ class VirtualizedList extends React.PureComponent { } newCellsAroundViewport = computeWindowedRenderLimits( - props.data, - props.getItemCount, + props, maxToRenderPerBatchOrDefault(props.maxToRenderPerBatch), windowSizeOrDefault(props.windowSize), cellsAroundViewport,