fix: Fix NoSuchElementException when rendering custom cluster content (#280)

DSteve595 · web-flow · commit 3dfd6bfcc50e · 2023-03-29T16:20:24.000-07:00
* fix: Fix NoSuchElementException when rendering custom cluster content

* Create new ViewInfo as a fallback
diff --git a/maps-compose-utils/src/main/java/com/google/maps/android/compose/clustering/ClusterRenderer.kt b/maps-compose-utils/src/main/java/com/google/maps/android/compose/clustering/ClusterRenderer.kt
@@ -83,7 +83,7 @@ internal class ComposeUiClusterRenderer<T : ClusterItem>(
         }
     }
 
-    private fun createAndAddView(key: ViewKey<T>) {
+    private fun createAndAddView(key: ViewKey<T>): ViewInfo {
         val view = InvalidatingComposeView(
             context,
             content = when (key) {
@@ -101,13 +101,15 @@ internal class ComposeUiClusterRenderer<T : ClusterItem>(
             collectInvalidationsAndRerender(key, view)
         }
 
-        keysToViews[key] = ViewInfo(
+        val viewInfo = ViewInfo(
             view,
             onRemove = {
                 rerenderJob.cancel()
                 renderHandle.dispose()
             },
         )
+        keysToViews[key] = viewInfo
+        return viewInfo
     }
 
     /** Re-render the corresponding marker whenever [view] invalidates */
@@ -145,8 +147,9 @@ internal class ComposeUiClusterRenderer<T : ClusterItem>(
     override fun getDescriptorForCluster(cluster: Cluster<T>): BitmapDescriptor {
         return if (clusterContentState.value != null) {
             val viewInfo = keysToViews.entries
-                .first { (key, _) -> (key as? ViewKey.Cluster)?.cluster == cluster }
-                .value
+                .firstOrNull { (key, _) -> (key as? ViewKey.Cluster)?.cluster == cluster }
+                ?.value
+                ?: createAndAddView(cluster.computeViewKeys().first())
             renderViewToBitmapDescriptor(viewInfo.view)
         } else {
             super.getDescriptorForCluster(cluster)
@@ -158,8 +161,9 @@ internal class ComposeUiClusterRenderer<T : ClusterItem>(
 
         if (clusterItemContentState.value != null) {
             val viewInfo = keysToViews.entries
-                .first { (key, _) -> (key as? ViewKey.Item)?.item == item }
-                .value
+                .firstOrNull { (key, _) -> (key as? ViewKey.Item)?.item == item }
+                ?.value
+                ?: createAndAddView(ViewKey.Item(item))
             markerOptions.icon(renderViewToBitmapDescriptor(viewInfo.view))
         }
     }
