From e36f0e27b49e1bab307b870dbfcb0daefbf400d3 Mon Sep 17 00:00:00 2001 From: Pixel Perfect Date: Tue, 10 Nov 2026 00:46:52 -0800 Subject: [PATCH 1/2] feat(mobile): open pull requests beside the chat in the inspector --- .../features/layout/useOpenWorkspaceDetail.ts | 22 ++++ .../useAndroidWorkspaceNavigation.ts | 7 +- .../pull-requests/PullRequestRouteScreen.tsx | 45 +++++++- .../guide/PullRequestGuideScreen.tsx | 8 +- .../pullRequestNavigation.test.ts | 19 +++- .../thread-inspector-navigation.test.tsx | 104 +++++++++++++++++- .../threads/thread-inspector-navigation.ts | 38 ++++++- .../threads/thread-inspector-preview.tsx | 26 ++++- .../features/threads/thread-preview-route.tsx | 28 +++++ apps/mobile/src/lib/pullRequestNavigation.ts | 17 +++ apps/mobile/src/native/useOpenPullRequest.ts | 14 ++- 11 files changed, 304 insertions(+), 24 deletions(-) diff --git a/apps/mobile/src/features/layout/useOpenWorkspaceDetail.ts b/apps/mobile/src/features/layout/useOpenWorkspaceDetail.ts index 64966c35844c..61b23208e3ea 100644 --- a/apps/mobile/src/features/layout/useOpenWorkspaceDetail.ts +++ b/apps/mobile/src/features/layout/useOpenWorkspaceDetail.ts @@ -1,4 +1,9 @@ import { StackActions, useNavigation } from "@react-navigation/native"; +import { use } from "react"; +import { + ThreadInspectorNavigationContext, + useOpenPullRequestInspector, +} from "../threads/thread-inspector-navigation"; import { Platform } from "react-native"; import { useSelectWorkspaceDetail } from "./workspace/useSelectWorkspaceDetail"; @@ -12,7 +17,24 @@ import type { WorkspaceDetail, WorkspaceDetailSheet } from "./workspace/workspac export function useOpenWorkspaceDetail() { const navigation = useNavigation(); const selectDetail = useSelectWorkspaceDetail(); + const openPullRequestInspector = useOpenPullRequestInspector(); + const openInInspector = use(ThreadInspectorNavigationContext); return (detail: WorkspaceDetail, sheet?: WorkspaceDetailSheet) => { + if (!sheet && detail.name === "PullRequest" && openPullRequestInspector(detail.params)) return; + if ( + !sheet && + detail.name === "Thread" && + openInInspector && + detail.params.environmentId && + detail.params.threadId + ) { + openInInspector({ + type: "thread", + environmentId: detail.params.environmentId, + threadId: detail.params.threadId, + }); + return; + } if (Platform.OS === "android") selectDetail(detail, sheet); else if (sheet) navigation.navigate(sheet.name, sheet.params); else navigation.dispatch(StackActions.push(detail.name, detail.params)); diff --git a/apps/mobile/src/features/layout/workspace/useAndroidWorkspaceNavigation.ts b/apps/mobile/src/features/layout/workspace/useAndroidWorkspaceNavigation.ts index dfc8e13d162c..4ee463fbe773 100644 --- a/apps/mobile/src/features/layout/workspace/useAndroidWorkspaceNavigation.ts +++ b/apps/mobile/src/features/layout/workspace/useAndroidWorkspaceNavigation.ts @@ -31,20 +31,21 @@ export function useWorkspaceBackNavigation(tab: WorkspaceTab) { }; } -export function useAndroidWorkspaceBack(tab: WorkspaceTab) { +export function useAndroidWorkspaceBack(tab: WorkspaceTab, onBack?: () => void) { const dispatch = useWorkspaceTabs()?.dispatch; const goBack = useWorkspaceBackNavigation(tab); useFocusEffect( useCallback(() => { if (Platform.OS !== "android") return; - dispatch?.({ type: "select", tab }); + if (!onBack) dispatch?.({ type: "select", tab }); const subscription = BackHandler.addEventListener("hardwareBackPress", () => { if (Keyboard.isVisible()) Keyboard.dismiss(); + else if (onBack) onBack(); else goBack(); return true; }); return () => subscription.remove(); - }, [goBack, dispatch, tab]), + }, [goBack, dispatch, tab, onBack]), ); return goBack; } diff --git a/apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx b/apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx index f78cd9caa58c..7edfb2f56e9d 100644 --- a/apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx +++ b/apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx @@ -40,7 +40,12 @@ import { } from "./pullRequestDiffDebug"; import { usePullRequestDiffHighlightFiles } from "./usePullRequestDiffHighlightFiles"; import { isTestChangedFile } from "@t3tools/shared/changedFileKind"; -import { useFocusEffect, useNavigation, type StaticScreenProps } from "@react-navigation/native"; +import { + useNavigationState, + useFocusEffect, + useNavigation, + type StaticScreenProps, +} from "@react-navigation/native"; import type { NativeStackNavigationProp } from "@react-navigation/native-stack"; import { RegistryContext, useAtomRefresh, useAtomValue } from "@effect/atom-react"; import { pullRequestReviewKey } from "./pullRequestReviewDrafts"; @@ -322,10 +327,25 @@ function usePullRequestToolbarHeight(bottomInset: number) { return useState(() => (Platform.OS === "android" ? bottomInset + buttonSize + 40 : 0)); } -export function PullRequestRouteScreen({ route }: StaticScreenProps) { - const returnToList = useAndroidWorkspaceBack("pullRequests"); - const { layout } = useAdaptiveWorkspaceLayout(); +export function PullRequestRouteScreen({ + route, + inspectorPresentation, +}: StaticScreenProps & { + readonly inspectorPresentation?: { + readonly onClose: () => void; + readonly onMaximize: () => void; + }; +}) { const navigation = useNavigation(); + const followsChat = useNavigationState( + (state) => state.routes[state.index - 1]?.name === "Thread", + ); + const returnToChat = followsChat ? () => navigation.goBack() : undefined; + const returnToList = useAndroidWorkspaceBack( + "pullRequests", + inspectorPresentation?.onClose ?? returnToChat, + ); + const { layout } = useAdaptiveWorkspaceLayout(); const insets = useSafeAreaInsets(); const [toolbarHeight, setToolbarHeight] = usePullRequestToolbarHeight(insets.bottom); const contentTopInset = useContentTopInset(); @@ -465,7 +485,22 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps diff --git a/apps/mobile/src/features/pull-requests/pullRequestNavigation.test.ts b/apps/mobile/src/features/pull-requests/pullRequestNavigation.test.ts index 8a97deffaf06..28700877625e 100644 --- a/apps/mobile/src/features/pull-requests/pullRequestNavigation.test.ts +++ b/apps/mobile/src/features/pull-requests/pullRequestNavigation.test.ts @@ -1,6 +1,9 @@ import { EnvironmentId, ProjectId, SourceControlProviderKind } from "@t3tools/contracts"; import { describe, expect, it } from "vite-plus/test"; -import { nativePullRequestDestination as destination } from "../../lib/pullRequestNavigation"; +import { + pullRequestOverviewRoute, + nativePullRequestDestination as destination, +} from "../../lib/pullRequestNavigation"; const context = { environmentId: "remote", projectId: "project" }; const project = (id: string, canonicalKey: string, provider: string, remoteUrl: string) => ({ @@ -71,3 +74,17 @@ describe("native PR entry points", () => { ).toBeNull(); }); }); + +it("returns a guide tour to the PR inspector while preserving standalone PR history", () => { + const thread = { + name: "Thread", + params: { + environmentId: "env", + threadId: "chat", + inspector: { type: "pullRequest", params: { number: 1 } }, + }, + }; + const stop = { name: "PullRequestGuideStop" }; + expect(pullRequestOverviewRoute([{ name: "Home" }, thread, stop, stop])).toBe("Thread"); + expect(pullRequestOverviewRoute([thread, { name: "PullRequest" }, stop])).toBe("PullRequest"); +}); diff --git a/apps/mobile/src/features/threads/thread-inspector-navigation.test.tsx b/apps/mobile/src/features/threads/thread-inspector-navigation.test.tsx index d09bd106941c..18d3896f28b6 100644 --- a/apps/mobile/src/features/threads/thread-inspector-navigation.test.tsx +++ b/apps/mobile/src/features/threads/thread-inspector-navigation.test.tsx @@ -9,11 +9,12 @@ const harness = vi.hoisted(() => ({ dispatch: (_action: unknown) => {}, getState: (): unknown => undefined, getRoute: (): unknown => undefined, + supported: true, })); vi.mock("react-native", () => ({ Platform: { OS: "ios" } })); vi.mock("../layout/AdaptiveWorkspaceLayout", () => ({ - useWorkspacePaneState: () => ({ fileInspector: { supported: true } }), + useWorkspacePaneState: () => ({ fileInspector: { supported: harness.supported } }), })); vi.mock("@react-navigation/native", async () => { const { createRequire } = await import("node:module"); @@ -27,7 +28,7 @@ vi.mock("@react-navigation/native", async () => { }; }); -import { useOpenThreadInspector } from "./thread-inspector-navigation"; +import { useOpenPullRequestInspector, useOpenThreadInspector } from "./thread-inspector-navigation"; import { useOpenLinkedThread } from "./useOpenLinkedThread"; const requireNavigation = NodeModule.createRequire( @@ -39,10 +40,18 @@ const { StackRouter, StackActions } = requireNavigation("@react-navigation/route }; function setup(fromAgents: boolean, fullscreen = false) { + harness.supported = true; (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true; const router = StackRouter({}); const options = { - routeNames: ["Home", "Thread", "ThreadAgents", "ThreadInspectorFullscreen"], + routeNames: [ + "Home", + "Thread", + "ThreadAgents", + "ThreadInspectorFullscreen", + "ThreadPullRequests", + "GitOverview", + ], routeParamList: {}, routeGetIdList: {}, }; @@ -65,12 +74,15 @@ function setup(fromAgents: boolean, fullscreen = false) { StackActions.push("ThreadAgents", fullscreen ? { ...source, threadId: "child" } : source), ); let openInspector: ReturnType; + let openPullRequest: ReturnType; let openLinkedThread: ReturnType; function Probe() { const open = useOpenThreadInspector(); + const openPr = useOpenPullRequestInspector(); const openLinked = useOpenLinkedThread(); useLayoutEffect(() => { openInspector = open; + openPullRequest = openPr; openLinkedThread = openLinked; }); return null; @@ -91,6 +103,14 @@ function setup(fromAgents: boolean, fullscreen = false) { }); return opened; }, + openPullRequest(params: Parameters[0], from = source) { + act(() => root.render()); + let opened = false; + act(() => { + opened = openPullRequest(params, from); + }); + return opened; + }, openLinked(threadId: string) { act(() => openLinkedThread({ environmentId: source.environmentId, threadId })); }, @@ -297,3 +317,81 @@ it("keeps a focused inspector registered across renders and updates its content" expect(activeRender).toBeUndefined(); expect(listeners.focus.size + listeners.blur.size).toBe(0); }); + +it("switches PR identities without replacing the chat or its draft params", () => { + using screen = setup(false); + const params = { + environmentId: "other-environment", + projectId: "project", + host: "github.com", + repository: "demo/repo", + number: 12, + }; + expect(screen.openPullRequest(params)).toBe(true); + expect(screen.state.routes.at(-1)).toMatchObject({ + key: screen.parentKey, + params: { + ...screen.source, + prompt: "retained prompt", + inspector: { type: "pullRequest", params }, + }, + }); + const next = { ...params, environmentId: "third-environment", number: 13 }; + expect(screen.openPullRequest(next)).toBe(true); + expect(screen.state.routes).toHaveLength(2); + expect(screen.state.routes.at(-1)).toMatchObject({ + key: screen.parentKey, + params: { + inspector: { type: "pullRequest", params: next }, + }, + }); +}); + +it("leaves compact and standalone navigation to the PR opener", () => { + using screen = setup(false); + const params = { + environmentId: "environment", + projectId: "project", + repository: "demo/repo", + number: 12, + }; + const original = screen.state; + harness.supported = false; + expect(screen.openPullRequest(params)).toBe(false); + expect(screen.state).toEqual(original); + harness.supported = true; + screen.dispatch(StackActions.push("ThreadInspectorFullscreen", screen.source)); + expect(screen.openPullRequest(params)).toBe(false); +}); + +it.each(["ThreadPullRequests", "GitOverview"])( + "opens PRs from %s back in the source chat", + (sheet) => { + using screen = setup(false); + screen.dispatch(StackActions.push(sheet, screen.source)); + const params = { + environmentId: "env", + projectId: "project", + repository: "demo/repo", + number: 1, + }; + expect(screen.openPullRequest(params)).toBe(true); + expect(screen.state.routes).toHaveLength(2); + expect(screen.state.routes.at(-1)).toMatchObject({ + key: screen.parentKey, + params: { inspector: { type: "pullRequest", params } }, + }); + }, +); + +it("does not consume a PR from another sidebar thread or a new-task draft", () => { + using screen = setup(false); + const params = { environmentId: "env", projectId: "project", repository: "demo/repo", number: 1 }; + const original = screen.state; + expect(screen.openPullRequest(params, { ...screen.source, threadId: "other" })).toBe(false); + expect(screen.state).toEqual(original); + screen.dispatch( + StackActions.replace("Thread", { draft: { requestId: "draft", projectId: "project" } }), + ); + expect(screen.openPullRequest(params)).toBe(false); +}); diff --git a/apps/mobile/src/features/threads/thread-inspector-navigation.ts b/apps/mobile/src/features/threads/thread-inspector-navigation.ts index ef00083a36cf..b58b5d3488a6 100644 --- a/apps/mobile/src/features/threads/thread-inspector-navigation.ts +++ b/apps/mobile/src/features/threads/thread-inspector-navigation.ts @@ -1,16 +1,20 @@ import { StackActions, useNavigation } from "@react-navigation/native"; import { createContext, use } from "react"; +import type { PullRequestParams } from "../pull-requests/usePullRequestDiff"; + import { useWorkspacePaneState } from "../layout/AdaptiveWorkspaceLayout"; export type ThreadInspectorMode = "route" | "git" | "files" | "preview"; -export type ThreadInspectorTarget = { - readonly type: "thread" | "device"; - readonly environmentId: string; - readonly threadId: string; - readonly deviceKey?: string; -}; +export type ThreadInspectorTarget = + | { + readonly type: "thread" | "device"; + readonly environmentId: string; + readonly threadId: string; + readonly deviceKey?: string; + } + | { readonly type: "pullRequest"; readonly params: PullRequestParams }; export const ThreadInspectorNavigationContext = createContext< ((target: ThreadInspectorTarget) => void) | null @@ -43,3 +47,25 @@ export function useOpenThreadInspector() { return true; }; } + +export function useOpenPullRequestInspector() { + const navigation = useNavigation(); + const open = useOpenThreadInspector(); + const openInInspector = use(ThreadInspectorNavigationContext); + const { fileInspector } = useWorkspacePaneState(); + return ( + params: PullRequestParams, + source?: { readonly environmentId: string; readonly threadId: string }, + ) => { + if (!fileInspector.supported) return false; + const target = { type: "pullRequest", params } as const; + if (openInInspector) { + openInInspector(target); + return true; + } + const route = navigation.getState()?.routes.at(-1); + if (!source || !route || !["Thread", "ThreadPullRequests", "GitOverview"].includes(route.name)) + return false; + return open(source, target); + }; +} diff --git a/apps/mobile/src/features/threads/thread-inspector-preview.tsx b/apps/mobile/src/features/threads/thread-inspector-preview.tsx index d41d1f0c7e9b..f2824b434ef1 100644 --- a/apps/mobile/src/features/threads/thread-inspector-preview.tsx +++ b/apps/mobile/src/features/threads/thread-inspector-preview.tsx @@ -1,4 +1,9 @@ -import { useIsFocused, useNavigation, type StaticScreenProps } from "@react-navigation/native"; +import { + StackActions, + useIsFocused, + useNavigation, + type StaticScreenProps, +} from "@react-navigation/native"; import { EnvironmentId, ThreadId } from "@t3tools/contracts"; import { type ReactNode } from "react"; import { View } from "react-native"; @@ -14,7 +19,8 @@ import { ThreadInspectorNavigationContext, type ThreadInspectorTarget, } from "./thread-inspector-navigation"; -import { ThreadPreviewRoute } from "./thread-preview-route"; +import { PullRequestRouteScreen } from "../pull-requests/PullRequestRouteScreen"; +import { PullRequestPreviewRoute, ThreadPreviewRoute } from "./thread-preview-route"; /** A thread shown outside its route: in the inspector pane, or presented full screen with a close. */ export type ThreadInspectorPresentation = @@ -68,6 +74,7 @@ export function ThreadInspectorPreview(props: { const focused = useIsFocused(); const { target } = props; const maximizeDevice = (deviceKey: string | null) => { + if (target.type !== "device") return; props.onOpen({ ...target, deviceKey: deviceKey ?? undefined }); navigation.navigate("ThreadDevicePreview", { environmentId: target.environmentId, @@ -79,7 +86,20 @@ export function ThreadInspectorPreview(props: { return ( - {target.type === "device" ? ( + {target.type === "pullRequest" ? ( + + {(route) => ( + + navigation.dispatch(StackActions.push("PullRequest", route.params)), + }} + /> + )} + + ) : target.type === "device" ? ( ); } + +const PullRequestPreview = createThreadPreviewNavigator<{ PullRequest: PullRequestParams }>(); + +export function PullRequestPreviewRoute(props: { + readonly params: PullRequestParams; + readonly children: ( + route: RouteProp<{ PullRequest: PullRequestParams }, "PullRequest">, + ) => ReactNode; +}) { + const host = useNavigation(); + const theme = useMobileNavigationTheme(); + const { environmentId, projectId, host: forgeHost, repository, number } = props.params; + return ( + + + + + {(screen) => props.children(screen.route)} + + + + + ); +} diff --git a/apps/mobile/src/lib/pullRequestNavigation.ts b/apps/mobile/src/lib/pullRequestNavigation.ts index ecc25375b37d..39cd063f854e 100644 --- a/apps/mobile/src/lib/pullRequestNavigation.ts +++ b/apps/mobile/src/lib/pullRequestNavigation.ts @@ -27,3 +27,20 @@ export function nativePullRequestDestination( ...(target.host === undefined ? {} : { host: target.host }), }; } + +export function pullRequestOverviewRoute( + routes: readonly { readonly name: string; readonly params?: object }[], +) { + const detail = routes.findLast( + (route) => route.name === "PullRequest" || route.name === "Thread", + ); + return detail?.name === "Thread" && + detail.params && + "inspector" in detail.params && + detail.params.inspector && + typeof detail.params.inspector === "object" && + "type" in detail.params.inspector && + detail.params.inspector.type === "pullRequest" + ? "Thread" + : "PullRequest"; +} diff --git a/apps/mobile/src/native/useOpenPullRequest.ts b/apps/mobile/src/native/useOpenPullRequest.ts index ca6edda06a3b..3dd8f9d383a4 100644 --- a/apps/mobile/src/native/useOpenPullRequest.ts +++ b/apps/mobile/src/native/useOpenPullRequest.ts @@ -9,13 +9,19 @@ import { appAtomRegistry } from "../state/atom-registry"; import { environmentServerConfigsAtom } from "../state/server"; import { withKnownPullRequestSummary } from "../state/use-thread-pr"; +import { useOpenPullRequestInspector } from "../features/threads/thread-inspector-navigation"; + type PullRequestContext = { readonly environmentId: string; readonly projectId: string }; // Avoid useRoute so layouts without route context can open any thread's pull requests. -export function useNavigateToPullRequest(options?: { readonly replace?: boolean }) { +export function useNavigateToPullRequest(options?: { + readonly replace?: boolean; + readonly source?: { readonly environmentId: string; readonly threadId: string }; +}) { const navigation = useNavigation(); const selectDetail = useSelectWorkspaceDetail(); const projects = useProjects(); + const openInspector = useOpenPullRequestInspector(); const replace = options?.replace; return async (url: string, context: PullRequestContext | null) => { // Read at press time so a config push does not hand every link a new handler. @@ -25,6 +31,7 @@ export function useNavigateToPullRequest(options?: { readonly replace?: boolean ); if (!destination) return tryOpenExternalUrl(url, "pull-request"); const params = withKnownPullRequestSummary(destination); + if (openInspector(params, options?.source)) return true; // Android shows one page at a time; iOS opens it over the current page, so Back returns. if (Platform.OS === "android") selectDetail({ name: "PullRequest", params }); else if (replace) navigation.dispatch(StackActions.replace("PullRequest", params)); @@ -58,7 +65,10 @@ export function useOpenPullRequest(options?: { ); const projectId = options?.context?.projectId ?? first(routeContext?.projectId) ?? thread?.projectId; - const navigateToPullRequest = useNavigateToPullRequest({ replace: options?.replace }); + const navigateToPullRequest = useNavigateToPullRequest({ + replace: options?.replace, + source: environmentId && threadId ? { environmentId, threadId } : undefined, + }); return (url: string) => navigateToPullRequest( url, From c48814117c8c875fd7416bb5c87875c8d44e3c48 Mon Sep 17 00:00:00 2001 From: Pixel Perfect Date: Tue, 10 Nov 2026 07:49:22 -0800 Subject: [PATCH 2/2] fix(mobile): maximize PR inspectors over the full workspace --- apps/mobile/src/Stack.tsx | 8 ++++++ .../layout/AdaptiveWorkspaceLayout.tsx | 24 ++++++++++------ .../features/layout/useOpenWorkspaceDetail.ts | 13 +++++++++ .../pull-requests/PullRequestRouteScreen.tsx | 28 +++++++++++++++++-- .../guide/PullRequestGuideScreen.tsx | 5 +++- .../pullRequestNavigation.test.ts | 3 ++ .../thread-inspector-navigation.test.tsx | 16 +++++++++++ .../threads/thread-inspector-preview.tsx | 4 ++- apps/mobile/src/lib/pullRequestNavigation.ts | 9 ++++-- apps/mobile/src/native/useOpenPullRequest.ts | 4 +++ 10 files changed, 99 insertions(+), 15 deletions(-) diff --git a/apps/mobile/src/Stack.tsx b/apps/mobile/src/Stack.tsx index b8ab00673db1..4326de05227c 100644 --- a/apps/mobile/src/Stack.tsx +++ b/apps/mobile/src/Stack.tsx @@ -29,6 +29,7 @@ import { import { AndroidWorkspaceTabsProvider } from "./features/layout/workspace/AndroidWorkspaceTabsProvider"; import { PullRequestRouteScreen, + FullscreenPullRequestRouteScreen, PullRequestFileRouteScreen, } from "./features/pull-requests/PullRequestRouteScreen"; import { PullRequestFilesSheet } from "./features/pull-requests/PullRequestFiles"; @@ -506,6 +507,13 @@ const RootStackConfig = createWorkspaceStackNavigator({ }, options: pageRoute({ duoMinimize: "never" }), }), + PullRequestInspectorFullscreen: createNativeStackScreen({ + screen: FullscreenPullRequestRouteScreen, + options: { + ...modalRoute({ header: "glass", itemStyle: "editor", duoMinimize: "never" }), + animation: "none", + }, + }), PullRequestGuideStop: createNativeStackScreen({ screen: PullRequestGuideStopScreen, options: pageRoute(), diff --git a/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx b/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx index c61f83146c16..a656f91d78b5 100644 --- a/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx +++ b/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx @@ -131,6 +131,7 @@ export function Inspector(props: { const { registerWorkspaceInspector } = useAdaptiveWorkspaceLayout(); const navigation = use(NavigationContext); const route = use(NavigationRouteContext); + const routeKey = route?.key; const content: InspectorContent = { ...props.content, resetKeys: [route?.key, ...(props.content.resetKeys ?? [])], @@ -145,27 +146,32 @@ export function Inspector(props: { ), })), }; - const focusedRef = useRef(false); + const activeRef = useRef(false); const deactivateRef = useRef<(() => void) | null>(null); const syncRegistration = useEffectEvent(() => { - if (!focusedRef.current) { + if (!activeRef.current) { deactivateRef.current?.(); return; } deactivateRef.current = registerWorkspaceInspector(content, route?.key, props.revealKey); }); - // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- Navigation focus events own the inspector registration lifetime. + // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- Navigation focus tracks the inspector owner, including presentations covering its workspace. useEffect(() => { if (navigation === undefined) return; const focus = () => { - if (focusedRef.current) return; - focusedRef.current = true; + if (activeRef.current) return; + activeRef.current = true; syncRegistration(); }; const blur = () => { - focusedRef.current = false; + const state = navigation.getState(); + const { workspace, overlays } = workspaceRoutesOf( + state?.routes.slice(0, state.index + 1) ?? [], + ); + if (overlays.length > 0 && workspace.at(-1)?.key === routeKey) return; + activeRef.current = false; syncRegistration(); }; if (navigation.isFocused()) focus(); @@ -174,15 +180,15 @@ export function Inspector(props: { return () => { unsubscribeFocus(); unsubscribeBlur(); - focusedRef.current = false; + activeRef.current = false; deactivateRef.current?.(); deactivateRef.current = null; }; - }, [navigation]); + }, [navigation, routeKey]); // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- Changed column content replaces the focused inspector registration. useEffect(() => { - if (focusedRef.current) { + if (activeRef.current) { syncRegistration(); } // oxlint-disable-next-line react/exhaustive-effect-dependencies -- Changed column content replaces its existing native workspace registration. diff --git a/apps/mobile/src/features/layout/useOpenWorkspaceDetail.ts b/apps/mobile/src/features/layout/useOpenWorkspaceDetail.ts index 61b23208e3ea..5e2b6a3510fe 100644 --- a/apps/mobile/src/features/layout/useOpenWorkspaceDetail.ts +++ b/apps/mobile/src/features/layout/useOpenWorkspaceDetail.ts @@ -20,6 +20,19 @@ export function useOpenWorkspaceDetail() { const openPullRequestInspector = useOpenPullRequestInspector(); const openInInspector = use(ThreadInspectorNavigationContext); return (detail: WorkspaceDetail, sheet?: WorkspaceDetailSheet) => { + if (!sheet && navigation.getState()?.routes.at(-1)?.name === "PullRequestInspectorFullscreen") { + if (detail.name === "PullRequest") { + navigation.dispatch(StackActions.replace("PullRequestInspectorFullscreen", detail.params)); + return; + } + if (detail.params.environmentId && detail.params.threadId) { + navigation.navigate("ThreadInspectorFullscreen", { + environmentId: detail.params.environmentId, + threadId: detail.params.threadId, + }); + return; + } + } if (!sheet && detail.name === "PullRequest" && openPullRequestInspector(detail.params)) return; if ( !sheet && diff --git a/apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx b/apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx index 7edfb2f56e9d..8d1283964946 100644 --- a/apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx +++ b/apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx @@ -1,3 +1,7 @@ +import { + WorkspaceContentWidthContext, + WorkspaceSettledContentWidthContext, +} from "../layout/workspace-content-width"; import { AppActivityIndicator } from "../../components/ui/AppActivityIndicator"; import { Chip } from "../../components/ui/Chip"; import { pullRequestTabOffset } from "./pullRequestTabScroll"; @@ -327,13 +331,27 @@ function usePullRequestToolbarHeight(bottomInset: number) { return useState(() => (Platform.OS === "android" ? bottomInset + buttonSize + 40 : 0)); } +export function FullscreenPullRequestRouteScreen(props: StaticScreenProps) { + const navigation = useNavigation(); + return ( + + + navigation.goBack() }} + /> + + + ); +} + export function PullRequestRouteScreen({ route, inspectorPresentation, }: StaticScreenProps & { readonly inspectorPresentation?: { readonly onClose: () => void; - readonly onMaximize: () => void; + readonly onMaximize?: () => void; }; }) { const navigation = useNavigation(); @@ -490,8 +508,14 @@ export function PullRequestRouteScreen({ ? undefined : (returnToChat ?? (layout.usesSplitView ? undefined : returnToList)) } + onClose={ + inspectorPresentation && !inspectorPresentation.onMaximize + ? inspectorPresentation.onClose + : undefined + } + closeAccessibilityLabel="Close pull request" actions={ - inspectorPresentation + inspectorPresentation?.onMaximize ? [ { accessibilityLabel: "Maximize pull request", diff --git a/apps/mobile/src/features/pull-requests/guide/PullRequestGuideScreen.tsx b/apps/mobile/src/features/pull-requests/guide/PullRequestGuideScreen.tsx index 0a1868c2a637..81f62ec275d4 100644 --- a/apps/mobile/src/features/pull-requests/guide/PullRequestGuideScreen.tsx +++ b/apps/mobile/src/features/pull-requests/guide/PullRequestGuideScreen.tsx @@ -273,7 +273,10 @@ export function PullRequestGuideStopScreen({ route }: StaticScreenProps diff --git a/apps/mobile/src/features/pull-requests/pullRequestNavigation.test.ts b/apps/mobile/src/features/pull-requests/pullRequestNavigation.test.ts index 28700877625e..d871d708de6c 100644 --- a/apps/mobile/src/features/pull-requests/pullRequestNavigation.test.ts +++ b/apps/mobile/src/features/pull-requests/pullRequestNavigation.test.ts @@ -87,4 +87,7 @@ it("returns a guide tour to the PR inspector while preserving standalone PR hist const stop = { name: "PullRequestGuideStop" }; expect(pullRequestOverviewRoute([{ name: "Home" }, thread, stop, stop])).toBe("Thread"); expect(pullRequestOverviewRoute([thread, { name: "PullRequest" }, stop])).toBe("PullRequest"); + expect(pullRequestOverviewRoute([thread, { name: "PullRequestInspectorFullscreen" }, stop])).toBe( + "PullRequestInspectorFullscreen", + ); }); diff --git a/apps/mobile/src/features/threads/thread-inspector-navigation.test.tsx b/apps/mobile/src/features/threads/thread-inspector-navigation.test.tsx index 18d3896f28b6..bb6cffdd9310 100644 --- a/apps/mobile/src/features/threads/thread-inspector-navigation.test.tsx +++ b/apps/mobile/src/features/threads/thread-inspector-navigation.test.tsx @@ -30,6 +30,7 @@ vi.mock("@react-navigation/native", async () => { import { useOpenPullRequestInspector, useOpenThreadInspector } from "./thread-inspector-navigation"; import { useOpenLinkedThread } from "./useOpenLinkedThread"; +import { workspaceRoutesOf } from "../layout/workspace-overlay-routes"; const requireNavigation = NodeModule.createRequire( NodeModule.createRequire(import.meta.url).resolve("@react-navigation/native/package.json"), @@ -195,6 +196,7 @@ it("keeps a focused inspector registered across renders and updates its content" const requireMobile = NodeModule.createRequire(import.meta.url); const listeners = { focus: new Set<() => void>(), blur: new Set<() => void>() }; let focused = true; + let covered = false; let activeRender: (() => React.ReactNode) | undefined; const deactivate = vi.fn(() => { activeRender = undefined; @@ -207,6 +209,13 @@ it("keeps a focused inspector registered across renders and updates its content" ); const navigation = { isFocused: () => focused, + getState: () => ({ + index: 1, + routes: [ + { key: "file", name: "Thread" }, + { key: "next", name: covered ? "PullRequestReview" : "Thread" }, + ], + }), addListener(event: "focus" | "blur", listener: () => void) { listeners[event].add(listener); return () => { @@ -256,6 +265,7 @@ it("keeps a focused inspector registered across renders and updates its content" return { useAdaptiveWorkspaceLayout: () => ({ registerWorkspaceInspector }), }; + if (name === "./workspace-overlay-routes") return { workspaceRoutesOf }; if (name === "@react-navigation/native") return { NavigationContext: navigationContext, @@ -300,6 +310,12 @@ it("keeps a focused inspector registered across renders and updates its content" focused = event === "focus"; for (const listener of listeners[event]) listener(); }); + covered = true; + emit("blur"); + expect(deactivate).not.toHaveBeenCalled(); + expect(activeRender).toBeDefined(); + emit("focus"); + covered = false; emit("blur"); expect(deactivate).toHaveBeenCalledTimes(1); registerWorkspaceInspector.mockClear(); diff --git a/apps/mobile/src/features/threads/thread-inspector-preview.tsx b/apps/mobile/src/features/threads/thread-inspector-preview.tsx index f2824b434ef1..ea49b296fd1d 100644 --- a/apps/mobile/src/features/threads/thread-inspector-preview.tsx +++ b/apps/mobile/src/features/threads/thread-inspector-preview.tsx @@ -94,7 +94,9 @@ export function ThreadInspectorPreview(props: { inspectorPresentation={{ onClose: props.onClose, onMaximize: () => - navigation.dispatch(StackActions.push("PullRequest", route.params)), + navigation.dispatch( + StackActions.push("PullRequestInspectorFullscreen", route.params), + ), }} /> )} diff --git a/apps/mobile/src/lib/pullRequestNavigation.ts b/apps/mobile/src/lib/pullRequestNavigation.ts index 39cd063f854e..fce974611058 100644 --- a/apps/mobile/src/lib/pullRequestNavigation.ts +++ b/apps/mobile/src/lib/pullRequestNavigation.ts @@ -32,7 +32,10 @@ export function pullRequestOverviewRoute( routes: readonly { readonly name: string; readonly params?: object }[], ) { const detail = routes.findLast( - (route) => route.name === "PullRequest" || route.name === "Thread", + (route) => + route.name === "PullRequest" || + route.name === "PullRequestInspectorFullscreen" || + route.name === "Thread", ); return detail?.name === "Thread" && detail.params && @@ -42,5 +45,7 @@ export function pullRequestOverviewRoute( "type" in detail.params.inspector && detail.params.inspector.type === "pullRequest" ? "Thread" - : "PullRequest"; + : detail?.name === "PullRequestInspectorFullscreen" + ? "PullRequestInspectorFullscreen" + : "PullRequest"; } diff --git a/apps/mobile/src/native/useOpenPullRequest.ts b/apps/mobile/src/native/useOpenPullRequest.ts index 3dd8f9d383a4..53a4f7e5df51 100644 --- a/apps/mobile/src/native/useOpenPullRequest.ts +++ b/apps/mobile/src/native/useOpenPullRequest.ts @@ -31,6 +31,10 @@ export function useNavigateToPullRequest(options?: { ); if (!destination) return tryOpenExternalUrl(url, "pull-request"); const params = withKnownPullRequestSummary(destination); + if (navigation.getState()?.routes.at(-1)?.name === "PullRequestInspectorFullscreen") { + navigation.dispatch(StackActions.replace("PullRequestInspectorFullscreen", params)); + return true; + } if (openInspector(params, options?.source)) return true; // Android shows one page at a time; iOS opens it over the current page, so Back returns. if (Platform.OS === "android") selectDetail({ name: "PullRequest", params });