Skip to content

fix(mobile): disable KeyboardProvider on Android to fix header inset #2524

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
esimkowitz wants to merge 3 commits into from
Closed

fix(mobile): disable KeyboardProvider on Android to fix header inset #2524

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
294e670
fix(mobile): disable KeyboardProvider on Android to fix header inset
esimkowitz Feb 26, 2026
05aaded
fix header color regression
esimkowitz Feb 27, 2026
75fb33c
revert all transparent header changes
esimkowitz Feb 27, 2026
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
24 changes: 19 additions & 5 deletions apps/mobile/app/_layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import "@/globals.css";
import "expo-dev-client";

import type React from "react";
Copy link
Copy Markdown
Collaborator

@xuatz xuatz Mar 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
import type React from "react";
import type { ReactNode } from "react";

nitpick ^^

import { useEffect } from "react";
import { Platform } from "react-native";
import { GestureHandlerRootView } from "react-native-gesture-handler";
Expand All @@ -18,6 +19,22 @@ import { cn } from "@/lib/utils";
import { NAV_THEME } from "@/theme";
import { ThemeProvider as NavThemeProvider } from "@react-navigation/native";

// On Android, KeyboardProvider's EdgeToEdgeReactViewGroup intercepts window insets at
// the root view level, zeroing out the status bar top inset. This prevents the native
// navigation toolbar (react-native-screens' CustomToolbar) from receiving the correct
// system bar insets, resulting in headers appearing cramped against the status bar.
// We skip KeyboardProvider on Android entirely to let the toolbar handle its own insets.
function RootKeyboardProvider({ children }: { children: React.ReactNode }) {
if (Platform.OS === "android") {
return children;
}
return (
<KeyboardProvider statusBarTranslucent navigationBarTranslucent>
{children}
</KeyboardProvider>
);
}

export default function RootLayout() {
useInitialAndroidBarSync();
const router = useRouter();
Expand All @@ -34,10 +51,7 @@ export default function RootLayout() {

return (
<SafeAreaProvider>
<KeyboardProvider
statusBarTranslucent={Platform.OS !== "android" ? true : undefined}
navigationBarTranslucent={Platform.OS !== "android" ? true : undefined}
>
<RootKeyboardProvider>
<NavThemeProvider value={NAV_THEME[colorScheme]}>
<SplashScreenController />
<StyledStack
Expand Down Expand Up @@ -128,7 +142,7 @@ export default function RootLayout() {
/>
</StyledStack>
</NavThemeProvider>
</KeyboardProvider>
</RootKeyboardProvider>
<StatusBar
key={`root-status-bar-${isDarkColorScheme ? "light" : "dark"}`}
style={isDarkColorScheme ? "light" : "dark"}
Expand Down
⚡