Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions apps/mobile/src/Stack.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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(),
Expand Down
24 changes: 15 additions & 9 deletions apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?? [])],
Expand All @@ -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();
Expand All @@ -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.
Expand Down
35 changes: 35 additions & 0 deletions apps/mobile/src/features/layout/useOpenWorkspaceDetail.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -12,7 +17,37 @@ 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 && 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 &&
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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
69 changes: 64 additions & 5 deletions apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -40,7 +44,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";
Expand Down Expand Up @@ -322,10 +331,39 @@ function usePullRequestToolbarHeight(bottomInset: number) {
return useState(() => (Platform.OS === "android" ? bottomInset + buttonSize + 40 : 0));
}

export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestParams>) {
const returnToList = useAndroidWorkspaceBack("pullRequests");
const { layout } = useAdaptiveWorkspaceLayout();
export function FullscreenPullRequestRouteScreen(props: StaticScreenProps<PullRequestParams>) {
const navigation = useNavigation();
return (
<WorkspaceContentWidthContext value={null}>
<WorkspaceSettledContentWidthContext value={null}>
<PullRequestRouteScreen
{...props}
inspectorPresentation={{ onClose: () => navigation.goBack() }}
/>
</WorkspaceSettledContentWidthContext>
</WorkspaceContentWidthContext>
);
}

export function PullRequestRouteScreen({
route,
inspectorPresentation,
}: StaticScreenProps<PullRequestParams> & {
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();
Expand Down Expand Up @@ -465,7 +503,28 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
<AppBar
title={`#${params.number}`}
subtitle={connected ? params.repository : `${params.repository} · Offline`}
onBack={layout.usesSplitView ? undefined : returnToList}
onBack={
inspectorPresentation
? undefined
: (returnToChat ?? (layout.usesSplitView ? undefined : returnToList))
}
onClose={
inspectorPresentation && !inspectorPresentation.onMaximize
? inspectorPresentation.onClose
: undefined
}
closeAccessibilityLabel="Close pull request"
actions={
inspectorPresentation?.onMaximize
? [
{
accessibilityLabel: "Maximize pull request",
icon: "arrow.up.left.and.arrow.down.right",
onPress: inspectorPresentation.onMaximize,
},
]
: undefined
}
menus={[
{
title: `${capitalizeTerm(terminology.singular)} actions`,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { pullRequestOverviewRoute } from "../../../lib/pullRequestNavigation";
import { sourceControlClients } from "@t3tools/client-runtime/source-control-clients";
import { parsePatchFiles } from "@pierre/diffs/utils/parsePatchFiles";
import type { FileDiffMetadata } from "@pierre/diffs";
Expand Down Expand Up @@ -268,7 +269,15 @@ export function PullRequestGuideStopScreen({ route }: StaticScreenProps<GuideSto
...route.params,
mode: "review",
})
: navigation.dispatch(StackActions.popTo("PullRequest", route.params))
: navigation.dispatch(
pullRequestOverviewRoute(navigation.getState()?.routes ?? []) ===
"Thread"
? StackActions.popTo("Thread")
: StackActions.popTo(
pullRequestOverviewRoute(navigation.getState()?.routes ?? []),
route.params,
),
)
}
>
<View className="min-w-0 flex-1 gap-1">
Expand Down
Original file line number Diff line number Diff line change
@@ -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) => ({
Expand Down Expand Up @@ -71,3 +74,20 @@ 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");
expect(pullRequestOverviewRoute([thread, { name: "PullRequestInspectorFullscreen" }, stop])).toBe(
"PullRequestInspectorFullscreen",
);
});
Loading
Loading