react-native-maps 1.11.3 → 1.12.0

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

@@ -392,8 +392,6 @@ public class MapManager extends ViewGroupManager<MapView> {
         "onPress", MapBuilder.of("registrationName", "onPress"),
         "onLongPress", MapBuilder.of("registrationName", "onLongPress"),
         "onMarkerPress", MapBuilder.of("registrationName", "onMarkerPress"),
-        "onMarkerSelect", MapBuilder.of("registrationName", "onMarkerSelect"),
-        "onMarkerDeselect", MapBuilder.of("registrationName", "onMarkerDeselect"),
         "onCalloutPress", MapBuilder.of("registrationName", "onCalloutPress")
     );
 
@@ -411,7 +409,9 @@ public class MapManager extends ViewGroupManager<MapView> {
         "onIndoorLevelActivated", MapBuilder.of("registrationName", "onIndoorLevelActivated"),
         "onIndoorBuildingFocused", MapBuilder.of("registrationName", "onIndoorBuildingFocused"),
         "onDoublePress", MapBuilder.of("registrationName", "onDoublePress"),
-        "onMapLoaded", MapBuilder.of("registrationName", "onMapLoaded")
+        "onMapLoaded", MapBuilder.of("registrationName", "onMapLoaded"),
+        "onMarkerSelect", MapBuilder.of("registrationName", "onMarkerSelect"),
+        "onMarkerDeselect", MapBuilder.of("registrationName", "onMarkerDeselect")
     ));
 
     return map;

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

@@ -276,6 +276,10 @@ public class MapMarker extends MapFeature {
     }
   }
 
+  public LatLng getPosition() {
+    return position;
+  }
+
   public boolean updateCustomForTracking() {
     if (!tracksViewChangesActive)
       return false;

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

@@ -326,7 +326,9 @@ public class MapMarkerManager extends ViewGroupManager<MapMarker> {
         "onCalloutPress", MapBuilder.of("registrationName", "onCalloutPress"),
         "onDragStart", MapBuilder.of("registrationName", "onDragStart"),
         "onDrag", MapBuilder.of("registrationName", "onDrag"),
-        "onDragEnd", MapBuilder.of("registrationName", "onDragEnd")
+        "onDragEnd", MapBuilder.of("registrationName", "onDragEnd"),
+        "onSelect", MapBuilder.of("registrationName", "onSelect"),
+        "onDeselect", MapBuilder.of("registrationName", "onDeselect")
     );
 
     map.putAll(MapBuilder.of(

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

@@ -112,6 +112,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
   private boolean initialCameraSet = false;
   private LatLngBounds cameraLastIdleBounds;
   private int cameraMoveReason = 0;
+  private MapMarker selectedMarker;
 
   private static final String[] PERMISSIONS = new String[]{
       "android.permission.ACCESS_FINE_LOCATION", "android.permission.ACCESS_COARSE_LOCATION"};
@@ -296,6 +297,8 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         event.putString("id", airMapMarker.getIdentifier());
         manager.pushEvent(context, airMapMarker, "onPress", event);
 
+        handleMarkerSelection(airMapMarker);
+
         // Return false to open the callout info window and center on the marker
         // https://developers.google.com/android/reference/com/google/android/gms/maps/GoogleMap
         // .OnMarkerClickListener
@@ -351,6 +354,8 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         WritableMap event = makeClickEventData(point);
         event.putString("action", "press");
         manager.pushEvent(context, view, "onPress", event);
+
+        handleMarkerSelection(null);
       }
     });
 
@@ -463,6 +468,40 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     context.addLifecycleEventListener(lifecycleListener);
   }
 
+  private synchronized void handleMarkerSelection(MapMarker target) {
+    if (selectedMarker == target) {
+      return;
+    }
+    
+    WritableMap event;
+
+    if (selectedMarker != null) {
+      event = makeClickEventData(selectedMarker.getPosition());
+      event.putString("action", "marker-deselect");
+      event.putString("id", selectedMarker.getIdentifier());
+      manager.pushEvent(context, selectedMarker, "onDeselect", event);
+
+      event = makeClickEventData(selectedMarker.getPosition());
+      event.putString("action", "marker-deselect");
+      event.putString("id", selectedMarker.getIdentifier());
+      manager.pushEvent(context, this, "onMarkerDeselect", event);
+    }
+
+    if (target != null) {
+      event = makeClickEventData(target.getPosition());
+      event.putString("action", "marker-select");
+      event.putString("id", target.getIdentifier());
+      manager.pushEvent(context, target, "onSelect", event);
+
+      event = makeClickEventData(target.getPosition());
+      event.putString("action", "marker-select");
+      event.putString("id", target.getIdentifier());
+      manager.pushEvent(context, this, "onMarkerSelect", event);
+    }
+
+     selectedMarker = target;
+  }
+
   private boolean hasPermissions() {
     return checkSelfPermission(getContext(), PERMISSIONS[0]) == PermissionChecker.PERMISSION_GRANTED ||
         checkSelfPermission(getContext(), PERMISSIONS[1]) == PermissionChecker.PERMISSION_GRANTED;

package/ios/AirGoogleMaps/AIRGMSMarker.h

@@ -16,6 +16,8 @@
 @property (nonatomic, strong) NSString *identifier;
 @property (nonatomic, weak) AIRGoogleMapMarker *fakeMarker;
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
+@property (nonatomic, copy) RCTDirectEventBlock onSelect;
+@property (nonatomic, copy) RCTDirectEventBlock onDeselect;
 @end
 
 

package/ios/AirGoogleMaps/AIRGoogleMap.h

@@ -34,6 +34,8 @@
 @property (nonatomic, copy) RCTBubblingEventBlock onPanDrag;
 @property (nonatomic, copy) RCTBubblingEventBlock onUserLocationChange;
 @property (nonatomic, copy) RCTBubblingEventBlock onMarkerPress;
+@property (nonatomic, copy) RCTBubblingEventBlock onMarkerSelect;
+@property (nonatomic, copy) RCTBubblingEventBlock onMarkerDeselect;
 @property (nonatomic, copy) RCTBubblingEventBlock onChange;
 @property (nonatomic, copy) RCTBubblingEventBlock onPoiClick;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChange;
@@ -80,7 +82,6 @@
 
 - (NSDictionary*) getMarkersFramesWithOnlyVisible:(BOOL)onlyVisible;
 - (instancetype) initWithMapId:(NSString *) mapId;
-
 @end
 
 #endif

package/ios/AirGoogleMaps/AIRGoogleMap.m

@@ -354,6 +354,7 @@ id regionAsJSON(MKCoordinateRegion region) {
 
   // TODO: not sure why this is necessary
   [self setSelectedMarker:marker];
+
   return NO;
 }
 
@@ -582,6 +583,33 @@ id regionAsJSON(MKCoordinateRegion region) {
   return self.settings.indoorPicker;
 }
 
+-(void)setSelectedMarker:(AIRGMSMarker *)selectedMarker {
+  if (selectedMarker == self.selectedMarker) {
+    return;
+  }
+    AIRGMSMarker *airMarker = (AIRGMSMarker *) self.selectedMarker;
+    AIRGoogleMapMarker *fakeAirMarker = (AIRGoogleMapMarker *) airMarker.fakeMarker;
+    AIRGoogleMapMarker *fakeSelectedMarker = (AIRGoogleMapMarker *) selectedMarker.fakeMarker;
+    
+    if (airMarker && airMarker.onDeselect) {
+        airMarker.onDeselect([fakeAirMarker makeEventData:@"marker-deselect"]);
+    }
+
+    if (airMarker && self.onMarkerDeselect) {
+        self.onMarkerDeselect([fakeAirMarker makeEventData:@"marker-deselect"]);
+    }
+    
+    if (selectedMarker && selectedMarker.onSelect) {
+        selectedMarker.onSelect([fakeSelectedMarker makeEventData:@"marker-select"]);
+    }
+
+    if (selectedMarker && self.onMarkerSelect) {
+        self.onMarkerSelect([fakeSelectedMarker makeEventData:@"marker-select"]);
+    }
+
+  [super setSelectedMarker:selectedMarker];
+}
+
 + (MKCoordinateRegion) makeGMSCameraPositionFromMap:(GMSMapView *)map andGMSCameraPosition:(GMSCameraPosition *)position {
   // solution from here: http://stackoverflow.com/a/16587735/1102215
   GMSVisibleRegion visibleRegion = map.projection.visibleRegion;
@@ -740,16 +768,19 @@ id regionAsJSON(MKCoordinateRegion region) {
     BOOL isTap = [gestureRecognizer isKindOfClass:[UITapGestureRecognizer class]] || [gestureRecognizer isMemberOfClass:[UITapGestureRecognizer class]];
     if (isTap) {
         BOOL isTapInsideBubble = NO;
-    CGPoint tapPoint = CGPointZero;
-    CGPoint tapPointInBubble = CGPointZero;
-
-    NSArray* touches = [gestureRecognizer valueForKey:@"touches"];
-    UITouch* oneTouch = [touches firstObject];
-    NSArray* delayedTouches = [gestureRecognizer valueForKey:@"delayedTouches"];
-    NSObject* delayedTouch = [delayedTouches firstObject]; //UIGestureDeleayedTouch
-    UITouch* tapTouch = [delayedTouch valueForKey:@"stateWhenDelayed"];
-    if (!tapTouch)
-        tapTouch = oneTouch;
+        CGPoint tapPoint = CGPointZero;
+        CGPoint tapPointInBubble = CGPointZero;
+
+        NSArray* touches = [gestureRecognizer valueForKey:@"touches"];
+        UITouch* oneTouch = [touches firstObject];
+        NSArray* delayedTouches = [gestureRecognizer valueForKey:@"delayedTouches"];
+        NSObject* delayedTouch = [delayedTouches firstObject]; //UIGestureDeleayedTouch
+        UITouch* tapTouch = [delayedTouch valueForKey:@"stateWhenDelayed"];
+
+        if (!tapTouch) {
+            tapTouch = oneTouch;
+        };
+
         tapPoint = [tapTouch locationInView:self];
         isTapInsideBubble = tapTouch != nil && CGRectContainsPoint(bubbleFrame, tapPoint);
         if (isTapInsideBubble) {

package/ios/AirGoogleMaps/AIRGoogleMapManager.m

@@ -101,6 +101,8 @@ RCT_EXPORT_VIEW_PROPERTY(onPanDrag, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onUserLocationChange, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onMarkerPress, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerSelect, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onMarkerDeselect, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onRegionChange, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onRegionChangeComplete, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onPoiClick, RCTDirectEventBlock)

package/ios/AirGoogleMaps/AIRGoogleMapMarker.h

@@ -51,6 +51,8 @@
 - (void)didBeginDraggingMarker:(AIRGMSMarker *)marker;
 - (void)didEndDraggingMarker:(AIRGMSMarker *)marker;
 - (void)didDragMarker:(AIRGMSMarker *)marker;
+- (id)makeEventData;
+- (id)makeEventData:(NSString *)action;
 @end
 
 #endif

package/ios/AirGoogleMaps/AIRGoogleMapMarker.m

@@ -24,7 +24,6 @@ CGRect unionRect(CGRect a, CGRect b) {
 }
 
 @interface AIRGoogleMapMarker ()
-- (id)eventFromMarker:(AIRGMSMarker*)marker;
 @end
 
 @implementation AIRGoogleMapMarker {
@@ -60,23 +59,7 @@ CGRect unionRect(CGRect a, CGRect b) {
   [_iconView setFrame:CGRectMake(0, 0, width, height)];
 }
 
-- (id)eventFromMarker:(AIRGMSMarker*)marker {
 
-  CLLocationCoordinate2D coordinate = marker.position;
-  CGPoint position = [self.realMarker.map.projection pointForCoordinate:coordinate];
-
-  return @{
-         @"id": marker.identifier ?: @"unknown",
-         @"position": @{
-             @"x": @(position.x),
-             @"y": @(position.y),
-             },
-         @"coordinate": @{
-             @"latitude": @(coordinate.latitude),
-             @"longitude": @(coordinate.longitude),
-             }
-         };
-}
 
 - (void)iconViewInsertSubview:(UIView*)subview atIndex:(NSInteger)atIndex {
   if (!_realMarker.iconView) {
@@ -199,17 +182,17 @@ CGRect unionRect(CGRect a, CGRect b) {
 
 - (void)didBeginDraggingMarker:(AIRGMSMarker *)marker {
   if (!self.onDragStart) return;
-  self.onDragStart([self eventFromMarker:marker]);
+  self.onDragStart([self makeEventData]);
 }
 
 - (void)didEndDraggingMarker:(AIRGMSMarker *)marker {
   if (!self.onDragEnd) return;
-  self.onDragEnd([self eventFromMarker:marker]);
+  self.onDragEnd([self makeEventData]);
 }
 
 - (void)didDragMarker:(AIRGMSMarker *)marker {
   if (!self.onDrag) return;
-  self.onDrag([self eventFromMarker:marker]);
+  self.onDrag([self makeEventData]);
 }
 
 - (void)setCoordinate:(CLLocationCoordinate2D)coordinate {
@@ -244,6 +227,22 @@ CGRect unionRect(CGRect a, CGRect b) {
   return _realMarker.onPress;
 }
 
+- (void)setOnSelect:(RCTDirectEventBlock)onSelect {
+  _realMarker.onSelect = onSelect;
+}
+
+- (RCTDirectEventBlock)onSelect {
+  return _realMarker.onSelect;
+}
+
+- (void)setOnDeselect:(RCTDirectEventBlock)onDeselect {
+  _realMarker.onDeselect = onDeselect;
+}
+
+- (RCTDirectEventBlock)onDeselect {
+  return _realMarker.onDeselect;
+}
+
 - (void)setOpacity:(double)opacity
 {
   _realMarker.opacity = opacity;
@@ -429,6 +428,29 @@ CGRect unionRect(CGRect a, CGRect b) {
   return _realMarker.tracksInfoWindowChanges;
 }
 
+
+- (id)makeEventData:(NSString *)action {
+    CLLocationCoordinate2D coordinate = self.realMarker.position;
+    CGPoint position = [self.realMarker.map.projection pointForCoordinate:coordinate];
+
+    return @{
+            @"id": self.identifier ?: @"unknown",
+            @"position": @{
+                @"x": @(position.x),
+                @"y": @(position.y),
+                },
+            @"coordinate": @{
+                @"latitude": @(coordinate.latitude),
+                @"longitude": @(coordinate.longitude),
+                },
+            @"action": action,
+            };
+}
+
+- (id)makeEventData {
+    return [self makeEventData:@"unknown"];
+}
+
 @end
 
 #endif

package/ios/AirGoogleMaps/AIRGoogleMapMarkerManager.m

@@ -52,6 +52,8 @@ RCT_EXPORT_VIEW_PROPERTY(opacity, double)
 RCT_EXPORT_VIEW_PROPERTY(onDragStart, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onDrag, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onDragEnd, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onSelect, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onDeselect, RCTDirectEventBlock)
 
 RCT_EXPORT_METHOD(showCallout:(nonnull NSNumber *)reactTag)
 {

package/lib/MapMarker.d.ts

@@ -168,8 +168,8 @@ export type MapMarkerProps = ViewProps & {
      * Callback that is called when the marker becomes selected.
      * This will be called when the callout for that marker is about to be shown.
      *
-     * @platform iOS: Apple Maps only.
-     * @platform Android: Not supported
+     * @platform iOS: Supported.
+     * @platform Android: Supported
      */
     onSelect?: (event: MarkerSelectEvent) => void;
     /**

package/lib/MapView.d.ts

@@ -243,8 +243,8 @@ export type MapViewProps = ViewProps & {
      * Callback that is called when a marker on the map becomes deselected.
      * This will be called when the callout for that marker is about to be hidden.
      *
-     * @platform iOS: Apple Maps only
-     * @platform Android: Not supported
+     * @platform iOS: Supported
+     * @platform Android: Supported
      */
     onMarkerDeselect?: (event: MarkerDeselectEvent) => void;
     /**
@@ -280,8 +280,8 @@ export type MapViewProps = ViewProps & {
      * Callback that is called when a marker on the map becomes selected.
      * This will be called when the callout for that marker is about to be shown.
      *
-     * @platform iOS: Apple Maps only.
-     * @platform Android: Not supported
+     * @platform iOS: Supported.
+     * @platform Android: Supported
      */
     onMarkerSelect?: (event: MarkerSelectEvent) => void;
     /**

package/lib/decorateMapComponent.d.ts

@@ -12,6 +12,7 @@ import { MapPolygon } from './MapPolygon';
 import { MapPolyline } from './MapPolyline';
 import { MapUrlTile } from './MapUrlTile';
 import { MapWMSTile } from './MapWMSTile';
+import { Commands } from './MapViewNativeComponent';
 export declare const SUPPORTED: ImplementationStatus;
 export declare const USES_DEFAULT_IMPLEMENTATION: ImplementationStatus;
 export declare const NOT_SUPPORTED: ImplementationStatus;
@@ -28,7 +29,7 @@ type Providers = {
     };
 };
 export type UIManagerCommand = number;
-export type MapManagerCommand = any;
+export type MapManagerCommand = keyof typeof Commands;
 export type NativeComponent<H = unknown> = HostComponent<H> | ReturnType<typeof createNotSupportedComponent>;
 type Component = typeof MapCallout | typeof MapCalloutSubview | typeof MapCircle | typeof MapHeatmap | typeof MapLocalTile | typeof MapMarker | typeof MapOverlay | typeof MapPolygon | typeof MapPolyline | typeof MapUrlTile | typeof MapWMSTile;
 type ComponentName = 'Callout' | 'CalloutSubview' | 'Circle' | 'Heatmap' | 'LocalTile' | 'Marker' | 'Overlay' | 'Polygon' | 'Polyline' | 'UrlTile' | 'WMSTile';

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