Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix onEndReached not being called when getItemLayout is present and we scroll past render window #46990

Closed
wants to merge 1 commit into from
Closed

Fix onEndReached not being called when getItemLayout is present and we scroll past render window #46990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion packages/virtualized-lists/Lists/VirtualizedList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1160,7 +1160,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
}

componentDidUpdate(prevProps: Props) {
const {data, extraData} = this.props;
const {data, extraData, getItemLayout} = this.props;
if (data !== prevProps.data || extraData !== prevProps.extraData) {
// clear the viewableIndices cache to also trigger
// the onViewableItemsChanged callback with the new data
Expand All @@ -1181,6 +1181,14 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
if (hiPriInProgress) {
this._hiPriInProgress = false;
}

// We only call `onEndReached` after we render the last cell, but when
// getItemLayout is present, we can scroll past the last rendered cell, and
// never trigger a new layout or bounds change, so we need to check again
// after rendering more cells.
if (getItemLayout != null) {
this._maybeCallOnEdgeReached();
}
}

_cellRefs: {[string]: null | CellRenderer<any>} = {};
Expand Down Expand Up @@ -1496,6 +1504,14 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
onEndReached,
onEndReachedThreshold,
} = this.props;
// Wait until we have real metrics
if (
!this._listMetrics.hasContentLength() ||
this._scrollMetrics.visibleLength === 0
) {
return;
}

// If we have any pending scroll updates it means that the scroll metrics
// are out of date and we should not call any of the edge reached callbacks.
if (this.state.pendingScrollUpdateCount > 0) {
Expand Down
14 changes: 9 additions & 5 deletions packages/virtualized-lists/Lists/__tests__/VirtualizedList-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,11 +663,6 @@ describe('VirtualizedList', () => {
renderItem: ({item}) => <item value={item.key} />,
getItem: (items, index) => items[index],
getItemCount: items => items.length,
getItemLayout: (items, index) => ({
length: ITEM_HEIGHT,
offset: ITEM_HEIGHT * index,
index,
}),
onEndReached,
};

Expand All @@ -694,6 +689,15 @@ describe('VirtualizedList', () => {
expect(onEndReached).not.toHaveBeenCalled();

await act(() => {
for (let i = 0; i < 20; ++i) {
simulateCellLayout(component, data, i, {
width: 10,
height: ITEM_HEIGHT,
x: 0,
y: i * ITEM_HEIGHT,
});
}

instance._onScroll({
timeStamp: 1000,
nativeEvent: {
Expand Down