From 4576b4236569a2088c045e5451408c84085d18ce Mon Sep 17 00:00:00 2001 From: Nicolas Gallagher Date: Sun, 9 Oct 2016 16:53:41 -0700 Subject: [PATCH] Correct the Image docs --- docs/components/Image.md | 2 +- src/components/Image/ImageResizeMode.js | 18 ++++++++---------- src/components/Image/index.js | 7 +++++-- src/components/Image/resolveAssetSource.js | 5 ----- 4 files changed, 14 insertions(+), 18 deletions(-) delete mode 100644 src/components/Image/resolveAssetSource.js diff --git a/docs/components/Image.md b/docs/components/Image.md index 14833095..47d65fc5 100644 --- a/docs/components/Image.md +++ b/docs/components/Image.md @@ -46,7 +46,7 @@ Invoked when load either succeeds or fails, Invoked on load start. -**resizeMode**: oneOf('center', 'contain', 'cover', 'none', 'repeat', 'stretch') = 'stretch' +**resizeMode**: oneOf('center', 'contain', 'cover', 'none', 'repeat', 'stretch') = 'cover' Determines how to resize the image when the frame doesn't match the raw image dimensions. diff --git a/src/components/Image/ImageResizeMode.js b/src/components/Image/ImageResizeMode.js index d763627f..854fc90d 100644 --- a/src/components/Image/ImageResizeMode.js +++ b/src/components/Image/ImageResizeMode.js @@ -1,12 +1,10 @@ -import keyMirror from 'fbjs/lib/keyMirror'; - -const ImageResizeMode = keyMirror({ - center: null, - contain: null, - cover: null, - none: null, - repeat: null, - stretch: null -}); +const ImageResizeMode = { + center: 'center', + contain: 'contain', + cover: 'cover', + none: 'none', + repeat: 'repeat', + stretch: 'stretch' +}; module.exports = ImageResizeMode; diff --git a/src/components/Image/index.js b/src/components/Image/index.js index eaa4f742..ad344722 100644 --- a/src/components/Image/index.js +++ b/src/components/Image/index.js @@ -4,7 +4,6 @@ import BaseComponentPropTypes from '../../propTypes/BaseComponentPropTypes'; import createDOMElement from '../../modules/createDOMElement'; import ImageResizeMode from './ImageResizeMode'; import ImageStylePropTypes from './ImageStylePropTypes'; -import resolveAssetSource from './resolveAssetSource'; import StyleSheet from '../../apis/StyleSheet'; import StyleSheetPropType from '../../propTypes/StyleSheetPropType'; import View from '../View'; @@ -23,6 +22,10 @@ const ImageSourcePropType = PropTypes.oneOfType([ PropTypes.string ]); +const resolveAssetSource = (source) => { + return ((typeof source === 'object') ? source.uri : source) || null; +}; + class Image extends Component { static displayName = 'Image'; @@ -35,7 +38,7 @@ class Image extends Component { onLoad: PropTypes.func, onLoadEnd: PropTypes.func, onLoadStart: PropTypes.func, - resizeMode: PropTypes.oneOf([ 'center', 'contain', 'cover', 'none', 'repeat', 'stretch' ]), + resizeMode: PropTypes.oneOf(Object.keys(ImageResizeMode)), source: ImageSourcePropType, style: StyleSheetPropType(ImageStylePropTypes) }; diff --git a/src/components/Image/resolveAssetSource.js b/src/components/Image/resolveAssetSource.js deleted file mode 100644 index 58c2eded..00000000 --- a/src/components/Image/resolveAssetSource.js +++ /dev/null @@ -1,5 +0,0 @@ -function resolveAssetSource(source) { - return ((typeof source === 'object') ? source.uri : source) || null; -} - -module.exports = resolveAssetSource;