react-native-maps 1.29.4 → 1.29.6

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

@@ -193,7 +193,9 @@ public class MapManager extends ViewGroupManager<MapView> {
         }
 
         view.applyBaseMapPadding(left, top, right, bottom);
-        view.map.setPadding(left, top, right, bottom);
+        if (view.map != null) {
+            view.map.setPadding(left, top, right, bottom);
+        }
     }
 
     @ReactProp(name = "showsUserLocation", defaultBoolean = false)

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

@@ -9,6 +9,7 @@ import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.animation.ObjectAnimator;
 import android.util.Property;
@@ -658,6 +659,22 @@ public class MapMarker extends MapFeature {
 
     private Bitmap mLastBitmapCreated = null;
 
+    // Walks the subtree to find the union of descendant bounds for bitmap sizing.
+    // Uses only laid-out dimensions — do NOT call View#measure() here (Fabric assertion).
+    private void expandSnapshotSizeFromSubtree(View view, int offsetX, int offsetY, int[] outWh) {
+        int w = view.getWidth() > 0 ? view.getWidth() : view.getMeasuredWidth();
+        int h = view.getHeight() > 0 ? view.getHeight() : view.getMeasuredHeight();
+        outWh[0] = Math.max(outWh[0], offsetX + w);
+        outWh[1] = Math.max(outWh[1], offsetY + h);
+        if (view instanceof ViewGroup) {
+            ViewGroup group = (ViewGroup) view;
+            for (int i = 0; i < group.getChildCount(); i++) {
+                View child = group.getChildAt(i);
+                expandSnapshotSizeFromSubtree(child, offsetX + child.getLeft(), offsetY + child.getTop(), outWh);
+            }
+        }
+    }
+
     private void clearDrawableCache() {
         mLastBitmapCreated = null;
     }
@@ -666,6 +683,27 @@ public class MapMarker extends MapFeature {
         int width = this.width <= 0 ? 100 : this.width;
         int height = this.height <= 0 ? 100 : this.height;
 
+        // Bitmap must cover laid-out custom-marker subtree; Yoga box alone can be too small (Fabric).
+        if (hasCustomMarkerView) {
+            int[] expanded = new int[] { width, height };
+            for (int i = 0; i < getChildCount(); i++) {
+                View child = getChildAt(i);
+                if (child instanceof MapCallout) {
+                    continue;
+                }
+                expandSnapshotSizeFromSubtree(child, child.getLeft(), child.getTop(), expanded);
+            }
+            width = expanded[0];
+            height = expanded[1];
+        }
+
+        if (width <= 0) {
+            width = 100;
+        }
+        if (height <= 0) {
+            height = 100;
+        }
+
         // Do not create the doublebuffer-bitmap each time. reuse it to save memory.
         Bitmap bitmap = mLastBitmapCreated;
 

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

@@ -1363,7 +1363,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     }
 
     public void updateExtraData(Object extraData) {
-        if (setPaddingDeferred && super.getHeight() > 0 && super.getWidth() > 0) {
+        if (setPaddingDeferred && map != null && super.getHeight() > 0 && super.getWidth() > 0) {
             CameraUpdate cu = CameraUpdateFactory.newCameraPosition(map.getCameraPosition());
 
             map.setPadding(edgeLeftPadding + baseLeftMapPadding,
@@ -1530,8 +1530,9 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     int edgeBottomPadding;
 
     public void applyBaseMapPadding(int left, int top, int right, int bottom) {
-        if (super.getHeight() <= 0 || super.getWidth() <= 0) {
-            // the map is not laid out yet and calling setPadding() now has no effect
+        if (map == null || super.getHeight() <= 0 || super.getWidth() <= 0) {
+            // the map is not ready or not laid out yet and calling setPadding() now
+            // has no effect, or crashes when the GoogleMap instance does not exist
             baseLeftMapPadding = left;
             baseRightMapPadding = right;
             baseTopMapPadding = top;

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