Wrap a screen content to a Box for the iOS back animation blackout #2146
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MatkovIvan
reviewed
Jun 2, 2025
navigation/navigation-compose/src/uikitMain/kotlin/androidx/navigation/compose/NavHost.uikit.kt
Outdated
Show resolved
Hide resolved
navigation/navigation-compose/src/commonMain/kotlin/androidx/navigation/compose/NavHost.kt
Show resolved
Hide resolved
navigation/navigation-compose/src/uikitMain/kotlin/androidx/navigation/compose/NavHost.uikit.kt
Show resolved
Hide resolved
MatkovIvan
changed the title
MatkovIvan
reviewed
Jun 3, 2025
navigation/navigation-compose/src/uikitMain/kotlin/androidx/navigation/compose/NavHost.uikit.kt
Outdated
Show resolved
Hide resolved
| @@ -719,28 +721,33 @@ internal fun NavHost( | |||
| // while in the scope of the composable, we provide the navBackStackEntry as the | |||
| // ViewModelStoreOwner and LifecycleOwner | |||
| currentEntry?.LocalOwnersProvider(saveableStateHolder) { | |||
| (currentEntry.destination as ComposeNavigator.Destination).content( | |||
There was a problem hiding this comment.
It probably makes sense to extract our extra drawing into a separate function to simplify the diff with AOSP (+ it's already a huge function)
There was a problem hiding this comment.
there is a lot of the local context to pass to the new function. readability will be worse
It fixes a crash when NavHost is located inside a scrollable container and there is no available max size.
MatkovIvan
approved these changes
Jun 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It fixes a crash when NavHost is located inside a scrollable container and there is no available max size.
The reason is an additional iOS blackout layer.
Simple reproducer:
Inside the
verticalScrollit is not possible to measure constrains:.layout { m, c -> val placeable = m.measure(Constraints.fixed(c.maxWidth, c.maxHeight) layout(c.minWidth, c.minHeight) { placeable.place(0, 0) } }So, I wrapped the screen content in an additional Box and use
matchParentSize()modifier now.Fixes https://youtrack.jetbrains.com/issue/CMP-8233
Release Notes
Fixes - Navigation
NavHostis located in a scrollable container