Separate MapView disposal from LifecycleOwner changes (#228)

googlemaps · Nov 30, 2022 · 0618bde · 0618bde
1 parent 904708a
commit 0618bde
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/maps-compose/src/main/java/com/google/maps/android/compose/GoogleMap.kt b/maps-compose/src/main/java/com/google/maps/android/compose/GoogleMap.kt
@@ -177,6 +177,10 @@ private fun MapLifecycle(mapView: MapView) {
         onDispose {
             lifecycle.removeObserver(mapLifecycleObserver)
             context.unregisterComponentCallbacks(callbacks)
+        }
+    }
+    DisposableEffect(mapView) {
+        onDispose {
             mapView.onDestroy()
             mapView.removeAllViews()
         }