fix: Fixed callout tap gesture

Author: LuisThein

ios/Classes/Annotations/AnnotationController.swift

@@ -108,9 +108,6 @@ class AnnotationController: NSObject {
     }
 
     private func initInfoWindow(annotation: FlutterAnnotation, annotationView: MKAnnotationView) {
-        if annotation.infoWindowConsumesTapEvents {
-            annotationView.rightCalloutAccessoryView = UIButton(type: .detailDisclosure)
-        }
         if #available(iOS 9.0, *) {
             let lines = annotation.subtitle?.split(whereSeparator: \.isNewline)
             if lines != nil {

ios/Classes/MapView/AppleMapController.swift

@@ -40,6 +40,8 @@ public class AppleMapController : NSObject, FlutterPlatformView, MKMapViewDelega
     var circleController: CircleController
     var initialCameraPosition: [String: Any]
     var options: [String: Any]
+    var onCalloutTapGestureRecognizer: UITapGestureRecognizer?
+    var currentlySelectedAnnotation: String?
 
     public init(withFrame frame: CGRect, withRegistrar registrar: FlutterPluginRegistrar, withargs args: Dictionary<String, Any> ,withId id: Int64) {
         self.options = args["options"] as! [String: Any]
@@ -72,18 +74,14 @@ public class AppleMapController : NSObject, FlutterPlatformView, MKMapViewDelega
         if let circlesToAdd: NSArray = args["circlesToAdd"] as? NSArray {
             self.circleController.addCircles(circleData: circlesToAdd)
         }
+        
+        self.onCalloutTapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(self.calloutTapped(_:)))
     }
 
     public func view() -> UIView {
         return mapView
     }
 
-    public func mapView(_ mapView: MKMapView, annotationView view: MKAnnotationView, calloutAccessoryControlTapped control: UIControl) {
-        if let flutterAnnotation: FlutterAnnotation = view.annotation as? FlutterAnnotation {
-            self.channel.invokeMethod("infoWindow#onTap", arguments: ["annotationId": flutterAnnotation.id])
-        }
-    }
-    
     // onIdle
     public func mapView(_ mapView: MKMapView, regionDidChangeAnimated animated: Bool) {
         self.channel.invokeMethod("camera#onIdle", arguments: "")
@@ -95,11 +93,20 @@ public class AppleMapController : NSObject, FlutterPlatformView, MKMapViewDelega
     }
 
     public func mapView(_ mapView: MKMapView, didSelect view: MKAnnotationView)  {
+        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(self.calloutTapped(_:)))
+        view.addGestureRecognizer(tapGesture)
         if let annotation :FlutterAnnotation = view.annotation as? FlutterAnnotation  {
+            self.currentlySelectedAnnotation = annotation.id
             self.annotationController.onAnnotationClick(annotation: annotation)
         }
     }
 
+    public func mapView(_ mapView: MKMapView, didDeselect view: MKAnnotationView) {
+        self.currentlySelectedAnnotation = nil
+        view.removeGestureRecognizer(self.onCalloutTapGestureRecognizer!)
+    }
+
+    
     public func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) -> MKAnnotationView? {
         if annotation is MKUserLocation {
             return nil
@@ -120,6 +127,12 @@ public class AppleMapController : NSObject, FlutterPlatformView, MKMapViewDelega
         return MKOverlayRenderer()
     }
 
+    @objc func calloutTapped(_ sender: UITapGestureRecognizer? = nil) {
+        if self.currentlySelectedAnnotation != nil {
+            self.channel.invokeMethod("infoWindow#onTap", arguments: ["annotationId": self.currentlySelectedAnnotation!])
+        }
+    }
+    
     private func setMethodCallHandlers() {
         channel.setMethodCallHandler({(call: FlutterMethodCall, result: FlutterResult) -> Void in
             if let args :Dictionary<String, Any> = call.arguments as? Dictionary<String,Any> {