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

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

@@ -72,8 +72,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 +87,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/providers/google/GoogleMapProvider.kt

@@ -67,6 +67,14 @@ 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()
+            Log.d(TAG, "MapView resumed — GoogleMap still valid")
+            return
+        }
+        // First attach — need async init
         mv.getMapAsync { googleMap ->
             onMapReady(googleMap, mv)
         }
@@ -74,14 +82,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maydon_tech/react-native-nitro-maps",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "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",