@maydon_tech/react-native-nitro-maps 0.2.2 → 0.2.4

package/android/src/main/kotlin/com/margelo/nitro/nitromap/NitroMap.kt

@@ -58,6 +58,26 @@ class HybridNitroMap(context: Context) : HybridNitroMapSpec() {
     private var isDisposed = false
 
     init {
+        // Tag container so the ViewManager can retrieve this instance for proper disposal
+        container.setTag(R.id.nitro_map_hybrid_view, this)
+
+        // Fabric/Yoga intercepts requestLayout() on managed views, so dynamically
+        // added children (the MapView) never get a proper measure/layout pass.
+        // Re-measure and lay out the MapView whenever the container's dimensions change.
+        container.addOnLayoutChangeListener { _, left, top, right, bottom, _, _, _, _ ->
+            currentMapView?.let { mv ->
+                val w = right - left
+                val h = bottom - top
+                if (w > 0 && h > 0) {
+                    mv.measure(
+                        View.MeasureSpec.makeMeasureSpec(w, View.MeasureSpec.EXACTLY),
+                        View.MeasureSpec.makeMeasureSpec(h, View.MeasureSpec.EXACTLY)
+                    )
+                    mv.layout(0, 0, w, h)
+                }
+            }
+        }
+
         container.addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
             override fun onViewAttachedToWindow(v: View) {
                 if (!isDisposed) {

package/android/src/main/kotlin/com/margelo/nitro/nitromap/NitroMapPackage.kt

@@ -6,11 +6,12 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
 
-import com.margelo.nitro.nitromap.views.HybridNitroMapManager
-
 /**
  * React Native Package for NitroMap.
  * Registers the ViewManager and loads the native C++ library.
+ *
+ * Uses NitroMapViewManager (our subclass) instead of the generated
+ * HybridNitroMapManager to add proper MapView disposal on onDropViewInstance.
  */
 class NitroMapPackage : BaseReactPackage() {
     override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
@@ -22,7 +23,7 @@ class NitroMapPackage : BaseReactPackage() {
     }
 
     override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-        return listOf(HybridNitroMapManager())
+        return listOf(NitroMapViewManager())
     }
 
     companion object {

package/android/src/main/kotlin/com/margelo/nitro/nitromap/NitroMapViewManager.kt

@@ -0,0 +1,34 @@
+package com.margelo.nitro.nitromap
+
+import android.util.Log
+import android.view.View
+import com.margelo.nitro.nitromap.views.HybridNitroMapManager
+
+/**
+ * Custom ViewManager that extends the Nitrogen-generated HybridNitroMapManager
+ * to add proper MapView lifecycle management.
+ *
+ * The generated manager doesn't call dispose() on the HybridNitroMap when the
+ * view is dropped, which leaks the MapView (GL surface, GoogleMap instance,
+ * coroutine scope, etc.). This subclass retrieves the HybridNitroMap via a
+ * View tag set in HybridNitroMap.init and calls dispose() before the view
+ * is released.
+ */
+class NitroMapViewManager : HybridNitroMapManager() {
+
+    companion object {
+        private const val TAG = "NitroMap"
+    }
+
+    override fun onDropViewInstance(view: View) {
+        // Retrieve the HybridNitroMap from the tag and dispose it before
+        // the generated manager removes it from its internal views map.
+        val hybridMap = view.getTag(R.id.nitro_map_hybrid_view) as? HybridNitroMap
+        if (hybridMap != null) {
+            hybridMap.dispose()
+            view.setTag(R.id.nitro_map_hybrid_view, null)
+            Log.d(TAG, "ViewManager: disposed HybridNitroMap on drop")
+        }
+        super.onDropViewInstance(view)
+    }
+}

package/android/src/main/kotlin/com/margelo/nitro/nitromap/providers/google/GoogleMapProvider.kt

@@ -71,6 +71,10 @@ class GoogleMapProvider(internal val context: Context) : MapProviderInterface {
             // Resuming from detach — GoogleMap is still valid, just resume the MapView
             mv.onStart()
             mv.onResume()
+            // Force Fabric to re-layout the GL surface. After onStop/onStart the
+            // GL surface may be recreated, but Yoga won't trigger requestLayout for
+            // an already-measured view — resulting in a blank map.
+            mv.post { mv.requestLayout() }
             Log.d(TAG, "MapView resumed — GoogleMap still valid")
             return
         }

package/android/src/main/res/values/ids.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="nitro_map_hybrid_view" type="id" />
+</resources>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maydon_tech/react-native-nitro-maps",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "A high-performance React Native map library powered by Nitro Modules with support for Apple Maps, Google Maps, and Yandex Maps. Features native clustering, custom markers, and seamless cross-platform integration.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",