diff --git a/apps/mobile/src/features/layout/inspector-host.android.tsx b/apps/mobile/src/features/layout/inspector-host.android.tsx index 9537811916f07..e68c5430194df 100644 --- a/apps/mobile/src/features/layout/inspector-host.android.tsx +++ b/apps/mobile/src/features/layout/inspector-host.android.tsx @@ -53,7 +53,8 @@ export function InspectorPanes(props: { position: "absolute", inset: 0, opacity: visible ? 1 : 0, - zIndex: visible ? 1 : 0, + // Material searches children in drawing order, including prewarmed hidden panes. + zIndex: visible ? 0 : 1, }} > diff --git a/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx b/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx index 43e541083688f..b24737b555217 100644 --- a/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx +++ b/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx @@ -65,6 +65,8 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) { const presentation = props.presentation ?? "sheet"; const isInspector = presentation === "inspector"; const closeInspectorSheet = use(InspectorSheetContext); + const isAndroidSheet = + Platform.OS === "android" && (!isInspector || closeInspectorSheet !== null); const presentRoute = (present: () => void) => closeInspectorSheet ? closeInspectorSheet(present) : present(); const environmentId = EnvironmentId.make(props.route.params.environmentId); @@ -241,7 +243,10 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) { gap: Platform.OS === "android" ? 8 : 14, }} refreshControl={ - void handleRefresh()} /> + // Material must track the ScrollView instead of Android's refresh wrapper. + !isAndroidSheet ? ( + void handleRefresh()} /> + ) : undefined } > @@ -343,19 +348,28 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) { onPress: () => void handleRefresh(), }; + // Material targets the first nested scroll child; Compose headers must follow the body. + const header = ( + navigation.goBack()} + refresh={refresh} + /> + ); + return ( - navigation.goBack()} - refresh={refresh} - /> + {Platform.OS === "android" ? null : header} {content} + {Platform.OS === "android" ? header : null} ); }