mirror of
https://github.com/zhigang1992/react-native.git
synced 2026-03-26 07:04:05 +08:00
[React Native] sync JS for D2287297
This commit is contained in:
@@ -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>;
|
||||
|
||||
|
||||
@@ -227,6 +227,7 @@ var View = React.createClass({
|
||||
* interaction/animation.
|
||||
*/
|
||||
renderToHardwareTextureAndroid: PropTypes.bool,
|
||||
collapsable: PropTypes.bool,
|
||||
},
|
||||
|
||||
render: function() {
|
||||
|
||||
@@ -26,6 +26,7 @@ ReactNativeViewAttributes.UIView = {
|
||||
onLayout: true,
|
||||
onAccessibilityTap: true,
|
||||
onMagicTap: true,
|
||||
collapsable: true,
|
||||
};
|
||||
|
||||
ReactNativeViewAttributes.RCTView = merge(
|
||||
|
||||
Reference in New Issue
Block a user