From bce2c9d09d99519d1f5e97f70a887b164e36cc88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?=
 <eenriquelopez@gmail.com>
Date: Thu, 26 Feb 2026 09:42:39 +0100
Subject: [PATCH] fix: avoid ComposeNotIdleException when clusterContent is
 null

---
 .../android/compose/clustering/ClusterRenderer.kt    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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
index f7994963..78b81ca0 100644
--- 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
@@ -82,9 +82,17 @@ internal class ComposeUiClusterRenderer<T : ClusterItem>(
      */
     private fun Cluster<T>.computeViewKeys(): Set<ViewKey<T>> {
         return if (shouldRenderAsCluster(this)) {
-            setOf(ViewKey.Cluster(this))
+            if (clusterContentState.value != null) {
+                setOf(ViewKey.Cluster(this))
+            } else {
+                emptySet()
+            }
         } else {
-            items.mapTo(mutableSetOf()) { ViewKey.Item(it) }
+            if (clusterItemContentState.value != null) {
+                items.mapTo(mutableSetOf()) { ViewKey.Item(it) }
+            } else {
+                emptySet()
+            }
         }
     }