react-native-maps 1.29.8 → 1.29.10

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/RNMapsGoogleMarkerView.mm

@@ -270,6 +270,23 @@ using namespace facebook::react;
     return self;
 }
 
+// The legacy AIRGoogleMapMarker is never added to a view hierarchy under Fabric, so its
+// layoutSubviews never runs and the iconView it hands to GMSMarker stays 0x0 — custom-view
+// markers render blank. Size it from Fabric's layout (the marker is position:absolute, so
+// this is the size of its children) and ask GMS to re-snapshot the icon.
+- (void)updateLayoutMetrics:(LayoutMetrics const &)layoutMetrics
+           oldLayoutMetrics:(LayoutMetrics const &)oldLayoutMetrics
+{
+    [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
+    CGRect bounds = CGRectMake(0, 0, layoutMetrics.frame.size.width, layoutMetrics.frame.size.height);
+    if (CGRectIsEmpty(bounds) || CGRectEqualToRect(_view.iconView.frame, bounds)) {
+        return;
+    }
+    _view.frame = bounds;
+    _view.iconView.frame = bounds;
+    [_view redraw];
+}
+
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
 {
     [self prepareMarkerView];

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.8",
+  "version": "1.29.10",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",