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

package/docs/docs.json

@@ -1,4 +1,98 @@
 {
+  "Annotation": {
+    "description": "",
+    "displayName": "Annotation",
+    "methods": [
+      {
+        "name": "onPress",
+        "docblock": null,
+        "modifiers": [],
+        "params": [],
+        "returns": null
+      },
+      {
+        "name": "symbolStyle",
+        "docblock": null,
+        "modifiers": [
+          "get"
+        ],
+        "params": [],
+        "returns": null
+      }
+    ],
+    "props": [
+      {
+        "name": "id",
+        "required": true,
+        "type": "string",
+        "default": "none",
+        "description": "FIX ME NO DESCRIPTION"
+      },
+      {
+        "name": "animated",
+        "required": false,
+        "type": "bool",
+        "default": "false",
+        "description": "FIX ME NO DESCRIPTION"
+      },
+      {
+        "name": "animationDuration",
+        "required": false,
+        "type": "number",
+        "default": "1000",
+        "description": "FIX ME NO DESCRIPTION"
+      },
+      {
+        "name": "animationEasingFunction",
+        "required": false,
+        "type": "func",
+        "default": "Easing.linear",
+        "description": "FIX ME NO DESCRIPTION"
+      },
+      {
+        "name": "coordinates",
+        "required": false,
+        "type": {
+          "name": "array",
+          "value": {
+            "type": "number"
+          }
+        },
+        "default": "none",
+        "description": "FIX ME NO DESCRIPTION"
+      },
+      {
+        "name": "onPress",
+        "required": false,
+        "type": "func",
+        "default": "none",
+        "description": "FIX ME NO DESCRIPTION"
+      },
+      {
+        "name": "children",
+        "required": false,
+        "type": "any",
+        "default": "none",
+        "description": "FIX ME NO DESCRIPTION"
+      },
+      {
+        "name": "style",
+        "required": false,
+        "type": "any",
+        "default": "none",
+        "description": "FIX ME NO DESCRIPTION"
+      },
+      {
+        "name": "icon",
+        "required": false,
+        "type": "union",
+        "default": "none",
+        "description": "FIX ME NO DESCRIPTION"
+      }
+    ],
+    "fileNameWithExt": "Annotation.js",
+    "name": "Annotation"
+  },
   "Atmosphere": {
     "description": "",
     "displayName": "Atmosphere",
@@ -3166,7 +3260,7 @@
     "name": "MapView"
   },
   "MarkerView": {
-    "description": "MarkerView allows you to place a interactive react native marker to the map.\n\nIf you have static view consider using PointAnnotation or SymbolLayer they'll offer much better performance\n.\nThis is based on [MakerView plugin](https://docs.mapbox.com/android/plugins/overview/markerview/) on Android\nand PointAnnotation on iOS.",
+    "description": "MarkerView represents an interactive React Native marker on the map.\n\nIf you have static views, consider using PointAnnotation or SymbolLayer to display\nan image, as they'll offer much better performance. Mapbox suggests using this\ncomponent for a maximum of around 100 views displayed at one time.\n\nThis is implemented with view annotations on [Android](https://docs.mapbox.com/android/maps/guides/annotations/view-annotations/)\nand [iOS](https://docs.mapbox.com/ios/maps/guides/annotations/view-annotations).\n\nThis component has no dedicated `onPress` method. Instead, you should handle gestures\nwith the React views passed in as `children`.",
     "displayName": "MarkerView",
     "methods": [],
     "props": [
@@ -3175,7 +3269,7 @@
         "required": true,
         "type": "tuple",
         "default": "none",
-        "description": "The center point (specified as a map coordinate) of the marker.\nSee also #anchor."
+        "description": "The center point (specified as a map coordinate) of the marker."
       },
       {
         "name": "anchor",
@@ -3188,26 +3282,40 @@
               "required": true,
               "type": "number",
               "default": "none",
-              "description": "`x` of anchor"
+              "description": "FIX ME NO DESCRIPTION"
             },
             {
               "name": "y",
               "required": true,
               "type": "number",
               "default": "none",
-              "description": "`y` of anchor"
+              "description": "FIX ME NO DESCRIPTION"
             }
           ]
         },
         "default": "{ x: 0.5, y: 0.5 }",
-        "description": "Specifies the anchor being set on a particular point of the annotation.\nThe anchor point is specified in the continuous space [0.0, 1.0] x [0.0, 1.0],\nwhere (0, 0) is the top-left corner of the image, and (1, 1) is the bottom-right corner.\nNote this is only for custom annotations not the default pin view.\nDefaults to the center of the view."
+        "description": "Any coordinate between (0, 0) and (1, 1), where (0, 0) is the top-left corner of\nthe view, and (1, 1) is the bottom-right corner. Defaults to the center at (0.5, 0.5)."
+      },
+      {
+        "name": "allowOverlap",
+        "required": false,
+        "type": "boolean",
+        "default": "false",
+        "description": "@v10\n\nWhether or not nearby markers on the map should all be displayed. If false, adjacent\nmarkers will 'collapse' and only one will be shown. Defaults to false."
+      },
+      {
+        "name": "isSelected",
+        "required": false,
+        "type": "boolean",
+        "default": "false",
+        "description": "FIX ME NO DESCRIPTION"
       },
       {
         "name": "children",
         "required": true,
         "type": "ReactReactElement",
         "default": "none",
-        "description": "Expects one child - can be container with multiple elements"
+        "description": "One or more valid React Native views."
       }
     ],
     "fileNameWithExt": "MarkerView.tsx",
@@ -3237,7 +3345,7 @@
     "name": "NativeUserLocation"
   },
   "PointAnnotation": {
-    "description": "PointAnnotation represents a one-dimensional shape located at a single geographical coordinate.\n\nConsider using ShapeSource and SymbolLayer instead, if you have many points and you have static images,\nthey'll offer much better performance.\n\nIf you need interactive views please use MarkerView,\nas with PointAnnotation on Android child views are rendered onto a bitmap for better performance.",
+    "description": "PointAnnotation represents a one-dimensional shape located at a single geographical coordinate.\n\nConsider using ShapeSource and SymbolLayer instead, if you have many points and you have static images,\nthey'll offer much better performance.\n\nIf you need interactive views please use MarkerView,\nas with PointAnnotation child views are rendered onto a bitmap",
     "displayName": "PointAnnotation",
     "methods": [
       {
@@ -4381,7 +4489,7 @@
       {
         "name": "filter",
         "required": false,
-        "type": "Array",
+        "type": "Expression",
         "default": "none",
         "description": "Filter only the features in the source layer that satisfy a condition that you define"
       },
@@ -6117,100 +6225,6 @@
     "fileNameWithExt": "VectorSource.js",
     "name": "VectorSource"
   },
-  "Annotation": {
-    "description": "",
-    "displayName": "Annotation",
-    "methods": [
-      {
-        "name": "onPress",
-        "docblock": null,
-        "modifiers": [],
-        "params": [],
-        "returns": null
-      },
-      {
-        "name": "symbolStyle",
-        "docblock": null,
-        "modifiers": [
-          "get"
-        ],
-        "params": [],
-        "returns": null
-      }
-    ],
-    "props": [
-      {
-        "name": "id",
-        "required": true,
-        "type": "string",
-        "default": "none",
-        "description": "FIX ME NO DESCRIPTION"
-      },
-      {
-        "name": "animated",
-        "required": false,
-        "type": "bool",
-        "default": "false",
-        "description": "FIX ME NO DESCRIPTION"
-      },
-      {
-        "name": "animationDuration",
-        "required": false,
-        "type": "number",
-        "default": "1000",
-        "description": "FIX ME NO DESCRIPTION"
-      },
-      {
-        "name": "animationEasingFunction",
-        "required": false,
-        "type": "func",
-        "default": "Easing.linear",
-        "description": "FIX ME NO DESCRIPTION"
-      },
-      {
-        "name": "coordinates",
-        "required": false,
-        "type": {
-          "name": "array",
-          "value": {
-            "type": "number"
-          }
-        },
-        "default": "none",
-        "description": "FIX ME NO DESCRIPTION"
-      },
-      {
-        "name": "onPress",
-        "required": false,
-        "type": "func",
-        "default": "none",
-        "description": "FIX ME NO DESCRIPTION"
-      },
-      {
-        "name": "children",
-        "required": false,
-        "type": "any",
-        "default": "none",
-        "description": "FIX ME NO DESCRIPTION"
-      },
-      {
-        "name": "style",
-        "required": false,
-        "type": "any",
-        "default": "none",
-        "description": "FIX ME NO DESCRIPTION"
-      },
-      {
-        "name": "icon",
-        "required": false,
-        "type": "union",
-        "default": "none",
-        "description": "FIX ME NO DESCRIPTION"
-      }
-    ],
-    "fileNameWithExt": "Annotation.js",
-    "name": "Annotation"
-  },
   "offlineManager": {
     "name": "offlineManager",
     "fileNameWithExt": "offlineManager.js",

package/index.d.ts

@@ -153,6 +153,7 @@ declare namespace MapboxGL {
   const PointAnnotation = _PointAnnotation;
   const SymbolLayer = _SymbolLayer;
   const ShapeSource = _ShapeSource;
+  type ShapeSource = _ShapeSource;
 
   type MapboxGLEvent = _MapboxGLEvent;
   type UserTrackingMode = _UserTrackingMode;

package/ios/RCTMGL-v10/RCTLog.swift

@@ -1,19 +1,19 @@
-func RCTLogError(_ message: String, _ file: String=#file, _ line: UInt=#line) {
+func RCTMGLLogError(_ message: String, _ file: String=#file, _ line: UInt=#line) {
   RCTMGLSwiftLog.error(message, file: file, line: line)
 }
 
-func RCTLogWarn(_ message: String, _ file: String=#file, _ line: UInt=#line) {
+func RCTMGLLogWarn(_ message: String, _ file: String=#file, _ line: UInt=#line) {
   RCTMGLSwiftLog.warn(message, file: file, line: line)
 }
 
-func RCTLogInfo(_ message: String, _ file: String=#file, _ line: UInt=#line) {
+func RCTMGLLogInfo(_ message: String, _ file: String=#file, _ line: UInt=#line) {
   RCTMGLSwiftLog.info(message, file: file, line: line)
 }
 
-func RCTLog(_ message: String, _ file: String=#file, _ line: UInt=#line) {
+func RCTMGLLog(_ message: String, _ file: String=#file, _ line: UInt=#line) {
   RCTMGLSwiftLog.log(message, file: file, line: line)
 }
 
-func RCTLogTrace(_ message: String, _ file: String=#file, _ line: UInt=#line) {
+func RCTMGLLogTrace(_ message: String, _ file: String=#file, _ line: UInt=#line) {
   RCTMGLSwiftLog.trace(message, file: file, line: line)
 }

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/ios/RCTMGL-v10/RCTMGLMapViewManager.swift

@@ -30,7 +30,7 @@ extension RCTMGLMapViewManager {
         let view = viewRegistry![reactTag]
 
         guard let view = view! as? RCTMGLMapView else {
-          RCTLogError("Invalid react tag, could not find RCTMGLMapView");
+          RCTMGLLogError("Invalid react tag, could not find RCTMGLMapView");
           rejecter(name, "Unknown find reactTag: \(reactTag)", nil)
           return;
         }
@@ -47,7 +47,7 @@ extension RCTMGLMapViewManager {
     {
       withMapView(reactTag, name: name, rejecter: rejecter) { view in
         guard let mapboxMap = view.mapboxMap else {
-          RCTLogError("MapboxMap is not yet available");
+          RCTMGLLogError("MapboxMap is not yet available");
           rejecter(name, "Map not loaded yet", nil)
           return;
         }