react-native-maps 1.26.9 → 1.26.11

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

@@ -152,6 +152,12 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
         view.setUpdated(true);
     }
 
+    @Override
+    public void onDropViewInstance(MapMarker view) {
+        super.onDropViewInstance(view);
+        view.doDestroy();
+    }
+
     @Override
     public void setCalloutOffset(MapMarker view, @Nullable ReadableMap value) {
 

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

@@ -17,11 +17,13 @@ import android.animation.TypeEvaluator;
 import android.os.Handler;
 import android.os.Looper;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.facebook.common.references.CloseableReference;
 import com.facebook.datasource.DataSource;
 import com.facebook.drawee.backends.pipeline.Fresco;
+import com.facebook.drawee.controller.AbstractDraweeController;
 import com.facebook.drawee.controller.BaseControllerListener;
 import com.facebook.drawee.controller.ControllerListener;
 import com.facebook.drawee.drawable.ScalingUtils;
@@ -29,6 +31,8 @@ import com.facebook.drawee.generic.GenericDraweeHierarchy;
 import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
 import com.facebook.drawee.interfaces.DraweeController;
 import com.facebook.drawee.view.DraweeHolder;
+import com.facebook.drawee.view.DraweeView;
+import com.facebook.fresco.ui.common.ControllerListener2;
 import com.facebook.imagepipeline.core.ImagePipeline;
 import com.facebook.imagepipeline.image.CloseableImage;
 import com.facebook.imagepipeline.image.CloseableStaticBitmap;
@@ -56,6 +60,8 @@ import com.rnmaps.fabric.event.OnDragStartEvent;
 import com.rnmaps.fabric.event.OnPressEvent;
 import com.rnmaps.fabric.event.OnSelectEvent;
 
+import java.lang.ref.SoftReference;
+import java.lang.reflect.Method;
 import java.util.Map;
 
 public class MapMarker extends MapFeature {
@@ -102,6 +108,10 @@ public class MapMarker extends MapFeature {
     private String imageUri;
     private boolean loadingImage;
 
+    private SoftReference<MarkerManager.Collection> markerCollectionRef;
+
+
+
     private final DraweeHolder<?> logoHolder;
     private ImageManager.OnImageLoadedListener imageLoadedListener;
     private DataSource<CloseableReference<CloseableImage>> dataSource;
@@ -204,6 +214,16 @@ public class MapMarker extends MapFeature {
         update(false);
     }
 
+    public void doDestroy() {
+        MarkerManager.Collection collection = markerCollectionRef != null
+                ? markerCollectionRef.get()
+                : null;
+
+        if (collection != null) {
+            this.removeFromMap(collection);
+        }
+        markerCollectionRef = null;
+    }
     public String getIdentifier() {
         return this.identifier;
     }
@@ -324,7 +344,7 @@ public class MapMarker extends MapFeature {
         }
 
         updateMarkerIcon();
-        if (updated > 0){
+        if (updated > 0) {
             updated--;
         }
         return true;
@@ -449,9 +469,67 @@ public class MapMarker extends MapFeature {
         if (!(child instanceof MapCallout)) {
             hasCustomMarkerView = true;
             updateTracksViewChanges();
+            hackToHandleDraweeLifecycle(child);
         }
         update(true);
     }
+    private void hackToHandleDraweeLifecycle(View child){
+        if (child instanceof DraweeView<?>) {
+            try {
+                DraweeView draweeView = (DraweeView) child;
+
+                Method onAttachMethod = DraweeView.class.getDeclaredMethod("onAttachedToWindow");
+                onAttachMethod.setAccessible(true);
+                onAttachMethod.invoke(child);
+
+                Handler mainHandler = new Handler(Looper.getMainLooper());
+
+                if (draweeView.getController() instanceof AbstractDraweeController<?,?>){
+                    AbstractDraweeController abstractController = (AbstractDraweeController) draweeView.getController();
+
+                    abstractController.addControllerListener2(new ControllerListener2() {
+                        @Override
+                        public void onSubmit(@NonNull String s, @Nullable Object o, @Nullable Extras extras) {
+
+                        }
+
+                        @Override
+                        public void onFinalImageSet(@NonNull String s, @Nullable Object o, @Nullable Extras extras) {
+                            mainHandler.postDelayed(() -> update(true), ((GenericDraweeHierarchy) draweeView.getHierarchy()).getFadeDuration());
+                        }
+
+                        @Override
+                        public void onIntermediateImageSet(@NonNull String s, @Nullable Object o) {
+                            mainHandler.post(() -> update(true));
+                        }
+
+                        @Override
+                        public void onIntermediateImageFailed(@NonNull String s) {
+
+                        }
+
+                        @Override
+                        public void onFailure(@NonNull String s, @Nullable Throwable throwable, @Nullable Extras extras) {
+
+                        }
+
+                        @Override
+                        public void onRelease(@NonNull String s, @Nullable Extras extras) {
+
+                        }
+
+                        @Override
+                        public void onEmptyEvent(@Nullable Object o) {
+
+                        }
+                    });
+                }
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
 
     @Override
     public void requestLayout() {
@@ -484,6 +562,7 @@ public class MapMarker extends MapFeature {
     public void addToMap(Object collection) {
         MarkerManager.Collection markerCollection = (MarkerManager.Collection) collection;
         marker = markerCollection.addMarker(getMarkerOptions());
+        this.markerCollectionRef = new SoftReference<>(markerCollection);
         updateTracksViewChanges();
     }
 
@@ -556,13 +635,13 @@ public class MapMarker extends MapFeature {
         } else {
             marker.setInfoWindowAnchor(0.5f, 0);
         }
-        updated +=1;
+        updated += 1;
     }
 
     public void update(int width, int height) {
         this.width = width;
         this.height = height;
-        updated +=1;
+        updated += 1;
         updateTracksViewChanges();
         clearDrawableCache();
         update(true);
@@ -740,10 +819,10 @@ public class MapMarker extends MapFeature {
         );
     }
 
-  @Override
-  protected void onLayout(boolean changed, int l, int t, int r, int b) {
-    super.onLayout(changed, l, t, r, b);
-    this.height = b-t;
-    this.width = r-l;
-  }
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+        this.height = b - t;
+        this.width = r - l;
+    }
 }

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