@maydon_tech/react-native-nitro-maps 0.2.1 → 0.2.3

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

@@ -58,6 +58,9 @@ 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)
+
         container.addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
             override fun onViewAttachedToWindow(v: View) {
                 if (!isDisposed) {
@@ -72,8 +75,14 @@ class HybridNitroMap(context: Context) : HybridNitroMapSpec() {
     }
 
     private fun attachMapView() {
-        if (currentMapView != null) return // already attached
+        if (currentMapView != null) {
+            // Reattaching — reuse existing MapView, just resume it
+            mapProvider.onViewAttached(currentMapView!!)
+            Log.d(TAG, "MapView reattached (resumed)")
+            return
+        }
 
+        // First time — create and add to container
         val mv = mapProvider.createMapView(mapContext)
         container.addView(mv, FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)
 
@@ -81,16 +90,15 @@ class HybridNitroMap(context: Context) : HybridNitroMapSpec() {
             mapProvider.onViewAttached(mv)
         }
         currentMapView = mv
-        Log.d(TAG, "MapView attached")
+        Log.d(TAG, "MapView created and attached")
     }
 
     private fun detachMapView() {
-        currentMapView?.let { mv ->
-            mapProvider.onViewDetaching()
-            container.removeView(mv)
-        }
-        currentMapView = null
-        Log.d(TAG, "MapView detached (paused, state saved)")
+        if (currentMapView == null) return
+        mapProvider.onViewDetaching()
+        // Keep currentMapView and the view in the container — reuse on reattach.
+        // The MapView and GoogleMap survive pause/resume cycles.
+        Log.d(TAG, "MapView paused (preserved for reattach)")
     }
 
     override fun dispose() {

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

@@ -67,6 +67,18 @@ class GoogleMapProvider(internal val context: Context) : MapProviderInterface {
 
     override fun onViewAttached(view: View) {
         val mv = view as NitroMapView
+        if (isMapReady && googleMap != null) {
+            // 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
+        }
+        // First attach — need async init
         mv.getMapAsync { googleMap ->
             onMapReady(googleMap, mv)
         }
@@ -74,14 +86,12 @@ class GoogleMapProvider(internal val context: Context) : MapProviderInterface {
 
     override fun onViewDetaching() {
         mapView?.let { mv ->
-            val state = Bundle()
-            mv.onSaveInstanceState(state)
-            savedState = state
             mv.onPause()
             mv.onStop()
         }
-        onMapDetaching()
-        mapView = null
+        // Keep mapView, googleMap, isMapReady, and all rendered objects alive.
+        // GoogleMap and its native markers/overlays survive pause/resume cycles.
+        Log.d(TAG, "MapView paused — all state preserved for reattach")
     }
 
     override fun onViewDestroying() {

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.1",
+  "version": "0.2.3",
   "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",