[React Native] sync JS for D2287297
This commit is contained in:
parent
ee8b50c955
commit
3e79838a31
|
@ -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>;
|
||||||
|
|
||||||
|
|
|
@ -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() {
|
||||||
|
|
|
@ -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(
|
||||||
|
|
Loading…
Reference in New Issue