Skip to content

Commit 5a56653

Browse files
authored
Merge pull request #41 from Expensify/Rory-PortCustomChanges-0.71.2
Port custom changes to 0.71.2
2 parents 66a47e1 + 2bf456e commit 5a56653

37 files changed

+1264
-114
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,3 +134,5 @@ package-lock.json
134134

135135
# Temporary files created by Metro to check the health of the file watcher
136136
.metro-health-check*
137+
138+
react-native-*.tgz

Libraries/Components/ScrollView/ScrollView.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,6 @@ type IOSProps = $ReadOnly<{|
278278
* Caveat 2: This simply uses `contentOffset` and `frame.origin` in native code to compute
279279
* visibility. Occlusion, transforms, and other complexity won't be taken into account as to
280280
* whether content is "visible" or not.
281-
*
282-
* @platform ios
283281
*/
284282
maintainVisibleContentPosition?: ?$ReadOnly<{|
285283
minIndexForVisible: number,

Libraries/Lists/FlatList.d.ts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,19 +104,6 @@ export interface FlatListProps<ItemT> extends VirtualizedListProps<ItemT> {
104104
*/
105105
numColumns?: number | undefined;
106106

107-
/**
108-
* Called once when the scroll position gets within onEndReachedThreshold of the rendered content.
109-
*/
110-
onEndReached?: ((info: {distanceFromEnd: number}) => void) | null | undefined;
111-
112-
/**
113-
* How far from the end (in units of visible length of the list) the bottom edge of the
114-
* list must be from the end of the content to trigger the `onEndReached` callback.
115-
* Thus a value of 0.5 will trigger `onEndReached` when the end of the content is
116-
* within half the visible length of the list.
117-
*/
118-
onEndReachedThreshold?: number | null | undefined;
119-
120107
/**
121108
* If provided, a standard RefreshControl will be added for "Pull to Refresh" functionality.
122109
* Make sure to also set the refreshing prop correctly.

Libraries/Lists/VirtualizedList.d.ts

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,10 +262,37 @@ export interface VirtualizedListWithoutRenderItemProps<ItemT>
262262
*/
263263
maxToRenderPerBatch?: number | undefined;
264264

265+
/**
266+
* Called once when the scroll position gets within within `onEndReachedThreshold`
267+
* from the logical end of the list.
268+
*/
265269
onEndReached?: ((info: {distanceFromEnd: number}) => void) | null | undefined;
266270

271+
/**
272+
* How far from the end (in units of visible length of the list) the trailing edge of the
273+
* list must be from the end of the content to trigger the `onEndReached` callback.
274+
* Thus, a value of 0.5 will trigger `onEndReached` when the end of the content is
275+
* within half the visible length of the list.
276+
*/
267277
onEndReachedThreshold?: number | null | undefined;
268278

279+
/**
280+
* Called once when the scroll position gets within within `onStartReachedThreshold`
281+
* from the logical start of the list.
282+
*/
283+
onStartReached?:
284+
| ((info: {distanceFromStart: number}) => void)
285+
| null
286+
| undefined;
287+
288+
/**
289+
* How far from the start (in units of visible length of the list) the leading edge of the
290+
* list must be from the start of the content to trigger the `onStartReached` callback.
291+
* Thus, a value of 0.5 will trigger `onStartReached` when the start of the content is
292+
* within half the visible length of the list.
293+
*/
294+
onStartReachedThreshold?: number | null | undefined;
295+
269296
onLayout?: ((event: LayoutChangeEvent) => void) | undefined;
270297

271298
/**

0 commit comments

Comments
 (0)