fix(markers): cancel stale icon jobs and guard pending marker updates

Author: pinpong

android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt

@@ -256,7 +256,7 @@ class MapMarkerBuilder(
     m: RNMarker,
     onReady: (BitmapDescriptor?) -> Unit,
   ) {
-    jobsById[m.id]?.cancel()
+    cancelIconJob(m.id)
 
     m.iconSvg ?: return onReady(null)
 
@@ -275,6 +275,7 @@ class MapMarkerBuilder(
           if (renderResult?.bitmap == null) {
             withContext(Dispatchers.Main) {
               ensureActive()
+              jobsById.remove(m.id)
               onReady(createFallbackDescriptor())
             }
             return@launch
@@ -290,34 +291,34 @@ class MapMarkerBuilder(
 
           withContext(Dispatchers.Main) {
             ensureActive()
+            jobsById.remove(m.id)
             onReady(desc)
           }
         } catch (e: OutOfMemoryError) {
           mapErrorHandler.report(RNMapErrorCode.MARKER_ICON_BUILD_FAILED, "markerId=${m.id} buildIconAsync out of memory", e)
           clearIconCache()
           withContext(Dispatchers.Main) {
             ensureActive()
+            jobsById.remove(m.id)
             onReady(createFallbackDescriptor())
           }
         } catch (_: CancellationException) {
-          withContext(Dispatchers.Main) {
-            ensureActive()
-            onReady(createFallbackDescriptor())
-          }
+          // cancelled
         } catch (t: Throwable) {
           mapErrorHandler.report(RNMapErrorCode.MARKER_ICON_BUILD_FAILED, "markerId=${m.id} buildIconAsync failed", t)
           withContext(Dispatchers.Main) {
             ensureActive()
+            jobsById.remove(m.id)
             onReady(createFallbackDescriptor())
           }
-        } finally {
-          jobsById.remove(m.id)
         }
       }
 
     jobsById[m.id] = job
   }
 
+  fun hasIconJob(id: String): Boolean = jobsById.containsKey(id)
+
   fun cancelIconJob(id: String) {
     jobsById[id]?.cancel()
     jobsById.remove(id)

android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt

@@ -170,8 +170,18 @@ class RNGoogleMapsPlusView(
           }
 
           !prev.markerEquals(next) -> {
-            view.updateMarker(id) { marker ->
-              markerBuilder.update(prev, next, marker)
+            if (markerBuilder.hasIconJob(id)) {
+              markerBuilder.buildIconAsync(next) { icon ->
+                view.addMarker(
+                  id,
+                  markerBuilder.build(next, icon),
+                  MarkerTag(id = id, iconSvg = next.infoWindowIconSvg),
+                )
+              }
+            } else {
+              view.updateMarker(id) { marker ->
+                markerBuilder.update(prev, next, marker)
+              }
             }
           }
         }

ios/MapMarkerBuilder.swift

@@ -159,7 +159,7 @@ final class MapMarkerBuilder {
     _ m: RNMarker,
     onReady: @escaping (UIImage?) -> Void
   ) {
-    tasks[m.id]?.cancel()
+    cancelIconTask(m.id)
 
     guard let iconSvg = m.iconSvg else {
       onReady(nil)
@@ -176,16 +176,14 @@ final class MapMarkerBuilder {
 
     let task = Task(priority: .userInitiated) { [weak self] in
       guard let self else { return }
-      defer {
-        Task { @MainActor in self.tasks.removeValue(forKey: m.id) }
-      }
 
       let renderResult = self.renderUIImage(iconSvg, m.id, scale)
       guard !Task.isCancelled else { return }
 
       guard let renderResult = renderResult else {
         await MainActor.run {
           guard !Task.isCancelled else { return }
+          self.tasks.removeValue(forKey: m.id)
           onReady(self.createFallbackUIImage())
         }
         return
@@ -197,13 +195,18 @@ final class MapMarkerBuilder {
 
       await MainActor.run {
         guard !Task.isCancelled else { return }
+        self.tasks.removeValue(forKey: m.id)
         onReady(renderResult.image)
       }
     }
 
     tasks[m.id] = task
   }
 
+  func hasIconTask(_ id: String) -> Bool {
+    tasks[id] != nil
+  }
+
   func cancelIconTask(_ id: String) {
     tasks[id]?.cancel()
     tasks.removeValue(forKey: id)
@@ -311,6 +314,9 @@ final class MapMarkerBuilder {
     return autoreleasepool { () -> (image: UIImage, isFallback: Bool)? in
       guard !Task.isCancelled else { return nil }
 
+      CATransaction.begin()
+      defer { CATransaction.commit() }
+
       guard let svgImg = SVGKImage(data: data) else {
         mapErrorHandler.report(RNMapErrorCode.markerIconBuildFailed, "markerId=\(markerId) icon: SVGKImage init failed")
         return (createFallbackUIImage(), true)

ios/RNGoogleMapsPlusView.swift

@@ -127,9 +127,17 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
       for (id, next) in nextById {
         if let prev = prevById[id] {
           if !prev.markerEquals(next) {
-            self.impl.updateMarker(id: id) { [weak self] m in
-              guard let self else { return }
-              self.markerBuilder.update(prev, next, m)
+            if self.markerBuilder.hasIconTask(id) {
+              self.markerBuilder.buildIconAsync(next) { [weak self] icon in
+                guard let self else { return }
+                let marker = self.markerBuilder.build(next, icon: icon)
+                self.impl.addMarker(id: id, marker: marker)
+              }
+            } else {
+              self.impl.updateMarker(id: id) { [weak self] m in
+                guard let self else { return }
+                self.markerBuilder.update(prev, next, m)
+              }
             }
           }
         } else {