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

Merge branch 'iRoachie-viewPropTypes'

This commit is contained in:
Dylan Vann 2017-11-12 14:22:10 -05:00
parent d7d0038e49 1d9ca5aa7f
commit 17a5a7e96e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FastImage.js
View File

@ -4,8 +4,8 @@ import {
Image, Image,
NativeModules, NativeModules,
requireNativeComponent, requireNativeComponent,
View,
} from 'react-native' } from 'react-native'
import ViewPropTypes from './utils/ViewPropTypes'
const resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource') const resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource')
@ -87,7 +87,7 @@ const FastImageSourcePropType = PropTypes.shape({
}) })
FastImage.propTypes = { FastImage.propTypes = {
...View.propTypes, ...ViewPropTypes,
source: PropTypes.oneOfType([FastImageSourcePropType, PropTypes.number]), source: PropTypes.oneOfType([FastImageSourcePropType, PropTypes.number]),
onLoadStart: PropTypes.func, onLoadStart: PropTypes.func,
onProgress: PropTypes.func, onProgress: PropTypes.func,

3
utils/ViewPropTypes.js Normal file
View File

@ -0,0 +1,3 @@
import { ViewPropTypes as RNViewPropTypes, View } from 'react-native'
export default RNViewPropTypes || View.propTypes