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

[React Native] sync JS for D2287297

This commit is contained in:
Philipp von Weitershausen 2015-07-31 22:03:05 -07:00
parent ee8b50c955
commit 3e79838a31
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,7 +333,8 @@ var ScrollView = React.createClass({
<View <View
ref={INNERVIEW} ref={INNERVIEW}
style={contentContainerStyle} style={contentContainerStyle}
removeClippedSubviews={this.props.removeClippedSubviews}> removeClippedSubviews={this.props.removeClippedSubviews}
collapsable={false}>
{this.props.children} {this.props.children}
</View>; </View>;

1
Libraries/Components/View/View.js
View File

@ -227,6 +227,7 @@ var View = React.createClass({
* interaction/animation. * interaction/animation.
*/ */
renderToHardwareTextureAndroid: PropTypes.bool, renderToHardwareTextureAndroid: PropTypes.bool,
collapsable: PropTypes.bool,
}, },
render: function() { render: function() {

1
Libraries/ReactNative/ReactNativeViewAttributes.js
View File

@ -26,6 +26,7 @@ ReactNativeViewAttributes.UIView = {
onLayout: true, onLayout: true,
onAccessibilityTap: true, onAccessibilityTap: true,
onMagicTap: true, onMagicTap: true,
collapsable: true,
}; };
ReactNativeViewAttributes.RCTView = merge( ReactNativeViewAttributes.RCTView = merge(