Skip to content

Commit e258d7c

Browse files
fix(mobile): coordinate keyboard with task settings dismissal
- Restore composer focus after native sheet transitions - Surface native-stack transition completion events
1 parent 88f40ad commit e258d7c

8 files changed

Lines changed: 152 additions & 172 deletions

‎apps/mobile/src/Stack.tsx‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ import {
4949
NewTaskThreadSettingsRouteScreen,
5050
} from "./features/threads/ThreadSettingsSheet";
5151
import { NewTaskFlowProvider } from "./features/threads/new-task-flow-provider";
52-
import { NewTaskSettingsTransitionProvider } from "./features/threads/new-task-settings-transition";
5352
import { NewTaskRouteScreen } from "./features/threads/NewTaskRouteScreen";
5453
import { SettingsAppearanceRouteScreen } from "./features/settings/SettingsAppearanceRouteScreen";
5554
import { SettingsClientStorageRouteScreen } from "./features/settings/SettingsClientStorageRouteScreen";
@@ -637,11 +636,7 @@ export const RootStack = createNativeStackNavigator({
637636
// The whole new-task flow (choose project → draft → add project) shares
638637
// draft state via NewTaskFlowProvider. The expo-router era mounted it in
639638
// app/new/_layout.tsx; this layout wrapper is the native-stack equivalent.
640-
layout: ({ children }) => (
641-
<NewTaskFlowProvider>
642-
<NewTaskSettingsTransitionProvider>{children}</NewTaskSettingsTransitionProvider>
643-
</NewTaskFlowProvider>
644-
),
639+
layout: ({ children }) => <NewTaskFlowProvider>{children}</NewTaskFlowProvider>,
645640
options: {
646641
gestureEnabled: true,
647642
headerShown: false,

‎apps/mobile/src/features/threads/NewTaskDraftScreen.tsx‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ import { ProviderIcon } from "../../components/ProviderIcon";
3434
import { SymbolView } from "../../components/AppSymbol";
3535
import { AppText as Text } from "../../components/AppText";
3636
import { ComposerSurface } from "./ThreadComposer";
37-
import { useThreadSettingsSheetPresentation } from "./use-thread-settings-sheet-presentation";
37+
import {
38+
useThreadSettingsSheetPresentation,
39+
type NavigationWithFinishTransitioning,
40+
} from "./use-thread-settings-sheet-presentation";
3841

3942
import { makeTurnCommandMetadata } from "../../lib/commandMetadata";
4043
import { convertPastedImagesToAttachments, pickComposerImages } from "../../lib/composerImages";
@@ -53,7 +56,6 @@ import { armAgentAwarenessLiveActivityForLocalWork } from "../agent-awareness/re
5356
import { enqueueThreadOutboxMessage, removeThreadOutboxMessage } from "../../state/thread-outbox";
5457
import { useRemoteConnectionStatus } from "../../state/use-remote-environment-registry";
5558
import { useNewTaskFlow } from "./new-task-flow-provider";
56-
import { useNewTaskSettingsTransition } from "./new-task-settings-transition";
5759
import { useCreateProjectThread } from "./use-project-actions";
5860
import { resolveDraftProjectSelection } from "./new-task-project-selection";
5961
import {
@@ -96,7 +98,6 @@ export function NewTaskDraftScreen(props: {
9698
const createProjectThread = useCreateProjectThread();
9799
const flow = useNewTaskFlow();
98100
const navigation = useNavigation();
99-
const settingsTransition = useNewTaskSettingsTransition();
100101
const {
101102
consumeShare,
102103
getShare,
@@ -125,7 +126,6 @@ export function NewTaskDraftScreen(props: {
125126
const settingsSheetPresentation = useThreadSettingsSheetPresentation({
126127
editorRef: promptInputRef,
127128
isEditorFocused: isComposerFocused,
128-
keepEditorFocused: true,
129129
});
130130
useEffect(() => {
131131
if (Platform.OS !== "ios") {
@@ -150,18 +150,6 @@ export function NewTaskDraftScreen(props: {
150150
settingsRoutePresentedRef.current = true;
151151
navigation.dispatch(StackActions.push("ThreadSettings"));
152152
}, [navigation, settingsSheetPresentation.isVisible]);
153-
useEffect(
154-
() =>
155-
settingsTransition.registerHandlers({
156-
onDismissalStart: settingsSheetPresentation.beginDismissalFocusRestore,
157-
onDismissalCancel: settingsSheetPresentation.cancelDismissalFocusRestore,
158-
}),
159-
[
160-
settingsTransition,
161-
settingsSheetPresentation.beginDismissalFocusRestore,
162-
settingsSheetPresentation.cancelDismissalFocusRestore,
163-
],
164-
);
165153
useFocusEffect(
166154
useCallback(() => {
167155
if (!settingsRoutePresentedRef.current) {
@@ -172,6 +160,16 @@ export function NewTaskDraftScreen(props: {
172160
settingsSheetPresentation.onDismissed();
173161
}, [settingsSheetPresentation.onDismissed]),
174162
);
163+
useEffect(
164+
() =>
165+
// UIKit's completion callback for the sheet dismissal, surfaced by the
166+
// native-stack patch. This is when the queued keyboard restore runs.
167+
(navigation as unknown as NavigationWithFinishTransitioning).addListener(
168+
"finishTransitioning",
169+
settingsSheetPresentation.onStackTransitionsFinished,
170+
),
171+
[navigation, settingsSheetPresentation.onStackTransitionsFinished],
172+
);
175173
const [importingShareKey, setImportingShareKey] = useState<string | null>(null);
176174
const [isCancellingShareImport, setIsCancellingShareImport] = useState(false);
177175
const [cancelledIncomingShareId, setCancelledIncomingShareId] = useState<string | null>(null);
@@ -1035,7 +1033,6 @@ export function NewTaskDraftScreen(props: {
10351033
{heroViewport}
10361034

10371035
<KeyboardStickyView
1038-
enabled={isKeyboardVisible}
10391036
style={{ position: "absolute", bottom: 0, left: 0, right: 0 }}
10401037
offset={{ closed: 0, opened: keyboardOpenedOffset }}
10411038
>
@@ -1064,7 +1061,6 @@ export function NewTaskDraftScreen(props: {
10641061

10651062
{heroViewport}
10661063
<KeyboardStickyView
1067-
enabled={isKeyboardVisible}
10681064
style={{ position: "absolute", bottom: 0, left: 0, right: 0 }}
10691065
offset={{ closed: 0, opened: keyboardOpenedOffset }}
10701066
>

‎apps/mobile/src/features/threads/ThreadComposer.tsx‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,10 @@ import {
7070
type ExistingThreadSettingsRouteSession,
7171
useExistingThreadSettingsRoutePresentation,
7272
} from "./ThreadSettingsSheet";
73-
import { useThreadSettingsSheetPresentation } from "./use-thread-settings-sheet-presentation";
73+
import {
74+
useThreadSettingsSheetPresentation,
75+
type NavigationWithFinishTransitioning,
76+
} from "./use-thread-settings-sheet-presentation";
7477

7578
/**
7679
* Height of the collapsed composer (pill + vertical padding, excluding safe-area inset).
@@ -273,7 +276,6 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
273276
const settingsSheetPresentation = useThreadSettingsSheetPresentation({
274277
editorRef: inputRef,
275278
isEditorFocused: isFocused,
276-
keepEditorFocused: true,
277279
});
278280
const settingsRoutePresentation = useExistingThreadSettingsRoutePresentation();
279281
const settingsRoutePresentedRef = useRef(false);
@@ -633,8 +635,6 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
633635
props.onUpdateModelSelection({ ...currentModelSelection, options }),
634636
runtimeMode: currentRuntimeMode,
635637
onUpdateRuntimeMode: props.onUpdateRuntimeMode,
636-
onDismissalStart: settingsSheetPresentation.beginDismissalFocusRestore,
637-
onDismissalCancel: settingsSheetPresentation.cancelDismissalFocusRestore,
638638
}),
639639
[
640640
currentModelSelection,
@@ -643,8 +643,6 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
643643
props.onUpdateRuntimeMode,
644644
providerOptionDescriptors,
645645
settingsOwnerId,
646-
settingsSheetPresentation.beginDismissalFocusRestore,
647-
settingsSheetPresentation.cancelDismissalFocusRestore,
648646
threadProviderGroups,
649647
],
650648
);
@@ -680,6 +678,17 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
680678
}, [settingsOwnerId, settingsRoutePresentation.clear, settingsSheetPresentation.onDismissed]),
681679
);
682680

681+
useEffect(
682+
() =>
683+
// UIKit's completion callback for the sheet dismissal, surfaced by the
684+
// native-stack patch. This is when the queued keyboard restore runs.
685+
(navigation as unknown as NavigationWithFinishTransitioning).addListener(
686+
"finishTransitioning",
687+
settingsSheetPresentation.onStackTransitionsFinished,
688+
),
689+
[navigation, settingsSheetPresentation.onStackTransitionsFinished],
690+
);
691+
683692
return (
684693
<Animated.View
685694
className="px-4"

‎apps/mobile/src/features/threads/ThreadSettingsSheet.tsx‎

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ import {
5151
NATIVE_SHEET_SURFACE_CONTENT_STYLE,
5252
} from "../../native/sheet-surface";
5353
import { useNewTaskFlow } from "./new-task-flow-provider";
54-
import { useNewTaskSettingsTransition } from "./new-task-settings-transition";
5554
import {
5655
createNativeMailSearchToolbarItem,
5756
NATIVE_MAIL_SEARCH_TOOLBAR_CONTENT_INSET,
@@ -296,8 +295,6 @@ type ThreadSettingsSessionProps = {
296295

297296
export type ExistingThreadSettingsRouteSession = ThreadSettingsSessionProps & {
298297
readonly ownerId: string;
299-
readonly onDismissalStart: () => void;
300-
readonly onDismissalCancel: () => void;
301298
};
302299

303300
type ExistingThreadSettingsRouteContextValue = {
@@ -1196,35 +1193,11 @@ export function ExistingThreadSettingsRouteScreen() {
11961193
navigation.goBack();
11971194
}, [navigation, session]);
11981195

1199-
useEffect(() => {
1200-
if (!session) {
1201-
return;
1202-
}
1203-
1204-
const removeTransitionStart = navigation.addListener("transitionStart", (event) => {
1205-
if (event.data.closing) {
1206-
session.onDismissalStart();
1207-
}
1208-
});
1209-
const removeGestureCancel = navigation.addListener("gestureCancel", () => {
1210-
session.onDismissalCancel();
1211-
});
1212-
return () => {
1213-
removeTransitionStart();
1214-
removeGestureCancel();
1215-
};
1216-
}, [navigation, session]);
1217-
12181196
if (!session) {
12191197
return <View className="flex-1 bg-sheet" />;
12201198
}
12211199

1222-
const {
1223-
ownerId: _ownerId,
1224-
onDismissalStart: _onDismissalStart,
1225-
onDismissalCancel: _onDismissalCancel,
1226-
...settings
1227-
} = session;
1200+
const { ownerId: _ownerId, ...settings } = session;
12281201

12291202
return (
12301203
<ThreadSettingsSessionProvider {...settings}>
@@ -1241,7 +1214,6 @@ export function ExistingThreadSettingsRouteScreen() {
12411214
export function NewTaskThreadSettingsRouteScreen() {
12421215
const flow = useNewTaskFlow();
12431216
const navigation = useNavigation<NativeStackNavigationProp<Record<string, object | undefined>>>();
1244-
const transition = useNewTaskSettingsTransition();
12451217
const optionDescriptors = useMemo(
12461218
() =>
12471219
resolveProviderOptionDescriptors({
@@ -1250,20 +1222,6 @@ export function NewTaskThreadSettingsRouteScreen() {
12501222
}),
12511223
[flow.selectedModel?.options, flow.selectedModelOption?.capabilities],
12521224
);
1253-
useEffect(() => {
1254-
const removeTransitionStart = navigation.addListener("transitionStart", (event) => {
1255-
if (event.data.closing) {
1256-
transition.notifyDismissalStart();
1257-
}
1258-
});
1259-
const removeGestureCancel = navigation.addListener("gestureCancel", () => {
1260-
transition.notifyDismissalCancel();
1261-
});
1262-
return () => {
1263-
removeTransitionStart();
1264-
removeGestureCancel();
1265-
};
1266-
}, [navigation, transition]);
12671225

12681226
return (
12691227
<ThreadSettingsSessionProvider

‎apps/mobile/src/features/threads/new-task-settings-transition.tsx‎

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

0 commit comments

Comments
 (0)