@rnmapbox/maps 10.1.39 → 10.1.41-rc.2

package/android/build.gradle

@@ -1,5 +1,5 @@
 def defaultMapboxMapsImpl = "mapbox"
-def defaultMapboxMapsVersion = "10.18.4"
+def defaultMapboxMapsVersion = "10.19.0"
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -167,7 +167,19 @@ dependencies {
     // Mapbox SDK
     customizableDependencies('RNMapboxMapsLibs') {
         if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
-            implementation "com.mapbox.maps:android:${safeExtGet("RNMapboxMapsVersion", defaultMapboxMapsVersion)}"
+            def targetSdk = safeExtGet("targetSdkVersion", 28)
+            def mapboxVersion = safeExtGet("RNMapboxMapsVersion", defaultMapboxMapsVersion)
+            
+            // Use NDK27 variant for Android 15+ (API 35+) to support 16KB page size
+            // Required by Google Play for apps targeting Android 15+ by November 1, 2025
+            // See: https://github.com/rnmapbox/maps/issues/3896
+            // Mapbox Docs: https://docs.mapbox.com/android/maps/guides/#ndk-27
+            if (targetSdk >= 35) {
+                implementation "com.mapbox.maps:android-ndk27:${mapboxVersion}"
+            } else {
+                implementation "com.mapbox.maps:android:${mapboxVersion}"
+            }
+            
             implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:6.11.0'
             implementation 'androidx.asynclayoutinflater:asynclayoutinflater:1.0.0'
         } else {

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

@@ -186,7 +186,7 @@ class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewMa
             allowOverlapWithPuck(mAllowOverlapWithPuck)
             offsets(offset.dx, offset.dy)
             selected(mIsSelected)
-
+            ignoreCameraPadding(true)
         }
         return options
     }

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

@@ -18,6 +18,7 @@ import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 import com.rnmapbox.rnmbx.v11compat.annotation.*
 import com.rnmapbox.rnmbx.utils.LatLng
 import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toGNPointGeometry
+import com.rnmapbox.rnmbx.utils.Logger
 
 class RNMBXMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
     AbstractEventEmitter<RNMBXMarkerView>(reactApplicationContext),
@@ -39,12 +40,21 @@ class RNMBXMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
     @ReactProp(name = "coordinate")
     override fun setCoordinate(markerView: RNMBXMarkerView, value: Dynamic) {
         val array = value.asArray()
+        if (array == null) {
+            Logger.e("RNMBXMarkerViewManager", "array in setCoordinate is null")
+            return
+        }
         markerView.setCoordinate(toGNPointGeometry(LatLng(array.getDouble(1), array.getDouble(0))))
     }
 
     @ReactProp(name = "anchor")
     override fun setAnchor(markerView: RNMBXMarkerView, map: Dynamic) {
-        markerView.setAnchor(map.asMap().getDouble("x").toFloat(), map.asMap().getDouble("y").toFloat())
+        val mapValue = map.asMap()
+        if (mapValue == null) {
+            Logger.e("RNMBXMarkerViewManager", "map in setAnchor is null")
+            return
+        }
+        markerView.setAnchor(mapValue.getDouble("x").toFloat(), mapValue.getDouble("y").toFloat())
     }
 
     @ReactProp(name = "allowOverlap")

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

@@ -14,6 +14,7 @@ import com.rnmapbox.rnmbx.events.constants.EventKeys
 import com.rnmapbox.rnmbx.events.constants.eventMapOf
 import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toPointGeometry
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
+import com.rnmapbox.rnmbx.utils.Logger
 
 class RNMBXPointAnnotationManager(reactApplicationContext: ReactApplicationContext, val viewTagResolver: ViewTagResolver) : AbstractEventEmitter<RNMBXPointAnnotation>(reactApplicationContext),
   RNMBXPointAnnotationManagerInterface<RNMBXPointAnnotation> {
@@ -69,7 +70,12 @@ class RNMBXPointAnnotationManager(reactApplicationContext: ReactApplicationConte
 
     @ReactProp(name = "anchor")
     override fun setAnchor(annotation: RNMBXPointAnnotation, map: Dynamic) {
-        annotation.setAnchor(map.asMap().getDouble("x").toFloat(), map.asMap().getDouble("y").toFloat())
+        val mapValue = map.asMap()
+        if (mapValue == null) {
+            Logger.e("RNMBXPointAnnotationManager", "anchor map is null")
+            return
+        }
+        annotation.setAnchor(mapValue.getDouble("x").toFloat(), mapValue.getDouble("y").toFloat())
     }
 
     @ReactProp(name = "draggable")

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

@@ -14,6 +14,7 @@ import com.rnmapbox.rnmbx.utils.extensions.asBooleanOrNull
 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
 
 class RNMBXCameraManager(private val mContext: ReactApplicationContext, val viewTagResolver: ViewTagResolver) :
     AbstractEventEmitter<RNMBXCamera>(
@@ -34,7 +35,12 @@ class RNMBXCameraManager(private val mContext: ReactApplicationContext, val view
     @ReactProp(name = "stop")
     override fun setStop(camera: RNMBXCamera, map: Dynamic) {
         if (!map.isNull) {
-            val stop = fromReadableMap(mContext, map.asMap(), null)
+            val mapValue = map.asMap()
+            if (mapValue == null) {
+                Logger.e("RNMBXCameraManager", "stop map is null")
+                return
+            }
+            val stop = fromReadableMap(mContext, mapValue, null)
             camera.setStop(stop)
         }
     }
@@ -42,7 +48,12 @@ class RNMBXCameraManager(private val mContext: ReactApplicationContext, val view
     @ReactProp(name = "defaultStop")
     override fun setDefaultStop(camera: RNMBXCamera, map: Dynamic) {
         if (!map.isNull) {
-            val stop = fromReadableMap(mContext, map.asMap(), null)
+            val mapValue = map.asMap()
+            if (mapValue == null) {
+                Logger.e("RNMBXCameraManager", "defaultStop map is null")
+                return
+            }
+            val stop = fromReadableMap(mContext, mapValue, null)
             camera.setDefaultStop(stop)
         }
     }
@@ -95,13 +106,23 @@ class RNMBXCameraManager(private val mContext: ReactApplicationContext, val view
 
     @ReactProp(name = "followPadding")
     override fun setFollowPadding(camera: RNMBXCamera, value: Dynamic) {
-        camera.setFollowPadding(value.asMap())
+        val mapValue = value.asMap()
+        if (mapValue == null) {
+            Logger.e("RNMBXCameraManager", "followPadding map is null")
+            return
+        }
+        camera.setFollowPadding(mapValue)
     }
 
     @ReactProp(name = "maxBounds")
     override fun setMaxBounds(camera: RNMBXCamera, value: Dynamic) {
         if (!value.isNull) {
-            val collection = FeatureCollection.fromJson(value.asString())
+            val stringValue = value.asString()
+            if (stringValue == null) {
+                Logger.e("RNMBXCameraManager", "maxBounds string is null")
+                return
+            }
+            val collection = FeatureCollection.fromJson(stringValue)
             camera.setMaxBounds(toLatLngBounds(collection))
         } else {
             camera.setMaxBounds(null)

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

@@ -1,13 +1,20 @@
 package com.rnmapbox.rnmbx.components.camera
 
-import com.facebook.react.bridge.Callback
+import android.view.animation.AccelerateDecelerateInterpolator
+import android.view.animation.LinearInterpolator
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
+import com.mapbox.maps.ScreenCoordinate
+import com.mapbox.maps.plugin.animation.MapAnimationOptions
+import com.mapbox.maps.plugin.animation.easeTo
+import com.mapbox.maps.plugin.animation.moveBy
+import com.mapbox.maps.plugin.animation.scaleBy
+import com.mapbox.maps.toCameraOptions
 import com.rnmapbox.rnmbx.NativeRNMBXCameraModuleSpec
+import com.rnmapbox.rnmbx.components.camera.constants.CameraMode
 import com.rnmapbox.rnmbx.components.mapview.CommandResponse
 import com.rnmapbox.rnmbx.utils.ViewRefTag
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
@@ -49,4 +56,60 @@ class RNMBXCameraModule(context: ReactApplicationContext, val viewTagResolver: V
             promise.resolve(null)
         }
     }
+
+    private fun getAnimationOptions(
+        animationMode: Double,
+        animationDuration: Double
+    ): MapAnimationOptions {
+        return MapAnimationOptions.Builder()
+            .apply {
+                when (animationMode.toInt()) {
+                    CameraMode.LINEAR -> interpolator(LinearInterpolator())
+                    CameraMode.EASE -> interpolator(AccelerateDecelerateInterpolator())
+                }
+                animationDuration.let { duration ->
+                    duration(duration.toLong())
+                }
+            }
+            .build()
+    }
+
+    override fun moveBy(
+        viewRef: ViewRefTag?,
+        x: Double,
+        y: Double,
+        animationMode: Double,
+        animationDuration: Double,
+        promise: Promise
+    ) {
+        withViewportOnUIThread(viewRef, promise) {
+            it.mapboxMap?.let { map ->
+                val animationOptions = getAnimationOptions(animationMode, animationDuration)
+                map.moveBy(ScreenCoordinate(x, y), animationOptions)
+
+                promise.resolve(null)
+            }
+        }
+    }
+
+    override fun scaleBy(
+        viewRef: ViewRefTag?,
+        x: Double,
+        y: Double,
+        animationMode: Double,
+        animationDuration: Double,
+        scaleFactor: Double,
+        promise: Promise
+    ) {
+        withViewportOnUIThread(viewRef, promise) {
+            it.mapboxMap?.let { map ->
+                val animationOptions =
+                    getAnimationOptions(animationMode, animationDuration)
+
+                map.scaleBy(scaleFactor, ScreenCoordinate(x, y), animationOptions)
+
+                promise.resolve(null)
+            }
+        }
+    }
 }

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

@@ -40,14 +40,14 @@ import com.mapbox.maps.plugin.viewport.data.OverviewViewportStateOptions
 import com.rnmapbox.rnmbx.events.constants.EventKeys
 
 class BaseEvent(
-    private val surfaceId: Int,
-    private val viewTag: Int,
-    private val eventName: String,
+    surfaceId: Int,
+    viewTag: Int,
+    private val _eventName: String,
     private val eventData: WritableMap,
     private val canCoalesce: Boolean = false
 ): Event<BaseEvent>(surfaceId, viewTag) {
     override fun getEventName(): String {
-        return eventName
+        return _eventName
     }
 
     override fun canCoalesce(): Boolean {

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

@@ -72,8 +72,13 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
 
     @ReactProp(name = "images")
     override fun setImages(images: RNMBXImages, map: Dynamic) {
+        val mapValue = map.asMap()
+        if (mapValue == null) {
+            Logger.e("RNMBXImagesManager", "images map is null")
+            return
+        }
         val imagesList = mutableListOf<Map.Entry<String, ImageEntry>>()
-        map.asMap().forEach { imageName, imageInfo ->
+        mapValue.forEach { imageName, imageInfo ->
             when (imageInfo) {
                 is ReadableMap -> {
                     val uri = imageInfo.getString("uri")
@@ -160,7 +165,11 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
     fun toNativeImage(dynamic: Dynamic): NativeImage? {
         when (dynamic.type) {
             ReadableType.String -> {
-                val resourceName = dynamic.asString();
+                val resourceName = dynamic.asString()
+                if (resourceName == null) {
+                    Logger.e("RNMBXImages", "nativeImages string element is null")
+                    return null
+                }
                 val drawable =
                     convertDrawableToBitmap(ResourceUtils.getDrawableByName(mContext, resourceName))
                 if (drawable != null) {
@@ -172,6 +181,10 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
             }
             ReadableType.Map -> {
                 val map = dynamic.asMap()
+                if (map == null) {
+                    Logger.e("RNMBXImages", "nativeImages map element is null")
+                    return null
+                }
                 val resourceName = map.getString("name")
                 val drawable =
                     convertDrawableToBitmap(ResourceUtils.getDrawableByName(mContext, resourceName))
@@ -191,9 +204,14 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
 
     @ReactProp(name = "nativeImages")
     override fun setNativeImages(images: RNMBXImages, arr: Dynamic) {
+        val arrayValue = arr.asArray()
+        if (arrayValue == null) {
+            Logger.e("RNMBXImagesManager", "nativeImages array is null")
+            return
+        }
         val nativeImages = mutableListOf<NativeImage>();
-        for (i in 0 until arr.asArray().size()) {
-            val nativeImage = toNativeImage(arr.asArray().getDynamic(i))
+        for (i in 0 until arrayValue.size()) {
+            val nativeImage = toNativeImage(arrayValue.getDynamic(i))
             if (nativeImage != null) {
                 nativeImages.add(nativeImage)
             }
@@ -241,6 +259,10 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
                 return null
             }
             val array = stretch.asArray()
+            if (array == null) {
+                Logger.e("RNMBXImages", "stretch array is null")
+                return null
+            }
             var result = mutableListOf<ImageStretches>();
             for (i in 0 until array.size()) {
                 if (array.getType(i) != ReadableType.Array) {
@@ -266,6 +288,10 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
                 return null
             }
             val array = content.asArray()
+            if (array == null) {
+                Logger.e("RNMBXImages", "content array is null")
+                return null
+            }
             if (array.size() != 4) {
                 Logger.e("RNMBXImages", "content should be an array of 4 numbers, got $content")
                 return null

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

@@ -24,6 +24,10 @@ class RNMBXCustomLocationProviderManager : ViewGroupManager<RNMBXCustomLocationP
     override fun setCoordinate(view: RNMBXCustomLocationProvider, value: Dynamic?) {
         if (value?.type == ReadableType.Array) {
             val array = value.asArray()
+            if (array == null) {
+                Logger.e(LOG_TAG, "coordinate array is null")
+                return
+            }
             if (array.size() == 2 && array.getType(0) == ReadableType.Number && array.getType(1) == ReadableType.Number) {
                 view.coordinate = Pair(array.getDouble(0), array.getDouble(1))
             } else {

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

@@ -163,7 +163,7 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
             if (pulsing.hasKey("color")) {
                 when (pulsing.getType("color")) {
                     ReadableType.Map ->
-                        location2.pulsingColor = ColorPropConverter.getColor(pulsing.getMap("color"), mContext)
+                        location2.pulsingColor = ColorPropConverter.getColor(pulsing.getMap("color"), mContext) ?: 0
                     ReadableType.Number ->
                         location2.pulsingColor = pulsing.getInt("color")
                     else ->

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

@@ -108,8 +108,14 @@ fun _convertToDoubleValueOrExpression(value: Dynamic?, name: String): Value? {
         return null
     }
     return when (value.type) {
-        ReadableType.Array ->
-            Expression.fromRaw(Gson().toJson(value.asArray().toJsonArray()))
+        ReadableType.Array -> {
+            val array = value.asArray()
+            if (array == null) {
+                Logger.e("RNMBXNativeUserLocationManager", "_convertToDoubleValueOrExpression: array is null for $name")
+                return null
+            }
+            Expression.fromRaw(Gson().toJson(array.toJsonArray()))
+        }
         ReadableType.Number ->
             Value.valueOf(value.asDouble())
         else -> {

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

@@ -139,8 +139,13 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
 
     @ReactProp(name = "localizeLabels")
     override fun setLocalizeLabels(mapView: RNMBXMapView, localeMap: Dynamic) {
-        val locale = localeMap.asMap().getString("locale")
-        val layerIds = localeMap.asMap().getArray("layerIds")?.toArrayList()?.mapNotNull {it.toString()}
+        val mapValue = localeMap.asMap()
+        if (mapValue == null) {
+            Logger.e(LOG_TAG, "localizeLabels map is null")
+            return
+        }
+        val locale = mapValue.getString("locale")
+        val layerIds = mapValue.getArray("layerIds")?.toArrayList()?.mapNotNull {it.toString()}
         mapView.setReactLocalizeLabels(locale, layerIds)
     }
 
@@ -160,6 +165,10 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
         mapView.withMap {
            it.gesturesPlugin {
                val map = settings.asMap()
+               if (map == null) {
+                   Logger.e(LOG_TAG, "gestureSettings map is null")
+                   return@gesturesPlugin Unit
+               }
                this.updateSettings {
                    map.getAndLogIfNotBoolean("doubleTapToZoomInEnabled", LOG_TAG)?.let {
                        this.doubleTapToZoomInEnabled = it
@@ -207,7 +216,12 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
 
     @ReactProp(name = "styleURL")
     override fun setStyleURL(mapView: RNMBXMapView, styleURL:Dynamic) {
-        mapView.setReactStyleURL(styleURL.asString())
+        val url = styleURL.asString()
+        if (url == null) {
+            Logger.e(LOG_TAG, "styleURL is null")
+            return
+        }
+        mapView.setReactStyleURL(url)
     }
 
     @ReactProp(name = "preferredFramesPerSecond")
@@ -252,12 +266,22 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
 
     @ReactProp(name = "attributionPosition")
     override fun setAttributionPosition(mapView: RNMBXMapView, attributionPosition: Dynamic) {
-        mapView.setReactAttributionPosition(attributionPosition.asMap())
+        val mapValue = attributionPosition.asMap()
+        if (mapValue == null) {
+            Logger.e(LOG_TAG, "attributionPosition map is null")
+            return
+        }
+        mapView.setReactAttributionPosition(mapValue)
     }
 
     @ReactProp(name = "attributionViewMargins")
     override fun setAttributionViewMargins(mapView: RNMBXMapView, scaleBarMargins: Dynamic) {
-        mapView.setReactAttributionViewMargins(scaleBarMargins.asMap())
+        val mapValue = scaleBarMargins.asMap()
+        if (mapValue == null) {
+            Logger.e(LOG_TAG, "attributionViewMargins map is null")
+            return
+        }
+        mapView.setReactAttributionViewMargins(mapValue)
     }
 
     @ReactProp(name = "attributionViewPosition")
@@ -272,7 +296,12 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
 
     @ReactProp(name = "logoPosition")
     override fun setLogoPosition(mapView: RNMBXMapView, logoPosition: Dynamic) {
-        mapView.setReactLogoPosition(logoPosition.asMap())
+        val mapValue = logoPosition.asMap()
+        if (mapValue == null) {
+            Logger.e(LOG_TAG, "logoPosition map is null")
+            return
+        }
+        mapView.setReactLogoPosition(mapValue)
     }
 
     @ReactProp(name = "scaleBarEnabled")
@@ -282,12 +311,22 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
 
     @ReactProp(name = "scaleBarViewMargins")
     override fun setScaleBarViewMargins(mapView: RNMBXMapView, scaleBarMargins: Dynamic) {
-        mapView.setReactScaleBarViewMargins(scaleBarMargins.asMap())
+        val mapValue = scaleBarMargins.asMap()
+        if (mapValue == null) {
+            Logger.e(LOG_TAG, "scaleBarViewMargins map is null")
+            return
+        }
+        mapView.setReactScaleBarViewMargins(mapValue)
     }
 
     @ReactProp(name = "scaleBarPosition")
     override fun setScaleBarPosition(mapView: RNMBXMapView, scaleBarPosition: Dynamic) {
-        mapView.setReactScaleBarPosition(scaleBarPosition.asMap())
+        val mapValue = scaleBarPosition.asMap()
+        if (mapValue == null) {
+            Logger.e(LOG_TAG, "scaleBarPosition map is null")
+            return
+        }
+        mapView.setReactScaleBarPosition(mapValue)
     }
 
     @ReactProp(name = "compassEnabled")
@@ -302,7 +341,12 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
 
     @ReactProp(name = "compassViewMargins")
     override fun setCompassViewMargins(mapView: RNMBXMapView, compassViewMargins: Dynamic) {
-        mapView.setReactCompassViewMargins(compassViewMargins.asMap())
+        val mapValue = compassViewMargins.asMap()
+        if (mapValue == null) {
+            Logger.e(LOG_TAG, "compassViewMargins map is null")
+            return
+        }
+        mapView.setReactCompassViewMargins(mapValue)
     }
 
     @ReactProp(name = "compassViewPosition")
@@ -312,7 +356,12 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
 
     @ReactProp(name = "compassPosition")
     override fun setCompassPosition(mapView: RNMBXMapView, compassMargins: Dynamic) {
-        mapView.setReactCompassPosition(compassMargins.asMap())
+        val mapValue = compassMargins.asMap()
+        if (mapValue == null) {
+            Logger.e(LOG_TAG, "compassPosition map is null")
+            return
+        }
+        mapView.setReactCompassPosition(mapValue)
     }
 
     @ReactProp(name = "contentInset") @Suppress("UNUSED_PARAMETER")

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

@@ -52,7 +52,12 @@ class RNMBXStyleImportManager(context: ReactApplicationContext) :
         if (value.type != ReadableType.Map) {
             Logger.e(REACT_CLASS, "config expected Map but received: ${value.type}")
         } else {
-            view.config = value.asMap().toValueHashMap()
+            val mapValue = value.asMap()
+            if (mapValue == null) {
+                Logger.e(REACT_CLASS, "config map is null")
+                return
+            }
+            view.config = mapValue.toValueHashMap()
         }
     }
 }

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

@@ -223,11 +223,15 @@ class RNMBXStyleValue(config: ReadableMap) {
             val dynamic = mPayload!!.getDynamic("value")
             if (dynamic.type == ReadableType.Array) {
                 val array = dynamic.asArray()
-                if (array.size() > 0 && mPayload.getString("type") == "array") {
-                    val map = array.getMap(0)
-                    if (map != null && map.getString("type") == "string") {
-                        isExpression = true
-                        mExpression = ExpressionParser.fromTyped(mPayload)
+                if (array == null) {
+                    Logger.e("RNMBXStyleValue", "value array is null")
+                } else {
+                    if (array.size() > 0 && mPayload.getString("type") == "array") {
+                        val map = array.getMap(0)
+                        if (map != null && map.getString("type") == "string") {
+                            isExpression = true
+                            mExpression = ExpressionParser.fromTyped(mPayload)
+                        }
                     }
                 }
             }

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

@@ -27,7 +27,11 @@ class RNMBXModelLayer(context: Context?) : RNMBXLayer<ModelLayer?>(
         }
     }
 
-    fun setSourceLayerID(value: String) {
+    fun setSourceLayerID(value: String?) {
+        if (value == null) {
+            Logger.e("RNMBXModelLayer", "setSourceLayerID: sourceLayerID is null")
+            return
+        }
         mSourceLayerID = value
     }
 }

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

@@ -5,6 +5,7 @@ import com.facebook.react.uimanager.ThemedReactContext
 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
 
 
 class RNMBXModelLayerManager : ViewGroupManager<RNMBXModelLayer>(),

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

@@ -47,11 +47,12 @@ class RNMBXRasterSourceManager(reactApplicationContext: ReactApplicationContext)
 
     @ReactProp(name = "sourceBounds")
     override fun setSourceBounds(source: RNMBXRasterSource, value: Dynamic) {
-        if (value.type != ReadableType.Array || value.asArray().size() != 4) {
+        val array = value.asArray()
+        if (value.type != ReadableType.Array || array == null || array.size() != 4) {
            Logger.e(REACT_CLASS, "source bounds must be an array with left, bottom, top, and right values")
            return
         }
-        val bboxArray = Array(4) { i -> value.asArray().getDouble(i) }
+        val bboxArray = Array(4) { i -> array.getDouble(i) }
 
         if(!this.validateBbox(bboxArray)){
             Logger.e(REACT_CLASS, "source bounds contain invalid bbox")

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

@@ -82,7 +82,12 @@ class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext, val
 
     @ReactProp(name = "shape")
     override fun setShape(source: RNMBXShapeSource, geoJSONStr: Dynamic) {
-        source.setShape(geoJSONStr.asString())
+        val str = geoJSONStr.asString()
+        if (str == null) {
+            Logger.e(LOG_TAG, "shape string is null")
+            return
+        }
+        source.setShape(str)
     }
 
     @ReactProp(name = "cluster")
@@ -102,11 +107,16 @@ class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext, val
 
     @ReactProp(name = "clusterProperties")
     override fun setClusterProperties(source: RNMBXShapeSource, map: Dynamic) {
+        val mapValue = map.asMap()
+        if (mapValue == null) {
+            Logger.e(LOG_TAG, "clusterProperties map is null")
+            return
+        }
         val properties = HashMap<String, Any>()
-        val iterator = map.asMap().keySetIterator()
+        val iterator = mapValue.keySetIterator()
         while (iterator.hasNextKey()) {
             val name = iterator.nextKey()
-            val expressions = map.asMap().getArray(name)
+            val expressions = mapValue.getArray(name)
             val builder: MutableList<Value> = ArrayList()
             for (iExp in 0 until expressions!!.size()) {
                 var argument: Expression
@@ -158,7 +168,12 @@ class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext, val
 
     @ReactProp(name = "hitbox")
     override fun setHitbox(source: RNMBXShapeSource, map: Dynamic) {
-        source.setHitbox(map.asMap())
+        val mapValue = map.asMap()
+        if (mapValue == null) {
+            Logger.e(LOG_TAG, "hitbox map is null")
+            return
+        }
+        source.setHitbox(mapValue)
     }
 
     override fun customEvents(): Map<String, String>? {

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

@@ -39,10 +39,15 @@ abstract class RNMBXTileSourceManager<T : RNMBXTileSource<*>> internal construct
 
     @ReactProp(name = "tileUrlTemplates")
     fun setTileUrlTemplates(source: T, tileUrlTemplates: Dynamic) {
+        val array = tileUrlTemplates.asArray()
+        if (array == null) {
+            Logger.e("RNMBXTileSourceManager", "tileUrlTemplates array is null")
+            return
+        }
         val urls: MutableList<String> = ArrayList()
-        for (i in 0 until tileUrlTemplates.asArray().size()) {
-            if (tileUrlTemplates.asArray().getType(0) == ReadableType.String) {
-                tileUrlTemplates.asArray().getString(i)?.let { urls.add(it) } ?: Logger.d("RNMBXTileSource", "Skipping null URL template at index $i")
+        for (i in 0 until array.size()) {
+            if (array.getType(i) == ReadableType.String) {
+                array.getString(i)?.let { urls.add(it) } ?: Logger.d("RNMBXTileSource", "Skipping null URL template at index $i")
             }
         }
         source!!.tileUrlTemplates = urls