diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js index e82c5134b..765934bfc 100644 --- a/Libraries/Components/ScrollView/ScrollView.js +++ b/Libraries/Components/ScrollView/ScrollView.js @@ -333,7 +333,8 @@ var ScrollView = React.createClass({ + removeClippedSubviews={this.props.removeClippedSubviews} + collapsable={false}> {this.props.children} ; diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js index a016a9967..5ba250dea 100644 --- a/Libraries/Components/View/View.js +++ b/Libraries/Components/View/View.js @@ -227,6 +227,7 @@ var View = React.createClass({ * interaction/animation. */ renderToHardwareTextureAndroid: PropTypes.bool, + collapsable: PropTypes.bool, }, render: function() { diff --git a/Libraries/ReactNative/ReactNativeViewAttributes.js b/Libraries/ReactNative/ReactNativeViewAttributes.js index e7db511ef..c9d715433 100644 --- a/Libraries/ReactNative/ReactNativeViewAttributes.js +++ b/Libraries/ReactNative/ReactNativeViewAttributes.js @@ -26,6 +26,7 @@ ReactNativeViewAttributes.UIView = { onLayout: true, onAccessibilityTap: true, onMagicTap: true, + collapsable: true, }; ReactNativeViewAttributes.RCTView = merge(