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

Fix broken image cropper - can not scroll 

Summary: ImageCropper is broken on iOS. Can not scroll up and down

Differential Revision: D3413397

fbshipit-source-id: 75096fc1d5dd14764c0ddd4fd3888a9576c1d1ce
This commit is contained in:
Wenjing Wang 2016-06-09 23:08:05 -07:00 committed by Facebook Github Bot 6
parent fb0007d853
commit 13dfb6267a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,6 @@ const ColorPropType = require('ColorPropType');
const EdgeInsetsPropType = require('EdgeInsetsPropType'); const EdgeInsetsPropType = require('EdgeInsetsPropType');
const Platform = require('Platform'); const Platform = require('Platform');
const PointPropType = require('PointPropType'); const PointPropType = require('PointPropType');
const RCTScrollViewManager = require('NativeModules').ScrollViewManager;
const React = require('React'); const React = require('React');
const ReactNative = require('ReactNative'); const ReactNative = require('ReactNative');
const ScrollResponder = require('ScrollResponder'); const ScrollResponder = require('ScrollResponder');
@ -469,7 +468,6 @@ const ScrollView = React.createClass({
!this.props.horizontal; !this.props.horizontal;
const baseStyle = this.props.horizontal ? styles.baseHorizontal : styles.baseVertical; const baseStyle = this.props.horizontal ? styles.baseHorizontal : styles.baseVertical;
const props = { const props = {
...this.props, ...this.props,
alwaysBounceHorizontal, alwaysBounceHorizontal,
@ -548,6 +546,7 @@ const ScrollView = React.createClass({
const styles = StyleSheet.create({ const styles = StyleSheet.create({
baseVertical: { baseVertical: {
flex: 1, flex: 1,
flexDirection: 'column',
}, },
baseHorizontal: { baseHorizontal: {
flex: 1, flex: 1,