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

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/fabric/MarkerManager.java

@@ -1,6 +1,7 @@
 package com.rnmaps.fabric;
 
 
+import android.graphics.Color;
 import android.util.Log;
 import android.view.View;
 
@@ -163,7 +164,7 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
 
     @Override
     public void setDescription(MapMarker view, @Nullable String value) {
-
+        view.setSnippet(value);
     }
 
     @Override
@@ -193,7 +194,10 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
 
     @Override
     public void setPinColor(MapMarker view, @Nullable Integer value) {
-
+        float[] hsv = new float[3];
+        Color.colorToHSV(value, hsv);
+        // NOTE: android only supports a hue
+        view.setMarkerHue(hsv[0]);
     }
 
     @Override
@@ -213,7 +217,7 @@ public class MarkerManager extends ViewGroupManager<MapMarker> implements RNMaps
 
     @Override
     public void animateToCoordinates(MapMarker view, double latitude, double longitude, int duration) {
-
+        view.animateToCoodinate(new LatLng(latitude, longitude), duration);
     }
 
     @Override

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

@@ -20,6 +20,7 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.CameraPosition;
@@ -71,7 +72,27 @@ public class NativeAirMapsModule extends NativeAirMapsModuleSpec {
 
     @Override
     public void getMapBoundaries(double tag, Promise promise) {
+        UIManager uiManager = UIManagerHelper.getUIManagerForReactTag(getReactApplicationContext(), (int) tag);
+        getReactApplicationContext().runOnUiQueueThread(new Runnable() {
+            @Override
+            public void run() {
+                MapView view = (MapView) uiManager.resolveView((int) tag);
+                double[][] boundaries = view.getMapBoundaries();
+                WritableMap coordinates = new WritableNativeMap();
+                WritableMap northEastHash = new WritableNativeMap();
+                WritableMap southWestHash = new WritableNativeMap();
 
+                northEastHash.putDouble("longitude", boundaries[0][0]);
+                northEastHash.putDouble("latitude", boundaries[0][1]);
+                southWestHash.putDouble("longitude", boundaries[1][0]);
+                southWestHash.putDouble("latitude", boundaries[1][1]);
+
+                coordinates.putMap("northEast", northEastHash);
+                coordinates.putMap("southWest", southWestHash);
+
+                promise.resolve(coordinates);
+            }
+        });
     }
 
     @Override

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

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

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

@@ -0,0 +1,33 @@
+package com.rnmaps.fabric.event;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeMap;
+import com.facebook.react.uimanager.events.Event;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.LatLngBounds;
+
+public class OnRegionChangeStartEvent extends Event<OnRegionChangeStartEvent> {
+  public static final String EVENT_NAME = "topRegionChangeStart";
+
+  private final WritableMap payload;
+
+  public OnRegionChangeStartEvent(int surfaceId, int viewId, WritableMap payload) {
+    super(surfaceId, viewId);
+    this.payload = payload;
+  }
+
+  @NonNull
+  @Override
+  public String getEventName() {
+    return EVENT_NAME;
+  }
+
+
+  @Override
+  protected WritableMap getEventData() {
+    return payload;
+  }
+
+}

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);
             }
         });
 
@@ -453,45 +453,32 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
             }
         });
 
-        map.setOnCameraMoveStartedListener(new GoogleMap.OnCameraMoveStartedListener() {
-            @Override
-            public void onCameraMoveStarted(int reason) {
-                cameraMoveReason = reason;
-                boolean isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == reason;
-                WritableMap event = new WritableNativeMap();
-                event.putBoolean("isGesture", isGesture);
-                // todo: use Fabric events
-                // manager.pushEvent(context, view, "onRegionChangeStart", event);
-            }
+        map.setOnCameraMoveStartedListener(reason -> {
+            cameraMoveReason = reason;
+            boolean isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == reason;
+            WritableMap event = new WritableNativeMap();
+            event.putBoolean("isGesture", isGesture);
+            dispatchEvent(event, OnRegionChangeStartEvent::new);
         });
 
-        map.setOnCameraMoveListener(new GoogleMap.OnCameraMoveListener() {
-            @Override
-            public void onCameraMove() {
-                LatLngBounds bounds = map.getProjection().getVisibleRegion().latLngBounds;
-
-                cameraLastIdleBounds = null;
-                boolean isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason;
-                WritableMap payload = OnRegionChangeEvent.payLoadFor(bounds, true, isGesture);
-                dispatchEvent(payload, OnRegionChangeEvent::new);
-            }
+        map.setOnCameraMoveListener(() -> {
+            LatLngBounds bounds = map.getProjection().getVisibleRegion().latLngBounds;
+            cameraLastIdleBounds = null;
+            boolean isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason;
+            WritableMap payload = OnRegionChangeEvent.payLoadFor(bounds, false, isGesture);
+            dispatchEvent(payload, OnRegionChangeStartEvent::new);
         });
 
-        map.setOnCameraIdleListener(new GoogleMap.OnCameraIdleListener() {
-            @Override
-            public void onCameraIdle() {
-                LatLngBounds bounds = map.getProjection().getVisibleRegion().latLngBounds;
-                if ((cameraMoveReason != 0) &&
-                        ((cameraLastIdleBounds == null) ||
-                                LatLngBoundsUtils.BoundsAreDifferent(bounds, cameraLastIdleBounds))) {
-
-                    cameraLastIdleBounds = bounds;
-                    boolean isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason;
-
-                    RegionChangeEvent event = new RegionChangeEvent(getId(), bounds, false, isGesture);
-                    // todo: use Fabric events
-                    // eventDispatcher.dispatchEvent(event);
-                }
+        map.setOnCameraIdleListener(() -> {
+            LatLngBounds bounds = map.getProjection().getVisibleRegion().latLngBounds;
+            if ((cameraMoveReason != 0) &&
+                    ((cameraLastIdleBounds == null) ||
+                            LatLngBoundsUtils.BoundsAreDifferent(bounds, cameraLastIdleBounds))) {
+
+                cameraLastIdleBounds = bounds;
+                boolean isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == cameraMoveReason;
+                WritableMap payload = OnRegionChangeEvent.payLoadFor(bounds, false, isGesture);
+                dispatchEvent(payload, OnRegionChangeCompleteEvent::new);
             }
         });
 
@@ -602,6 +589,8 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         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));
+        builder.put(OnLongPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeStartEvent.EVENT_NAME));
+        builder.put(OnLongPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnRegionChangeCompleteEvent.EVENT_NAME));
         return builder.build();
     }
 

package/lib/MapView.d.ts

@@ -692,6 +692,8 @@ declare class MapView extends React.Component<MapViewProps, State> {
     private handleMarkerSelect;
     private handleMarkerDeselect;
     private handleRegionChange;
+    private handleRegionChangeStarted;
+    private handleRegionChangeComplete;
     render(): React.JSX.Element;
 }
 export declare const AnimatedMapView: RNAnimated.AnimatedComponent<typeof MapView>;

package/lib/MapView.js

@@ -156,13 +156,8 @@ class MapView extends React.Component {
      * @return Promise Promise with the bounding box ({ northEast: <LatLng>, southWest: <LatLng> })
      */
     async getMapBoundaries() {
-        if (react_native_1.Platform.OS === 'android') {
-            return await react_native_1.NativeModules.AirMapModule.getMapBoundaries(this._getHandle());
-        }
-        else if (react_native_1.Platform.OS === 'ios') {
-            if (this.fabricMap.current) {
-                return this.fabricMap.current.getMapBoundaries();
-            }
+        if (this.fabricMap.current) {
+            return this.fabricMap.current.getMapBoundaries();
         }
         return Promise.reject('getMapBoundaries not supported on this platform');
     }
@@ -342,6 +337,18 @@ class MapView extends React.Component {
             this.props.onRegionChangeComplete(event.nativeEvent.region, details);
         }
     };
+    handleRegionChangeStarted = (event) => {
+        if (this.props.onRegionChangeStart) {
+            this.props.onRegionChangeStart(event);
+        }
+    };
+    handleRegionChangeComplete = (event) => {
+        const isGesture = event.nativeEvent.isGesture;
+        const details = { isGesture };
+        if (this.props.onRegionChangeComplete) {
+            this.props.onRegionChangeComplete(event.nativeEvent.region, details);
+        }
+    };
     render() {
         // Define props specifically for MapFabricNativeProps
         /* eslint-disable @typescript-eslint/no-unused-vars */
@@ -361,6 +368,8 @@ class MapView extends React.Component {
             minZoom: minZoomLevel,
             maxZoom: maxZoomLevel,
             onRegionChange: this.handleRegionChange,
+            onRegionChangeStart: this.handleRegionChangeStarted,
+            onRegionChangeComplete: this.handleRegionChangeComplete,
             ...restProps,
         };
         if (this.props.region) {

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