@devries-cameron20 / t3code Mirror · read-only / commits / 44dae85688
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 22, 14:30 UTC

fix(mobile): lists end at the search field, and HTML previews start below the header (#25765)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Julius Marminge committed Oct 26, 2026 at 22:20 UTC 44dae856886342c684e437174138233cae57c38d
5 files changed +54 -55
apps/mobile/src/features/files/WorkspaceFileWebPreview.tsx
+15 -10
@@ -23,7 +23,8 @@ export function WorkspaceFileWebPreview(props: { readonly uri: string | null })
23 function DocumentWebPreview(props: { readonly uri: string }) {
24 const insets = useSafeAreaInsets();
25 const columnMetrics = useNativeColumnLayoutMetrics();
26 - const pdfTopInset = Platform.OS === "ios" ? (columnMetrics?.safeArea.top ?? insets.top) : 0;
26 + // iOS headers float over this column, so content starts below them.
27 + const headerInset = Platform.OS === "ios" ? (columnMetrics?.safeArea.top ?? insets.top) : 0;
28 const [loadProgress, setLoadProgress] = useState(0);
29 const [loadError, setLoadError] = useState<string | null>(null);
30 const [linkedPdf, setLinkedPdf] = useState<string | null>(null);
@@ -35,7 +36,7 @@ function DocumentWebPreview(props: { readonly uri: string }) {
36
37 if (isPdfPreviewUri(props.uri)) {
38 return (
38 - <View className="flex-1" style={{ paddingTop: pdfTopInset }}>
39 + <View className="flex-1" style={{ paddingTop: headerInset }}>
40 <PdfPreview uri={props.uri} />
41 </View>
42 );
@@ -44,7 +45,7 @@ function DocumentWebPreview(props: { readonly uri: string }) {
45 return (
46 <View className="relative flex-1 bg-card">
47 {linkedPdf ? (
47 - <View className="flex-1" style={{ paddingTop: pdfTopInset }}>
48 + <View className="flex-1" style={{ paddingTop: headerInset }}>
49 <PdfPreview key={linkedPdf} uri={linkedPdf} />
50 <SafeAreaView edges={["bottom"]} className="border-t border-border px-4 py-2">
51 <ControlPill
@@ -56,15 +57,10 @@ function DocumentWebPreview(props: { readonly uri: string }) {
57 </View>
58 ) : null}
59 <View className="flex-1" style={linkedPdf ? { display: "none" } : undefined}>
59 - {loadProgress > 0 && loadProgress < 1 ? <LoadingStrip progress={loadProgress} /> : null}
60 - {loadError ? (
61 - <View className="border-b border-border bg-card px-4 py-2">
62 - <Text className="text-xs font-t3-bold text-foreground">Preview failed</Text>
63 - <Text className="mt-0.5 text-xs leading-snug text-foreground-muted">{loadError}</Text>
64 - </View>
65 - ) : null}
60 <WebView
61 source={{ uri: props.uri }}
62 + // react-native-webview defaults to "never", which starts the page under the header.
63 + contentInsetAdjustmentBehavior="automatic"
64 originWhitelist={["*"]}
65 allowsBackForwardNavigationGestures
66 allowsFullscreenVideo
@@ -98,6 +94,15 @@ function DocumentWebPreview(props: { readonly uri: string }) {
94 )}
95 style={{ flex: 1, backgroundColor: "transparent" }}
96 />
97 + <View pointerEvents="box-none" className="absolute inset-x-0" style={{ top: headerInset }}>
98 + {loadProgress > 0 && loadProgress < 1 ? <LoadingStrip progress={loadProgress} /> : null}
99 + {loadError ? (
100 + <View className="border-b border-border bg-card px-4 py-2">
101 + <Text className="text-xs font-t3-bold text-foreground">Preview failed</Text>
102 + <Text className="mt-0.5 text-xs leading-snug text-foreground-muted">{loadError}</Text>
103 + </View>
104 + ) : null}
105 + </View>
106 </View>
107 </View>
108 );
apps/mobile/src/features/pull-requests/PullRequestsScreen.tsx
+7 -2
@@ -22,6 +22,7 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
22 import { AppText as Text } from "../../components/ui/AppText";
23 import { EmptyState } from "../../components/ui/EmptyState";
24 import { NativePrimaryColumnContext } from "../../native/v5-workspace-context";
25 +import { useNativeColumnLayoutMetrics } from "../../native/native-layout-metrics";
26 import { useWorkspaceState } from "../../state/workspace";
27 import { useProjects } from "../../state/entities";
28 import { environmentServerConfigsAtom } from "../../state/server";
@@ -96,6 +97,10 @@ export function PullRequestsScreen(
97 const { environments } = useWorkspaceState();
98 const configs = useAtomValue(environmentServerConfigsAtom);
99 const insets = useSafeAreaInsets();
100 + // UIKit insets the list by its column's safe area, which this context can report as 0.
101 + const columnSafeBottom = useNativeColumnLayoutMetrics()?.safeArea.bottom;
102 + const bottomSafeArea =
103 + Platform.OS === "ios" ? (columnSafeBottom ?? insets.bottom) : insets.bottom;
104 const listRef = useRef<LegendListRef>(null);
105 const tab = workspace.state.tabs.pullRequests;
106 const [initialScrollOffset] = useState(() => workspace.getScrollOffset("pullRequests"));
@@ -314,8 +319,8 @@ export function PullRequestsScreen(
319 contentInsetStartAdjustment={Platform.OS === "ios" ? insets.top : 0}
320 contentContainerStyle={{
321 paddingBottom:
317 - Math.max(insets.bottom, workspace.bottomClearance) -
318 - (Platform.OS === "ios" ? insets.bottom : 0),
322 + Math.max(bottomSafeArea, workspace.bottomClearance) -
323 + (Platform.OS === "ios" ? bottomSafeArea : 0),
324 }}
325 onScroll={(event) => {
326 workspace.recordScrollOffset(
apps/mobile/src/features/settings/SettingsRouteScreen.tsx
+29 -34
@@ -12,18 +12,14 @@ import { currentWorkspaceSelections } from "../workspace/workspace-selection-sto
12 import { rememberedSettingsPage } from "../workspace/workspace-tab-navigation";
13 import { useSelectWorkspaceTab } from "../workspace/useSelectWorkspaceTab";
14 import { useWorkspaceTabs } from "../workspace/WorkspaceTabsContext";
15 -import {
16 - ScreenScrollView as ScrollView,
17 - ScreenScrollViewBottomInset,
18 -} from "../../components/ui/ScreenScrollView";
15 +import { ScreenScrollView as ScrollView } from "../../components/ui/ScreenScrollView";
16 import { EmptyState } from "../../components/ui/EmptyState";
17 import { useAuth, useUser } from "@clerk/expo";
18 import { useNavigation, useNavigationState } from "@react-navigation/native";
19 import { use, useMemo, type ComponentProps } from "react";
20 import { Platform, View } from "react-native";
21 import { useWorkspaceSurface } from "../workspace/useWorkspaceSurface";
25 -import { useDeviceType } from "../../native/native-layout-metrics";
26 -import { useCompactWorkspaceTabs } from "../workspace/useSystemWorkspaceTabBar";
22 +import { useNativeColumnLayoutMetrics } from "../../native/native-layout-metrics";
23 import { deriveProjectGroupLabel } from "@t3tools/client-runtime/state/project-grouping";
24 import { useSafeAreaInsets } from "react-native-safe-area-context";
25
@@ -44,8 +40,6 @@ import { NativePrimaryColumnContext } from "../../native/v5-workspace-context";
40
41 export function SettingsRouteScreen() {
42 const surface = useWorkspaceSurface();
47 - const deviceType = useDeviceType();
48 - const compactTabs = useCompactWorkspaceTabs();
43 const workspace = useWorkspaceTabs();
44 const { layout } = useAdaptiveWorkspaceLayout();
45 const inSidebar = use(NativePrimaryColumnContext) !== null && layout.usesSplitView;
@@ -69,28 +63,26 @@ export function SettingsRouteScreen() {
63 <SettingsSidebarContext value={sidebar}>
64 <View className={`flex-1 ${inSidebar ? surface.className : "bg-screen"}`}>
65 <SettingsEnvironmentFilterHeader />
72 - <ScreenScrollViewBottomInset value={deviceType === "pad" || compactTabs ? 80 : 0}>
73 - {Platform.OS === "android" ? (
74 - <SettingsScreen
75 - title="Settings"
76 - trailing={<AndroidSettingsEnvironmentFilter />}
77 - search={
78 - workspace
79 - ? {
80 - value: workspace.state.tabs.settings.query,
81 - onChangeText: (query) =>
82 - workspace.dispatch({ type: "query", tab: "settings", query }),
83 - placeholder: "Search settings",
84 - }
85 - : undefined
86 - }
87 - >
88 - {content}
89 - </SettingsScreen>
90 - ) : (
91 - content
92 - )}
93 - </ScreenScrollViewBottomInset>
66 + {Platform.OS === "android" ? (
67 + <SettingsScreen
68 + title="Settings"
69 + trailing={<AndroidSettingsEnvironmentFilter />}
70 + search={
71 + workspace
72 + ? {
73 + value: workspace.state.tabs.settings.query,
74 + onChangeText: (query) =>
75 + workspace.dispatch({ type: "query", tab: "settings", query }),
76 + placeholder: "Search settings",
77 + }
78 + : undefined
79 + }
80 + >
81 + {content}
82 + </SettingsScreen>
83 + ) : (
84 + content
85 + )}
86 </View>
87 </SettingsSidebarContext>
88 );
@@ -159,6 +151,8 @@ function SettingsList(props: { readonly connections: readonly SettingsListRow[]
151 // Grouped cards only lift off the screen surface; the drawer is as dark as they are.
152 const listSurface = use(SettingsSidebarContext) ? "bg-drawer" : "bg-screen";
153 const insets = useSafeAreaInsets();
154 + // UIKit insets the scroll view by its column's safe area, which this context can report as 0.
155 + const bottomSafeArea = useNativeColumnLayoutMetrics()?.safeArea.bottom ?? insets.bottom;
156 const workspace = useWorkspaceTabs();
157 const query = workspace?.state.tabs.settings.query ?? "";
158 const overflowRows = useOverflowRows();
@@ -178,10 +172,11 @@ function SettingsList(props: { readonly connections: readonly SettingsListRow[]
172 contentContainerClassName="gap-4 px-5 pt-4"
173 contentContainerStyle={{
174 // The workspace's clearance keeps the last row above its search field and keyboard.
181 - paddingBottom: Math.max(
182 - Math.max(insets.bottom, 18) + 18,
183 - workspace?.bottomClearance ?? 0,
184 - ),
175 + paddingBottom:
176 + Platform.OS === "ios"
177 + ? Math.max(Math.max(bottomSafeArea, 18) + 18, workspace?.bottomClearance ?? 0) -
178 + bottomSafeArea
179 + : Math.max(Math.max(insets.bottom, 18) + 18, workspace?.bottomClearance ?? 0),
180 }}
181 >
182 {sections.length ? (
apps/mobile/src/features/threads/HtmlRenderWebView.tsx
+1 -1
@@ -131,7 +131,7 @@ export function HtmlRenderWebView(props: {
131 accessibilityLabel={props.title}
132 style={{ flex: 1, backgroundColor: "transparent" }}
133 allowsInlineMediaPlayback
134 - automaticallyAdjustContentInsets={!props.nested}
134 + contentInsetAdjustmentBehavior={props.nested ? "never" : "automatic"}
135 bounces={!props.nested}
136 showsVerticalScrollIndicator={!props.nested}
137 showsHorizontalScrollIndicator={!props.nested}
apps/mobile/src/features/workspace/WorkspaceRootScreen.tsx
+2 -8
@@ -18,7 +18,6 @@ import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
18 import { useWorkspaceSurface } from "./useWorkspaceSurface";
19 import {
20 useDeviceType,
21 - useDuoBottomBarInset,
21 useNativeColumnLayoutMetrics,
22 useNativeLayoutMetrics,
23 } from "../../native/native-layout-metrics";
@@ -35,7 +34,6 @@ import {
34 import { WorkspaceToolbar } from "./WorkspaceToolbar";
35 import {
36 WORKSPACE_DOCK,
38 - workspaceSearchBottomClearance,
37 workspaceDockBottomClearance,
38 workspaceToolbarHeight,
39 } from "./workspace-tabs-state";
@@ -94,7 +92,6 @@ function WorkspaceRootContent() {
92 (nativeMetrics !== null && nativeMetrics.verticalBarEdge !== "none"));
93 const width = columnMetrics?.width ?? windowWidth;
94 const insets = useSafeAreaInsets();
97 - const bottomBarInset = useDuoBottomBarInset();
95 const keyboardHeight = useKeyboardState((keyboard) => keyboard.height);
96 const workspace = useWorkspaceTabs()!;
97 const { state } = workspace;
@@ -114,11 +111,8 @@ function WorkspaceRootContent() {
111 layout.primarySidebarOverlaysContent && state.selectedTab === "usage"
112 ? workspaceDockBottomClearance({ bottomInset: insets.bottom, keyboardHeight })
113 : Platform.OS === "ios" && isDuoDevice(deviceType)
117 - ? workspaceSearchBottomClearance({
118 - bottomInset: insets.bottom,
119 - bottomBarInset,
120 - keyboardHeight,
121 - })
114 + ? // The column's safe area already holds the Duo's search toolbar and keyboard.
115 + Math.max(insets.bottom, keyboardHeight) + 16
116 : compactTabs || deviceType === "pad"
117 ? workspaceDockBottomClearance({ bottomInset: insets.bottom, keyboardHeight })
118 : Platform.OS === "ios"