Skip to content

fix(Android, Stack v4): fall back to rootWindowInsets for status bar top when ancestor consumed insets #3870

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

Closed
khorark wants to merge 1 commit into from
Closed

fix(Android, Stack v4): fall back to rootWindowInsets for status bar top when ancestor consumed insets #3870

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
12 changes: 11 additions & 1 deletion android/src/main/java/com/swmansion/rnscreens/CustomToolbar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,20 @@ open class CustomToolbar(
// We want to handle display cutout always, no matter the HeaderConfig prop values.
// If there are no cutout displays, we want to apply the additional padding to
// respect the status bar.
//
// Use rootWindowInsets as a fallback for status bar top height when unhandledInsets
// reports 0. This can happen when an ancestor view (e.g. SafeAreaProvider from
// react-native-safe-area-context) has already consumed the top systemBars inset, causing
// unhandledInsets.top == 0 and the toolbar title to render behind the status bar.
// rootWindowInsets always contains the raw window insets regardless of consumption by ancestors.
val statusBarTop = if (shouldApplyTopInset) {
val fromUnhandled = systemBarInsets.top
if (fromUnhandled > 0) fromUnhandled else resolveInsetsOrZero(WindowInsetsCompat.Type.systemBars()).top
} else 0
val verticalInsets =
InsetsCompat.of(
0,
max(cutoutInsets.top, if (shouldApplyTopInset) systemBarInsets.top else 0),
max(cutoutInsets.top, statusBarTop),
0,
max(cutoutInsets.bottom, 0),
)
Expand Down
⚡