From 0bd6d6fcb1a25b1aff622efc2cbd5de217720a57 Mon Sep 17 00:00:00 2001
From: Jovanni Lo <lodev09@gmail.com>
Date: Wed, 11 Nov 2026 04:05:14 +0800
Subject: [PATCH 1/2] fix(android): re-add custom markers moved by zIndex
 changes

---
 android/src/main/java/com/luggmaps/core/GoogleMapProvider.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/android/src/main/java/com/luggmaps/core/GoogleMapProvider.kt b/android/src/main/java/com/luggmaps/core/GoogleMapProvider.kt
index a8c613a..29b7fe8 100644
--- a/android/src/main/java/com/luggmaps/core/GoogleMapProvider.kt
+++ b/android/src/main/java/com/luggmaps/core/GoogleMapProvider.kt
@@ -776,7 +776,10 @@ class GoogleMapProvider(private val context: Context) :
     }
 
     if (markerView.marker == null) {
-      if (markerView.hasCustomView) return
+      // Custom views wait for their first layout. Fabric moves a laid-out
+      // marker (e.g. on a zIndex change) by removing and re-adding it, and no
+      // new layout follows, so it's added back here.
+      if (markerView.hasCustomView && !markerView.didLayout) return
       addMarkerViewToMap(markerView)
       return
     }

From f51c51c005f760ab33cf13e10c343612f5fdc066 Mon Sep 17 00:00:00 2001
From: Jovanni Lo <lodev09@gmail.com>
Date: Wed, 11 Nov 2026 04:12:23 +0800
Subject: [PATCH 2/2] fix(android): keep map objects when fabric reorders
 children

---
 .../src/main/java/com/luggmaps/LuggMapView.kt    | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/android/src/main/java/com/luggmaps/LuggMapView.kt b/android/src/main/java/com/luggmaps/LuggMapView.kt
index 5cce2f2..2539f3e 100644
--- a/android/src/main/java/com/luggmaps/LuggMapView.kt
+++ b/android/src/main/java/com/luggmaps/LuggMapView.kt
@@ -79,8 +79,14 @@ class LuggMapView(private val reactContext: ThemedReactContext) :
 
   // region View Lifecycle
 
+  // Children whose removal from the map waits a loop, in case they come back
+  private val pendingRemovals = mutableSetOf<View>()
+
   override fun addView(child: View?, index: Int) {
     super.addView(child, index)
+    // Fabric moves a child (e.g. on a zIndex change) by removing and
+    // re-inserting it. Its map object is still there, so it's kept as is.
+    if (pendingRemovals.remove(child)) return
     when (child) {
       is LuggMapWrapperView -> mapWrapperView = child
       is LuggMarkerView -> provider?.addMarkerView(child)
@@ -94,6 +100,15 @@ class LuggMapView(private val reactContext: ThemedReactContext) :
 
   override fun removeViewAt(index: Int) {
     val view = getChildAt(index)
+    super.removeViewAt(index)
+    if (view == null || view is LuggMapWrapperView) return
+    pendingRemovals.add(view)
+    post {
+      if (pendingRemovals.remove(view)) removeFromProvider(view)
+    }
+  }
+
+  private fun removeFromProvider(view: View) {
     when (view) {
       is LuggMarkerView -> provider?.removeMarkerView(view)
       is LuggPolylineView -> provider?.removePolylineView(view)
@@ -102,7 +117,6 @@ class LuggMapView(private val reactContext: ThemedReactContext) :
       is LuggGroundOverlayView -> provider?.removeGroundOverlayView(view)
       is LuggTileOverlayView -> provider?.removeTileOverlayView(view)
     }
-    super.removeViewAt(index)
   }
 
   override fun onAttachedToWindow() {