react-native-maps 1.21.0-alpha.51 → 1.21.0-alpha.53

package/android/generated/java/com/facebook/react/viewmanagers/RNMapsMarkerManagerDelegate.java

@@ -0,0 +1,103 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ColorPropConverter;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class RNMapsMarkerManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNMapsMarkerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNMapsMarkerManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "anchor":
+        mViewManager.setAnchor(view, (ReadableMap) value);
+        break;
+      case "calloutAnchor":
+        mViewManager.setCalloutAnchor(view, (ReadableMap) value);
+        break;
+      case "image":
+        mViewManager.setImage(view, (ReadableMap) value);
+        break;
+      case "calloutOffset":
+        mViewManager.setCalloutOffset(view, (ReadableMap) value);
+        break;
+      case "displayPriority":
+        mViewManager.setDisplayPriority(view, (String) value);
+        break;
+      case "coordinate":
+        mViewManager.setCoordinate(view, (ReadableMap) value);
+        break;
+      case "description":
+        mViewManager.setDescription(view, value == null ? null : (String) value);
+        break;
+      case "draggable":
+        mViewManager.setDraggable(view, value == null ? false : (boolean) value);
+        break;
+      case "title":
+        mViewManager.setTitle(view, value == null ? null : (String) value);
+        break;
+      case "identifier":
+        mViewManager.setIdentifier(view, value == null ? null : (String) value);
+        break;
+      case "isPreselected":
+        mViewManager.setIsPreselected(view, value == null ? false : (boolean) value);
+        break;
+      case "opacity":
+        mViewManager.setOpacity(view, value == null ? 1f : ((Double) value).doubleValue());
+        break;
+      case "pinColor":
+        mViewManager.setPinColor(view, ColorPropConverter.getColor(value, view.getContext()));
+        break;
+      case "titleVisibility":
+        mViewManager.setTitleVisibility(view, (String) value);
+        break;
+      case "subtitleVisibility":
+        mViewManager.setSubtitleVisibility(view, (String) value);
+        break;
+      case "useLegacyPinView":
+        mViewManager.setUseLegacyPinView(view, value == null ? false : (boolean) value);
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+
+  @Override
+  public void receiveCommand(T view, String commandName, @Nullable ReadableArray args) {
+    switch (commandName) {
+      case "animateToCoordinates":
+        mViewManager.animateToCoordinates(view, args.getDouble(0), args.getDouble(1), args.getInt(2));
+        break;
+      case "setCoordinates":
+        mViewManager.setCoordinates(view, args.getDouble(0), args.getDouble(1));
+        break;
+      case "showCallout":
+        mViewManager.showCallout(view);
+        break;
+      case "hideCallout":
+        mViewManager.hideCallout(view);
+        break;
+      case "redrawCallout":
+        mViewManager.redrawCallout(view);
+        break;
+      case "redraw":
+        mViewManager.redraw(view);
+        break;
+    }
+  }
+}

package/android/generated/java/com/facebook/react/viewmanagers/RNMapsMarkerManagerInterface.java

@@ -0,0 +1,39 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ReadableMap;
+
+public interface RNMapsMarkerManagerInterface<T extends View> {
+  void setAnchor(T view, @Nullable ReadableMap value);
+  void setCalloutAnchor(T view, @Nullable ReadableMap value);
+  void setImage(T view, @Nullable ReadableMap value);
+  void setCalloutOffset(T view, @Nullable ReadableMap value);
+  void setDisplayPriority(T view, @Nullable String value);
+  void setCoordinate(T view, @Nullable ReadableMap value);
+  void setDescription(T view, @Nullable String value);
+  void setDraggable(T view, boolean value);
+  void setTitle(T view, @Nullable String value);
+  void setIdentifier(T view, @Nullable String value);
+  void setIsPreselected(T view, boolean value);
+  void setOpacity(T view, double value);
+  void setPinColor(T view, @Nullable Integer value);
+  void setTitleVisibility(T view, @Nullable String value);
+  void setSubtitleVisibility(T view, @Nullable String value);
+  void setUseLegacyPinView(T view, boolean value);
+  void animateToCoordinates(T view, double latitude, double longitude, int duration);
+  void setCoordinates(T view, double latitude, double longitude);
+  void showCallout(T view);
+  void hideCallout(T view);
+  void redrawCallout(T view);
+  void redraw(T view);
+}

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

@@ -1,24 +1,22 @@
 package com.rnmaps.fabric;
 
 
+import android.view.View;
+
 import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.ViewManagerDelegate;
-import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.viewmanagers.RNMapsMapViewManagerInterface;
 import com.facebook.react.viewmanagers.RNMapsMapViewManagerDelegate;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMapOptions;
 import com.rnmaps.maps.MapView;
 
-import java.util.HashMap;
 import java.util.Map;
 
 @ReactModule(name = MapViewManager.REACT_CLASS)
@@ -142,6 +140,11 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     }
 
+    @Override
+    public void addView(MapView parent, View child, int index) {
+        parent.addFeature(child, index);
+    }
+
     @Override
     public void setMapType(MapView view, @Nullable String value) {
         //hybrid | none | satellite | standard | terrain

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

@@ -0,0 +1,176 @@
+package com.rnmaps.fabric;
+
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.ViewManagerDelegate;
+import com.facebook.react.viewmanagers.RNMapsMapViewManagerDelegate;
+import com.facebook.react.viewmanagers.RNMapsMapViewManagerInterface;
+import com.facebook.react.viewmanagers.RNMapsMarkerManagerDelegate;
+import com.facebook.react.viewmanagers.RNMapsMarkerManagerInterface;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.GoogleMapOptions;
+import com.google.android.gms.maps.model.LatLng;
+import com.rnmaps.maps.MapMarker;
+import com.rnmaps.maps.MapView;
+
+import java.util.Map;
+
+@ReactModule(name = MarkerManager.REACT_CLASS)
+public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMapsMarkerManagerInterface<MapMarker> {
+
+
+    public MarkerManager(ReactApplicationContext context){
+        super(context);
+    }
+    private GoogleMapOptions options;
+    private final RNMapsMarkerManagerDelegate<MapMarker, MarkerManager> delegate =
+            new RNMapsMarkerManagerDelegate<>(this);
+
+    @Override
+    public ViewManagerDelegate<MapMarker> getDelegate() {
+        return delegate;
+    }
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    public MapMarker createViewInstance(ThemedReactContext context) {
+        return new MapMarker(context, null);
+    }
+
+
+    public static final String REACT_CLASS = "RNMapsMarker";
+
+    @Nullable
+    @Override
+    public Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+        return MapMarker.getExportedCustomBubblingEventTypeConstants();
+    }
+
+    @Nullable
+    @Override
+    public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
+        return MapMarker.getExportedCustomDirectEventTypeConstants();
+    }
+
+    @Override
+    public void setAnchor(MapMarker view, @Nullable ReadableMap map) {
+        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);
+    }
+
+    @Override
+    public void setCalloutAnchor(MapMarker view, @Nullable ReadableMap value) {
+
+    }
+
+    @Override
+    public void setImage(MapMarker view, @Nullable ReadableMap value) {
+
+    }
+
+    @Override
+    public void setCalloutOffset(MapMarker view, @Nullable ReadableMap value) {
+
+    }
+
+    @Override
+    public void setDisplayPriority(MapMarker view, @Nullable String value) {
+
+    }
+
+    @Override
+    public void setCoordinate(MapMarker view, @Nullable ReadableMap value) {
+        view.setCoordinate(value);
+    }
+
+    @Override
+    public void setDescription(MapMarker view, @Nullable String value) {
+
+    }
+
+    @Override
+    public void setDraggable(MapMarker view, boolean value) {
+        view.setDraggable(value);
+    }
+
+    @Override
+    public void setTitle(MapMarker view, @Nullable String value) {
+        view.setTitle(value);
+    }
+
+    @Override
+    public void setIdentifier(MapMarker view, @Nullable String value) {
+        view.setIdentifier(value);
+    }
+
+    @Override
+    public void setIsPreselected(MapMarker view, boolean value) {
+
+    }
+
+    @Override
+    public void setOpacity(MapMarker view, double value) {
+        view.setOpacity((float) value);
+    }
+
+    @Override
+    public void setPinColor(MapMarker view, @Nullable Integer value) {
+
+    }
+
+    @Override
+    public void setTitleVisibility(MapMarker view, @Nullable String value) {
+
+    }
+
+    @Override
+    public void setSubtitleVisibility(MapMarker view, @Nullable String value) {
+
+    }
+
+    @Override
+    public void setUseLegacyPinView(MapMarker view, boolean value) {
+
+    }
+
+    @Override
+    public void animateToCoordinates(MapMarker view, double latitude, double longitude, int duration) {
+
+    }
+
+    @Override
+    public void setCoordinates(MapMarker view, double latitude, double longitude) {
+            view.setCoordinate(new LatLng(latitude, longitude));
+    }
+
+    @Override
+    public void showCallout(MapMarker view) {
+
+    }
+
+    @Override
+    public void hideCallout(MapMarker view) {
+
+    }
+
+    @Override
+    public void redrawCallout(MapMarker view) {
+
+    }
+
+    @Override
+    public void redraw(MapMarker view) {
+
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/event/OnCalloutPressEvent.java

@@ -0,0 +1,25 @@
+package com.rnmaps.fabric.event;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnCalloutPressEvent extends Event<OnCalloutPressEvent> {
+    public static final String EVENT_NAME = "topCalloutPress";
+
+    private final WritableMap payload;
+
+    public OnCalloutPressEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/event/OnDeselectEvent.java

@@ -0,0 +1,25 @@
+package com.rnmaps.fabric.event;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnDeselectEvent extends Event<OnDeselectEvent> {
+    public static final String EVENT_NAME = "topDeselect";
+
+    private final WritableMap payload;
+
+    public OnDeselectEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/event/OnDragEndEvent.java

@@ -0,0 +1,25 @@
+package com.rnmaps.fabric.event;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnDragEndEvent extends Event<OnDragEndEvent> {
+    public static final String EVENT_NAME = "topDragEnd";
+
+    private final WritableMap payload;
+
+    public OnDragEndEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/event/OnDragEvent.java

@@ -0,0 +1,25 @@
+package com.rnmaps.fabric.event;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnDragEvent extends Event<OnDragEvent> {
+    public static final String EVENT_NAME = "topDrag";
+
+    private final WritableMap payload;
+
+    public OnDragEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/event/OnDragStartEvent.java

@@ -0,0 +1,25 @@
+package com.rnmaps.fabric.event;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnDragStartEvent extends Event<OnDragStartEvent> {
+    public static final String EVENT_NAME = "topDragStart";
+
+    private final WritableMap payload;
+
+    public OnDragStartEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/event/OnLongPressEvent.java

@@ -0,0 +1,25 @@
+package com.rnmaps.fabric.event;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnLongPressEvent extends Event<OnLongPressEvent> {
+    public static final String EVENT_NAME = "topLongPress";
+
+    private final WritableMap payload;
+
+    public OnLongPressEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/event/OnMarkerDeselectEvent.java

@@ -0,0 +1,25 @@
+package com.rnmaps.fabric.event;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnMarkerDeselectEvent extends Event<OnMarkerDeselectEvent> {
+    public static final String EVENT_NAME = "topMarkerDeselect";
+
+    private final WritableMap payload;
+
+    public OnMarkerDeselectEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/event/OnMarkerDragEndEvent.java

@@ -0,0 +1,25 @@
+package com.rnmaps.fabric.event;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnMarkerDragEndEvent extends Event<OnMarkerDragEndEvent> {
+    public static final String EVENT_NAME = "topMarkerDragEnd";
+
+    private final WritableMap payload;
+
+    public OnMarkerDragEndEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/event/OnMarkerDragEvent.java

@@ -0,0 +1,25 @@
+package com.rnmaps.fabric.event;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnMarkerDragEvent extends Event<OnMarkerDragEvent> {
+    public static final String EVENT_NAME = "topMarkerDrag";
+
+    private final WritableMap payload;
+
+    public OnMarkerDragEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/event/OnMarkerDragStartEvent.java

@@ -0,0 +1,25 @@
+package com.rnmaps.fabric.event;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnMarkerDragStartEvent extends Event<OnMarkerDragStartEvent> {
+    public static final String EVENT_NAME = "topMarkerDragStart";
+
+    private final WritableMap payload;
+
+    public OnMarkerDragStartEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/event/OnMarkerSelectEvent.java

@@ -0,0 +1,25 @@
+package com.rnmaps.fabric.event;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnMarkerSelectEvent extends Event<OnMarkerSelectEvent> {
+    public static final String EVENT_NAME = "topMarkerSelect";
+
+    private final WritableMap payload;
+
+    public OnMarkerSelectEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/event/OnPoiClickEvent.java

@@ -0,0 +1,24 @@
+package com.rnmaps.fabric.event;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnPoiClickEvent extends Event<OnPoiClickEvent> {
+    public static final String EVENT_NAME = "topPoiClick";
+    private final WritableMap payload;
+
+    public OnPoiClickEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/event/OnSelectEvent.java

@@ -0,0 +1,25 @@
+package com.rnmaps.fabric.event;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnSelectEvent extends Event<OnSelectEvent> {
+    public static final String EVENT_NAME = "topSelect";
+
+    private final WritableMap payload;
+
+    public OnSelectEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

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

@@ -9,10 +9,10 @@ import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.uimanager.ViewManager;
 import com.rnmaps.fabric.MapViewManager;
+import com.rnmaps.fabric.MarkerManager;
 import com.rnmaps.fabric.NativeAirMapsModule;
 import com.facebook.fbreact.specs.NativeAirMapsModuleSpec;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,12 +21,15 @@ public class MapAirModulePackage extends TurboReactPackage {
 
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return Collections.singletonList(new MapViewManager(reactContext));
+        return List.of(new MapViewManager(reactContext), new MarkerManager(reactContext));
     }
 
 
     @Override
     public NativeModule getModule(String name, ReactApplicationContext reactContext) {
+        if (MarkerManager.REACT_CLASS.equals(name)) {
+            return new MarkerManager(reactContext);
+        }
         if (MapViewManager.REACT_CLASS.equals(name)) {
             return new MapViewManager(reactContext);
         }

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

@@ -32,13 +32,27 @@ import com.facebook.imagepipeline.image.CloseableStaticBitmap;
 import com.facebook.imagepipeline.image.ImageInfo;
 import com.facebook.imagepipeline.request.ImageRequest;
 import com.facebook.imagepipeline.request.ImageRequestBuilder;
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.common.MapBuilder;
+import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.events.Event;
+import com.facebook.react.uimanager.events.EventDispatcher;
 import com.google.android.gms.maps.model.BitmapDescriptor;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
 import com.google.maps.android.collections.MarkerManager;
+import com.rnmaps.fabric.event.OnDeselectEvent;
+import com.rnmaps.fabric.event.OnDragEndEvent;
+import com.rnmaps.fabric.event.OnDragEvent;
+import com.rnmaps.fabric.event.OnDragStartEvent;
+import com.rnmaps.fabric.event.OnPressEvent;
+import com.rnmaps.fabric.event.OnSelectEvent;
+
+import java.util.Map;
 
 public class MapMarker extends MapFeature {
 
@@ -155,7 +169,10 @@ public class MapMarker extends MapFeature {
   }
 
   public void setCoordinate(ReadableMap coordinate) {
-    position = new LatLng(coordinate.getDouble("latitude"), coordinate.getDouble("longitude"));
+    setCoordinate(new LatLng(coordinate.getDouble("latitude"), coordinate.getDouble("longitude")));
+  }
+  public void setCoordinate(LatLng position){
+    this.position = position;
     if (marker != null) {
       marker.setPosition(position);
     }
@@ -618,8 +635,43 @@ public class MapMarker extends MapFeature {
         getContext().getPackageName());
   }
 
+  @FunctionalInterface
+  public interface EventCreator<T extends Event> {
+    T create(int surfaceId, int viewId, WritableMap payload);
+  }
+  private <T extends Event> void dispatchEvent(WritableMap payload, MapView.EventCreator<T> creator) {
+    // Cast context to ReactContext
+    ReactContext reactContext = (ReactContext) context;
+
+    // Get the event dispatcher
+    EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, getId());
+
+    // 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);
+      eventDispatcher.dispatchEvent(event);
+    }
+  }
+
   private BitmapDescriptor getBitmapDescriptorByName(String name) {
     return BitmapDescriptorFactory.fromResource(getDrawableResourceByName(name));
   }
 
+  public static Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+    MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
+    builder.put(OnSelectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnSelectEvent.EVENT_NAME));
+    builder.put(OnDeselectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDeselectEvent.EVENT_NAME));
+    builder.put(OnPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPressEvent.EVENT_NAME));
+    return builder.build();
+  }
+
+  public static Map<String, Object> getExportedCustomDirectEventTypeConstants() {
+    return MapBuilder.of(
+            OnDragEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDragEvent.EVENT_NAME),
+            OnDragStartEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDragStartEvent.EVENT_NAME),
+            OnDragEndEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDragEndEvent.EVENT_NAME)
+    );
+  }
+
 }

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

@@ -392,8 +392,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
       public void onMapLongClick(@NonNull LatLng point) {
         WritableMap event = makeClickEventData(point);
         event.putString("action", "long-press");
-        // todo: use Fabric events
-       // manager.pushEvent(context, view, "onLongPress", makeClickEventData(point));
+        dispatchEvent(event, OnLongPressEvent::new);
       }
     });
 
@@ -521,8 +520,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
       event = makeClickEventData(selectedMarker.getPosition());
       event.putString("action", "marker-deselect");
       event.putString("id", selectedMarker.getIdentifier());
-      // todo: use Fabric events
-   //   manager.pushEvent(context, this, "onMarkerDeselect", event);
+      dispatchEvent(event, OnMarkerDeselectEvent::new);
     }
 
     if (target != null) {
@@ -535,8 +533,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
       event = makeClickEventData(target.getPosition());
       event.putString("action", "marker-select");
       event.putString("id", target.getIdentifier());
-      // todo: use Fabric events
-     // manager.pushEvent(context, this, "onMarkerSelect", event);
+      dispatchEvent(event, OnMarkerSelectEvent::new);
     }
 
      selectedMarker = target;
@@ -549,10 +546,17 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
 
   public static Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
-    return MapBuilder.of(
-            OnMarkerPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerPressEvent.EVENT_NAME),
-            OnPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPressEvent.EVENT_NAME)
-    );
+    MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
+    builder.put(OnMarkerPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerPressEvent.EVENT_NAME));
+    builder.put(OnPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPressEvent.EVENT_NAME));
+    builder.put(OnMarkerSelectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerSelectEvent.EVENT_NAME));
+    builder.put(OnMarkerDeselectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerDeselectEvent.EVENT_NAME));
+    builder.put(OnMarkerDragEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerDragEvent.EVENT_NAME));
+    builder.put(OnMarkerDragStartEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerDragStartEvent.EVENT_NAME));
+    builder.put(OnMarkerDragEndEvent.EVENT_NAME, MapBuilder.of("registrationName", OnMarkerDragEndEvent.EVENT_NAME));
+    builder.put(OnPoiClickEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPoiClickEvent.EVENT_NAME));
+    builder.put(OnLongPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnLongPressEvent.EVENT_NAME));
+    return builder.build();
   }
 
   public static Map<String, Object> getExportedCustomDirectEventTypeConstants() {
@@ -1237,7 +1241,7 @@ public static CameraPosition cameraPositionFromMap(ReadableMap camera){
   public void onMarkerDragStart(Marker marker) {
     WritableMap event = makeClickEventData(marker.getPosition());
     // todo: use Fabric events
-   // manager.pushEvent(context, this, "onMarkerDragStart", event);
+    dispatchEvent(event, OnMarkerDragStartEvent::new);
 
     MapMarker markerView = getMarkerMap(marker);
     event = makeClickEventData(marker.getPosition());
@@ -1248,8 +1252,7 @@ public static CameraPosition cameraPositionFromMap(ReadableMap camera){
   @Override
   public void onMarkerDrag(Marker marker) {
     WritableMap event = makeClickEventData(marker.getPosition());
-    // todo: use Fabric events
-    /// manager.pushEvent(context, this, "onMarkerDrag", event);
+    dispatchEvent(event, OnMarkerDragEvent::new);
 
     MapMarker markerView = getMarkerMap(marker);
     event = makeClickEventData(marker.getPosition());
@@ -1260,8 +1263,8 @@ public static CameraPosition cameraPositionFromMap(ReadableMap camera){
   @Override
   public void onMarkerDragEnd(Marker marker) {
     WritableMap event = makeClickEventData(marker.getPosition());
-    // todo: use Fabric events
-   // manager.pushEvent(context, this, "onMarkerDragEnd", event);
+    dispatchEvent(event, OnMarkerDragEndEvent::new);
+
 
     MapMarker markerView = getMarkerMap(marker);
     event = makeClickEventData(marker.getPosition());
@@ -1275,8 +1278,7 @@ public static CameraPosition cameraPositionFromMap(ReadableMap camera){
 
     event.putString("placeId", poi.placeId);
     event.putString("name", poi.name);
-    // todo: use Fabric events
-    // manager.pushEvent(context, this, "onPoiClick", event);
+    dispatchEvent(event, OnPoiClickEvent::new);
   }
 
   private ProgressBar getMapLoadingProgressBar() {

package/lib/MapMarker.js

@@ -116,7 +116,7 @@ class MapMarker extends React.Component {
         const { stopPropagation = false } = this.props;
         if (this.fabricMarker === undefined) {
             const provider = this.context;
-            this.fabricMarker = provider !== ProviderConstants_1.PROVIDER_GOOGLE && react_native_1.Platform.OS === 'ios';
+            this.fabricMarker = !(react_native_1.Platform.OS === 'ios' && provider !== ProviderConstants_1.PROVIDER_GOOGLE);
         }
         let icon;
         if (this.props.icon) {

package/lib/decorateMapComponent.js

@@ -40,8 +40,7 @@ function decorateMapComponent(Component, componentName, providers) {
         function getNativeComponent() {
             const provider = this.context;
             if (componentName === 'Marker' &&
-                provider !== ProviderConstants_1.PROVIDER_GOOGLE &&
-                react_native_1.Platform.OS === 'ios') {
+                (react_native_1.Platform.OS !== 'ios' || provider !== ProviderConstants_1.PROVIDER_GOOGLE)) {
                 // @ts-ignore
                 return NativeComponentMarker_1.default;
             }

package/lib/specs/NativeComponentMarker.js

@@ -16,6 +16,4 @@ exports.Commands = (0, codegenNativeCommands_1.default)({
         'redraw',
     ],
 });
-exports.default = (0, codegenNativeComponent_1.default)('RNMapsMarker', {
-    excludedPlatforms: ['android'],
-});
+exports.default = (0, codegenNativeComponent_1.default)('RNMapsMarker', {});

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.51",
+  "version": "1.21.0-alpha.53",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",