@rnmapbox/maps 10.1.0 → 10.1.2

package/CHANGELOG.md

@@ -1,9 +1,13 @@
-## UNRELEASED
+Please check `https://github.com/rnmapbox/maps/releases` for all release logs. We no longer maintain this file.
+
+### Release notes for 10.1.0
+
+- fabric support (should cover all functionality, but some stuff might be broken)
+- v11 support, including api for new features like style config, slot and ModelLayers
+- deprecate `UserLocation#renderMode`, to use native user location, use the new component `LocationPuck`
+- deprecate `Camera#onUserTrackingModeChange`, use `Viewport#onStatusChanged` instead
+- lot of smaller bugfixes/features
 
-```
-Please add unreleased changes in the following style:
-PR Title ([#123](link to my pr))
-```
 
 ### UNRELEASED/10.0.0-beta.10
 

package/README.md

@@ -79,36 +79,7 @@ _See [iOS](ios/install.md) & [Android](android/install.md) setup guide for using
 
 ## Installation
 
-### Step 1 - Install Package:
-
-#### Using `yarn`
-Install the latest source from git:
-```sh
-yarn add @rnmapbox/maps
-``` 
-
-#### Using `npm`
-Install the latest source from git:
-```sh
-npm install --save @rnmapbox/maps
-``` 
-
-#### Installing other versions
-
-- `@rnmapbox/maps` installs the latest release from npm
-- to install current `main` from github replace `@rnmapbox/maps` with `rnmapbox/maps#main`. To install specific version use `@rnmapbox/maps@10.0.4`
-
-
-#### Using `expo`
-Please follow the [Expo Guide](/plugin/install.md).
-
-### Step 2 - Installation Guides:
-
-- [Android](/android/install.md)
-- [iOS](/ios/install.md)
-- [Expo](/plugin/install.md)
-- [Example](/example)
-
+Check our [Installation insructions](https://rnmapbox.github.io/docs/install)
 
 ### Getting Started
 For more information, check out our [Getting Started](/docs/GettingStarted.md) section
@@ -183,8 +154,10 @@ const styles = StyleSheet.create({
 - [Callout](/docs/Callout.md)
 - [Camera](docs/Camera.md)
 - [UserLocation](docs/UserLocation.md)
+- [LocaitonPuck](docs/LocationPuck.md)
 - [Images](docs/Images.md)
 - [Image](docs/Image.md)
+- [Models](docs/Models.md)
 
 ### Sources
 
@@ -204,6 +177,7 @@ const styles = StyleSheet.create({
 - [SymbolLayer](/docs/SymbolLayer.md)
 - [HeatmapLayer](/docs/HeatmapLayer.md)
 - [SkyLayer](/docs/SkyLayer.md)
+- [ModelLayer](/docs/ModelLayer.md)
 
 ### Terrain
 
@@ -217,7 +191,7 @@ const styles = StyleSheet.create({
 
 ### Misc
 
-- [Mapbox](/docs/MapboxGL.md)
+- [Mapbox](/docs/Mapbox.md)
 - [CustomHttpHeaders](/docs/CustomHttpHeaders.md)
 - [Logger](/docs/Logger.md)
 

package/android/build.gradle

@@ -1,5 +1,5 @@
 def defaultMapboxMapsImpl = "mapbox"
-def defaultMapboxMapsVersion = "10.16.1"
+def defaultMapboxMapsVersion = "10.16.2"
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -58,11 +58,15 @@ android {
         sourceSets {
             main {
                 java.srcDirs = ['src/main/java']
-                if (safeExtGet("RNMapboxMapsUseV11", false)) {
+                def majorMapboxVersion = safeExtGet("RNMapboxMapsVersion", defaultMapboxMapsVersion).split("\\.")[0] as Integer
+                if (majorMapboxVersion >= 11) {
                     java.srcDirs += 'src/main/mapbox-v11-compat/v11'
                 } else {
                     java.srcDirs += 'src/main/mapbox-v11-compat/v10'
                 }
+                if (safeExtGet("RNMapboxMapsUseV11", false)) {
+                    logger.warn("RNMapboxMapsUseV11 is deprecated, just set RNMapboxMapsVersion to 11.*")
+                }
             }
         }
 

package/android/install.md

@@ -2,7 +2,8 @@
 
 ## Supported mapbox libraries
 
-We're only supporting mabpox 10.0 releases. 11.0 beta has experimental support.
+We're only supporting mapbox 10.16* and 11.*. The default is 10.16*. 
+Next release will be 11.* only so we recommend updatign to 11.*
 
 ### Adding mapbox maven repo
 
@@ -35,31 +36,17 @@ allprojects {
 }
 ```
 
-### Setting Mapbox implementation
-
-Note 10.1 or later only supports mapbox 10 and 11 implementations. So you no longer need to set this variable:
-
-Set `RNMapboxMapsImpl` in `android/build.gradle > buildscript > ext` section
-
-```groovy
-buildscript {
-    ext {
-        RNMapboxMapsImpl = 'mapbox'
-    }
-}
-```
-
 ### Using non default mapbox version
 
 *Warning*: If you set a custom version, make sure you revisit, any time you update @rnmapbox/maps. Setting it to earlier version than what we exepect will likely result in a build error.
 
-Set `RNMapboxMapsLibs` in `android/build.gradle > buildscript > ext` section
+Set `RNMapboxMapsVersion` in `android/build.gradle > buildscript > ext` section
 
 
 ```groovy
 buildscript {
     ext {
-        RNMapboxMapsVersion = '10.6.0'
+        RNMapboxMapsVersion = '11.0.0'
     }
 }
 ```
@@ -83,14 +70,11 @@ buildscript {
 ```groovy
 buildscript {
     ext {
-        RNMapboxMapsUseV11 = true
-        RNMapboxMapsVersion = '10.6.0'
+        RNMapboxMapsVersion = '11.0.0'
     }
 }
 ```
 
-
-
 # Troubleshooting
 
 If you see `2 files found with path 'lib/arm64-v8a/libc++_shared.so' from inputs` issue see [possible workaround](#workaround-for-2-files-found-with-path-libarm64-v8alibc_sharedso-from-inputs).

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.rnmapbox.rnmbx">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

package/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt

@@ -8,13 +8,18 @@ import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
 import com.rnmapbox.rnmbx.components.annotation.RNMBXCalloutManager
+import com.rnmapbox.rnmbx.components.annotation.RNMBXMarkerViewContentManager
 import com.rnmapbox.rnmbx.components.annotation.RNMBXMarkerViewManager
 import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotationManager
 import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotationModule
 import com.rnmapbox.rnmbx.components.camera.RNMBXCameraManager
+import com.rnmapbox.rnmbx.components.camera.RNMBXViewport
+import com.rnmapbox.rnmbx.components.camera.RNMBXViewportManager
+import com.rnmapbox.rnmbx.components.camera.RNMBXViewportModule
 import com.rnmapbox.rnmbx.components.images.RNMBXImageManager
 import com.rnmapbox.rnmbx.components.images.RNMBXImageModule
 import com.rnmapbox.rnmbx.components.images.RNMBXImagesManager
+import com.rnmapbox.rnmbx.components.location.RNMBXCustomLocationProviderManager
 import com.rnmapbox.rnmbx.components.location.RNMBXNativeUserLocationManager
 import com.rnmapbox.rnmbx.components.mapview.NativeMapViewModule
 import com.rnmapbox.rnmbx.components.mapview.RNMBXMapViewManager
@@ -26,10 +31,12 @@ import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillExtrusionLayerManage
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXHeatmapLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXLineLayerManager
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXModelLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXRasterLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXSkyLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXSymbolLayerManager
 import com.rnmapbox.rnmbx.components.styles.light.RNMBXLightManager
+import com.rnmapbox.rnmbx.components.styles.model.RNMBXModelsManager
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXImageSourceManager
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterDemSourceManager
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterSourceManager
@@ -41,22 +48,40 @@ import com.rnmapbox.rnmbx.modules.RNMBXLocationModule
 import com.rnmapbox.rnmbx.modules.RNMBXLogging
 import com.rnmapbox.rnmbx.modules.RNMBXModule
 import com.rnmapbox.rnmbx.modules.RNMBXOfflineModule
+import com.rnmapbox.rnmbx.modules.RNMBXOfflineModuleLegacy
 import com.rnmapbox.rnmbx.modules.RNMBXSnapshotModule
+import com.rnmapbox.rnmbx.shape_animators.RNMBXMovePointShapeAnimatorModule
+import com.rnmapbox.rnmbx.shape_animators.ShapeAnimatorManager
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
 
 class RNMBXPackage : TurboReactPackage() {
 
     var viewTagResolver: ViewTagResolver? = null
-    fun getViewTagResolver(context: ReactApplicationContext) : ViewTagResolver {
+    fun getViewTagResolver(context: ReactApplicationContext, module: String) : ViewTagResolver {
         val viewTagResolver = viewTagResolver
         if (viewTagResolver == null) {
-            val viewTagResolver = ViewTagResolver(context)
-            this.viewTagResolver = viewTagResolver
-            return viewTagResolver
+            val result = ViewTagResolver(context)
+            this.viewTagResolver = result
+            return result
         }
         return viewTagResolver
     }
 
+    var shapeAnimators: ShapeAnimatorManager? = null
+    fun getShapeAnimators(module: String): ShapeAnimatorManager {
+        val shapeAnimators = shapeAnimators
+        if (shapeAnimators == null) {
+            val result = ShapeAnimatorManager()
+            this.shapeAnimators = result
+            return result
+        }
+        return shapeAnimators
+    }
+
+    fun resetViewTagResolver() {
+        viewTagResolver = null
+    }
+
     override fun getModule(
         s: String,
         reactApplicationContext: ReactApplicationContext
@@ -65,12 +90,15 @@ class RNMBXPackage : TurboReactPackage() {
             RNMBXModule.REACT_CLASS -> return RNMBXModule(reactApplicationContext)
             RNMBXLocationModule.REACT_CLASS -> return RNMBXLocationModule(reactApplicationContext)
             RNMBXOfflineModule.REACT_CLASS -> return RNMBXOfflineModule(reactApplicationContext)
+            RNMBXOfflineModuleLegacy.REACT_CLASS -> return RNMBXOfflineModuleLegacy(reactApplicationContext)
             RNMBXSnapshotModule.REACT_CLASS -> return RNMBXSnapshotModule(reactApplicationContext)
             RNMBXLogging.REACT_CLASS -> return RNMBXLogging(reactApplicationContext)
-            NativeMapViewModule.NAME -> return NativeMapViewModule(reactApplicationContext, getViewTagResolver(reactApplicationContext))
-            RNMBXShapeSourceModule.NAME -> return RNMBXShapeSourceModule(reactApplicationContext, getViewTagResolver(reactApplicationContext))
-            RNMBXImageModule.NAME -> return RNMBXImageModule(reactApplicationContext, getViewTagResolver(reactApplicationContext))
-            RNMBXPointAnnotationModule.NAME -> return RNMBXPointAnnotationModule(reactApplicationContext, getViewTagResolver(reactApplicationContext))
+            NativeMapViewModule.NAME -> return NativeMapViewModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
+            RNMBXViewportModule.NAME -> return RNMBXViewportModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
+            RNMBXShapeSourceModule.NAME -> return RNMBXShapeSourceModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
+            RNMBXImageModule.NAME -> return RNMBXImageModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
+            RNMBXPointAnnotationModule.NAME -> return RNMBXPointAnnotationModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
+            RNMBXMovePointShapeAnimatorModule.NAME -> return RNMBXMovePointShapeAnimatorModule(reactApplicationContext, getShapeAnimators(s))
         }
         return null
     }
@@ -85,25 +113,32 @@ class RNMBXPackage : TurboReactPackage() {
 
         // components
         managers.add(RNMBXCameraManager(reactApplicationContext))
-        managers.add(RNMBXMapViewManager(reactApplicationContext, getViewTagResolver(reactApplicationContext)))
+        managers.add(RNMBXViewportManager(reactApplicationContext))
+        managers.add(RNMBXMapViewManager(reactApplicationContext, getViewTagResolver(reactApplicationContext, "RNMBXMapViewManager")))
         managers.add(RNMBXStyleImportManager(reactApplicationContext))
+        managers.add(RNMBXModelsManager(reactApplicationContext))
 
         // annotations
         managers.add(RNMBXMarkerViewManager(reactApplicationContext))
-        managers.add(RNMBXPointAnnotationManager(reactApplicationContext, getViewTagResolver(reactApplicationContext)))
+        managers.add(RNMBXMarkerViewContentManager(reactApplicationContext))
+        managers.add(RNMBXPointAnnotationManager(reactApplicationContext, getViewTagResolver(reactApplicationContext, "RNMBXPointAnnotationManager")))
         managers.add(RNMBXCalloutManager())
         managers.add(RNMBXNativeUserLocationManager())
+        managers.add(RNMBXCustomLocationProviderManager())
 
         // sources
         managers.add(RNMBXVectorSourceManager(reactApplicationContext))
-        managers.add(RNMBXShapeSourceManager(reactApplicationContext, getViewTagResolver(reactApplicationContext)))
+        managers.add(RNMBXShapeSourceManager(reactApplicationContext,
+            getViewTagResolver(reactApplicationContext, "RNMBXShapeSourceManager"),
+            getShapeAnimators("RNMBXShapeSourceManager")
+            ))
         managers.add(RNMBXRasterDemSourceManager(reactApplicationContext))
         managers.add(RNMBXRasterSourceManager(reactApplicationContext))
         managers.add(RNMBXImageSourceManager())
 
         // images
         managers.add(RNMBXImagesManager(reactApplicationContext))
-        managers.add(RNMBXImageManager(reactApplicationContext, getViewTagResolver(reactApplicationContext)))
+        managers.add(RNMBXImageManager(reactApplicationContext, getViewTagResolver(reactApplicationContext, "RNMBXImageManager")))
 
         // layers
         managers.add(RNMBXFillLayerManager())
@@ -118,10 +153,12 @@ class RNMBXPackage : TurboReactPackage() {
         managers.add(RNMBXAtmosphereManager())
         managers.add(RNMBXBackgroundLayerManager())
         managers.add(RNMBXLightManager())
+        managers.add(RNMBXModelLayerManager())
         return managers
     }
 
     override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+        resetViewTagResolver()
         return ReactModuleInfoProvider {
             val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
             val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
@@ -152,6 +189,15 @@ class RNMBXPackage : TurboReactPackage() {
                 false,  // isCxxModule
                 false // isTurboModule
             )
+            moduleInfos[RNMBXOfflineModuleLegacy.REACT_CLASS] = ReactModuleInfo(
+                RNMBXOfflineModuleLegacy.REACT_CLASS,
+                RNMBXOfflineModuleLegacy.REACT_CLASS,
+                false,  // canOverrideExistingModule
+                false,  // needsEagerInit
+                true,  // hasConstants
+                false,  // isCxxModule
+                false // isTurboModule
+            )
             moduleInfos[RNMBXSnapshotModule.REACT_CLASS] = ReactModuleInfo(
                 RNMBXSnapshotModule.REACT_CLASS,
                 RNMBXSnapshotModule.REACT_CLASS,
@@ -179,6 +225,15 @@ class RNMBXPackage : TurboReactPackage() {
                 false,  // isCxxModule
                 isTurboModule // isTurboModule
             )
+            moduleInfos[RNMBXViewportModule.NAME] = ReactModuleInfo(
+                RNMBXViewportModule.NAME,
+                RNMBXViewportModule.NAME,
+                false,  // canOverrideExistingModule
+                false,  // needsEagerInit
+                false,  // hasConstants
+                false,  // isCxxModule
+                isTurboModule // isTurboModule
+            )
             moduleInfos[RNMBXShapeSourceModule.NAME] = ReactModuleInfo(
                 RNMBXShapeSourceModule.NAME,
                 RNMBXShapeSourceModule.NAME,
@@ -206,6 +261,15 @@ class RNMBXPackage : TurboReactPackage() {
                 false,  // isCxxModule
                 isTurboModule // isTurboModule
             )
+            moduleInfos[RNMBXMovePointShapeAnimatorModule.NAME] = ReactModuleInfo(
+                RNMBXMovePointShapeAnimatorModule.NAME,
+                RNMBXMovePointShapeAnimatorModule.NAME,
+                false,
+                false,
+                false,
+                false,
+                isTurboModule
+            )
             moduleInfos
         }
     }

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

@@ -0,0 +1,24 @@
+package com.rnmapbox.rnmbx.components
+
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+class AbstractEvent(
+    viewId: Int,
+    private val mEventName: String,
+    private val mCanCoalesce: Boolean,
+    private val mEvent: WritableMap?
+) : Event<AbstractEvent>(viewId) {
+    override fun getEventName(): String {
+        return mEventName
+    }
+
+    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
+        rctEventEmitter.receiveEvent(viewTag, eventName, mEvent)
+    }
+
+    override fun canCoalesce(): Boolean {
+        return mCanCoalesce
+    }
+}

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

@@ -7,6 +7,7 @@ import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.events.Event
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.rnmapbox.rnmbx.events.IEvent
 
@@ -27,6 +28,10 @@ abstract class AbstractEventEmitter<T : ViewGroup?>(reactApplicationContext: Rea
     val activity : Activity?
         get() = mRCTAppContext.currentActivity
 
+    fun <T : Event<T>>dispatchEvent(event: Event<T>) {
+        mEventDispatcher!!.dispatchEvent(event)
+    }
+
     fun handleEvent(event: IEvent) {
         val eventCacheKey = getEventCacheKey(event)
 

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

@@ -16,6 +16,7 @@ import com.rnmapbox.rnmbx.components.RemovalReason
 import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 import com.rnmapbox.rnmbx.utils.Logger
 import java.util.Vector
+import com.rnmapbox.rnmbx.v11compat.annotation.*
 
 private data class Vec2(val dx: Double, val dy: Double)
 
@@ -30,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?) {
@@ -47,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()
@@ -115,11 +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() {
@@ -169,13 +179,14 @@ class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewMa
         val offset = getOffset()
 
         val options = viewAnnotationOptions {
-            geometry(coordinate)
-            width(width)
-            height(height)
+            coordinate?.let { geometry(it) }
+            width(width.toDouble())
+            height(height.toDouble())
             allowOverlap(mAllowOverlap)
-            offsetX(offset.dx.toInt())
-            offsetY(offset.dy.toInt())
+            allowOverlapWithPuck(mAllowOverlapWithPuck)
+            offsets(offset.dx, offset.dy)
             selected(mIsSelected)
+
         }
         return options
     }

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

@@ -0,0 +1,31 @@
+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) {
+        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)
+        }
+    }
+
+}
+

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

@@ -0,0 +1,23 @@
+package com.rnmapbox.rnmbx.components.annotation
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.viewmanagers.RNMBXMarkerViewContentManagerInterface
+
+
+class RNMBXMarkerViewContentManager(reactApplicationContext: ReactApplicationContext) :
+    ViewGroupManager<RNMBXMarkerViewContent>(),
+    RNMBXMarkerViewContentManagerInterface<RNMBXMarkerView> {
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(context: ThemedReactContext): RNMBXMarkerViewContent {
+        return RNMBXMarkerViewContent(context)
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNMBXMarkerViewContent"
+    }
+}

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

@@ -13,9 +13,9 @@ import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.viewmanagers.RNMBXMarkerViewManagerDelegate
 import com.facebook.react.viewmanagers.RNMBXMarkerViewManagerInterface
 import com.mapbox.maps.ScreenCoordinate
-import com.mapbox.maps.viewannotation.OnViewAnnotationUpdatedListener
 import com.mapbox.maps.viewannotation.ViewAnnotationManager
 import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.v11compat.annotation.*
 
 class RNMBXMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
     AbstractEventEmitter<RNMBXMarkerView>(reactApplicationContext),
@@ -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())
@@ -69,7 +74,7 @@ class RNMBXMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
         fun markerViewContainerSizeFixer(mapView: RNMBXMapView, viewAnnotationManager: ViewAnnotationManager) {
             // see https://github.com/rnmapbox/maps/issues/2376
             viewAnnotationManager.addOnViewAnnotationUpdatedListener(object :
-                OnViewAnnotationUpdatedListener {
+                OnViewAnnotationUpdatedListener() {
                 override fun onViewAnnotationVisibilityUpdated(view: View, visible: Boolean) {
                     val parent = view.parent
                     if (parent is FrameLayout) {
@@ -79,13 +84,7 @@ class RNMBXMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
                     }
                 }
 
-                override fun onViewAnnotationPositionUpdated(
-                    view: View,
-                    leftTopCoordinate: ScreenCoordinate,
-                    width: Int,
-                    height: Int
-                ) {
-                }
+
             })
         }
     }