@rnmapbox/maps 10.1.0-beta.9 → 10.1.0-rc.0

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

@@ -17,7 +17,7 @@ class RNMBXAtmosphere(context: Context?) : AbstractSourceConsumer(context) {
     override var iD: String? = null
     protected var mAtmosphere: Atmosphere? = null
 
-    // beginregion RCTLayer
+    // beginregion RNMBXLayer
     @JvmField
     protected var mMap: MapboxMap? = null
 
@@ -30,7 +30,7 @@ class RNMBXAtmosphere(context: Context?) : AbstractSourceConsumer(context) {
             addStyles()
         }
     }
-    // endregion RCTLayer
+    // endregion RNMBXLayer
 
     override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)

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

@@ -1,11 +1,25 @@
 package com.rnmapbox.rnmbx.components.styles.atmosphere
 
-import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.Dynamic
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXAtmosphereManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXAtmosphereManagerInterface
+
+class RNMBXAtmosphereManager : ViewGroupManager<RNMBXAtmosphere>(), RNMBXAtmosphereManagerInterface<RNMBXAtmosphere> {
+
+    private val mDelegate: ViewManagerDelegate<RNMBXAtmosphere>
+
+    init {
+        mDelegate = RNMBXAtmosphereManagerDelegate(this)
+    }
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXAtmosphere> {
+        return mDelegate
+    }
 
-class RNMBXAtmosphereManager : ViewGroupManager<RNMBXAtmosphere>() {
     override fun getName(): String {
         return REACT_CLASS
     }
@@ -14,14 +28,9 @@ class RNMBXAtmosphereManager : ViewGroupManager<RNMBXAtmosphere>() {
         return RNMBXAtmosphere(reactContext)
     }
 
-    @ReactProp(name = "id")
-    fun setId(layer: RNMBXAtmosphere, id: String?) {
-        layer.iD = id
-    }
-
     @ReactProp(name = "reactStyle")
-    fun setReactStyle(atmosphere: RNMBXAtmosphere, reactStyle: ReadableMap?) {
-        atmosphere.setReactStyle(reactStyle)
+    override fun setReactStyle(atmosphere: RNMBXAtmosphere, reactStyle: Dynamic) {
+        atmosphere.setReactStyle(reactStyle.asMap())
     }
 
     companion object {

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

@@ -6,7 +6,7 @@ import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
 import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
 import com.rnmapbox.rnmbx.utils.Logger
 
-class RNMBXBackgroundLayer(context: Context?) : RCTLayer<BackgroundLayer?>(
+class RNMBXBackgroundLayer(context: Context?) : RNMBXLayer<BackgroundLayer?>(
     context!!
 ) {
     override fun makeLayer(): BackgroundLayer {

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

@@ -1,11 +1,13 @@
 package com.rnmapbox.rnmbx.components.styles.layers
 
-import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.Dynamic
 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
 
-class RNMBXBackgroundLayerManager : ViewGroupManager<RNMBXBackgroundLayer>() {
+class RNMBXBackgroundLayerManager : ViewGroupManager<RNMBXBackgroundLayer>(),
+    RNMBXBackgroundLayerManagerInterface<RNMBXBackgroundLayer> {
     override fun getName(): String {
         return REACT_CLASS
     }
@@ -15,48 +17,53 @@ class RNMBXBackgroundLayerManager : ViewGroupManager<RNMBXBackgroundLayer>() {
     }
 
     @ReactProp(name = "id")
-    fun setId(layer: RNMBXBackgroundLayer, id: String?) {
-        layer.iD = id
+    override fun setId(layer: RNMBXBackgroundLayer, id: Dynamic) {
+        layer.iD = id.asString()
     }
 
     @ReactProp(name = "existing")
-    fun setExisting(layer: RNMBXBackgroundLayer, existing: Boolean) {
-        layer.setExisting(existing)
+    override fun setExisting(layer: RNMBXBackgroundLayer, existing: Dynamic) {
+        layer.setExisting(existing.asBoolean())
     }
 
     @ReactProp(name = "sourceID")
-    fun setSourceID(layer: RNMBXBackgroundLayer, sourceID: String?) {
-        layer.setSourceID(sourceID)
+    override fun setSourceID(layer: RNMBXBackgroundLayer, sourceID: Dynamic) {
+        layer.setSourceID(sourceID.asString())
     }
 
     @ReactProp(name = "aboveLayerID")
-    fun setAboveLayerID(layer: RNMBXBackgroundLayer, aboveLayerID: String?) {
-        layer.setAboveLayerID(aboveLayerID)
+    override fun setAboveLayerID(layer: RNMBXBackgroundLayer, aboveLayerID: Dynamic) {
+        layer.setAboveLayerID(aboveLayerID.asString())
     }
 
     @ReactProp(name = "belowLayerID")
-    fun setBelowLayerID(layer: RNMBXBackgroundLayer, belowLayerID: String?) {
-        layer.setBelowLayerID(belowLayerID)
+    override fun setBelowLayerID(layer: RNMBXBackgroundLayer, belowLayerID: Dynamic) {
+        layer.setBelowLayerID(belowLayerID.asString())
     }
 
     @ReactProp(name = "layerIndex")
-    fun setLayerIndex(layer: RNMBXBackgroundLayer, layerIndex: Int) {
-        layer.setLayerIndex(layerIndex)
+    override fun setLayerIndex(layer: RNMBXBackgroundLayer, layerIndex: Dynamic) {
+        layer.setLayerIndex(layerIndex.asInt())
     }
 
     @ReactProp(name = "minZoomLevel")
-    fun setMinZoomLevel(layer: RNMBXBackgroundLayer, minZoomLevel: Double) {
-        layer.setMinZoomLevel(minZoomLevel)
+    override fun setMinZoomLevel(layer: RNMBXBackgroundLayer, minZoomLevel: Dynamic) {
+        layer.setMinZoomLevel(minZoomLevel.asDouble())
     }
 
     @ReactProp(name = "maxZoomLevel")
-    fun setMaxZoomLevel(layer: RNMBXBackgroundLayer, maxZoomLevel: Double) {
-        layer.setMaxZoomLevel(maxZoomLevel)
+    override fun setMaxZoomLevel(layer: RNMBXBackgroundLayer, maxZoomLevel: Dynamic) {
+        layer.setMaxZoomLevel(maxZoomLevel.asDouble())
     }
 
     @ReactProp(name = "reactStyle")
-    fun setReactStyle(layer: RNMBXBackgroundLayer, style: ReadableMap?) {
-        layer.setReactStyle(style)
+    override fun setReactStyle(layer: RNMBXBackgroundLayer, style: Dynamic) {
+        layer.setReactStyle(style.asMap())
+    }
+
+    @ReactProp(name = "filter")
+    override fun setFilter(layer: RNMBXBackgroundLayer, filterList: Dynamic) {
+        layer.setFilter(filterList.asArray())
     }
 
     companion object {

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

@@ -8,7 +8,7 @@ import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
 import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
 import com.rnmapbox.rnmbx.utils.Logger
 
-class RNMBXCircleLayer(context: Context?) : RCTLayer<CircleLayer?>(
+class RNMBXCircleLayer(context: Context?) : RNMBXLayer<CircleLayer?>(
     context!!
 ) {
     private var mSourceLayerID: String? = null

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

@@ -1,12 +1,14 @@
 package com.rnmapbox.rnmbx.components.styles.layers
 
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.Dynamic
 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
+
+class RNMBXCircleLayerManager : ViewGroupManager<RNMBXCircleLayer>(),
+    RNMBXCircleLayerManagerInterface<RNMBXCircleLayer> {
 
-class RNMBXCircleLayerManager : ViewGroupManager<RNMBXCircleLayer>() {
     override fun getName(): String {
         return REACT_CLASS
     }
@@ -15,60 +17,67 @@ class RNMBXCircleLayerManager : ViewGroupManager<RNMBXCircleLayer>() {
         return RNMBXCircleLayer(reactContext)
     }
 
+    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXCircleLayer"})}
     @ReactProp(name = "id")
-    fun setId(layer: RNMBXCircleLayer, id: String?) {
-        layer.iD = id
+    override fun setId(layer: RNMBXCircleLayer, id: Dynamic) {
+        layer.iD = id.asString()
     }
 
     @ReactProp(name = "existing")
-    fun setExisting(layer: RNMBXCircleLayer, existing: Boolean) {
-        layer.setExisting(existing)
+    override fun setExisting(layer: RNMBXCircleLayer, existing: Dynamic) {
+        layer.setExisting(existing.asBoolean())
     }
 
     @ReactProp(name = "sourceID")
-    fun setSourceID(layer: RNMBXCircleLayer, sourceID: String?) {
-        layer.setSourceID(sourceID)
+    override fun setSourceID(layer: RNMBXCircleLayer, sourceID: Dynamic) {
+        layer.setSourceID(sourceID.asString())
     }
 
     @ReactProp(name = "aboveLayerID")
-    fun setAboveLayerID(layer: RNMBXCircleLayer, aboveLayerID: String?) {
-        layer.setAboveLayerID(aboveLayerID)
+    override fun setAboveLayerID(layer: RNMBXCircleLayer, aboveLayerID: Dynamic) {
+        layer.setAboveLayerID(aboveLayerID.asString())
     }
 
     @ReactProp(name = "belowLayerID")
-    fun setBelowLayerID(layer: RNMBXCircleLayer, belowLayerID: String?) {
-        layer.setBelowLayerID(belowLayerID)
+    override fun setBelowLayerID(layer: RNMBXCircleLayer, belowLayerID: Dynamic) {
+        layer.setBelowLayerID(belowLayerID.asString())
     }
 
     @ReactProp(name = "layerIndex")
-    fun setLayerIndex(layer: RNMBXCircleLayer, layerIndex: Int) {
-        layer.setLayerIndex(layerIndex)
+    override fun setLayerIndex(layer: RNMBXCircleLayer, layerIndex: Dynamic) {
+        layer.setLayerIndex(layerIndex.asInt())
     }
 
     @ReactProp(name = "minZoomLevel")
-    fun setMinZoomLevel(layer: RNMBXCircleLayer, minZoomLevel: Double) {
-        layer.setMinZoomLevel(minZoomLevel)
+    override fun setMinZoomLevel(layer: RNMBXCircleLayer, minZoomLevel: Dynamic) {
+        layer.setMinZoomLevel(minZoomLevel.asDouble())
     }
 
     @ReactProp(name = "maxZoomLevel")
-    fun setMaxZoomLevel(layer: RNMBXCircleLayer, maxZoomLevel: Double) {
-        layer.setMaxZoomLevel(maxZoomLevel)
+    override fun setMaxZoomLevel(layer: RNMBXCircleLayer, maxZoomLevel: Dynamic) {
+        layer.setMaxZoomLevel(maxZoomLevel.asDouble())
     }
 
     @ReactProp(name = "reactStyle")
-    fun setReactStyle(layer: RNMBXCircleLayer, style: ReadableMap?) {
-        layer.setReactStyle(style)
+    override fun setReactStyle(layer: RNMBXCircleLayer, style: Dynamic) {
+        layer.setReactStyle(style.asMap())
     }
 
     @ReactProp(name = "sourceLayerID")
-    fun setSourceLayerId(layer: RNMBXCircleLayer, sourceLayerID: String?) {
-        layer.setSourceLayerID(sourceLayerID)
+    override fun setSourceLayerID(layer: RNMBXCircleLayer, sourceLayerID: Dynamic) {
+        layer.setSourceLayerID(sourceLayerID.asString())
     }
 
     @ReactProp(name = "filter")
-    fun setFilter(layer: RNMBXCircleLayer, filterList: ReadableArray?) {
-        layer.setFilter(filterList)
+    override fun setFilter(layer: RNMBXCircleLayer, filterList: Dynamic) {
+        layer.setFilter(filterList.asArray())
+    }
+
+    @ReactProp(name = "slot")
+    override fun setSlot(layer: RNMBXCircleLayer, slot: Dynamic) {
+        layer.setSlot(slot.asString())
     }
+    // @{codepart-replace-end}
 
     companion object {
         const val REACT_CLASS = "RNMBXCircleLayer"

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

@@ -8,7 +8,7 @@ import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
 import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
 import com.rnmapbox.rnmbx.utils.Logger
 
-class RNMBXFillExtrusionLayer(context: Context?) : RCTLayer<FillExtrusionLayer?>(
+class RNMBXFillExtrusionLayer(context: Context?) : RNMBXLayer<FillExtrusionLayer?>(
     context!!
 ) {
     private var mSourceLayerID: String? = null

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

@@ -1,12 +1,13 @@
 package com.rnmapbox.rnmbx.components.styles.layers
 
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.Dynamic
 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
 
-class RNMBXFillExtrusionLayerManager : ViewGroupManager<RNMBXFillExtrusionLayer>() {
+class RNMBXFillExtrusionLayerManager : ViewGroupManager<RNMBXFillExtrusionLayer>(),
+    RNMBXFillExtrusionLayerManagerInterface<RNMBXFillExtrusionLayer> {
     override fun getName(): String {
         return REACT_CLASS
     }
@@ -16,58 +17,58 @@ class RNMBXFillExtrusionLayerManager : ViewGroupManager<RNMBXFillExtrusionLayer>
     }
 
     @ReactProp(name = "id")
-    fun setId(layer: RNMBXFillExtrusionLayer, id: String?) {
-        layer.iD = id
+    override fun setId(layer: RNMBXFillExtrusionLayer, id: Dynamic) {
+        layer.iD = id.asString()
     }
 
     @ReactProp(name = "existing")
-    fun setExisting(layer: RNMBXFillExtrusionLayer, existing: Boolean) {
-        layer.setExisting(existing)
+    override fun setExisting(layer: RNMBXFillExtrusionLayer, existing: Dynamic) {
+        layer.setExisting(existing.asBoolean())
     }
 
     @ReactProp(name = "sourceID")
-    fun setSourceID(layer: RNMBXFillExtrusionLayer, sourceID: String?) {
-        layer.setSourceID(sourceID)
+    override fun setSourceID(layer: RNMBXFillExtrusionLayer, sourceID: Dynamic) {
+        layer.setSourceID(sourceID.asString())
     }
 
     @ReactProp(name = "aboveLayerID")
-    fun setAboveLayerID(layer: RNMBXFillExtrusionLayer, aboveLayerID: String?) {
-        layer.setAboveLayerID(aboveLayerID)
+    override fun setAboveLayerID(layer: RNMBXFillExtrusionLayer, aboveLayerID: Dynamic) {
+        layer.setAboveLayerID(aboveLayerID.asString())
     }
 
     @ReactProp(name = "belowLayerID")
-    fun setBelowLayerID(layer: RNMBXFillExtrusionLayer, belowLayerID: String?) {
-        layer.setBelowLayerID(belowLayerID)
+    override fun setBelowLayerID(layer: RNMBXFillExtrusionLayer, belowLayerID: Dynamic) {
+        layer.setBelowLayerID(belowLayerID.asString())
     }
 
     @ReactProp(name = "layerIndex")
-    fun setLayerIndex(layer: RNMBXFillExtrusionLayer, layerIndex: Int) {
-        layer.setLayerIndex(layerIndex)
+    override fun setLayerIndex(layer: RNMBXFillExtrusionLayer, layerIndex: Dynamic) {
+        layer.setLayerIndex(layerIndex.asInt())
     }
 
     @ReactProp(name = "minZoomLevel")
-    fun setMinZoomLevel(layer: RNMBXFillExtrusionLayer, minZoomLevel: Double) {
-        layer.setMinZoomLevel(minZoomLevel)
+    override fun setMinZoomLevel(layer: RNMBXFillExtrusionLayer, minZoomLevel: Dynamic) {
+        layer.setMinZoomLevel(minZoomLevel.asDouble())
     }
 
     @ReactProp(name = "maxZoomLevel")
-    fun setMaxZoomLevel(layer: RNMBXFillExtrusionLayer, maxZoomLevel: Double) {
-        layer.setMaxZoomLevel(maxZoomLevel)
+    override fun setMaxZoomLevel(layer: RNMBXFillExtrusionLayer, maxZoomLevel: Dynamic) {
+        layer.setMaxZoomLevel(maxZoomLevel.asDouble())
     }
 
     @ReactProp(name = "reactStyle")
-    fun setReactStyle(layer: RNMBXFillExtrusionLayer, style: ReadableMap?) {
-        layer.setReactStyle(style)
+    override fun setReactStyle(layer: RNMBXFillExtrusionLayer, style: Dynamic) {
+        layer.setReactStyle(style.asMap())
     }
 
     @ReactProp(name = "sourceLayerID")
-    fun setSourceLayerId(layer: RNMBXFillExtrusionLayer, sourceLayerID: String?) {
-        layer.setSourceLayerID(sourceLayerID)
+    override fun setSourceLayerID(layer: RNMBXFillExtrusionLayer, sourceLayerID: Dynamic) {
+        layer.setSourceLayerID(sourceLayerID.asString())
     }
 
     @ReactProp(name = "filter")
-    fun setFilter(layer: RNMBXFillExtrusionLayer, filterList: ReadableArray?) {
-        layer.setFilter(filterList)
+    override fun setFilter(layer: RNMBXFillExtrusionLayer, filterList: Dynamic) {
+        layer.setFilter(filterList.asArray())
     }
 
     companion object {

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

@@ -8,7 +8,7 @@ import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
 import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
 import com.rnmapbox.rnmbx.utils.Logger
 
-class RNMBXFillLayer(context: Context?) : RCTLayer<FillLayer?>(
+class RNMBXFillLayer(context: Context?) : RNMBXLayer<FillLayer?>(
     context!!
 ) {
     private var mSourceLayerID: String? = null

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

@@ -1,12 +1,13 @@
 package com.rnmapbox.rnmbx.components.styles.layers
 
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.Dynamic
 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
 
-class RNMBXFillLayerManager : ViewGroupManager<RNMBXFillLayer>() {
+class RNMBXFillLayerManager : ViewGroupManager<RNMBXFillLayer>(),
+    RNMBXFillLayerManagerInterface<RNMBXFillLayer> {
     override fun getName(): String {
         return REACT_CLASS
     }
@@ -15,60 +16,67 @@ class RNMBXFillLayerManager : ViewGroupManager<RNMBXFillLayer>() {
         return RNMBXFillLayer(reactContext)
     }
 
+    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXFillLayer"})}
     @ReactProp(name = "id")
-    fun setId(layer: RNMBXFillLayer, id: String?) {
-        layer.iD = id
+    override fun setId(layer: RNMBXFillLayer, id: Dynamic) {
+        layer.iD = id.asString()
     }
 
     @ReactProp(name = "existing")
-    fun setExisting(layer: RNMBXFillLayer, existing: Boolean) {
-        layer.setExisting(existing)
+    override fun setExisting(layer: RNMBXFillLayer, existing: Dynamic) {
+        layer.setExisting(existing.asBoolean())
     }
 
     @ReactProp(name = "sourceID")
-    fun setSourceID(layer: RNMBXFillLayer, sourceID: String?) {
-        layer.setSourceID(sourceID)
-    }
-
-    @ReactProp(name = "sourceLayerID")
-    fun setSourceLayerId(layer: RNMBXFillLayer, sourceLayerID: String?) {
-        layer.setSourceLayerID(sourceLayerID)
+    override fun setSourceID(layer: RNMBXFillLayer, sourceID: Dynamic) {
+        layer.setSourceID(sourceID.asString())
     }
 
     @ReactProp(name = "aboveLayerID")
-    fun setAboveLayerID(layer: RNMBXFillLayer, aboveLayerID: String?) {
-        layer.setAboveLayerID(aboveLayerID)
+    override fun setAboveLayerID(layer: RNMBXFillLayer, aboveLayerID: Dynamic) {
+        layer.setAboveLayerID(aboveLayerID.asString())
     }
 
     @ReactProp(name = "belowLayerID")
-    fun setBelowLayerID(layer: RNMBXFillLayer, belowLayerID: String?) {
-        layer.setBelowLayerID(belowLayerID)
+    override fun setBelowLayerID(layer: RNMBXFillLayer, belowLayerID: Dynamic) {
+        layer.setBelowLayerID(belowLayerID.asString())
     }
 
     @ReactProp(name = "layerIndex")
-    fun setLayerIndex(layer: RNMBXFillLayer, layerIndex: Int) {
-        layer.setLayerIndex(layerIndex)
+    override fun setLayerIndex(layer: RNMBXFillLayer, layerIndex: Dynamic) {
+        layer.setLayerIndex(layerIndex.asInt())
     }
 
     @ReactProp(name = "minZoomLevel")
-    fun setMinZoomLevel(layer: RNMBXFillLayer, minZoomLevel: Double) {
-        layer.setMinZoomLevel(minZoomLevel)
+    override fun setMinZoomLevel(layer: RNMBXFillLayer, minZoomLevel: Dynamic) {
+        layer.setMinZoomLevel(minZoomLevel.asDouble())
     }
 
     @ReactProp(name = "maxZoomLevel")
-    fun setMaxZoomLevel(layer: RNMBXFillLayer, maxZoomLevel: Double) {
-        layer.setMaxZoomLevel(maxZoomLevel)
+    override fun setMaxZoomLevel(layer: RNMBXFillLayer, maxZoomLevel: Dynamic) {
+        layer.setMaxZoomLevel(maxZoomLevel.asDouble())
     }
 
     @ReactProp(name = "reactStyle")
-    fun setReactStyle(layer: RNMBXFillLayer, style: ReadableMap?) {
-        layer.setReactStyle(style)
+    override fun setReactStyle(layer: RNMBXFillLayer, style: Dynamic) {
+        layer.setReactStyle(style.asMap())
+    }
+
+    @ReactProp(name = "sourceLayerID")
+    override fun setSourceLayerID(layer: RNMBXFillLayer, sourceLayerID: Dynamic) {
+        layer.setSourceLayerID(sourceLayerID.asString())
     }
 
     @ReactProp(name = "filter")
-    fun setFilter(layer: RNMBXFillLayer, filterList: ReadableArray?) {
-        layer.setFilter(filterList)
+    override fun setFilter(layer: RNMBXFillLayer, filterList: Dynamic) {
+        layer.setFilter(filterList.asArray())
+    }
+
+    @ReactProp(name = "slot")
+    override fun setSlot(layer: RNMBXFillLayer, slot: Dynamic) {
+        layer.setSlot(slot.asString())
     }
+    // @{codepart-replace-end}
 
     companion object {
         const val REACT_CLASS = "RNMBXFillLayer"

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

@@ -8,7 +8,7 @@ import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
 import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
 import com.rnmapbox.rnmbx.utils.Logger
 
-class RNMBXHeatmapLayer(context: Context?) : RCTLayer<HeatmapLayer?>(
+class RNMBXHeatmapLayer(context: Context?) : RNMBXLayer<HeatmapLayer?>(
     context!!
 ) {
     private var mSourceLayerID: String? = null

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

@@ -1,12 +1,13 @@
 package com.rnmapbox.rnmbx.components.styles.layers
 
-import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.Dynamic
 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
 
-class RNMBXHeatmapLayerManager : ViewGroupManager<RNMBXHeatmapLayer>() {
+class RNMBXHeatmapLayerManager : ViewGroupManager<RNMBXHeatmapLayer>(),
+    RNMBXHeatmapLayerManagerInterface<RNMBXHeatmapLayer> {
     override fun getName(): String {
         return REACT_CLASS
     }
@@ -15,61 +16,68 @@ class RNMBXHeatmapLayerManager : ViewGroupManager<RNMBXHeatmapLayer>() {
         return RNMBXHeatmapLayer(reactContext)
     }
 
+    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXHeatmapLayer"})}
     @ReactProp(name = "id")
-    fun setId(layer: RNMBXHeatmapLayer, id: String?) {
-        layer.iD = id
+    override fun setId(layer: RNMBXHeatmapLayer, id: Dynamic) {
+        layer.iD = id.asString()
     }
 
     @ReactProp(name = "existing")
-    fun setExisting(layer: RNMBXHeatmapLayer, existing: Boolean) {
-        layer.setExisting(existing)
+    override fun setExisting(layer: RNMBXHeatmapLayer, existing: Dynamic) {
+        layer.setExisting(existing.asBoolean())
     }
 
     @ReactProp(name = "sourceID")
-    fun setSourceID(layer: RNMBXHeatmapLayer, sourceID: String?) {
-        layer.setSourceID(sourceID)
+    override fun setSourceID(layer: RNMBXHeatmapLayer, sourceID: Dynamic) {
+        layer.setSourceID(sourceID.asString())
     }
 
     @ReactProp(name = "aboveLayerID")
-    fun setAboveLayerID(layer: RNMBXHeatmapLayer, aboveLayerID: String?) {
-        layer.setAboveLayerID(aboveLayerID)
+    override fun setAboveLayerID(layer: RNMBXHeatmapLayer, aboveLayerID: Dynamic) {
+        layer.setAboveLayerID(aboveLayerID.asString())
     }
 
     @ReactProp(name = "belowLayerID")
-    fun setBelowLayerID(layer: RNMBXHeatmapLayer, belowLayerID: String?) {
-        layer.setBelowLayerID(belowLayerID)
+    override fun setBelowLayerID(layer: RNMBXHeatmapLayer, belowLayerID: Dynamic) {
+        layer.setBelowLayerID(belowLayerID.asString())
     }
 
     @ReactProp(name = "layerIndex")
-    fun setLayerIndex(layer: RNMBXHeatmapLayer, layerIndex: Int) {
-        layer.setLayerIndex(layerIndex)
+    override fun setLayerIndex(layer: RNMBXHeatmapLayer, layerIndex: Dynamic) {
+        layer.setLayerIndex(layerIndex.asInt())
     }
 
     @ReactProp(name = "minZoomLevel")
-    fun setMinZoomLevel(layer: RNMBXHeatmapLayer, minZoomLevel: Double) {
-        layer.setMinZoomLevel(minZoomLevel)
+    override fun setMinZoomLevel(layer: RNMBXHeatmapLayer, minZoomLevel: Dynamic) {
+        layer.setMinZoomLevel(minZoomLevel.asDouble())
     }
 
     @ReactProp(name = "maxZoomLevel")
-    fun setMaxZoomLevel(layer: RNMBXHeatmapLayer, maxZoomLevel: Double) {
-        layer.setMaxZoomLevel(maxZoomLevel)
+    override fun setMaxZoomLevel(layer: RNMBXHeatmapLayer, maxZoomLevel: Dynamic) {
+        layer.setMaxZoomLevel(maxZoomLevel.asDouble())
     }
 
     @ReactProp(name = "reactStyle")
-    fun setReactStyle(layer: RNMBXHeatmapLayer, style: ReadableMap?) {
-        layer.setReactStyle(style)
+    override fun setReactStyle(layer: RNMBXHeatmapLayer, style: Dynamic) {
+        layer.setReactStyle(style.asMap())
     }
 
     @ReactProp(name = "sourceLayerID")
-    fun setSourceLayerId(layer: RNMBXHeatmapLayer, sourceLayerID: String?) {
-        layer.setSourceLayerID(sourceLayerID)
+    override fun setSourceLayerID(layer: RNMBXHeatmapLayer, sourceLayerID: Dynamic) {
+        layer.setSourceLayerID(sourceLayerID.asString())
     }
 
     @ReactProp(name = "filter")
-    fun setFilter(layer: RNMBXHeatmapLayer, filterList: ReadableArray?) {
-        layer.setFilter(filterList)
+    override fun setFilter(layer: RNMBXHeatmapLayer, filterList: Dynamic) {
+        layer.setFilter(filterList.asArray())
     }
 
+    @ReactProp(name = "slot")
+    override fun setSlot(layer: RNMBXHeatmapLayer, slot: Dynamic) {
+        layer.setSlot(slot.asString())
+    }
+    // @{codepart-replace-end}
+
     companion object {
         const val REACT_CLASS = "RNMBXHeatmapLayer"
     }