react-native-maps 1.23.10 → 1.23.11

package/android/src/main/java/com/rnmaps/fabric/MarkerManager.java

@@ -134,6 +134,7 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
         double x = map != null && map.hasKey("x") ? map.getDouble("x") : 0.5;
         double y = map != null && map.hasKey("y") ? map.getDouble("y") : 1.0;
         view.setAnchor(x, y);
+        view.setUpdated(true);
     }
 
     @Override
@@ -144,6 +145,7 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
     @Override
     public void setImage(MapMarker view, @Nullable ReadableMap value) {
         view.setImage(value.getString("uri"));
+        view.setUpdated(true);
     }
 
     @Override
@@ -159,26 +161,31 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
     @Override
     public void setCoordinate(MapMarker view, @Nullable ReadableMap value) {
         view.setCoordinate(value);
+        view.setUpdated(true);
     }
 
     @Override
     public void setDescription(MapMarker view, @Nullable String value) {
         view.setSnippet(value);
+        view.setUpdated(true);
     }
 
     @Override
     public void setDraggable(MapMarker view, boolean value) {
         view.setDraggable(value);
+        view.setUpdated(true);
     }
 
     @Override
     public void setTitle(MapMarker view, @Nullable String value) {
         view.setTitle(value);
+        view.setUpdated(true);
     }
 
     @Override
     public void setIdentifier(MapMarker view, @Nullable String value) {
         view.setIdentifier(value);
+        view.setUpdated(true);
     }
 
     @Override
@@ -189,6 +196,7 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
     @Override
     public void setOpacity(MapMarker view, double value) {
         view.setOpacity((float) value);
+        view.setUpdated(true);
     }
 
     @Override
@@ -197,6 +205,7 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
         Color.colorToHSV(value, hsv);
         // NOTE: android only supports a hue
         view.setMarkerHue(hsv[0]);
+        view.setUpdated(true);
     }
 
     @Override
@@ -221,18 +230,20 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
 
     @Override
     public void setCoordinates(MapMarker view, double latitude, double longitude) {
-            view.setCoordinate(new LatLng(latitude, longitude));
+        view.setCoordinate(new LatLng(latitude, longitude));
+        view.setUpdated(true);
     }
 
     @Override
     public void showCallout(MapMarker view) {
         ((Marker) view.getFeature()).showInfoWindow();
-
+        view.setUpdated(true);
     }
 
     @Override
     public void hideCallout(MapMarker view) {
         ((Marker) view.getFeature()).hideInfoWindow();
+        view.setUpdated(true);
     }
 
     @Override
@@ -242,7 +253,7 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
 
     @Override
     public void redraw(MapMarker view) {
-
+        view.setUpdated(true);
     }
     @Override
     public void addView(MapMarker parent, View child, int index) {
@@ -252,7 +263,18 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
             parent.setCalloutView((MapCallout) child);
         } else {
             super.addView(parent, child, index);
+            if (index == 0) {
+                child.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+                    @Override
+                    public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                        int newWidth = right - left;
+                        int newHeight = bottom - top;
+                        MapMarker marker = (MapMarker) v.getParent();
+                        marker.update(newWidth, newHeight);
+                    }
+                });
+            }
             parent.update(true);
         }
     }
-}
+}

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

@@ -89,6 +89,8 @@ public class MapMarker extends MapFeature {
     private float calloutAnchorY;
     private boolean calloutAnchorIsSet;
 
+    private int updated = 0;
+
     private boolean tracksViewChanges = true;
     private boolean tracksViewChangesActive = false;
 
@@ -313,11 +315,15 @@ public class MapMarker extends MapFeature {
     }
 
     public boolean updateCustomForTracking() {
-        if (!tracksViewChangesActive)
+        if (!tracksViewChangesActive || updated == 0) {
+            tracksViewChangesActive = false;
             return false;
+        }
 
         updateMarkerIcon();
-
+        if (updated > 0){
+            updated--;
+        }
         return true;
     }
 
@@ -455,6 +461,14 @@ public class MapMarker extends MapFeature {
                 updateTracksViewChanges();
                 update(true);
             }
+        } else {
+            // custom subview
+            if (!(getChildAt(0) instanceof MapCallout)) {
+                if (updated == 0) {
+                    updated = 1;
+                    updateTracksViewChanges();
+                }
+            }
         }
     }
 
@@ -539,12 +553,15 @@ public class MapMarker extends MapFeature {
         } else {
             marker.setInfoWindowAnchor(0.5f, 0);
         }
+        updated +=1;
     }
 
     public void update(int width, int height) {
         this.width = width;
         this.height = height;
-
+        updated +=1;
+        updateTracksViewChanges();
+        clearDrawableCache();
         update(true);
     }
 
@@ -663,6 +680,14 @@ public class MapMarker extends MapFeature {
         this.imageLoadedListener = imageLoadedListener;
     }
 
+    public void setUpdated(boolean updated) {
+        if (updated) {
+            this.updated += 1;
+        } else {
+            this.updated = 0;
+        }
+    }
+
     @FunctionalInterface
     public interface EventCreator<T extends Event> {
         T create(int surfaceId, int viewId, WritableMap payload);

package/package.json

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