react-native-maps 1.21.0-alpha.93 → 1.21.0-alpha.94

package/lib/MapMarker.js

@@ -30,6 +30,7 @@ const decorateMapComponent_1 = __importStar(require("./decorateMapComponent"));
 const MapMarkerNativeComponent_1 = require("./MapMarkerNativeComponent");
 const NativeComponentMarker_1 = require("./specs/NativeComponentMarker");
 const ProviderConstants_1 = require("./ProviderConstants");
+const fixImageProp_1 = require("./fixImageProp");
 class MapMarker extends React.Component {
     getNativeComponent;
     getMapManagerCommand;
@@ -116,30 +117,28 @@ class MapMarker extends React.Component {
         const { stopPropagation = false } = this.props;
         if (this.fabricMarker === undefined) {
             const provider = this.context;
-            this.fabricMarker = !(react_native_1.Platform.OS === 'ios' && provider !== ProviderConstants_1.PROVIDER_GOOGLE);
+            this.fabricMarker = !(react_native_1.Platform.OS === 'ios' && provider === ProviderConstants_1.PROVIDER_GOOGLE);
         }
         let icon;
         if (this.props.icon) {
             icon = react_native_1.Image.resolveAssetSource(this.props.icon) || {};
             icon = icon.uri;
+            if (this.fabricMarker) {
+                icon = (0, fixImageProp_1.fixImageProp)(this.props.icon);
+            }
         }
         const AIRMapMarker = this.getNativeComponent();
         let image;
         if (this.props.image) {
             if (this.fabricMarker) {
-                if (typeof this.props.image === 'string') {
-                    image = { uri: this.props.image };
-                }
-                else {
-                    image = this.props.image;
-                }
-            }
-            else {
-                const resolvedImage = react_native_1.Image.resolveAssetSource(this.props.image) || {};
-                image = resolvedImage.uri || this.props.image;
+                image = (0, fixImageProp_1.fixImageProp)(this.props.image);
             }
         }
-        return (<AIRMapMarker {...this.props} ref={this.marker} image={image} icon={icon} style={[styles.marker, this.props.style]} onPress={event => {
+        return (<AIRMapMarker {...this.props} ref={this.marker} 
+        // @ts-ignore
+        image={image} 
+        // @ts-ignore
+        icon={icon} style={[styles.marker, this.props.style]} onPress={event => {
                 if (stopPropagation) {
                     event.stopPropagation();
                 }

package/lib/MapOverlay.js

@@ -27,6 +27,7 @@ exports.MapOverlay = void 0;
 const React = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const decorateMapComponent_1 = __importStar(require("./decorateMapComponent"));
+const fixImageProp_1 = require("./fixImageProp");
 class MapOverlay extends React.Component {
     getNativeComponent;
     getMapManagerCommand;
@@ -39,20 +40,9 @@ class MapOverlay extends React.Component {
             this.fabricOverlay = react_native_1.Platform.OS === 'android';
         }
         const AIRMapOverlay = this.getNativeComponent();
-        let image;
-        if (this.props.image) {
-            if (this.fabricOverlay) {
-                if (typeof this.props.image === 'string') {
-                    image = { uri: this.props.image };
-                }
-                else {
-                    image = this.props.image;
-                }
-            }
-            else {
-                const resolvedImage = react_native_1.Image.resolveAssetSource(this.props.image) || {};
-                image = resolvedImage.uri || this.props.image;
-            }
+        let image = this.props.image;
+        if (this.props.image && this.fabricOverlay) {
+            image = (0, fixImageProp_1.fixImageProp)(this.props.image);
         }
         return (<AIRMapOverlay {...this.props} opacity={opacity} 
         // @ts-ignore

package/lib/fixImageProp.d.ts

@@ -0,0 +1,4 @@
+import { ImageSourcePropType } from 'react-native';
+export declare function fixImageProp(image: ImageSourcePropType): {
+    uri: string;
+} | ImageSourcePropType;

package/lib/fixImageProp.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixImageProp = void 0;
+const react_native_1 = require("react-native");
+function fixImageProp(image) {
+    if (typeof image === 'string') {
+        return { uri: image };
+    }
+    if (typeof image === 'number') {
+        // Handle local image asset (require('./image.png'))
+        const resolvedImage = react_native_1.Image.resolveAssetSource(image);
+        return resolvedImage?.uri ? { uri: resolvedImage.uri } : image;
+    }
+    return image;
+}
+exports.fixImageProp = fixImageProp;

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.21.0-alpha.93",
+  "version": "1.21.0-alpha.94",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",