status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix issue that breaks scroll views w/ RefreshControl on Android 

Summary:
Fixes the issue I mentioned here https://github.com/facebook/react-native/pull/5623#issuecomment-180583142
Closes https://github.com/facebook/react-native/pull/5784

Reviewed By: svcscm

Differential Revision: D2908112

Pulled By: nicklockwood

fb-gh-sync-id: 8a2f053de3f7dc19807ee21dd969c53a57b71345
This commit is contained in:
Keith Norman 2016-02-05 16:24:48 -08:00 committed by facebook-github-bot-7
parent 64d56f34b7
commit 98797177ab
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Libraries/Components/ScrollView/ScrollView.js
View File

@ -530,7 +530,7 @@ var ScrollView = React.createClass({
// AndroidSwipeRefreshLayout and use flex: 1 for the ScrollView. // AndroidSwipeRefreshLayout and use flex: 1 for the ScrollView.
return React.cloneElement( return React.cloneElement(
refreshControl, refreshControl,
{style: this.props.style}, {style: props.style},
<ScrollViewClass {...props} style={styles.base} ref={SCROLLVIEW}> <ScrollViewClass {...props} style={styles.base} ref={SCROLLVIEW}>
{contentContainer} {contentContainer}
</ScrollViewClass> </ScrollViewClass>