@rnmapbox/maps 10.1.0-rc.2 → 10.1.0-rc.3

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerView.kt

@@ -31,6 +31,7 @@ class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewMa
     private var mCoordinate: Point? = null
     private var mAnchor: Vec2 = Vec2(0.5, 0.5)
     private var mAllowOverlap = false
+    private var mAllowOverlapWithPuck = false
     private var mIsSelected = false
 
     fun setCoordinate(point: Point?) {
@@ -48,6 +49,11 @@ class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewMa
         update()
     }
 
+    fun setAllowOverlapWithPuck(allowOverlapWithPuck: Boolean) {
+        mAllowOverlapWithPuck = allowOverlapWithPuck
+        update()
+    }
+
     fun setIsSelected(isSelected: Boolean) {
         mIsSelected = isSelected
         update()
@@ -116,13 +122,14 @@ class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewMa
 
         val options = getOptions()
 
-
+        val content = view as? RNMBXMarkerViewContent;
+        content?.inAdd = true;
+        didAddToMap = true
         val annotation = mMapView?.viewAnnotationManager?.addViewAnnotation(
             view,
             options
         )
-        didAddToMap = true
-
+        content?.inAdd = false;
     }
 
     fun update() {
@@ -176,6 +183,7 @@ class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewMa
             width(width.toDouble())
             height(height.toDouble())
             allowOverlap(mAllowOverlap)
+            allowOverlapWithPuck(mAllowOverlapWithPuck)
             offsets(offset.dx, offset.dy)
             selected(mIsSelected)
 

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerViewContent.kt

@@ -1,21 +1,29 @@
 package com.rnmapbox.rnmbx.components.annotation
 
 import android.content.Context
+import android.view.View.MeasureSpec
 import com.facebook.react.uimanager.MeasureSpecAssertions
 import com.facebook.react.views.view.ReactViewGroup
 
 class RNMBXMarkerViewContent(context: Context): ReactViewGroup(context) {
+
+    var inAdd: Boolean = false
     // see https://github.com/rnmapbox/maps/pull/3235
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        try {
+        if (inAdd) {
+            val w = if (widthMeasureSpec == 0) {
+                MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY)
+            } else {
+                widthMeasureSpec
+            };
+            val h = if (heightMeasureSpec == 0) {
+                MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.EXACTLY)
+            } else {
+                heightMeasureSpec
+            }
+            super.onMeasure(w, h)
+        } else {
             super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-        } catch(e: IllegalStateException) {
-            val w = MeasureSpec.getSize(widthMeasureSpec)
-            val h = MeasureSpec.getSize(heightMeasureSpec)
-            setMeasuredDimension(
-                if (w == 0) measuredWidth else w,
-                if (h == 0) measuredHeight else h
-            )
         }
     }
 

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerViewManager.kt

@@ -49,6 +49,11 @@ class RNMBXMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
         markerView.setAllowOverlap(allowOverlap.asBoolean())
     }
 
+    @ReactProp(name = "allowOverlapWithPuck")
+    override fun setAllowOverlapWithPuck(markerView: RNMBXMarkerView, allowOverlapWithPuck: Dynamic) {
+        markerView.setAllowOverlapWithPuck(allowOverlapWithPuck.asBoolean())
+    }
+
     @ReactProp(name = "isSelected")
     override fun setIsSelected(markerView: RNMBXMarkerView, isSelected: Dynamic) {
         markerView.setIsSelected(isSelected.asBoolean())

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewManagerDelegate.java

@@ -31,6 +31,9 @@ public class RNMBXMarkerViewManagerDelegate<T extends View, U extends BaseViewMa
       case "allowOverlap":
         mViewManager.setAllowOverlap(view, new DynamicFromObject(value));
         break;
+      case "allowOverlapWithPuck":
+        mViewManager.setAllowOverlapWithPuck(view, new DynamicFromObject(value));
+        break;
       case "isSelected":
         mViewManager.setIsSelected(view, new DynamicFromObject(value));
         break;

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewManagerInterface.java

@@ -16,5 +16,6 @@ public interface RNMBXMarkerViewManagerInterface<T extends View> {
   void setCoordinate(T view, Dynamic value);
   void setAnchor(T view, Dynamic value);
   void setAllowOverlap(T view, Dynamic value);
+  void setAllowOverlapWithPuck(T view, Dynamic value);
   void setIsSelected(T view, Dynamic value);
 }

package/ios/RNMBX/RNMBXMarkerView.swift

@@ -60,6 +60,12 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
     }
   }
   
+  @objc public var allowOverlapWithPuck: Bool = false {
+    didSet {
+      update()
+    }
+  }
+  
   @objc public var isSelected: Bool = false {
     didSet {
       update()
@@ -227,7 +233,7 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
     let size = self.bounds.size
     let offset = calcOffset(size: size)
   
-    let options = ViewAnnotationOptions(
+    var options = ViewAnnotationOptions(
       geometry: geometry,
       width: size.width,
       height: size.height,
@@ -236,6 +242,9 @@ public class RNMBXMarkerView: UIView, RNMBXMapComponent {
       offsetY: offset.dy,
       selected: isSelected
     )
+    #if RNMBX_11
+    options.allowOverlapWithPuck = allowOverlapWithPuck
+    #endif
     return options
   }
   

package/ios/RNMBX/RNMBXMarkerViewComponentView.mm

@@ -84,6 +84,10 @@ using namespace facebook::react;
     if (allowOverlap != nil) {
         _view.allowOverlap = allowOverlap;
     }
+    id allowOverlapWithPuck = RNMBXConvertFollyDynamicToId(newProps.allowOverlapWithPuck);
+    if (allowOverlapWithPuck != nil) {
+        _view.allowOverlapWithPuck = allowOverlapWithPuck;
+    }
     id isSelected = RNMBXConvertFollyDynamicToId(newProps.isSelected);
     if (isSelected != nil) {
         _view.isSelected = isSelected;

package/ios/RNMBX/RNMBXMarkerViewManager.m

@@ -7,6 +7,7 @@
 RCT_EXPORT_VIEW_PROPERTY(coordinate, NSString)
 RCT_EXPORT_VIEW_PROPERTY(anchor, NSDictionary)
 RCT_EXPORT_VIEW_PROPERTY(allowOverlap, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(allowOverlapWithPuck, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(isSelected, BOOL)
 
 @end

package/lib/commonjs/components/MarkerView.js

@@ -34,6 +34,7 @@ class MarkerView extends _react.default.PureComponent {
       y: 0.5
     },
     allowOverlap: false,
+    allowOverlapWithPuck: false,
     isSelected: false
   };
   static lastId = 0;
@@ -73,6 +74,7 @@ class MarkerView extends _react.default.PureComponent {
       coordinate: this._getCoordinate(this.props.coordinate),
       anchor: anchor,
       allowOverlap: this.props.allowOverlap,
+      allowOverlapWithPuck: this.props.allowOverlapWithPuck,
       isSelected: this.props.isSelected,
       onTouchEnd: e => {
         e.stopPropagation();

package/lib/commonjs/components/MarkerView.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_utils","_geoUtils","_RNMBXMarkerViewNativeComponent","_RNMBXMarkerViewContentNativeComponent","_PointAnnotation","obj","__esModule","default","_extends","Object","assign","bind","target","i","arguments","length","source","key","prototype","hasOwnProperty","call","apply","Mapbox","NativeModules","RNMBXModule","MarkerView","React","PureComponent","defaultProps","anchor","x","y","allowOverlap","isSelected","lastId","_idForPointAnnotation","__idForPointAnnotation","undefined","_getCoordinate","coordinate","toJSONString","makePoint","render","props","console","warn","Platform","OS","MapboxV10","createElement","id","RNMBXMarkerView","style","flex","alignSelf","onTouchEnd","e","stopPropagation","onStartShouldSetResponder","_event","children","NativeMarkerViewComponent","_default","exports"],"sourceRoot":"../../../src","sources":["components/MarkerView.tsx"],"mappings":"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"}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_utils","_geoUtils","_RNMBXMarkerViewNativeComponent","_RNMBXMarkerViewContentNativeComponent","_PointAnnotation","obj","__esModule","default","_extends","Object","assign","bind","target","i","arguments","length","source","key","prototype","hasOwnProperty","call","apply","Mapbox","NativeModules","RNMBXModule","MarkerView","React","PureComponent","defaultProps","anchor","x","y","allowOverlap","allowOverlapWithPuck","isSelected","lastId","_idForPointAnnotation","__idForPointAnnotation","undefined","_getCoordinate","coordinate","toJSONString","makePoint","render","props","console","warn","Platform","OS","MapboxV10","createElement","id","RNMBXMarkerView","style","flex","alignSelf","onTouchEnd","e","stopPropagation","onStartShouldSetResponder","_event","children","NativeMarkerViewComponent","_default","exports"],"sourceRoot":"../../../src","sources":["components/MarkerView.tsx"],"mappings":"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"}

package/lib/commonjs/specs/RNMBXMarkerViewNativeComponent.js.map

@@ -1 +1 @@
-{"version":3,"names":["_codegenNativeComponent","_interopRequireDefault","require","obj","__esModule","default","_default","exports","codegenNativeComponent"],"sourceRoot":"../../../src","sources":["specs/RNMBXMarkerViewNativeComponent.ts"],"mappings":";;;;;;AACA,IAAAA,uBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA6F,SAAAD,uBAAAE,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,IAAAG,QAAA,GAAAC,OAAA,CAAAF,OAAA,GAiB9E,IAAAG,+BAAsB,EACnC,iBACF,CAAC"}
+{"version":3,"names":["_codegenNativeComponent","_interopRequireDefault","require","obj","__esModule","default","_default","exports","codegenNativeComponent"],"sourceRoot":"../../../src","sources":["specs/RNMBXMarkerViewNativeComponent.ts"],"mappings":";;;;;;AACA,IAAAA,uBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA6F,SAAAD,uBAAAE,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,IAAAG,QAAA,GAAAC,OAAA,CAAAF,OAAA,GAkB9E,IAAAG,+BAAsB,EACnC,iBACF,CAAC"}

package/lib/module/components/MarkerView.js

@@ -27,6 +27,7 @@ class MarkerView extends React.PureComponent {
       y: 0.5
     },
     allowOverlap: false,
+    allowOverlapWithPuck: false,
     isSelected: false
   };
   static lastId = 0;
@@ -66,6 +67,7 @@ class MarkerView extends React.PureComponent {
       coordinate: this._getCoordinate(this.props.coordinate),
       anchor: anchor,
       allowOverlap: this.props.allowOverlap,
+      allowOverlapWithPuck: this.props.allowOverlapWithPuck,
       isSelected: this.props.isSelected,
       onTouchEnd: e => {
         e.stopPropagation();

package/lib/module/components/MarkerView.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","Platform","NativeModules","toJSONString","makePoint","NativeMarkerViewComponent","RNMBXMakerViewContentCoponent","PointAnnotation","Mapbox","RNMBXModule","MarkerView","PureComponent","defaultProps","anchor","x","y","allowOverlap","isSelected","lastId","_idForPointAnnotation","__idForPointAnnotation","undefined","_getCoordinate","coordinate","render","props","console","warn","OS","MapboxV10","createElement","_extends","id","RNMBXMarkerView","style","flex","alignSelf","onTouchEnd","e","stopPropagation","onStartShouldSetResponder","_event","children"],"sourceRoot":"../../../src","sources":["components/MarkerView.tsx"],"mappings":"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"}
+{"version":3,"names":["React","Platform","NativeModules","toJSONString","makePoint","NativeMarkerViewComponent","RNMBXMakerViewContentCoponent","PointAnnotation","Mapbox","RNMBXModule","MarkerView","PureComponent","defaultProps","anchor","x","y","allowOverlap","allowOverlapWithPuck","isSelected","lastId","_idForPointAnnotation","__idForPointAnnotation","undefined","_getCoordinate","coordinate","render","props","console","warn","OS","MapboxV10","createElement","_extends","id","RNMBXMarkerView","style","flex","alignSelf","onTouchEnd","e","stopPropagation","onStartShouldSetResponder","_event","children"],"sourceRoot":"../../../src","sources":["components/MarkerView.tsx"],"mappings":"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"}

package/lib/module/specs/RNMBXMarkerViewNativeComponent.js.map

@@ -1 +1 @@
-{"version":3,"names":["codegenNativeComponent"],"sourceRoot":"../../../src","sources":["specs/RNMBXMarkerViewNativeComponent.ts"],"mappings":"AACA,OAAOA,sBAAsB,MAAM,yDAAyD;AAiB5F,eAAeA,sBAAsB,CACnC,iBACF,CAAC"}
+{"version":3,"names":["codegenNativeComponent"],"sourceRoot":"../../../src","sources":["specs/RNMBXMarkerViewNativeComponent.ts"],"mappings":"AACA,OAAOA,sBAAsB,MAAM,yDAAyD;AAkB5F,eAAeA,sBAAsB,CACnC,iBACF,CAAC"}

package/lib/typescript/src/components/MarkerView.d.ts

@@ -21,6 +21,11 @@ declare type Props = ViewProps & {
      * markers will 'collapse' and only one will be shown. Defaults to false.
      */
     allowOverlap: boolean;
+    /**
+     * Whether or not nearby markers on the map should be hidden if close to a
+     * UserLocation puck. Defaults to false.
+     */
+    allowOverlapWithPuck: boolean;
     isSelected: boolean;
     /**
      * One or more valid React Native views.

package/lib/typescript/src/components/MarkerView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MarkerView.d.ts","sourceRoot":"","sources":["../../../../src/components/MarkerView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAIvE,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAQlD,aAAK,KAAK,GAAG,SAAS,GAAG;IACvB;;OAEG;IACH,UAAU,EAAE,QAAQ,CAAC;IAErB;;;OAGG;IACH,MAAM,EAAE;QACN,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;KACX,CAAC;IAEF;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC;CAC9B,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,cAAM,UAAW,SAAQ,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC;IACjD,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,CAIjC;IAEF,MAAM,CAAC,MAAM,SAAK;IAClB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,qBAAqB,IAAI,MAAM;IAQ/B,cAAc,CAAC,UAAU,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS;IAOxD,MAAM;CAmDP;AAID,eAAe,UAAU,CAAC"}
+{"version":3,"file":"MarkerView.d.ts","sourceRoot":"","sources":["../../../../src/components/MarkerView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAIvE,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAQlD,aAAK,KAAK,GAAG,SAAS,GAAG;IACvB;;OAEG;IACH,UAAU,EAAE,QAAQ,CAAC;IAErB;;;OAGG;IACH,MAAM,EAAE;QACN,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;KACX,CAAC;IAEF;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;OAGG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAE9B,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC;CAC9B,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,cAAM,UAAW,SAAQ,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC;IACjD,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,CAKjC;IAEF,MAAM,CAAC,MAAM,SAAK;IAClB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,qBAAqB,IAAI,MAAM;IAQ/B,cAAc,CAAC,UAAU,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS;IAOxD,MAAM;CAoDP;AAID,eAAe,UAAU,CAAC"}

package/lib/typescript/src/specs/RNMBXMarkerViewNativeComponent.d.ts

@@ -9,6 +9,7 @@ export interface NativeProps extends ViewProps {
     coordinate?: UnsafeMixed<string>;
     anchor: UnsafeMixed<Point>;
     allowOverlap: UnsafeMixed<boolean>;
+    allowOverlapWithPuck: UnsafeMixed<boolean>;
     isSelected: UnsafeMixed<boolean>;
 }
 declare const _default: HostComponent<NativeProps>;

package/lib/typescript/src/specs/RNMBXMarkerViewNativeComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RNMBXMarkerViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../../src/specs/RNMBXMarkerViewNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE7D,OAAO,EAAE,KAAK,EAAE,MAAM,2CAA2C,CAAC;AAElE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,aAAK,KAAK,GAAG;IACX,CAAC,EAAE,KAAK,CAAC;IACT,CAAC,EAAE,KAAK,CAAC;CACV,CAAC;AAEF,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,UAAU,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,MAAM,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;IAC3B,YAAY,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACnC,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;CAClC;;AAED,wBAEgC"}
+{"version":3,"file":"RNMBXMarkerViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../../src/specs/RNMBXMarkerViewNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE7D,OAAO,EAAE,KAAK,EAAE,MAAM,2CAA2C,CAAC;AAElE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,aAAK,KAAK,GAAG;IACX,CAAC,EAAE,KAAK,CAAC;IACT,CAAC,EAAE,KAAK,CAAC;CACV,CAAC;AAEF,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,UAAU,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjC,MAAM,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;IAC3B,YAAY,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACnC,oBAAoB,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3C,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;CAClC;;AAED,wBAEgC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.1.0-rc.2",
+  "version": "10.1.0-rc.3",
   "publishConfig": {
     "access": "public"
   },

package/src/components/MarkerView.tsx

@@ -34,6 +34,12 @@ type Props = ViewProps & {
    */
   allowOverlap: boolean;
 
+  /**
+   * Whether or not nearby markers on the map should be hidden if close to a
+   * UserLocation puck. Defaults to false.
+   */
+  allowOverlapWithPuck: boolean;
+
   isSelected: boolean;
 
   /**
@@ -59,6 +65,7 @@ class MarkerView extends React.PureComponent<Props> {
   static defaultProps: Partial<Props> = {
     anchor: { x: 0.5, y: 0.5 },
     allowOverlap: false,
+    allowOverlapWithPuck: false,
     isSelected: false,
   };
 
@@ -112,6 +119,7 @@ class MarkerView extends React.PureComponent<Props> {
         coordinate={this._getCoordinate(this.props.coordinate)}
         anchor={anchor}
         allowOverlap={this.props.allowOverlap}
+        allowOverlapWithPuck={this.props.allowOverlapWithPuck}
         isSelected={this.props.isSelected}
         onTouchEnd={(e) => {
           e.stopPropagation();

package/src/specs/RNMBXMarkerViewNativeComponent.ts

@@ -13,6 +13,7 @@ export interface NativeProps extends ViewProps {
   coordinate?: UnsafeMixed<string>;
   anchor: UnsafeMixed<Point>;
   allowOverlap: UnsafeMixed<boolean>;
+  allowOverlapWithPuck: UnsafeMixed<boolean>;
   isSelected: UnsafeMixed<boolean>;
 }