Skip to content

fix: prevent ComposeUiClusterRenderer crash on fast back gesture with compose-ui 1.10+ #930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kikoso wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −0
Draft

fix: prevent ComposeUiClusterRenderer crash on fast back gesture with compose-ui 1.10+ #930

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions ...compose-utils/src/main/java/com/google/maps/android/compose/clustering/ClusterRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import com.google.maps.android.clustering.view.DefaultClusterRenderer
import com.google.maps.android.compose.ComposeUiViewRenderer
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.android.awaitFrame
import kotlinx.coroutines.isActive
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.callbackFlow
import kotlinx.coroutines.flow.collectLatest
Expand All @@ -50,6 +51,10 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.LifecycleRegistry
import androidx.lifecycle.setViewTreeLifecycleOwner
import androidx.savedstate.SavedStateRegistry
import androidx.savedstate.SavedStateRegistryController
import androidx.savedstate.SavedStateRegistryOwner
import androidx.savedstate.setViewTreeSavedStateRegistryOwner

internal interface ClusterRendererItemState<T : ClusterItem> {
val unclusteredItems: State<Set<T>>
Expand Down Expand Up @@ -90,6 +95,15 @@ internal class ComposeUiClusterRenderer<T : ClusterItem>(
override val lifecycle: Lifecycle get() = lifecycleRegistry
}

private val fakeSavedStateRegistryOwner = object : SavedStateRegistryOwner {
private val controller = SavedStateRegistryController.create(this).apply {
performAttach()
performRestore(null)
}
override val savedStateRegistry: SavedStateRegistry get() = controller.savedStateRegistry
override val lifecycle: Lifecycle get() = fakeLifecycleOwner.lifecycle
}

override fun onClustersChanged(clusters: Set<Cluster<T>>) {
super.onClustersChanged(clusters)
unclusteredItems.value = clusters.filter { !shouldRenderAsCluster(it) }
Expand Down Expand Up @@ -149,6 +163,7 @@ internal class ComposeUiClusterRenderer<T : ClusterItem>(
}
)
view.setViewTreeLifecycleOwner(fakeLifecycleOwner)
view.setViewTreeSavedStateRegistryOwner(fakeSavedStateRegistryOwner)
val renderHandle = viewRendererState.value.startRenderingView(view)
val rerenderJob = scope.launch {
collectInvalidationsAndRerender(key, view)
Expand Down Expand Up @@ -212,6 +227,7 @@ internal class ComposeUiClusterRenderer<T : ClusterItem>(
}

override fun getDescriptorForCluster(cluster: Cluster<T>): BitmapDescriptor {
if (!scope.isActive) return super.getDescriptorForCluster(cluster)
return if (clusterContentState.value != null) {
val viewInfo = keysToViews.entries
.firstOrNull { (key, _) -> (key as? ViewKey.Cluster)?.cluster == cluster }
Expand All @@ -232,6 +248,8 @@ internal class ComposeUiClusterRenderer<T : ClusterItem>(
override fun onBeforeClusterItemRendered(item: T, markerOptions: MarkerOptions) {
super.onBeforeClusterItemRendered(item, markerOptions)

if (!scope.isActive) return

if (clusterItemContentState.value != null) {
val viewInfo = keysToViews.entries
.firstOrNull { (key, _) -> (key as? ViewKey.Item)?.item == item }
Expand Down
Loading