status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-02-26 08:05:34 +00:00
Code Issues Projects Releases Wiki Activity

fix crash with onEndReached={null}

Browse Source 
Reviewed By: bvaughn

Differential Revision: D4815310

fbshipit-source-id: 69d4a5a6fd247bdf877465a7cd07924a0dd6584b
This commit is contained in:
Spencer Ahrens 2017-04-03 19:07:44 -07:00 committed by Facebook Github Bot
parent e0bd35f76f
commit b12f6db0ef
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Examples/UIExplorer/js/FlatListExample.js
View File

@ -62,7 +62,7 @@ class FlatListExample extends React.PureComponent {
static description = 'Performant, scrollable list of data.';
state = {
data: genItemData(1000),
data: genItemData(100),
debug: false,
horizontal: false,
filterText: '',
@ -142,6 +142,7 @@ class FlatListExample extends React.PureComponent {
}
legacyImplementation={false}
numColumns={1}
onEndReached={this._onEndReached}
onRefresh={this._onRefresh}
onScroll={this.state.horizontal ? this._scrollSinkX : this._scrollSinkY}
onViewableItemsChanged={this._onViewableItemsChanged}
@ -157,6 +158,11 @@ class FlatListExample extends React.PureComponent {
_getItemLayout = (data: any, index: number) => {
return getItemLayout(data, index, this.state.horizontal);
};
_onEndReached = () => {
this.setState((state) => ({
data: state.data.concat(genItemData(100, state.data.length)),
}));
};
_onRefresh = () => alert('onRefresh: nothing to refresh :P');
_renderItemComponent = ({item}) => {
return (

4
Examples/UIExplorer/js/ListExampleShared.js
View File

@ -39,9 +39,9 @@ const {
type Item = {title: string, text: string, key: number, pressed: boolean, noImage?: ?boolean};
function genItemData(count: number): Array<Item> {
function genItemData(count: number, start: number = 0): Array<Item> {
const dataBlob = [];
for (let ii = 0; ii < count; ii++) {
for (let ii = start; ii < count + start; ii++) {
const itemHash = Math.abs(hashCode('Item ' + ii));
dataBlob.push({
title: 'Item ' + ii,

4
Libraries/Lists/VirtualizedList.js
View File

@ -259,7 +259,6 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
return String(index);
},
maxToRenderPerBatch: 10,
onEndReached: () => {},
onEndReachedThreshold: 2, // multiples of length
removeClippedSubviews: true,
renderScrollComponent: (props: Props) => {
@ -636,7 +635,8 @@ class VirtualizedList extends React.PureComponent<OptionalProps, Props, State> {
}
const distanceFromEnd = contentLength - visibleLength - offset;
const itemCount = getItemCount(data);
if (this.state.last === itemCount - 1 &&
if (onEndReached &&
this.state.last === itemCount - 1 &&
distanceFromEnd < onEndReachedThreshold * visibleLength &&
(this._hasDataChangedSinceEndReached ||
this._scrollMetrics.contentLength !== this._sentEndForContentLength)) {

4
Libraries/Lists/__tests__/__snapshots__/FlatList-test.js.snap
View File

@ -34,7 +34,6 @@ exports[`FlatList renders all the bells and whistles 1`] = `
maxToRenderPerBatch={10}
numColumns={2}
onContentSizeChange={[Function]}
onEndReached={[Function]}
onEndReachedThreshold={2}
onLayout={[Function]}
onRefresh={[Function]}
@ -134,7 +133,6 @@ exports[`FlatList renders empty list 1`] = `
maxToRenderPerBatch={10}
numColumns={1}
onContentSizeChange={[Function]}
onEndReached={[Function]}
onEndReachedThreshold={2}
onLayout={[Function]}
onScroll={[Function]}
@ -164,7 +162,6 @@ exports[`FlatList renders null list 1`] = `
maxToRenderPerBatch={10}
numColumns={1}
onContentSizeChange={[Function]}
onEndReached={[Function]}
onEndReachedThreshold={2}
onLayout={[Function]}
onScroll={[Function]}
@ -206,7 +203,6 @@ exports[`FlatList renders simple list 1`] = `
maxToRenderPerBatch={10}
numColumns={1}
onContentSizeChange={[Function]}
onEndReached={[Function]}
onEndReachedThreshold={2}
onLayout={[Function]}
onScroll={[Function]}

3
Libraries/Lists/__tests__/__snapshots__/SectionList-test.js.snap
View File

@ -26,7 +26,6 @@ exports[`SectionList rendering empty section headers is fine 1`] = `
keyExtractor={[Function]}
maxToRenderPerBatch={10}
onContentSizeChange={[Function]}
onEndReached={[Function]}
onEndReachedThreshold={2}
onLayout={[Function]}
onScroll={[Function]}
@ -130,7 +129,6 @@ exports[`SectionList renders all the bells and whistles 1`] = `
keyExtractor={[Function]}
maxToRenderPerBatch={10}
onContentSizeChange={[Function]}
onEndReached={[Function]}
onEndReachedThreshold={2}
onLayout={[Function]}
onRefresh={[Function]}
@ -269,7 +267,6 @@ exports[`SectionList renders empty list 1`] = `
keyExtractor={[Function]}
maxToRenderPerBatch={10}
onContentSizeChange={[Function]}
onEndReached={[Function]}
onEndReachedThreshold={2}
onLayout={[Function]}
onScroll={[Function]}