Skip to content

Cherry pick VirtualizedList fixes #46

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

Merged
roryabraham merged 2 commits into from
Mar 20, 2023
Merged

Cherry pick VirtualizedList fixes #46

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f84b5b
Fix batched rendering when mcvp adjustment changes
janicduplessis Mar 16, 2023
3bf2583
Avoid VirtualizedList viewability updates during state updates
janicduplessis Mar 16, 2023
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
14 changes: 12 additions & 2 deletions Libraries/Lists/VirtualizedList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,6 @@ export default class VirtualizedList extends StateSafePureComponent<
const onEndReachedThreshold = onEndReachedThresholdOrDefault(
props.onEndReachedThreshold,
);
this._updateViewableItems(props, cellsAroundViewport);

const {contentLength, offset, visibleLength} = this._scrollMetrics;
const distanceFromEnd = contentLength - visibleLength - offset;
Expand Down Expand Up @@ -1125,7 +1124,7 @@ export default class VirtualizedList extends StateSafePureComponent<
}
}

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
Expand All @@ -1147,6 +1146,15 @@ export default class VirtualizedList extends StateSafePureComponent<
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;
Expand Down Expand Up @@ -1787,6 +1795,8 @@ export default class VirtualizedList extends StateSafePureComponent<
};

_updateCellsToRender = () => {
this._updateViewableItems(this.props, this.state.cellsAroundViewport);

this.setState((state, props) => {
const cellsAroundViewport = this._adjustCellsAroundViewport(
props,
Expand Down