fix(close #537): fixed scope cancellation that leads to bug when invalidating composable doesn't invalidate marker/cluster (#538)

y9san9 · web-flow · commit 549636580a83 · 2024-04-23T11:35:11.000-06:00
diff --git a/maps-compose-utils/src/main/java/com/google/maps/android/compose/clustering/Clustering.kt b/maps-compose-utils/src/main/java/com/google/maps/android/compose/clustering/Clustering.kt
@@ -27,6 +27,7 @@ import com.google.maps.android.compose.MapsComposeExperimentalApi
 import com.google.maps.android.compose.currentCameraPositionState
 import com.google.maps.android.compose.rememberComposeUiViewRenderer
 import com.google.maps.android.compose.rememberReattachClickListenersHandle
+import kotlinx.coroutines.awaitCancellation
 import kotlinx.coroutines.launch
 
 /**
@@ -248,6 +249,7 @@ public fun <T : ClusterItem> rememberClusterRenderer(
             clusterItemContentState,
         )
         clusterRendererState.value = renderer
+        awaitCancellation()
     }
     return clusterRendererState.value
 }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ import com.google.maps.android.compose.MapsComposeExperimentalApi`
`27`	`27`	`import com.google.maps.android.compose.currentCameraPositionState`
`28`	`28`	`import com.google.maps.android.compose.rememberComposeUiViewRenderer`
`29`	`29`	`import com.google.maps.android.compose.rememberReattachClickListenersHandle`
	`30`	`+import kotlinx.coroutines.awaitCancellation`
`30`	`31`	`import kotlinx.coroutines.launch`
`31`	`32`
`32`	`33`	`/**`
`@@ -248,6 +249,7 @@ public fun <T : ClusterItem> rememberClusterRenderer(`
`248`	`249`	`clusterItemContentState,`
`249`	`250`	`)`
`250`	`251`	`clusterRendererState.value = renderer`
	`252`	`+ awaitCancellation()`
`251`	`253`	`}`
`252`	`254`	`return clusterRendererState.value`
`253`	`255`	`}`