[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

View File

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

View File

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

View File

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