Remember the view morph scope across recompositions (#184)

2026-09-27 12:01:41 +02:00
parent f7805cb0b5
commit dc841a91e0
1 changed files with 6 additions and 7 deletions
@@ -383,13 +383,12 @@ fun CalendarHost(
            transitionSpec = { viewSwitch },
            label = "view-switch",
        ) { currentView ->
-            CompositionLocalProvider(
-                LocalViewMorph provides if (reduceMotion) {
-                    null
-                } else {
-                    ViewMorphScope(this@SharedTransitionLayout, this@AnimatedContent, morphBounds, morphFade)
-                },
-            ) {
+            val sharedScope = this@SharedTransitionLayout
+            val visibilityScope = this@AnimatedContent
+            val viewMorph = remember(reduceMotion, sharedScope, visibilityScope, morphBounds, morphFade) {
+                if (reduceMotion) null else ViewMorphScope(sharedScope, visibilityScope, morphBounds, morphFade)
+            }
+            CompositionLocalProvider(LocalViewMorph provides viewMorph) {
            when (currentView) {
                CalendarView.Week -> WeekScreen(
                    selectedView = currentView,