-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #41189 from janicduplessis/@janic/osr-improvement-…
…patch
- Loading branch information
Showing
2 changed files
with
103 additions
and
0 deletions.
There are no files selected for viewing
33 changes: 33 additions & 0 deletions
33
patches/@react-native+virtualized-lists+0.73.4+002+osr-improvement.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| diff --git a/node_modules/@react-native/virtualized-lists/Lists/VirtualizedList.js b/node_modules/@react-native/virtualized-lists/Lists/VirtualizedList.js | ||
| index e338d90..70a59bf 100644 | ||
| --- a/node_modules/@react-native/virtualized-lists/Lists/VirtualizedList.js | ||
| +++ b/node_modules/@react-native/virtualized-lists/Lists/VirtualizedList.js | ||
| @@ -1219,7 +1219,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> { | ||
| zoomScale: 1, | ||
| }; | ||
| _scrollRef: ?React.ElementRef<any> = null; | ||
| - _sentStartForContentLength = 0; | ||
| + _sentStartForFirstVisibleItemKey: ?string = null; | ||
| _sentEndForContentLength = 0; | ||
| _updateCellsToRenderBatcher: Batchinator; | ||
| _viewabilityTuples: Array<ViewabilityHelperCallbackTuple> = []; | ||
| @@ -1550,16 +1550,16 @@ class VirtualizedList extends StateSafePureComponent<Props, State> { | ||
| onStartReached != null && | ||
| this.state.cellsAroundViewport.first === 0 && | ||
| isWithinStartThreshold && | ||
| - this._listMetrics.getContentLength() !== this._sentStartForContentLength | ||
| + this.state.firstVisibleItemKey !== this._sentStartForFirstVisibleItemKey | ||
| ) { | ||
| - this._sentStartForContentLength = this._listMetrics.getContentLength(); | ||
| + this._sentStartForFirstVisibleItemKey = this.state.firstVisibleItemKey; | ||
| onStartReached({distanceFromStart}); | ||
| } | ||
|
|
||
| // If the user scrolls away from the start or end and back again, | ||
| // cause onStartReached or onEndReached to be triggered again | ||
| if (!isWithinStartThreshold) { | ||
| - this._sentStartForContentLength = 0; | ||
| + this._sentStartForFirstVisibleItemKey = null; | ||
| } | ||
| if (!isWithinEndThreshold) { | ||
| this._sentEndForContentLength = 0; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| diff --git a/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js b/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js | ||
| index b05da08..80aea85 100644 | ||
| --- a/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js | ||
| +++ b/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js | ||
| @@ -332,7 +332,7 @@ class VirtualizedList extends StateSafePureComponent { | ||
| zoomScale: 1 | ||
| }; | ||
| this._scrollRef = null; | ||
| - this._sentStartForContentLength = 0; | ||
| + this._sentStartForFirstVisibleItemKey = null; | ||
| this._sentEndForContentLength = 0; | ||
| this._totalCellLength = 0; | ||
| this._totalCellsMeasured = 0; | ||
| @@ -1397,8 +1397,8 @@ class VirtualizedList extends StateSafePureComponent { | ||
| // Next check if the user just scrolled within the start threshold | ||
| // and call onStartReached only once for a given content length, | ||
| // and only if onEndReached is not being executed | ||
| - else if (onStartReached != null && this.state.cellsAroundViewport.first === 0 && isWithinStartThreshold && this._scrollMetrics.contentLength !== this._sentStartForContentLength) { | ||
| - this._sentStartForContentLength = this._scrollMetrics.contentLength; | ||
| + else if (onStartReached != null && this.state.cellsAroundViewport.first === 0 && isWithinStartThreshold && this.state.firstVisibleItemKey !== this._sentStartForFirstVisibleItemKey) { | ||
| + this._sentStartForFirstVisibleItemKey = this.state.firstVisibleItemKey; | ||
| onStartReached({ | ||
| distanceFromStart | ||
| }); | ||
| @@ -1407,7 +1407,7 @@ class VirtualizedList extends StateSafePureComponent { | ||
| // If the user scrolls away from the start or end and back again, | ||
| // cause onStartReached or onEndReached to be triggered again | ||
| else { | ||
| - this._sentStartForContentLength = isWithinStartThreshold ? this._sentStartForContentLength : 0; | ||
| + this._sentStartForFirstVisibleItemKey = isWithinStartThreshold ? this._sentStartForFirstVisibleItemKey : null; | ||
| this._sentEndForContentLength = isWithinEndThreshold ? this._sentEndForContentLength : 0; | ||
| } | ||
| } | ||
| diff --git a/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js b/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js | ||
| index 459f017..799a6ee 100644 | ||
| --- a/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js | ||
| +++ b/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js | ||
| @@ -1325,7 +1325,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> { | ||
| zoomScale: 1, | ||
| }; | ||
| _scrollRef: ?React.ElementRef<any> = null; | ||
| - _sentStartForContentLength = 0; | ||
| + _sentStartForFirstVisibleItemKey: ?string = null; | ||
| _sentEndForContentLength = 0; | ||
| _totalCellLength = 0; | ||
| _totalCellsMeasured = 0; | ||
| @@ -1675,18 +1675,18 @@ class VirtualizedList extends StateSafePureComponent<Props, State> { | ||
| onStartReached != null && | ||
| this.state.cellsAroundViewport.first === 0 && | ||
| isWithinStartThreshold && | ||
| - this._scrollMetrics.contentLength !== this._sentStartForContentLength | ||
| + this.state.firstVisibleItemKey !== this._sentStartForFirstVisibleItemKey | ||
| ) { | ||
| - this._sentStartForContentLength = this._scrollMetrics.contentLength; | ||
| + this._sentStartForFirstVisibleItemKey = this.state.firstVisibleItemKey; | ||
| onStartReached({distanceFromStart}); | ||
| } | ||
|
|
||
| // If the user scrolls away from the start or end and back again, | ||
| // cause onStartReached or onEndReached to be triggered again | ||
| else { | ||
| - this._sentStartForContentLength = isWithinStartThreshold | ||
| - ? this._sentStartForContentLength | ||
| - : 0; | ||
| + this._sentStartForFirstVisibleItemKey = isWithinStartThreshold | ||
| + ? this._sentStartForFirstVisibleItemKey | ||
| + : null; | ||
| this._sentEndForContentLength = isWithinEndThreshold | ||
| ? this._sentEndForContentLength | ||
| : 0; |