Skip to content

Commit fba3c7c

Browse files
committed
fix(mobile): preserve the first queued message anchor
1 parent 606d983 commit fba3c7c

3 files changed

Lines changed: 89 additions & 8 deletions

File tree

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

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ import {
7979
} from "./ThreadComposer";
8080
import { ThreadFeed } from "./ThreadFeed";
8181
import type { ThreadContentPresentation } from "./threadContentPresentation";
82+
import { resolveThreadFeedSubmissionAnchor } from "./thread-feed-live-follow";
8283

8384
export interface ThreadDetailScreenProps {
8485
readonly selectedThread: OrchestrationThreadShell;
@@ -521,21 +522,34 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
521522

522523
const handleSendMessage = useCallback(async () => {
523524
const targetThreadKey = selectedThreadKey;
524-
const shouldAnchorFirstMessage =
525-
props.selectedThread.latestTurn === null &&
526-
!selectedThreadFeed.some(
527-
(entry) => entry.type === "message" && entry.message.role === "user",
528-
);
525+
const hasUserMessage = selectedThreadFeed.some(
526+
(entry) => entry.type === "message" && entry.message.role === "user",
527+
);
529528
const messageId = await props.onSendMessage();
530529
if (messageId === null || selectedThreadKeyRef.current !== targetThreadKey) {
531530
return messageId;
532531
}
533532

534533
setSubmittedMessageId(messageId);
535-
setAnchorMessageId(shouldAnchorFirstMessage ? messageId : null);
534+
setAnchorMessageId(
535+
resolveThreadFeedSubmissionAnchor({
536+
currentAnchorMessageId: anchorMessageId,
537+
submittedMessageId: messageId,
538+
hasStartedTurn: props.selectedThread.latestTurn !== null,
539+
hasUserMessage,
540+
queuedMessageCount: props.selectedThreadQueueCount,
541+
}),
542+
);
536543
composerEditorRef.current?.blur();
537544
return messageId;
538-
}, [props.onSendMessage, props.selectedThread.latestTurn, selectedThreadFeed, selectedThreadKey]);
545+
}, [
546+
anchorMessageId,
547+
props.onSendMessage,
548+
props.selectedThread.latestTurn,
549+
props.selectedThreadQueueCount,
550+
selectedThreadFeed,
551+
selectedThreadKey,
552+
]);
539553

540554
const collapseComposer = useCallback(() => {
541555
composerEditorRef.current?.blur();

‎apps/mobile/src/features/threads/thread-feed-live-follow.test.ts‎

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,59 @@
11
import { describe, expect, it } from "vite-plus/test";
22

3-
import { resolveThreadFeedLiveFollow } from "./thread-feed-live-follow";
3+
import {
4+
resolveThreadFeedLiveFollow,
5+
resolveThreadFeedSubmissionAnchor,
6+
} from "./thread-feed-live-follow";
7+
8+
describe("resolveThreadFeedSubmissionAnchor", () => {
9+
it("anchors the first user message in a thread", () => {
10+
expect(
11+
resolveThreadFeedSubmissionAnchor({
12+
currentAnchorMessageId: null,
13+
submittedMessageId: "first-message",
14+
hasStartedTurn: false,
15+
hasUserMessage: false,
16+
queuedMessageCount: 0,
17+
}),
18+
).toBe("first-message");
19+
});
20+
21+
it("preserves the first-message anchor when another message is queued", () => {
22+
expect(
23+
resolveThreadFeedSubmissionAnchor({
24+
currentAnchorMessageId: "first-message",
25+
submittedMessageId: "second-message",
26+
hasStartedTurn: false,
27+
hasUserMessage: false,
28+
queuedMessageCount: 1,
29+
}),
30+
).toBe("first-message");
31+
});
32+
33+
it("does not anchor a follow-up after a user message appears", () => {
34+
expect(
35+
resolveThreadFeedSubmissionAnchor({
36+
currentAnchorMessageId: "first-message",
37+
submittedMessageId: "second-message",
38+
hasStartedTurn: false,
39+
hasUserMessage: true,
40+
queuedMessageCount: 0,
41+
}),
42+
).toBeNull();
43+
});
44+
45+
it("does not anchor a thread that has already started a turn", () => {
46+
expect(
47+
resolveThreadFeedSubmissionAnchor({
48+
currentAnchorMessageId: null,
49+
submittedMessageId: "second-message",
50+
hasStartedTurn: true,
51+
hasUserMessage: false,
52+
queuedMessageCount: 0,
53+
}),
54+
).toBeNull();
55+
});
56+
});
457

558
describe("resolveThreadFeedLiveFollow", () => {
659
it("pauses immediately when the user starts scrolling", () => {

‎apps/mobile/src/features/threads/thread-feed-live-follow.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,20 @@ export type ThreadFeedLiveFollowEvent =
1212
readonly userScrollSessionActive: boolean;
1313
};
1414

15+
export function resolveThreadFeedSubmissionAnchor<AnchorId>(input: {
16+
readonly currentAnchorMessageId: AnchorId | null;
17+
readonly submittedMessageId: AnchorId;
18+
readonly hasStartedTurn: boolean;
19+
readonly hasUserMessage: boolean;
20+
readonly queuedMessageCount: number;
21+
}): AnchorId | null {
22+
if (input.hasStartedTurn || input.hasUserMessage) {
23+
return null;
24+
}
25+
26+
return input.queuedMessageCount > 0 ? input.currentAnchorMessageId : input.submittedMessageId;
27+
}
28+
1529
export function resolveThreadFeedLiveFollow(
1630
current: boolean,
1731
event: ThreadFeedLiveFollowEvent,

0 commit comments

Comments
 (0)