kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-03-27 22:54:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed image source for MapView annotations

Browse Source 
Summary:
public
resolveAssetSource was not being called on MapView image any more, resulting in an error when using `require(./imagename.png)` syntax.

Reviewed By: fredliu

Differential Revision: D2772560

fb-gh-sync-id: 0a50a9c3ba727406343a0f47c84941e95df9cadd
This commit is contained in:
Nick Lockwood
2015-12-18 00:49:29 -08:00
committed by facebook-github-bot-4
parent 56fd138fd3
commit 9901bf20e1
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Libraries/Components/MapView/MapView.js
View File

@@ -294,8 +294,12 @@ const MapView = React.createClass({
}}
source={image}
/>;
image = undefined;
}
if (view) {
if (image) {
console.warn('`image` and `view` both set on annotation. Image will be ignored.');
}
var viewIndex = children.length;
children.push(React.cloneElement(view, {
style: [styles.annotationView, view.props.style || {}]
@@ -319,19 +323,22 @@ const MapView = React.createClass({
style: [styles.calloutView, detailCalloutView.props.style || {}]
}));
}
['hasLeftCallout', 'onLeftCalloutPress'].forEach(key => {
if (annotation[key]) {
console.warn('`' + key + '` is deprecated. Use leftCalloutView instead.');
}
});
['hasRightCallout', 'onRightCalloutPress'].forEach(key => {
if (annotation[key]) {
console.warn('`' + key + '` is deprecated. Use rightCalloutView instead.');
}
});
if (__DEV__) {
['hasLeftCallout', 'onLeftCalloutPress'].forEach(key => {
if (annotation[key]) {
console.warn('`' + key + '` is deprecated. Use leftCalloutView instead.');
}
});
['hasRightCallout', 'onRightCalloutPress'].forEach(key => {
if (annotation[key]) {
console.warn('`' + key + '` is deprecated. Use rightCalloutView instead.');
}
});
}
return {
...annotation,
tintColor: tintColor && processColor(tintColor),
image: image && resolveAssetSource(image),
viewIndex,
leftCalloutViewIndex,
rightCalloutViewIndex,