Skip to content

Commit 11ea3fc

Browse files
Merge branch 'main' into feat/usage-back-button
2 parents 2fa284f + 6676f9c commit 11ea3fc

37 files changed

Lines changed: 2489 additions & 499 deletions

‎apps/mobile/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@expo-google-fonts/dm-sans": "^0.4.2",
5050
"@expo/metro-runtime": "~56.0.15",
5151
"@expo/ui": "~56.0.18",
52-
"@legendapp/list": "3.3.3",
52+
"@legendapp/list": "catalog:",
5353
"@noble/curves": "catalog:",
5454
"@noble/hashes": "catalog:",
5555
"@pierre/diffs": "catalog:",

‎apps/mobile/src/Stack.tsx‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { AppText as Text } from "./components/AppText";
1818
import { getCompactBrandHeaderOptions } from "./components/CompactBrandTitle";
1919
import { ArchivedThreadsRouteScreen } from "./features/archive/ArchivedThreadsRouteScreen";
2020
import { useAgentNotificationNavigation } from "./features/agent-awareness/notificationNavigation";
21-
import { ClerkSettingsSheetDetentProvider } from "./features/cloud/ClerkSettingsSheetDetent";
2221
import { ConnectOnboardingRouteScreen } from "./features/cloud/ConnectOnboardingRouteScreen";
2322
import { useConnectOnboardingNavigation } from "./features/cloud/connectOnboardingNavigation";
2423
import { ThreadFilesTreeScreen, ThreadFileScreen } from "./features/files/ThreadFilesRouteScreen";
@@ -134,7 +133,7 @@ const LEGAL_DOCUMENT_HEADER_OPTIONS: AppScreenOptions = {
134133
presentation: "fullScreenModal",
135134
};
136135

137-
const SettingsSheetStack = createNativeStackNavigator({
136+
const SettingsContentStack = createNativeStackNavigator({
138137
initialRouteName: "Settings",
139138
screenOptions: {
140139
...GLASS_HEADER_OPTIONS,
@@ -198,20 +197,30 @@ const SettingsSheetStack = createNativeStackNavigator({
198197
title: "Usage",
199198
},
200199
}),
200+
},
201+
});
202+
203+
// The outer stack never owns visible chrome. Settings routes render inside a
204+
// nested stack whose native header remains mounted, while Clerk owns auth chrome.
205+
// Keeping bar visibility invariant avoids iOS 26's headerless-to-headered jump.
206+
const SettingsSheetStack = createNativeStackNavigator({
207+
initialRouteName: "SettingsContent",
208+
screenOptions: {
209+
headerShown: false,
210+
},
211+
screens: {
212+
SettingsContent: createNativeStackScreen({
213+
screen: SettingsContentStack,
214+
linking: "",
215+
}),
201216
SettingsAuth: createNativeStackScreen({
202217
screen: SettingsAuthRouteScreen,
203218
linking: "auth",
204-
options: {
205-
title: "Sign in",
206-
},
207219
}),
208220
SettingsWaitlist: createNativeStackScreen({
209221
// Keep the old deep link working after the Connect GA launch.
210222
screen: SettingsAuthRouteScreen,
211223
linking: "waitlist",
212-
options: {
213-
title: "Sign in",
214-
},
215224
}),
216225
},
217226
});
@@ -347,11 +356,9 @@ function RootStackLayout(props: {
347356
<HardwareKeyboardCommandProvider pathname={pathname}>
348357
<ThreadOutboxDrainWorker />
349358
<ShowcaseCaptureCoordinator pathname={pathname} />
350-
<ClerkSettingsSheetDetentProvider initiallyExpanded={false}>
351-
<AdaptiveWorkspaceLayout pathname={workspacePathname}>
352-
{props.children}
353-
</AdaptiveWorkspaceLayout>
354-
</ClerkSettingsSheetDetentProvider>
359+
<AdaptiveWorkspaceLayout pathname={workspacePathname}>
360+
{props.children}
361+
</AdaptiveWorkspaceLayout>
355362
</HardwareKeyboardCommandProvider>
356363
);
357364
}

‎apps/mobile/src/components/ControlPill.tsx‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
type ComponentProps,
77
type ReactElement,
88
type ReactNode,
9+
useRef,
910
} from "react";
1011
import { Platform, Pressable, useColorScheme, View } from "react-native";
1112
import { useThemeColor } from "../lib/useThemeColor";
@@ -21,10 +22,31 @@ export function ControlPill(props: {
2122
readonly label?: string;
2223
readonly accessibilityLabel?: string;
2324
readonly onPress?: () => void;
25+
readonly activateOnPressIn?: boolean;
2426
readonly variant?: "circle" | "pill" | "primary" | "danger";
2527
readonly disabled?: boolean;
28+
readonly className?: string;
2629
}) {
2730
const variant = props.variant ?? "circle";
31+
const activatedOnPressInRef = useRef(false);
32+
33+
const handlePressIn = () => {
34+
activatedOnPressInRef.current = true;
35+
props.onPress?.();
36+
};
37+
const handlePressOut = () => {
38+
// Pressability invokes onPressOut immediately before onPress on release.
39+
// Defer the reset so onPress can identify the same physical gesture.
40+
setTimeout(() => {
41+
activatedOnPressInRef.current = false;
42+
}, 0);
43+
};
44+
const handlePress = () => {
45+
if (activatedOnPressInRef.current) {
46+
return;
47+
}
48+
props.onPress?.();
49+
};
2850

2951
const iconColor = useThemeColor("--color-icon");
3052
const iconSubtle = useThemeColor("--color-icon-subtle");
@@ -54,6 +76,7 @@ export function ControlPill(props: {
5476
: variant === "danger"
5577
? "bg-danger"
5678
: "bg-subtle",
79+
props.className,
5780
);
5881
const labelClassName = cn(
5982
"text-center text-xs font-t3-bold",
@@ -68,7 +91,9 @@ export function ControlPill(props: {
6891
<Pressable
6992
accessibilityLabel={props.accessibilityLabel ?? props.label}
7093
accessibilityRole="button"
71-
onPress={props.onPress}
94+
onPress={props.activateOnPressIn ? handlePress : props.onPress}
95+
onPressIn={props.activateOnPressIn ? handlePressIn : undefined}
96+
onPressOut={props.activateOnPressIn ? handlePressOut : undefined}
7297
disabled={props.disabled}
7398
className={containerClassName}
7499
>

‎apps/mobile/src/features/archive/ArchivedThreadsRouteScreen.tsx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { useFocusEffect } from "@react-navigation/native";
55
import { useCallback, useMemo, useState } from "react";
66

77
import { useSavedRemoteConnections } from "../../state/use-remote-environment-registry";
8-
import { useClerkSettingsSheetDetent } from "../cloud/ClerkSettingsSheetDetent";
98
import { useArchivedThreadListActions } from "../home/useThreadListActions";
109
import {
1110
ArchivedThreadsScreen,
@@ -18,7 +17,6 @@ import {
1817
} from "./useArchivedThreadSnapshots";
1918

2019
export function ArchivedThreadsRouteScreen() {
21-
const { expand } = useClerkSettingsSheetDetent();
2220
const { savedConnectionsById } = useSavedRemoteConnections();
2321
const [searchQuery, setSearchQuery] = useState("");
2422
const [selectedEnvironmentId, setSelectedEnvironmentId] = useState<EnvironmentId | null>(null);
@@ -70,9 +68,8 @@ export function ArchivedThreadsRouteScreen() {
7068

7169
useFocusEffect(
7270
useCallback(() => {
73-
expand();
7471
refresh();
75-
}, [expand, refresh]),
72+
}, [refresh]),
7673
);
7774

7875
return (

‎apps/mobile/src/features/cloud/ClerkSettingsSheetDetent.tsx‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎apps/mobile/src/features/cloud/connectOnboardingNavigation.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { appAtomRegistry } from "../../state/atom-registry";
66
import { clearConnectOnboardingRequest, connectOnboardingRequestAtom } from "./connectOnboarding";
77
import { isConnectOnboardingOptedOut } from "./connectOnboardingOptOut";
88

9-
// Sign-in happens inside the Settings sheet; give its detent/session-state
10-
// transitions a beat to settle before presenting another formSheet on top.
9+
// Sign-in happens inside the Settings sheet; give its session-state transition
10+
// a beat to settle before presenting another formSheet on top.
1111
const PRESENT_ONBOARDING_DELAY_MS = 600;
1212

1313
/**

‎apps/mobile/src/features/home/HomeRouteScreen.tsx‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,10 @@ export function HomeRouteScreen() {
134134
<NativeStackScreenOptions
135135
options={getConnectionAwareBrandHeaderOptions({
136136
onOpenEnvironments: () =>
137-
navigation.navigate("SettingsSheet", { screen: "SettingsEnvironments" }),
137+
navigation.navigate("SettingsSheet", {
138+
screen: "SettingsContent",
139+
params: { screen: "SettingsEnvironments" },
140+
}),
138141
})}
139142
/>
140143
<HomeHeader
@@ -148,9 +151,17 @@ export function HomeRouteScreen() {
148151
onEnvironmentChange={setSelectedEnvironmentId}
149152
onProjectChange={setSelectedProjectKey}
150153
onOpenEnvironments={() =>
151-
navigation.navigate("SettingsSheet", { screen: "SettingsEnvironments" })
154+
navigation.navigate("SettingsSheet", {
155+
screen: "SettingsContent",
156+
params: { screen: "SettingsEnvironments" },
157+
})
158+
}
159+
onOpenSettings={() =>
160+
navigation.navigate("SettingsSheet", {
161+
screen: "SettingsContent",
162+
params: { screen: "Settings" },
163+
})
152164
}
153-
onOpenSettings={() => navigation.navigate("SettingsSheet", { screen: "Settings" })}
154165
onProjectSortOrderChange={setProjectSortOrder}
155166
onSearchQueryChange={setSearchQuery}
156167
onStartNewTask={() => navigation.navigate("NewTaskSheet", { screen: "NewTask" })}
@@ -161,7 +172,10 @@ export function HomeRouteScreen() {
161172
catalogState={catalogState}
162173
environments={environments}
163174
onAddConnection={() =>
164-
navigation.navigate("SettingsSheet", { screen: "SettingsEnvironmentNew" })
175+
navigation.navigate("SettingsSheet", {
176+
screen: "SettingsContent",
177+
params: { screen: "SettingsEnvironmentNew" },
178+
})
165179
}
166180
onArchiveThread={archiveThread}
167181
onDeleteThread={confirmDeleteThread}
@@ -174,7 +188,12 @@ export function HomeRouteScreen() {
174188
onMovePinnedThread={movePinnedThread}
175189
onEnvironmentChange={setSelectedEnvironmentId}
176190
onProjectChange={setSelectedProjectKey}
177-
onOpenSettings={() => navigation.navigate("SettingsSheet", { screen: "Settings" })}
191+
onOpenSettings={() =>
192+
navigation.navigate("SettingsSheet", {
193+
screen: "SettingsContent",
194+
params: { screen: "Settings" },
195+
})
196+
}
178197
onProjectSortOrderChange={setProjectSortOrder}
179198
onSearchQueryChange={setSearchQuery}
180199
onSelectThread={(thread) => {

‎apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,13 +429,19 @@ function AdaptiveWorkspaceLayoutContent(
429429
);
430430

431431
const handleOpenSettings = useCallback(() => {
432-
navigation.navigate("SettingsSheet", { screen: "Settings" });
432+
navigation.navigate("SettingsSheet", {
433+
screen: "SettingsContent",
434+
params: { screen: "Settings" },
435+
});
433436
}, [navigation]);
434437

435438
// Minted here (root stack navigation) so the sidebar pane stays free of
436439
// navigation hooks — on iOS it renders inside an independent nav tree.
437440
const handleOpenEnvironmentSettings = useCallback(() => {
438-
navigation.navigate("SettingsSheet", { screen: "SettingsEnvironments" });
441+
navigation.navigate("SettingsSheet", {
442+
screen: "SettingsContent",
443+
params: { screen: "SettingsEnvironments" },
444+
});
439445
}, [navigation]);
440446

441447
const handleNewThreadInProject = useCallback(
Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
import { useAuth } from "@clerk/expo";
22
import { AuthView, UserProfileView } from "@clerk/expo/native";
33
import { StackActions, useNavigation } from "@react-navigation/native";
4-
import { NativeStackScreenOptions } from "../../native/StackHeader";
5-
import { useCallback, useEffect } from "react";
4+
import { useCallback, useLayoutEffect } from "react";
65
import { View } from "react-native";
76

87
import { hasCloudPublicConfig } from "../cloud/publicConfig";
98

109
export function SettingsAuthRouteScreen() {
1110
const navigation = useNavigation();
1211

13-
useEffect(() => {
12+
useLayoutEffect(() => {
1413
if (!hasCloudPublicConfig()) {
15-
navigation.dispatch(StackActions.replace("Settings"));
14+
navigation.dispatch(StackActions.replace("SettingsContent"));
1615
}
1716
}, [navigation]);
1817

@@ -22,20 +21,20 @@ export function SettingsAuthRouteScreen() {
2221
function ConfiguredSettingsAuthRouteScreen() {
2322
const { isLoaded, isSignedIn } = useAuth({ treatPendingAsSignedOut: false });
2423
const navigation = useNavigation();
25-
const handleHostBack = useCallback(() => navigation.goBack(), [navigation]);
24+
const handleHostBack = useCallback(
25+
() => navigation.dispatch(StackActions.popTo("SettingsContent")),
26+
[navigation],
27+
);
2628

2729
return (
28-
<>
29-
<NativeStackScreenOptions options={{ headerShown: false }} />
30-
<View collapsable={false} className="flex-1 overflow-hidden bg-sheet">
31-
{isLoaded ? (
32-
isSignedIn ? (
33-
<UserProfileView isDismissible={false} onHostBack={handleHostBack} />
34-
) : (
35-
<AuthView isDismissible={false} onHostBack={handleHostBack} />
36-
)
37-
) : null}
38-
</View>
39-
</>
30+
<View collapsable={false} className="flex-1 overflow-hidden bg-sheet">
31+
{isLoaded ? (
32+
isSignedIn ? (
33+
<UserProfileView isDismissible={false} onHostBack={handleHostBack} />
34+
) : (
35+
<AuthView isDismissible={false} onHostBack={handleHostBack} />
36+
)
37+
) : null}
38+
</View>
4039
);
4140
}

‎apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,10 @@ export function SettingsEnvironmentsRouteScreen() {
9898
accessibilityLabel: "Add environment",
9999
icon: "plus",
100100
onPress: () =>
101-
navigation.navigate("SettingsSheet", { screen: "SettingsEnvironmentNew" }),
101+
navigation.navigate("SettingsSheet", {
102+
screen: "SettingsContent",
103+
params: { screen: "SettingsEnvironmentNew" },
104+
}),
102105
},
103106
]}
104107
/>
@@ -108,7 +111,10 @@ export function SettingsEnvironmentsRouteScreen() {
108111
<NativeHeaderToolbar.Button
109112
icon="plus"
110113
onPress={() =>
111-
navigation.navigate("SettingsSheet", { screen: "SettingsEnvironmentNew" })
114+
navigation.navigate("SettingsSheet", {
115+
screen: "SettingsContent",
116+
params: { screen: "SettingsEnvironmentNew" },
117+
})
112118
}
113119
separateBackground
114120
tintColor={headerIconColor}

0 commit comments

Comments
 (0)