feat(all): expose markerInfoWindowClosed event

Author: Finn Gutteridge

demo/app/main-page.xml

@@ -5,7 +5,8 @@
                       tilt="{{ tilt }}" i-padding="50,50,50,50" padding="{{ padding }}" mapReady="onMapReady"
                       markerSelect="onMarkerEvent" markerBeginDragging="onMarkerEvent"
                       markerEndDragging="onMarkerEvent" markerDrag="onMarkerEvent"
-                      markerInfoWindowTapped="onMarkerEvent" coordinateTapped="onCoordinateTapped"
+                      markerInfoWindowTapped="onMarkerEvent" markerInfoWindowClosed="onMarkerEvent"
+                      coordinateTapped="onCoordinateTapped"
                       cameraChanged="onCameraChanged"
                       indoorBuildingFocused="onIndoorBuildingFocused"
                       indoorLevelActivated="onIndoorLevelActivated"

src/map-view-common.ts

@@ -173,6 +173,7 @@ export abstract class MapViewBase extends View implements MapView {
     public static mapReadyEvent: string = "mapReady";
     public static markerSelectEvent: string = "markerSelect";
     public static markerInfoWindowTappedEvent: string = "markerInfoWindowTapped";
+    public static markerInfoWindowClosedEvent: string = "markerInfoWindowClosed";
     public static shapeSelectEvent: string = "shapeSelect";
     public static markerBeginDraggingEvent: string = "markerBeginDragging";
     public static markerEndDraggingEvent: string = "markerEndDragging";
@@ -321,15 +322,23 @@ export abstract class MapViewBase extends View implements MapView {
         let args: ShapeEventData = { eventName: eventName, object: this, shape: shape };
         this.notify(args);
     }
+
     notifyMarkerTapped(marker: MarkerBase) {
         this.notifyMarkerEvent(MapViewBase.markerSelectEvent, marker);
     }
+
     notifyMarkerInfoWindowTapped(marker: MarkerBase) {
         this.notifyMarkerEvent(MapViewBase.markerInfoWindowTappedEvent, marker);
     }
+
+    notifyMarkerInfoWindowClosed(marker: MarkerBase) {
+        this.notifyMarkerEvent(MapViewBase.markerInfoWindowClosedEvent, marker);
+    }
+
     notifyShapeTapped(shape: ShapeBase) {
         this.notifyShapeEvent(MapViewBase.shapeSelectEvent, shape);
     }
+
     notifyMarkerBeginDragging(marker: MarkerBase) {
         this.notifyMarkerEvent(MapViewBase.markerBeginDraggingEvent, marker);
     }

src/map-view.android.ts

@@ -130,6 +130,15 @@ export class MapView extends MapViewBase {
                     }
                 }));
 
+                gMap.setOnInfoWindowCloseListener(new com.google.android.gms.maps.GoogleMap.OnInfoWindowCloseListener({
+                    onInfoWindowClose: (gmsMarker) => {
+                        let marker = owner.findMarker((marker: Marker) => marker.android.getId() === gmsMarker.getId());
+                        owner.notifyMarkerInfoWindowClosed(marker);
+
+                        return false;
+                    }
+                }));
+
                 gMap.setOnMyLocationButtonClickListener(new com.google.android.gms.maps.GoogleMap.OnMyLocationButtonClickListener({
                     onMyLocationButtonClick: () => {
                         owner.notifyMyLocationTapped();

src/map-view.ios.ts

@@ -197,13 +197,21 @@ class MapViewDelegateImpl extends NSObject implements GMSMapViewDelegate {
     }
 
     public mapViewDidTapInfoWindowOfMarker(mapView: GMSMapView, gmsMarker: GMSMarker): void {
-        var owner = this._owner.get();
+        let owner = this._owner.get();
         if (owner) {
-            var marker = owner.findMarker(function (marker) { return marker.ios == gmsMarker; });
+            let marker: Marker = owner.findMarker((marker: Marker) => marker.ios == gmsMarker);
             owner.notifyMarkerInfoWindowTapped(marker);
         }
     }
 
+    public mapViewDidCloseInfoWindowOfMarker(mapView: GMSMapView, gmsMarker: GMSMarker): void {
+        let owner = this._owner.get();
+        if (owner) {
+            let marker: Marker = owner.findMarker((marker: Marker) => marker.ios == gmsMarker);
+            owner.notifyMarkerInfoWindowClosed(marker);
+        }
+    }
+
     public didTapMyLocationButtonForMapView(mapView: GMSMapView): boolean {
         const owner = this._owner.get();
         if (owner) {