@rnmapbox/maps 10.0.0-beta.45 → 10.0.0-beta.46

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/modules/CustomHttpHeaders.kt

@@ -0,0 +1,38 @@
+package com.mapbox.rctmgl.modules
+
+import com.mapbox.common.*
+
+object CustomHttpHeaders : HttpServiceInterceptorInterface {
+    init {}
+
+    val map = mutableMapOf<String, String>()
+
+    fun addCustomHeader(headerName: String, headerValue: String) {
+        HttpServiceFactory.getInstance().setInterceptor(
+            this
+        )
+    }
+
+    fun removeCustomHeader(headerName: String) {
+        map.remove(headerName)
+    }
+
+    override fun onRequest(request: HttpRequest): HttpRequest {
+        for (entry in map.entries.iterator()) {
+            request.headers[entry.key] = entry.value
+        }
+        return request
+    }
+
+    override fun onDownload(download: DownloadOptions): DownloadOptions {
+        for (entry in map.entries.iterator()) {
+            download.request.headers[entry.key] = entry.value
+        }
+        return download
+    }
+
+    override fun onResponse(response: HttpResponse): HttpResponse {
+        return response
+    }
+}
+

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/modules/RCTMGLModule.kt

@@ -12,6 +12,7 @@ import com.mapbox.rctmgl.modules.RCTMGLOfflineModule
 import com.mapbox.rctmgl.modules.RCTMGLLocationModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.common.MapBuilder
+import com.mapbox.common.*
 import com.mapbox.maps.Style
 import com.mapbox.rctmgl.components.camera.constants.CameraMode
 import java.util.HashMap
@@ -124,6 +125,16 @@ class RCTMGLModule(private val mReactContext: ReactApplicationContext) : ReactCo
         // NO-OP
     }
 
+    @ReactMethod
+    fun addCustomHeader(headerName: String, headerValue: String) {
+        CustomHttpHeaders.addCustomHeader(headerName, headerValue)
+    }
+
+    @ReactMethod
+    fun removeCustomHeader(headerName: String) {
+        CustomHttpHeaders.removeCustomHeader(headerName)
+    }
+
     companion object {
         const val REACT_CLASS = "RCTMGLModule"
         private val customHeaderInterceptorAdded = false
@@ -132,4 +143,4 @@ class RCTMGLModule(private val mReactContext: ReactApplicationContext) : ReactCo
             return getDefault((reactContext)!!, null).resourceOptions.accessToken
         }
     }
-}
+}

package/ios/RCTMGL-v10/RCTMGLMapView.swift

@@ -4,6 +4,8 @@ import MapKit
 
 @objc(RCTMGLMapView)
 open class RCTMGLMapView : MapView {
+  var tapDelegate: IgnoreRCTMGLMakerViewGestureDelegate? = nil
+
   var compassEnabled: Bool = false
   var compassFadeWhenNorth: Bool = false
   var reactOnPress : RCTBubblingEventBlock?
@@ -420,12 +422,70 @@ extension RCTMGLMapView {
 
 // MARK: - gestures
 
+class IgnoreRCTMGLMakerViewGestureDelegate : NSObject, UIGestureRecognizerDelegate {
+  var originalDelegate: UIGestureRecognizerDelegate?
+
+  init(originalDelegate: UIGestureRecognizerDelegate?) {
+    self.originalDelegate = originalDelegate
+  }
+  
+  func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+    return originalDelegate?.gestureRecognizerShouldBegin?(gestureRecognizer) ?? true
+  }
+
+  func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+    return originalDelegate?.gestureRecognizer?(gestureRecognizer,shouldRecognizeSimultaneouslyWith: otherGestureRecognizer) ?? false
+  }
+  
+  func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRequireFailureOf otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+    return originalDelegate?.gestureRecognizer?(gestureRecognizer,shouldRequireFailureOf: otherGestureRecognizer) ?? false
+  }
+
+  func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldBeRequiredToFailBy otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+    return originalDelegate?.gestureRecognizer?(gestureRecognizer,shouldBeRequiredToFailBy: otherGestureRecognizer) ?? false
+  }
+
+  private func isMarkerViewSubview(_ view: UIView) -> Bool {
+    var current : UIView? = view
+    while let act = current {
+      if (act is RCTMGLMarkerView) {
+        return true
+      }
+      current = act.superview
+    }
+    return false
+  }
+  
+  func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
+    if let view = touch.view, isMarkerViewSubview(view) {
+      return false
+    }
+    return originalDelegate?.gestureRecognizer?(gestureRecognizer,shouldReceive: touch) ?? true
+  }
+  
+  func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive press: UIPress) -> Bool {
+    return originalDelegate?.gestureRecognizer?(gestureRecognizer,shouldReceive: press) ?? true
+  }
+
+  
+  @available(iOS 13.4, *)
+  func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive event: UIEvent) -> Bool {
+        return originalDelegate?.gestureRecognizer?(gestureRecognizer,shouldReceive: event) ?? true
+  }
+}
+
 extension RCTMGLMapView {
+  
   @objc func setReactOnPress(_ value: @escaping RCTBubblingEventBlock) {
     self.reactOnPress = value
-    
-    self.mapView.gestures.singleTapGestureRecognizer.removeTarget( pointAnnotationManager.manager, action: nil)
-    self.mapView.gestures.singleTapGestureRecognizer.addTarget(self, action: #selector(doHandleTap(_:)))
+
+    let singleTapGestureRecognizer = self.mapView.gestures.singleTapGestureRecognizer
+
+    singleTapGestureRecognizer.removeTarget(pointAnnotationManager.manager, action: nil)
+    singleTapGestureRecognizer.addTarget(self, action: #selector(doHandleTap(_:)))
+
+    self.tapDelegate = IgnoreRCTMGLMakerViewGestureDelegate(originalDelegate: singleTapGestureRecognizer.delegate)
+    singleTapGestureRecognizer.delegate = tapDelegate
   }
 
   @objc func setReactOnLongPress(_ value: @escaping RCTBubblingEventBlock) {
@@ -673,6 +733,11 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
   private var draggedAnnotation: PointAnnotation?
   
   func annotationManager(_ manager: AnnotationManager, didDetectTappedAnnotations annotations: [Annotation]) {
+    // We handle taps ourselfs
+    //   onTap(annotations: annotations)
+  }
+
+  func onTap(annotations: [Annotation]) {
     guard annotations.count > 0 else {
       fatalError("didDetectTappedAnnotations: No annotations found")
     }
@@ -724,7 +789,7 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
     }
     let options = RenderedQueryOptions(layerIds: [layerId], filter: nil)
     mapFeatureQueryable.queryRenderedFeatures(
-        at: tap.location(in: tap.view),
+      with: tap.location(in: tap.view),
         options: options) { [weak self] (result) in
 
         guard let self = self else { return }
@@ -746,10 +811,7 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
 
             // If `tappedAnnotations` is not empty, call delegate
             if !tappedAnnotations.isEmpty {
-              self.annotationManager(
-                self.manager,
-                didDetectTappedAnnotations: tappedAnnotations)
-              
+              self.onTap(annotations: tappedAnnotations)
             } else {
               noAnnotationFound(tap)
             }
@@ -757,7 +819,6 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
         case .failure(let error):
           noAnnotationFound(tap)
           Logger.log(level:.warn, message:"Failed to query map for annotations due to error: \(error)")
-          
         }
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.0.0-beta.45",
+  "version": "10.0.0-beta.46",
   "publishConfig": {
     "access": "public"
   },