@rnmapbox/maps 10.3.1 → 10.3.2-rc.0

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

@@ -11,6 +11,7 @@ import com.mapbox.geojson.Point
 import com.mapbox.maps.ViewAnnotationAnchor
 import com.mapbox.maps.ViewAnnotationOptions
 import com.mapbox.maps.viewannotation.viewAnnotationOptions
+import com.facebook.react.uimanager.PointerEvents
 import com.rnmapbox.rnmbx.components.AbstractMapFeature
 import com.rnmapbox.rnmbx.components.RemovalReason
 import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
@@ -33,6 +34,7 @@ class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewMa
     private var mAllowOverlap = false
     private var mAllowOverlapWithPuck = false
     private var mIsSelected = false
+    private var mPointerEvents: PointerEvents = PointerEvents.AUTO
 
     fun setCoordinate(point: Point?) {
         mCoordinate = point
@@ -63,8 +65,14 @@ class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewMa
 
     // region View methods
 
+    fun setContentPointerEvents(pointerEvents: PointerEvents) {
+        mPointerEvents = pointerEvents
+        (mView as? RNMBXMarkerViewContent)?.setExternalPointerEvents(pointerEvents)
+    }
+
     override fun addView(childView: View, childPosition: Int) {
         mView = childView
+        (childView as? RNMBXMarkerViewContent)?.setExternalPointerEvents(mPointerEvents)
         // Note: Do not call this method on `super`. The view is added manually.
     }
 

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

@@ -6,12 +6,18 @@ import android.view.View.MeasureSpec
 import android.view.ViewGroup
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.views.view.ReactViewGroup
 import com.rnmapbox.rnmbx.components.camera.BaseEvent
 
 class RNMBXMarkerViewContent(context: Context): ReactViewGroup(context) {
     var inAdd: Boolean = false
+    private var externalPointerEvents: PointerEvents = PointerEvents.AUTO
+
+    fun setExternalPointerEvents(pointerEvents: PointerEvents) {
+        externalPointerEvents = pointerEvents
+    }
 
     // Track last reported translation to avoid feedback loop:
     // Mapbox sets setTranslationX(512) → we fire event → JS sets transform:[{translateX:512}]
@@ -29,6 +35,9 @@ class RNMBXMarkerViewContent(context: Context): ReactViewGroup(context) {
     }
 
     override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
+        if (externalPointerEvents == PointerEvents.NONE) {
+            return false
+        }
         // On ACTION_DOWN, tell the parent MapView not to intercept subsequent MOVE/UP
         // events for pan/zoom recognition — that would send CANCEL to child Pressables
         // and suppress onPress. Android resets the disallow flag on each new DOWN, so

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

@@ -2,13 +2,19 @@ package com.rnmapbox.rnmbx.components.annotation
 
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXMarkerViewContentManagerDelegate
 import com.facebook.react.viewmanagers.RNMBXMarkerViewContentManagerInterface
 import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 
 
 class RNMBXMarkerViewContentManager(reactApplicationContext: ReactApplicationContext) :
     AbstractEventEmitter<RNMBXMarkerViewContent>(reactApplicationContext),
-    RNMBXMarkerViewContentManagerInterface<RNMBXMarkerView> {
+    RNMBXMarkerViewContentManagerInterface<RNMBXMarkerViewContent> {
+
+    private val delegate = RNMBXMarkerViewContentManagerDelegate<RNMBXMarkerViewContent, RNMBXMarkerViewContentManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXMarkerViewContent> = delegate
 
     override fun getName(): String {
         return REACT_CLASS

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

@@ -8,8 +8,11 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.common.MapBuilder
+import com.facebook.react.uimanager.PointerEvents
+import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.uimanager.ViewProps
 import com.facebook.react.viewmanagers.RNMBXMarkerViewManagerDelegate
 import com.facebook.react.viewmanagers.RNMBXMarkerViewManagerInterface
 import com.mapbox.maps.ScreenCoordinate
@@ -72,6 +75,17 @@ class RNMBXMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
         markerView.setIsSelected(isSelected.asBoolean())
     }
 
+    override fun updateProperties(viewToUpdate: RNMBXMarkerView, props: ReactStylesDiffMap) {
+        super.updateProperties(viewToUpdate, props)
+        // The codegen delegate does not forward the standard `pointerEvents` ViewProp — it falls
+        // to BaseViewManagerDelegate which ignores it. Intercept it here so the marker content
+        // view (which lives in a separate Mapbox view hierarchy) can honour it.
+        if (props.hasKey(ViewProps.POINTER_EVENTS)) {
+            val pe = PointerEvents.parsePointerEvents(props.getString(ViewProps.POINTER_EVENTS))
+            viewToUpdate.setContentPointerEvents(pe)
+        }
+    }
+
     override fun createViewInstance(reactContext: ThemedReactContext): RNMBXMarkerView {
         return RNMBXMarkerView(reactContext, this)
     }

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

@@ -182,10 +182,13 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
 
     private fun updateMaxBounds(mapView: RNMBXMapView) {
         val map = mapView.getMapboxMap()
+        val currentBounds = map.getBounds()
         val builder = CameraBoundsOptions.Builder()
         builder.bounds(mMaxBounds?.toBounds())
         builder.minZoom(mMinZoomLevel ?: 0.0) // Passing null does not reset this value.
         builder.maxZoom(mMaxZoomLevel ?: 25.0) // Passing null does not reset this value.
+        builder.minPitch(currentBounds.minPitch)
+        builder.maxPitch(currentBounds.maxPitch)
         map.setBounds(builder.build())
         mCameraStop?.let { updateCamera(it, mapView) }
     }

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

@@ -15,11 +15,17 @@ import com.rnmapbox.rnmbx.utils.extensions.asDoubleOrNull
 import com.rnmapbox.rnmbx.utils.extensions.asStringOrNull
 import com.rnmapbox.rnmbx.rncompat.dynamic.*
 import com.rnmapbox.rnmbx.utils.Logger
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXCameraManagerDelegate
 
 class RNMBXCameraManager(private val mContext: ReactApplicationContext, val viewTagResolver: ViewTagResolver) :
     AbstractEventEmitter<RNMBXCamera>(
         mContext
     ), RNMBXCameraManagerInterface<RNMBXCamera> {
+
+    private val delegate = RNMBXCameraManagerDelegate<RNMBXCamera, RNMBXCameraManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXCamera> = delegate
     override fun customEvents(): Map<String, String>? {
         return HashMap()
     }

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

@@ -13,11 +13,17 @@ import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 import com.rnmapbox.rnmbx.events.constants.EventKeys
 import com.rnmapbox.rnmbx.events.constants.eventMapOf
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXViewportManagerDelegate
 
 class RNMBXViewportManager(private val mContext: ReactApplicationContext, val viewTagResolver: ViewTagResolver) : AbstractEventEmitter<RNMBXViewport>(
         mContext
     ), RNMBXViewportManagerInterface<RNMBXViewport> {
 
+    private val delegate = RNMBXViewportManagerDelegate<RNMBXViewport, RNMBXViewportManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXViewport> = delegate
+
     override fun getName(): String {
         return REACT_CLASS
     }

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

@@ -9,10 +9,16 @@ import com.facebook.react.viewmanagers.RNMBXImageManagerInterface
 import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXShapeSource
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXImageManagerDelegate
 
 class RNMBXImageManager(private val mContext: ReactApplicationContext, val viewTagResolver: ViewTagResolver) : AbstractEventEmitter<RNMBXImage>(
 mContext
 ), RNMBXImageManagerInterface<RNMBXImage> {
+
+    private val delegate = RNMBXImageManagerDelegate<RNMBXImage, RNMBXImageManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXImage> = delegate
     override fun getName(): String {
         return "RNMBXImage"
     }

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

@@ -20,11 +20,17 @@ import com.rnmapbox.rnmbx.utils.ResourceUtils
 import com.rnmapbox.rnmbx.utils.extensions.forEach
 import com.rnmapbox.rnmbx.utils.extensions.getIfDouble
 import java.util.*
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXImagesManagerDelegate
 
 class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
     AbstractEventEmitter<RNMBXImages>(
         mContext
     ), RNMBXImagesManagerInterface<RNMBXImages> {
+
+    private val delegate = RNMBXImagesManagerDelegate<RNMBXImages, RNMBXImagesManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXImages> = delegate
     override fun getName(): String {
         return "RNMBXImages"
     }

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

@@ -8,10 +8,16 @@ import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXCustomLocationProviderManagerInterface
 import com.rnmapbox.rnmbx.rncompat.dynamic.*
 import com.rnmapbox.rnmbx.utils.Logger
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXCustomLocationProviderManagerDelegate
 
 
 class RNMBXCustomLocationProviderManager : ViewGroupManager<RNMBXCustomLocationProvider>(),
     RNMBXCustomLocationProviderManagerInterface<RNMBXCustomLocationProvider> {
+
+    private val delegate = RNMBXCustomLocationProviderManagerDelegate<RNMBXCustomLocationProvider, RNMBXCustomLocationProviderManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXCustomLocationProvider> = delegate
     override fun getName(): String {
         return  REACT_CLASS
     }

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

@@ -20,9 +20,15 @@ import com.rnmapbox.rnmbx.utils.extensions.toJsonArray
 import java.io.StringWriter
 import javax.annotation.Nonnull
 import com.rnmapbox.rnmbx.v11compat.location.*
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXNativeUserLocationManagerDelegate
 
 class RNMBXNativeUserLocationManager : ViewGroupManager<RNMBXNativeUserLocation>(),
     RNMBXNativeUserLocationManagerInterface<RNMBXNativeUserLocation> {
+
+    private val delegate = RNMBXNativeUserLocationManagerDelegate<RNMBXNativeUserLocation, RNMBXNativeUserLocationManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXNativeUserLocation> = delegate
     @Nonnull
     override fun getName(): String {
         return REACT_CLASS

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

@@ -1357,6 +1357,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
     }
 
     var mScaleBarSettings = OrnamentSettings(enabled = false)
+    var mScaleBarUnits: String? = null
 
     fun setReactScaleBarEnabled(scaleBarEnabled: Boolean) {
         mScaleBarSettings.enabled = scaleBarEnabled
@@ -1378,9 +1379,21 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
         changes.add(Property.SCALEBAR)
     }
 
+    fun setReactScaleBarUnits(units: String?) {
+        mScaleBarUnits = units
+        changes.add(Property.SCALEBAR)
+    }
+
     private fun applyScaleBar() {
         mapView.scalebar.updateSettings {
             updateOrnament("scaleBar", mScaleBarSettings, this.toGenericOrnamentSettings())
+            mScaleBarUnits?.let { units ->
+                distanceUnits = when (units) {
+                    "imperial" -> com.mapbox.maps.plugin.DistanceUnits.IMPERIAL
+                    "nautical" -> com.mapbox.maps.plugin.DistanceUnits.NAUTICAL
+                    else -> com.mapbox.maps.plugin.DistanceUnits.METRIC
+                }
+            }
         }
         workaroundToRelayoutChildOfMapView()
     }

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

@@ -326,6 +326,11 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
         mapView.setReactScaleBarPosition(mapValue)
     }
 
+    @ReactProp(name = "scaleBarUnits")
+    override fun setScaleBarUnits(mapView: RNMBXMapView, scaleBarUnits: Dynamic) {
+        mapView.setReactScaleBarUnits(scaleBarUnits.asString())
+    }
+
     @ReactProp(name = "compassEnabled")
     override fun setCompassEnabled(mapView: RNMBXMapView, compassEnabled: Dynamic) {
         mapView.setReactCompassEnabled(compassEnabled.asBoolean())
@@ -428,7 +433,7 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
          * onDropViewInstance.
          */
         private fun diposeNativeMapView() {
-            val mapView = mViewManager.getByReactTag(reactTag)
+            val mapView = mViewManager.getByReactTag(getReactTag())
             if (mapView != null) {
                 UiThreadUtil.runOnUiThread {
                     try {

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

@@ -413,6 +413,12 @@ object RNMBXStyleFactory {
                 setTextOcclusionOpacityTransition(layer, styleValue)
               "iconColorSaturation" ->
                 setIconColorSaturation(layer, styleValue)
+              "iconColorContrast" ->
+                setIconColorContrast(layer, styleValue)
+              "iconColorBrightnessMin" ->
+                setIconColorBrightnessMin(layer, styleValue)
+              "iconColorBrightnessMax" ->
+                setIconColorBrightnessMax(layer, styleValue)
               "symbolZOffset" ->
                 setSymbolZOffset(layer, styleValue)
                 "symbolZOffsetTransition" ->
@@ -645,6 +651,8 @@ object RNMBXStyleFactory {
                 setFillExtrusionLineWidth(layer, styleValue)
                 "fillExtrusionLineWidthTransition" ->
                 setFillExtrusionLineWidthTransition(layer, styleValue)
+              "fillExtrusionCastShadows" ->
+                setFillExtrusionCastShadows(layer, styleValue)
           }
         } catch (e: MapboxStyleException) {
           Logger.e(LOG_TAG, "Failed to update: $styleKey ${e.message}")
@@ -791,6 +799,10 @@ object RNMBXStyleFactory {
                 setHillshadeAccentColor(layer, styleValue)
                 "hillshadeAccentColorTransition" ->
                 setHillshadeAccentColorTransition(layer, styleValue)
+              "hillshadeEmissiveStrength" ->
+                setHillshadeEmissiveStrength(layer, styleValue)
+                "hillshadeEmissiveStrengthTransition" ->
+                setHillshadeEmissiveStrengthTransition(layer, styleValue)
           }
         } catch (e: MapboxStyleException) {
           Logger.e(LOG_TAG, "Failed to update: $styleKey ${e.message}")
@@ -3195,6 +3207,60 @@ object RNMBXStyleFactory {
       }
     }
 
+    fun setIconColorContrast(layer: SymbolLayer, styleValue: RNMBXStyleValue ) {
+      if (styleValue.isExpression()) {
+        val expression = styleValue.getExpression()
+        if (expression != null) {
+          layer.iconColorContrast(expression)
+        } else {
+          Logger.e("RNMBXSymbol", "Expression for iconColorContrast is null")
+        }
+      } else {
+          val value = styleValue.getDouble(VALUE_KEY)
+          if (value != null) {
+            layer.iconColorContrast(value)
+          } else {
+            Logger.e("RNMBXSymbol", "value for iconColorContrast is null")
+          }
+      }
+    }
+
+    fun setIconColorBrightnessMin(layer: SymbolLayer, styleValue: RNMBXStyleValue ) {
+      if (styleValue.isExpression()) {
+        val expression = styleValue.getExpression()
+        if (expression != null) {
+          layer.iconColorBrightnessMin(expression)
+        } else {
+          Logger.e("RNMBXSymbol", "Expression for iconColorBrightnessMin is null")
+        }
+      } else {
+          val value = styleValue.getDouble(VALUE_KEY)
+          if (value != null) {
+            layer.iconColorBrightnessMin(value)
+          } else {
+            Logger.e("RNMBXSymbol", "value for iconColorBrightnessMin is null")
+          }
+      }
+    }
+
+    fun setIconColorBrightnessMax(layer: SymbolLayer, styleValue: RNMBXStyleValue ) {
+      if (styleValue.isExpression()) {
+        val expression = styleValue.getExpression()
+        if (expression != null) {
+          layer.iconColorBrightnessMax(expression)
+        } else {
+          Logger.e("RNMBXSymbol", "Expression for iconColorBrightnessMax is null")
+        }
+      } else {
+          val value = styleValue.getDouble(VALUE_KEY)
+          if (value != null) {
+            layer.iconColorBrightnessMax(value)
+          } else {
+            Logger.e("RNMBXSymbol", "value for iconColorBrightnessMax is null")
+          }
+      }
+    }
+
     fun setSymbolZOffset(layer: SymbolLayer, styleValue: RNMBXStyleValue ) {
       if (styleValue.isExpression()) {
         val expression = styleValue.getExpression()
@@ -4270,6 +4336,24 @@ object RNMBXStyleFactory {
       }
     }
 
+    fun setFillExtrusionCastShadows(layer: FillExtrusionLayer, styleValue: RNMBXStyleValue ) {
+      if (styleValue.isExpression()) {
+        val expression = styleValue.getExpression()
+        if (expression != null) {
+          layer.fillExtrusionCastShadows(expression)
+        } else {
+          Logger.e("RNMBXFillExtrusion", "Expression for fillExtrusionCastShadows is null")
+        }
+      } else {
+          val value = styleValue.getBoolean(VALUE_KEY)
+          if (value != null) {
+            layer.fillExtrusionCastShadows(value)
+          } else {
+            Logger.e("RNMBXFillExtrusion", "value for fillExtrusionCastShadows is null")
+          }
+      }
+    }
+
     fun setVisibility(layer: RasterLayer, styleValue: RNMBXStyleValue ) {
         layer.visibility(Visibility.valueOf(styleValue.getEnumName()));
     }
@@ -4881,6 +4965,32 @@ object RNMBXStyleFactory {
       }
     }
 
+    fun setHillshadeEmissiveStrength(layer: HillshadeLayer, styleValue: RNMBXStyleValue ) {
+      if (styleValue.isExpression()) {
+        val expression = styleValue.getExpression()
+        if (expression != null) {
+          layer.hillshadeEmissiveStrength(expression)
+        } else {
+          Logger.e("RNMBXHillshade", "Expression for hillshadeEmissiveStrength is null")
+        }
+      } else {
+          val value = styleValue.getDouble(VALUE_KEY)
+          if (value != null) {
+            layer.hillshadeEmissiveStrength(value)
+          } else {
+            Logger.e("RNMBXHillshade", "value for hillshadeEmissiveStrength is null")
+          }
+      }
+    }
+
+
+    fun setHillshadeEmissiveStrengthTransition(layer: HillshadeLayer, styleValue: RNMBXStyleValue) {
+      val transition = styleValue.transition
+      if (transition != null) {
+        layer.hillshadeEmissiveStrengthTransition(transition);
+      }
+    }
+
     fun setModelAllowDensityReduction(layer: ModelLayer, styleValue: RNMBXStyleValue ) {
       if (styleValue.isExpression()) {
         val expression = styleValue.getExpression()

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

@@ -15,10 +15,16 @@ import com.rnmapbox.rnmbx.rncompat.dynamic.*
 import com.rnmapbox.rnmbx.utils.Logger
 import com.rnmapbox.rnmbx.utils.extensions.toValueHashMap
 import org.json.JSONObject
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXStyleImportManagerDelegate
 
 class RNMBXStyleImportManager(context: ReactApplicationContext) :
     AbstractEventEmitter<RNMBXStyleImport>(context),
     RNMBXStyleImportManagerInterface<RNMBXStyleImport> {
+
+    private val delegate = RNMBXStyleImportManagerDelegate<RNMBXStyleImport, RNMBXStyleImportManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXStyleImport> = delegate
     override fun customEvents(): Map<String, String>? {
         return MapBuilder.builder<String, String>().build()
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXBackgroundLayerManager.kt

@@ -5,9 +5,15 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXBackgroundLayerManagerInterface
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXBackgroundLayerManagerDelegate
 
 class RNMBXBackgroundLayerManager : ViewGroupManager<RNMBXBackgroundLayer>(),
     RNMBXBackgroundLayerManagerInterface<RNMBXBackgroundLayer> {
+
+    private val delegate = RNMBXBackgroundLayerManagerDelegate<RNMBXBackgroundLayer, RNMBXBackgroundLayerManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXBackgroundLayer> = delegate
     override fun getName(): String {
         return REACT_CLASS
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXCircleLayerManager.kt

@@ -5,10 +5,16 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXCircleLayerManagerInterface
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXCircleLayerManagerDelegate
 
 class RNMBXCircleLayerManager : ViewGroupManager<RNMBXCircleLayer>(),
     RNMBXCircleLayerManagerInterface<RNMBXCircleLayer> {
 
+    private val delegate = RNMBXCircleLayerManagerDelegate<RNMBXCircleLayer, RNMBXCircleLayerManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXCircleLayer> = delegate
+
     override fun getName(): String {
         return REACT_CLASS
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXFillExtrusionLayerManager.kt

@@ -5,9 +5,15 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXFillExtrusionLayerManagerInterface
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXFillExtrusionLayerManagerDelegate
 
 class RNMBXFillExtrusionLayerManager : ViewGroupManager<RNMBXFillExtrusionLayer>(),
     RNMBXFillExtrusionLayerManagerInterface<RNMBXFillExtrusionLayer> {
+
+    private val delegate = RNMBXFillExtrusionLayerManagerDelegate<RNMBXFillExtrusionLayer, RNMBXFillExtrusionLayerManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXFillExtrusionLayer> = delegate
     override fun getName(): String {
         return REACT_CLASS
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXFillLayerManager.kt

@@ -5,9 +5,15 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXFillLayerManagerInterface
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXFillLayerManagerDelegate
 
 class RNMBXFillLayerManager : ViewGroupManager<RNMBXFillLayer>(),
     RNMBXFillLayerManagerInterface<RNMBXFillLayer> {
+
+    private val delegate = RNMBXFillLayerManagerDelegate<RNMBXFillLayer, RNMBXFillLayerManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXFillLayer> = delegate
     override fun getName(): String {
         return REACT_CLASS
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXHeatmapLayerManager.kt

@@ -5,9 +5,15 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXHeatmapLayerManagerInterface
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXHeatmapLayerManagerDelegate
 
 class RNMBXHeatmapLayerManager : ViewGroupManager<RNMBXHeatmapLayer>(),
     RNMBXHeatmapLayerManagerInterface<RNMBXHeatmapLayer> {
+
+    private val delegate = RNMBXHeatmapLayerManagerDelegate<RNMBXHeatmapLayer, RNMBXHeatmapLayerManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXHeatmapLayer> = delegate
     override fun getName(): String {
         return REACT_CLASS
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXHillshadeLayerManager.kt

@@ -5,9 +5,15 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXHillshadeLayerManagerInterface
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXHillshadeLayerManagerDelegate
 
 class RNMBXHillshadeLayerManager : ViewGroupManager<RNMBXHillshadeLayer>(),
     RNMBXHillshadeLayerManagerInterface<RNMBXHillshadeLayer> {
+
+    private val delegate = RNMBXHillshadeLayerManagerDelegate<RNMBXHillshadeLayer, RNMBXHillshadeLayerManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXHillshadeLayer> = delegate
     override fun getName(): String {
         return REACT_CLASS
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXLineLayerManager.kt

@@ -5,9 +5,15 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXLineLayerManagerInterface
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXLineLayerManagerDelegate
 
 class RNMBXLineLayerManager : ViewGroupManager<RNMBXLineLayer>(),
     RNMBXLineLayerManagerInterface<RNMBXLineLayer> {
+
+    private val delegate = RNMBXLineLayerManagerDelegate<RNMBXLineLayer, RNMBXLineLayerManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXLineLayer> = delegate
     override fun getName(): String {
         return REACT_CLASS
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXModelLayerManager.kt

@@ -6,10 +6,16 @@ import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXModelLayerManagerInterface
 import com.rnmapbox.rnmbx.utils.Logger
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXModelLayerManagerDelegate
 
 
 class RNMBXModelLayerManager : ViewGroupManager<RNMBXModelLayer>(),
     RNMBXModelLayerManagerInterface<RNMBXModelLayer> {
+
+    private val delegate = RNMBXModelLayerManagerDelegate<RNMBXModelLayer, RNMBXModelLayerManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXModelLayer> = delegate
     override fun getName(): String {
         return REACT_CLASS
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXRasterLayerManager.kt

@@ -5,9 +5,15 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXRasterLayerManagerInterface
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXRasterLayerManagerDelegate
 
 class RNMBXRasterLayerManager : ViewGroupManager<RNMBXRasterLayer>(),
     RNMBXRasterLayerManagerInterface<RNMBXRasterLayer> {
+
+    private val delegate = RNMBXRasterLayerManagerDelegate<RNMBXRasterLayer, RNMBXRasterLayerManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXRasterLayer> = delegate
     override fun getName(): String {
         return REACT_CLASS
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXSkyLayerManager.kt

@@ -5,9 +5,15 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXSkyLayerManagerInterface
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXSkyLayerManagerDelegate
 
 class RNMBXSkyLayerManager : ViewGroupManager<RNMBXSkyLayer>(),
     RNMBXSkyLayerManagerInterface<RNMBXSkyLayer> {
+
+    private val delegate = RNMBXSkyLayerManagerDelegate<RNMBXSkyLayer, RNMBXSkyLayerManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXSkyLayer> = delegate
     override fun getName(): String {
         return REACT_CLASS
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXSymbolLayerManager.kt

@@ -5,9 +5,15 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXSymbolLayerManagerInterface
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXSymbolLayerManagerDelegate
 
 class RNMBXSymbolLayerManager : ViewGroupManager<RNMBXSymbolLayer>(),
     RNMBXSymbolLayerManagerInterface<RNMBXSymbolLayer> {
+
+    private val delegate = RNMBXSymbolLayerManagerDelegate<RNMBXSymbolLayer, RNMBXSymbolLayerManager>(this)
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXSymbolLayer> = delegate
     override fun getName(): String {
         return REACT_CLASS
     }