react-native-maps 1.21.0-alpha.67 → 1.21.0-alpha.68

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

@@ -20,7 +20,6 @@ import java.util.Map;
 @ReactModule(name = CalloutManager.REACT_CLASS)
 public class CalloutManager extends ViewGroupManager<MapCallout> implements RNMapsCalloutManagerInterface<MapCallout> {
 
-
     public CalloutManager(ReactApplicationContext context){
         super(context);
     }
@@ -75,15 +74,4 @@ public class CalloutManager extends ViewGroupManager<MapCallout> implements RNMa
         return new SizeReportingShadowNode();
     }
 
-    @Override
-    public void updateExtraData(MapCallout view, Object extraData) {
-        // This method is called from the shadow node with the width/height of the rendered
-        // marker view.
-        //noinspection unchecked
-        Map<String, Float> data = (Map<String, Float>) extraData;
-        float width = data.get("width");
-        float height = data.get("height");
-        view.width = (int) width;
-        view.height = (int) height;
-    }
 }

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

@@ -4,14 +4,6 @@ import android.content.Context;
 
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.views.view.ReactViewGroup;
-import com.rnmaps.fabric.event.OnLongPressEvent;
-import com.rnmaps.fabric.event.OnMarkerDeselectEvent;
-import com.rnmaps.fabric.event.OnMarkerDragEndEvent;
-import com.rnmaps.fabric.event.OnMarkerDragEvent;
-import com.rnmaps.fabric.event.OnMarkerDragStartEvent;
-import com.rnmaps.fabric.event.OnMarkerPressEvent;
-import com.rnmaps.fabric.event.OnMarkerSelectEvent;
-import com.rnmaps.fabric.event.OnPoiClickEvent;
 import com.rnmaps.fabric.event.OnPressEvent;
 
 import java.util.Map;
@@ -33,6 +25,13 @@ public class MapCallout extends ReactViewGroup {
     return this.tooltip;
   }
 
+  @Override
+  protected void onLayout(boolean changed,
+                                   int left, int top, int right, int bottom){
+    width = right - left;
+    height = bottom - top;
+  }
+
 
   public static Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
     MapBuilder.Builder<String, Object> builder = MapBuilder.builder();

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

@@ -253,16 +253,19 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     }
 
     private <T extends Event> void dispatchEvent(WritableMap payload, EventCreator<T> creator) {
+        dispatchEvent(payload, creator, getId(), context);
+    }
+    public static <T extends Event> void dispatchEvent(WritableMap payload, EventCreator<T> creator, int viewId, ReactContext context){
         // Cast context to ReactContext
         ReactContext reactContext = context;
 
         // Get the event dispatcher
-        EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, getId());
+        EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, viewId);
 
         // If there is a dispatcher, create and dispatch the event
         if (eventDispatcher != null) {
             int surfaceId = UIManagerHelper.getSurfaceId(reactContext);
-            T event = creator.create(surfaceId, getId(), payload);
+            T event = creator.create(surfaceId, viewId, payload);
             eventDispatcher.dispatchEvent(event);
         }
     }
@@ -401,25 +404,22 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
             }
         });
 
-        markerCollection.setOnInfoWindowClickListener(new GoogleMap.OnInfoWindowClickListener() {
-            @Override
-            public void onInfoWindowClick(@NonNull Marker marker) {
-                WritableMap event = makeClickEventData(marker.getPosition());
-                event.putString("action", "callout-press");
-                // todo: use Fabric events
-//        manager.pushEvent(context, view, "onCalloutPress", event);
+        markerCollection.setOnInfoWindowClickListener(marker -> {
+            WritableMap event = makeClickEventData(marker.getPosition());
+            event.putString("action", "callout-press");
+            dispatchEvent(event, OnCalloutPressEvent::new);
 
-                event = makeClickEventData(marker.getPosition());
-                event.putString("action", "callout-press");
-                MapMarker markerView = getMarkerMap(marker);
-                // todo: use Fabric events
-                //  manager.pushEvent(context, markerView, "onCalloutPress", event);
 
+            event = makeClickEventData(marker.getPosition());
+            event.putString("action", "callout-press");
+            MapMarker markerView = getMarkerMap(marker);
+            dispatchEvent(event, OnCalloutPressEvent::new, markerView.getId(), context);
+
+            MapCallout infoWindow = markerView.getCalloutView();
+            if (infoWindow != null) {
                 event = makeClickEventData(marker.getPosition());
                 event.putString("action", "callout-press");
-                MapCallout infoWindow = markerView.getCalloutView();
-                // todo: use Fabric events
-                // if (infoWindow != null) manager.pushEvent(context, infoWindow, "onPress", event);
+                dispatchEvent(event, OnPressEvent::new, infoWindow.getId(), context);
             }
         });
 
@@ -460,6 +460,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
                 boolean isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == reason;
                 WritableMap event = new WritableNativeMap();
                 event.putBoolean("isGesture", isGesture);
+            //    dispatchEvent(event, OnRegionChangeEvent::new);
                 // todo: use Fabric events
                 // manager.pushEvent(context, view, "onRegionChangeStart", event);
             }

package/package.json

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