@rnmapbox/maps 10.1.37 → 10.1.39-rc.0

package/android/build.gradle

@@ -77,6 +77,16 @@ android {
                     java.srcDirs += 'src/main/mapbox-v11-compat/v10'
                 }
                 java.srcDirs += 'src/main/rn-compat/rn75'
+
+                // Add lifecycle compatibility source sets
+                // Apps targeting SDK 35+ typically use Lifecycle 2.6+ which changed from getLifecycle() to lifecycle property
+                def targetSdk = safeExtGet("targetSdkVersion", 28)
+                if (targetSdk >= 35) {
+                    java.srcDirs += 'src/main/lifecycle-compat/v26'
+                } else {
+                    java.srcDirs += 'src/main/lifecycle-compat/v25'
+                }
+
                 if (safeExtGet("RNMapboxMapsUseV11", false)) {
                     logger.warn("RNMapboxMapsUseV11 is deprecated, just set RNMapboxMapsVersion to 11.*")
                 }

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

@@ -6,7 +6,6 @@ import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.view.View
 import com.facebook.react.bridge.*
-import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXImagesManagerInterface
@@ -15,7 +14,6 @@ import com.mapbox.maps.ImageStretches
 import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 import com.rnmapbox.rnmbx.events.constants.EventKeys
 import com.rnmapbox.rnmbx.events.constants.eventMapOf
-import com.rnmapbox.rnmbx.rncompat.dynamic.*
 import com.rnmapbox.rnmbx.utils.ImageEntry
 import com.rnmapbox.rnmbx.utils.Logger
 import com.rnmapbox.rnmbx.utils.ResourceUtils
@@ -249,10 +247,14 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
                     Logger.e("RNMBXImages", "each element of strech should be an array but was: ${array.getDynamic(i)}")
                 } else {
                     val pair = array.getArray(i)
-                    if (pair.size() != 2 || pair.getType(0) != ReadableType.Number || pair.getType(1) != ReadableType.Number) {
-                        Logger.e("RNMBXImages", "each element of stretch should be pair of 2 integers but was ${pair}")
+                    if (pair != null) {
+                        if (pair.size() != 2 || pair.getType(0) != ReadableType.Number || pair.getType(1) != ReadableType.Number) {
+                            Logger.e("RNMBXImages", "each element of stretch should be pair of 2 integers but was ${pair}")
+                        } 
+                        result.add(ImageStretches(pair.getDouble(0).toFloat(), pair.getDouble(1).toFloat()))
+                    } else {
+                        Logger.e("RNMBXImages", "each element of stretch should be an array but was null")
                     }
-                    result.add(ImageStretches(pair.getDouble(0).toFloat(), pair.getDouble(1).toFloat()))
                 }
             }
             return result;

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

@@ -13,9 +13,6 @@ import android.view.View.OnLayoutChangeListener
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.LifecycleRegistry
-import androidx.lifecycle.ViewTreeLifecycleOwner
 import com.facebook.react.bridge.*
 import com.mapbox.android.gestures.*
 import com.mapbox.bindgen.Value
@@ -76,6 +73,7 @@ import com.rnmapbox.rnmbx.v11compat.ornamentsettings.*
 import org.json.JSONException
 import org.json.JSONObject
 
+
 fun <T> MutableList<T>.removeIf21(predicate: (T) -> Boolean): Boolean {
     var removed = false
     val iterator = this.iterator()
@@ -99,86 +97,11 @@ enum class MapGestureType {
     Move,Scale,Rotate,Fling,Shove
 }
 
-/***
- * Mapbox's MapView observers lifecycle events see MapboxLifecyclePluginImpl - (ON_START, ON_STOP, ON_DESTROY)
- * We need to emulate those.
- */
-interface RNMBXLifeCycleOwner : LifecycleOwner {
-    fun handleLifecycleEvent(event: Lifecycle.Event)
-}
-
 fun interface Cancelable {
     fun cancel()
 }
 
-class RNMBXLifeCycle {
-    private var lifecycleOwner : RNMBXLifeCycleOwner? = null
-
-    fun onAttachedToWindow(view: View) {
-        if (lifecycleOwner == null) {
-            lifecycleOwner = object : RNMBXLifeCycleOwner {
-                private lateinit var lifecycleRegistry: LifecycleRegistry
-                init {
-                    lifecycleRegistry = LifecycleRegistry(this)
-                    lifecycleRegistry.currentState = Lifecycle.State.CREATED
-                }
-
-                override fun handleLifecycleEvent(event: Lifecycle.Event) {
-                    try {
-                        lifecycleRegistry.handleLifecycleEvent(event)
-                    } catch (e: RuntimeException) {
-                        Log.e("RNMBXMapView", "handleLifecycleEvent, handleLifecycleEvent error: $e")
-                    }
-                }
-
-                override fun getLifecycle(): Lifecycle {
-                    return lifecycleRegistry
-                }
-            }
-            ViewTreeLifecycleOwner.set(view, lifecycleOwner);
-        }
-        lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_START)
-    }
-
-    fun onDetachedFromWindow() {
-        if (lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.DESTROYED) {
-            return
-        }
-        lifecycleOwner?.handleLifecycleEvent(androidx.lifecycle.Lifecycle.Event.ON_STOP)
-    }
-
-    fun onDestroy() {
-        if (lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.STARTED || lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.RESUMED) {
-            lifecycleOwner?.handleLifecycleEvent(androidx.lifecycle.Lifecycle.Event.ON_STOP)
-        }
-        if (lifecycleOwner?.lifecycle?.currentState != Lifecycle.State.DESTROYED) {
-            lifecycleOwner?.handleLifecycleEvent(androidx.lifecycle.Lifecycle.Event.ON_DESTROY)
-        }
-    }
-
-    fun getState() : Lifecycle.State {
-        return lifecycleOwner?.lifecycle?.currentState ?: Lifecycle.State.INITIALIZED;
-    }
-
-    var attachedToWindowWaiters : MutableList<()-> Unit> = mutableListOf()
-
-    fun callIfAttachedToWindow(callback: () -> Unit) : com.rnmapbox.rnmbx.components.mapview.Cancelable {
-        if (getState() == Lifecycle.State.STARTED) {
-            callback()
-            return com.rnmapbox.rnmbx.components.mapview.Cancelable {}
-        } else {
-            attachedToWindowWaiters.add(callback)
-            return com.rnmapbox.rnmbx.components.mapview.Cancelable {
-                attachedToWindowWaiters.removeIf21 { it === callback }
-            }
-        }
-    }
-
-    fun afterAttachFromLooper() {
-        attachedToWindowWaiters.forEach { it() }
-        attachedToWindowWaiters.clear()
-    }
-}
+// RNMBXLifeCycle is now provided by lifecycle-compat layer
 
 data class FeatureEntry(val feature: AbstractMapFeature?, val view: View?, var addedToMap: Boolean = false) {
 
@@ -235,6 +158,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
     private val mFeatures = mutableListOf<FeatureEntry>()
     private var mQueuedFeatures: MutableList<AbstractMapFeature>? = ArrayList()
     private val mCameraChangeTracker = CameraChangeTracker()
+    private var mPreferredFrameRate: Int? = null
     private lateinit var mMap: MapboxMap
 
     private lateinit var mMapView: MapView
@@ -651,6 +575,12 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
         changes.add(Property.LOCALIZE_LABELS)
     }
 
+    fun setReactPreferredFramesPerSecond(preferredFramesPerSecond: Int) {
+        if (this::mMapView.isInitialized) {
+            mMapView.setMaximumFps(preferredFramesPerSecond)
+        }
+    }
+
     fun setReactStyleURL(styleURL: String) {
         mStyleURL = styleURL
         changes.add(Property.STYLE_URL)

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

@@ -34,13 +34,13 @@ import java.util.HashMap
 
 fun ReadableArray.forEachString(action: (String) -> Unit) {
     for (i in 0 until size()) {
-        action(getString(i))
+        getString(i)?.let { action(it) } ?: Logger.d("RNMBXMapViewManager", "Skipping null string at index $i")
     }
 }
 
 fun ReadableArray.asArrayString(): Array<String> {
     val result = Array<String>(size()) {
-        getString(it)
+        getString(it).toString()
     }
     return result
 }
@@ -210,9 +210,9 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
         mapView.setReactStyleURL(styleURL.asString())
     }
 
-    @ReactProp(name = "preferredFramesPerSecond") @Suppress("UNUSED_PARAMETER")
-    fun setPreferredFramesPerSecond(mapView: RNMBXMapView, preferredFramesPerSecond: Int) {
-        //mapView.setReactPreferredFramesPerSecond(preferredFramesPerSecond);
+    @ReactProp(name = "preferredFramesPerSecond")
+    override fun setPreferredFramesPerSecond(mapView: RNMBXMapView, preferredFramesPerSecond: Dynamic) {
+        mapView.setReactPreferredFramesPerSecond(preferredFramesPerSecond.asInt())
     }
 
     @ReactProp(name = "zoomEnabled")

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

@@ -82,7 +82,11 @@ class RNMBXStyleValue(config: ReadableMap) {
         val result = ArrayList<Double>(arr!!.size())
         for (i in 0 until arr.size()) {
             val item = arr.getMap(i)
-            result.add(item.getDouble("value"))
+            if (item != null) {
+                result.add(item.getDouble("value"))
+            } else {
+                Logger.e("RNMBXStyleValue", "getFloatArray: null value for item: $i")
+            }
         }
         return result
     }
@@ -104,7 +108,7 @@ class RNMBXStyleValue(config: ReadableMap) {
         val result = ArrayList<String>(arr!!.size())
         for (i in 0 until arr.size()) {
             val item = arr.getMap(i)
-            val value = item.getString("value")
+            val value = item?.getString("value")
             if (value != null) {
                 result.add(value)
             } else {
@@ -121,9 +125,11 @@ class RNMBXStyleValue(config: ReadableMap) {
                 val result = WritableNativeMap()
                 for (i in 0 until keyValues!!.size()) {
                     val keyValue = keyValues.getArray(i)
-                    val stringKey = keyValue.getMap(0).getString("value")
+                    val stringKey = keyValue?.getMap(0)?.getString("value")
                     val value = WritableNativeMap()
-                    value.merge(keyValue.getMap(1))
+                    if (keyValue != null) {
+                        keyValue.getMap(1)?.let { value.merge(it) }
+                    }
                     result.putMap(stringKey!!, value)
                 }
                 return result

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

@@ -119,7 +119,10 @@ class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext, val
                     )
                     ReadableType.Boolean -> Expression.literal(expressions.getBoolean(iExp))
                     ReadableType.Number -> Expression.literal(expressions.getDouble(iExp))
-                    else -> Expression.literal(expressions.getString(iExp))
+                    else -> {
+                        Logger.d("setClusterProperties", "Unknown type for $iExp")
+                        return 
+                    }
                 }
                 builder.add(argument)
             }

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

@@ -6,6 +6,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableType
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.rnmapbox.rnmbx.components.AbstractEventEmitter
+import com.rnmapbox.rnmbx.utils.Logger
 
 abstract class RNMBXTileSourceManager<T : RNMBXTileSource<*>> internal constructor(
     reactApplicationContext: ReactApplicationContext
@@ -41,7 +42,7 @@ abstract class RNMBXTileSourceManager<T : RNMBXTileSource<*>> internal construct
         val urls: MutableList<String> = ArrayList()
         for (i in 0 until tileUrlTemplates.asArray().size()) {
             if (tileUrlTemplates.asArray().getType(0) == ReadableType.String) {
-                urls.add(tileUrlTemplates.asArray().getString(i))
+                tileUrlTemplates.asArray().getString(i)?.let { urls.add(it) } ?: Logger.d("RNMBXTileSource", "Skipping null URL template at index $i")
             }
         }
         source!!.tileUrlTemplates = urls

package/android/src/main/java/com/rnmapbox/rnmbx/shapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.kt

@@ -12,6 +12,7 @@ import com.mapbox.turf.TurfMeasurement
 import com.mapbox.turf.TurfMisc
 import com.rnmapbox.rnmbx.NativeRNMBXChangeLineOffsetsShapeAnimatorModuleSpec
 import com.rnmapbox.rnmbx.utils.ViewRefTag
+import com.rnmapbox.rnmbx.utils.Logger
 
 class ChangeLineOffsetsShapeAnimator(tag: Tag, _lineString: LineString, startOffset: Double, endOffset: Double): ShapeAnimatorCommon(tag) {
     private var lineString = _lineString
@@ -210,8 +211,13 @@ private fun buildLineString(_coordinates: ReadableArray): LineString {
 
     for (i in 0 until _coordinates.size()) {
         val arr = _coordinates.getArray(i)
-        val coord = Point.fromLngLat(arr.getDouble(0), arr.getDouble(1))
-        coordinates = coordinates.plus(coord)
+
+        val coord = arr?.let { Point.fromLngLat(arr.getDouble(0), it.getDouble(1)) }
+        if(coord != null) {
+            coordinates = coordinates.plus(coord)
+        } else {
+            Logger.e("RNMBXChangeLineOffsetsShapeAnimatorModule", "buildLineString: null coordinate for item: $i")
+        }
     }
 
     return LineString.fromLngLats(coordinates)

package/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/Dynamic.kt

@@ -6,6 +6,7 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
 import com.mapbox.bindgen.Value
 import com.rnmapbox.rnmbx.rncompat.dynamic.*
+import com.rnmapbox.rnmbx.utils.Logger
 
 fun ReadableMap.toValueHashMap(): HashMap<String, Value> {
     var result = hashMapOf<String, Value>()
@@ -33,15 +34,18 @@ fun ReadableArray.toValue(): Value {
     var result = ArrayList<Value>(size())
 
     for (i in 0 until size()) {
-        result.add(
         when (getType(i)) {
             ReadableType.Null -> Value.nullValue()
             ReadableType.Boolean -> Value.valueOf(getBoolean(i))
             ReadableType.Number -> Value.valueOf(getDouble(i))
-            ReadableType.String -> Value.valueOf(getString(i))
-            ReadableType.Array -> getArray(i).toValue()
-            ReadableType.Map -> getMap(i).toValue()
-        })
+            ReadableType.String -> getString(i)?.let { Value.valueOf(it) } ?: Logger.d("ReadableArray", "Skipping null string at index $i")
+            ReadableType.Array -> getArray(i)?.toValue()
+            ReadableType.Map -> getMap(i)?.toValue()
+        }?.let {
+            result.add(
+                it as Value
+            )
+        }
     }
     return Value.valueOf(result)
 }

package/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/ReadableArray.kt

@@ -46,8 +46,8 @@ fun ReadableArray.toJsonArray() : JsonArray {
     val result = JsonArray(size())
     for (i in 0 until size()) {
         when (getType(i)) {
-            ReadableType.Map -> result.add(getMap(i).toJsonObject())
-            ReadableType.Array -> result.add(getArray(i).toJsonArray())
+            ReadableType.Map -> getMap(i)?.let { result.add(it.toJsonObject()) } ?: Logger.d("ReadableTypeMap", "Map at index $i is null")
+            ReadableType.Array -> getArray(i)?.let {result.add(it.toJsonArray())} ?: Logger.d("ReadableTypeArray", "Array at index $i is null")
             ReadableType.Null -> result.add(null as JsonElement?)
             ReadableType.Number -> result.add(getDouble(i))
             ReadableType.String -> result.add(getString(i))

package/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/ReadableMap.kt

@@ -25,7 +25,7 @@ fun ReadableMap.forEach(action: (String, Any) -> Unit) {
     val iterator = this.entryIterator
     while (iterator.hasNext()) {
         val next = iterator.next()
-        action(next.key, next.value)
+        next.value?.let { action(next.key, it) } ?: Logger.d("ReadableMap", "Skipping null value for key: ${next.key}")
     }
 }
 fun ReadableMap.getIfDouble(key: String): Double? {

package/android/src/main/lifecycle-compat/v25/com/rnmapbox/rnmbx/components/mapview/LifecycleCompat.kt

@@ -0,0 +1,86 @@
+package com.rnmapbox.rnmbx.components.mapview
+
+import android.util.Log
+import android.view.View
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.ViewTreeLifecycleOwner
+
+/**
+ * Lifecycle compatibility for Lifecycle 2.5 and older which uses getLifecycle() method
+ */
+interface RNMBXLifeCycleOwner : LifecycleOwner {
+    fun handleLifecycleEvent(event: Lifecycle.Event)
+}
+
+class RNMBXLifeCycle {
+    private var lifecycleOwner : RNMBXLifeCycleOwner? = null
+
+    fun onAttachedToWindow(view: View) {
+        if (lifecycleOwner == null) {
+            lifecycleOwner = object : RNMBXLifeCycleOwner {
+                private lateinit var lifecycleRegistry: LifecycleRegistry
+                init {
+                    lifecycleRegistry = LifecycleRegistry(this)
+                    lifecycleRegistry.currentState = Lifecycle.State.CREATED
+                }
+
+                override fun handleLifecycleEvent(event: Lifecycle.Event) {
+                    try {
+                        lifecycleRegistry.handleLifecycleEvent(event)
+                    } catch (e: RuntimeException) {
+                        Log.e("RNMBXMapView", "handleLifecycleEvent, handleLifecycleEvent error: $e")
+                    }
+                }
+
+                // Lifecycle 2.5 and older uses method syntax
+                override fun getLifecycle(): Lifecycle {
+                    return lifecycleRegistry
+                }
+
+            }
+            ViewTreeLifecycleOwner.set(view, lifecycleOwner)
+        }
+        lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_START)
+    }
+
+    fun onDetachedFromWindow() {
+        if (lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.DESTROYED) {
+            return
+        }
+        lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+    }
+    
+    fun onDestroy() {
+        if (lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.STARTED || lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.RESUMED) {
+            lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+        }
+        if (lifecycleOwner?.lifecycle?.currentState != Lifecycle.State.DESTROYED) {
+            lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+        }
+    }
+    
+    fun getState() : Lifecycle.State {
+        return lifecycleOwner?.lifecycle?.currentState ?: Lifecycle.State.INITIALIZED
+    }
+    
+    var attachedToWindowWaiters : MutableList<()-> Unit> = mutableListOf()
+    
+    fun callIfAttachedToWindow(callback: () -> Unit) : com.rnmapbox.rnmbx.components.mapview.Cancelable {
+        if (getState() == Lifecycle.State.STARTED) {
+            callback()
+            return com.rnmapbox.rnmbx.components.mapview.Cancelable {}
+        } else {
+            attachedToWindowWaiters.add(callback)
+            return com.rnmapbox.rnmbx.components.mapview.Cancelable {
+                attachedToWindowWaiters.remove(callback)
+            }
+        }
+    }
+    
+    fun afterAttachFromLooper() {
+        attachedToWindowWaiters.forEach { it() }
+        attachedToWindowWaiters.clear()
+    }
+}

package/android/src/main/lifecycle-compat/v26/com/rnmapbox/rnmbx/components/mapview/LifecycleCompat.kt

@@ -0,0 +1,85 @@
+package com.rnmapbox.rnmbx.components.mapview
+
+import android.util.Log
+import android.view.View
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.setViewTreeLifecycleOwner
+
+/**
+ * Lifecycle compatibility for Lifecycle 2.6+ which uses 'lifecycle' property
+ */
+interface RNMBXLifeCycleOwner : LifecycleOwner {
+    fun handleLifecycleEvent(event: Lifecycle.Event)
+}
+
+class RNMBXLifeCycle {
+    private var lifecycleOwner : RNMBXLifeCycleOwner? = null
+
+    fun onAttachedToWindow(view: View) {
+        if (lifecycleOwner == null) {
+            lifecycleOwner = object : RNMBXLifeCycleOwner {
+                private lateinit var lifecycleRegistry: LifecycleRegistry
+                init {
+                    lifecycleRegistry = LifecycleRegistry(this)
+                    lifecycleRegistry.currentState = Lifecycle.State.CREATED
+                }
+
+                override fun handleLifecycleEvent(event: Lifecycle.Event) {
+                    try {
+                        lifecycleRegistry.handleLifecycleEvent(event)
+                    } catch (e: RuntimeException) {
+                        Log.e("RNMBXMapView", "handleLifecycleEvent, handleLifecycleEvent error: $e")
+                    }
+                }
+
+                // Lifecycle 2.6+ uses property syntax
+                override val lifecycle: Lifecycle
+                    get() = lifecycleRegistry
+
+            }
+            view.setViewTreeLifecycleOwner(lifecycleOwner)
+        }
+        lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_START)
+    }
+
+    fun onDetachedFromWindow() {
+        if (lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.DESTROYED) {
+            return
+        }
+        lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+    }
+    
+    fun onDestroy() {
+        if (lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.STARTED || lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.RESUMED) {
+            lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+        }
+        if (lifecycleOwner?.lifecycle?.currentState != Lifecycle.State.DESTROYED) {
+            lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+        }
+    }
+    
+    fun getState() : Lifecycle.State {
+        return lifecycleOwner?.lifecycle?.currentState ?: Lifecycle.State.INITIALIZED
+    }
+    
+    var attachedToWindowWaiters : MutableList<()-> Unit> = mutableListOf()
+    
+    fun callIfAttachedToWindow(callback: () -> Unit) : com.rnmapbox.rnmbx.components.mapview.Cancelable {
+        if (getState() == Lifecycle.State.STARTED) {
+            callback()
+            return com.rnmapbox.rnmbx.components.mapview.Cancelable {}
+        } else {
+            attachedToWindowWaiters.add(callback)
+            return com.rnmapbox.rnmbx.components.mapview.Cancelable {
+                attachedToWindowWaiters.remove(callback)
+            }
+        }
+    }
+    
+    fun afterAttachFromLooper() {
+        attachedToWindowWaiters.forEach { it() }
+        attachedToWindowWaiters.clear()
+    }
+}

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

@@ -12,10 +12,11 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
 
-public class RNMBXAtmosphereManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNMBXAtmosphereManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class RNMBXAtmosphereManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNMBXAtmosphereManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public RNMBXAtmosphereManagerDelegate(U viewManager) {
     super(viewManager);
   }

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

@@ -11,7 +11,8 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNMBXAtmosphereManagerInterface<T extends View> {
+public interface RNMBXAtmosphereManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setReactStyle(T view, Dynamic value);
 }

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

@@ -12,10 +12,11 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
 
-public class RNMBXBackgroundLayerManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNMBXBackgroundLayerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class RNMBXBackgroundLayerManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNMBXBackgroundLayerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public RNMBXBackgroundLayerManagerDelegate(U viewManager) {
     super(viewManager);
   }

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

@@ -11,8 +11,9 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNMBXBackgroundLayerManagerInterface<T extends View> {
+public interface RNMBXBackgroundLayerManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setId(T view, Dynamic value);
   void setSourceID(T view, Dynamic value);
   void setExisting(T view, Dynamic value);

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

@@ -11,10 +11,11 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
 
-public class RNMBXCalloutManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNMBXCalloutManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class RNMBXCalloutManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNMBXCalloutManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public RNMBXCalloutManagerDelegate(U viewManager) {
     super(viewManager);
   }

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

@@ -10,7 +10,8 @@
 package com.facebook.react.viewmanagers;
 
 import android.view.View;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNMBXCalloutManagerInterface<T extends View> {
+public interface RNMBXCalloutManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   // No props
 }

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

@@ -12,10 +12,11 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
 
-public class RNMBXCameraManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNMBXCameraManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class RNMBXCameraManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNMBXCameraManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public RNMBXCameraManagerDelegate(U viewManager) {
     super(viewManager);
   }

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

@@ -11,8 +11,9 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNMBXCameraManagerInterface<T extends View> {
+public interface RNMBXCameraManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setMaxBounds(T view, Dynamic value);
   void setAnimationDuration(T view, Dynamic value);
   void setAnimationMode(T view, Dynamic value);

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

@@ -12,10 +12,11 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
 
-public class RNMBXCircleLayerManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNMBXCircleLayerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class RNMBXCircleLayerManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNMBXCircleLayerManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public RNMBXCircleLayerManagerDelegate(U viewManager) {
     super(viewManager);
   }