react-native-maps 1.29.9 → 1.29.11

package/android/src/main/java/com/rnmaps/maps/MapView.java

@@ -709,6 +709,14 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
 
         isMapReady = true;
+        // Google's MapView removes every child when its map delegate is created
+        // (MapView.zza.onCreate -> removeAllViews). That takes the attacher group added
+        // in our constructor with it, so custom marker views added before the first
+        // detach/re-attach cycle never reach the window and Fresco never loads their
+        // images. Put the group back as soon as the map is ready.
+        if (attacherGroup != null && attacherGroup.getParent() == null) {
+            addView(attacherGroup);
+        }
         if (kmlSrc != null) {
             setKmlSrc(kmlSrc);
             kmlSrc = null;
@@ -1225,6 +1233,10 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
             // Ensure attacherGroup is not null before using it
             if (attacherGroup == null) {
                 prepareAttacherView();
+            } else if (attacherGroup.getParent() == null) {
+                // Orphaned by Google's removeAllViews (see onMapReady); re-add it so the
+                // marker view below actually attaches and its images load.
+                addView(attacherGroup);
             }
             // Add to the parent group
             attacherGroup.addView(annotation);

package/ios/AirGoogleMaps/AIRGoogleMapMarker.m

@@ -34,6 +34,7 @@ CGRect unionRect(CGRect a, CGRect b) {
     RCTDirectEventBlock _onSelect;
     RCTDirectEventBlock _onDeselect;
     __weak UIImageView *_iconImageView;
+    UIImage *_iconImage;
     UIView *_iconView;
     UIColor *_pinColor;
     CLLocationCoordinate2D _coordinates;
@@ -130,6 +131,13 @@ CGRect unionRect(CGRect a, CGRect b) {
     if (_pinColor){
         _realMarker.icon = [GMSMarker markerImageWithColor:_pinColor];
     }
+    if (_iconSrc){
+        if (_iconImage){
+            _realMarker.icon = _iconImage;
+        } else {
+            [self setIconSrc:_iconSrc];
+        }
+    }
     if (_opacity != 1.0){
         [_realMarker setOpacity:_opacity];
     }
@@ -420,6 +428,7 @@ CGRect unionRect(CGRect a, CGRect b) {
 - (void)setIconSrc:(NSString *)iconSrc
 {
     _iconSrc = iconSrc;
+    _iconImage = nil;
 
     if (_reloadImageCancellationBlock) {
         _reloadImageCancellationBlock();
@@ -446,6 +455,7 @@ CGRect unionRect(CGRect a, CGRect b) {
             NSLog(@"%@", error);
         }
         dispatch_async(dispatch_get_main_queue(), ^{
+            self->_iconImage = image;
             self->_realMarker.icon = image;
         });
     }];

package/package.json

@@ -7,7 +7,7 @@
   "types": "dist/src/index.d.ts",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.29.9",
+  "version": "1.29.11",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",