Skip to content

Commit c3c84a5

Browse files
committed
refactor(web): sync draft carets in one effect
1 parent 849649b commit c3c84a5

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎apps/web/src/components/chat/ChatComposer.tsx‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,17 +1527,15 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
15271527

15281528
useEffect(() => {
15291529
// During a switch, the cursor still belongs to the draft being left.
1530-
if (lastSyncedDraftKeyRef.current !== pendingAnswerKey || promptRef.current !== composerText) {
1530+
if (lastSyncedDraftKeyRef.current === pendingAnswerKey && promptRef.current === composerText) {
1531+
draftCaretsRef.current[pendingAnswerKey === null ? "message" : "answer"] = {
1532+
key: pendingAnswerKey ?? composerDraftTargetKey,
1533+
text: composerText,
1534+
cursor: composerCursor,
1535+
};
15311536
return;
15321537
}
1533-
draftCaretsRef.current[pendingAnswerKey === null ? "message" : "answer"] = {
1534-
key: pendingAnswerKey ?? composerDraftTargetKey,
1535-
text: composerText,
1536-
cursor: composerCursor,
1537-
};
1538-
}, [composerCursor, composerDraftTargetKey, composerText, pendingAnswerKey, promptRef]);
15391538

1540-
useEffect(() => {
15411539
const draftChanged = lastSyncedDraftKeyRef.current !== pendingAnswerKey;
15421540
lastSyncedDraftKeyRef.current = pendingAnswerKey;
15431541
if (!draftChanged && (pendingAnswerKey === null || promptRef.current === composerText)) {
@@ -1558,6 +1556,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
15581556
);
15591557
setComposerHighlightedItemId(null);
15601558
}, [
1559+
composerCursor,
15611560
composerDraftTargetKey,
15621561
composerText,
15631562
isLiteralPendingAnswer,

‎apps/web/src/components/chat/ComposerPendingUserInputPanel.navigation.browser.test.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ function PendingRequestsProbe({
9898
serverProjection: loading ? null : projection,
9999
supportsQuestionAttachments: false,
100100
composerDraftTarget: { environmentId, threadId: projection.thread.id },
101-
setComposerDraftPrompt: useComposerDraftStore.getState().setPrompt,
101+
setComposerDraftPrompt: (target, value) =>
102+
useComposerDraftStore.getState().setPrompt(target, value),
102103
promptRef: suppliedPromptRef ?? promptRef,
103104
composerRef: suppliedComposerRef ?? composerRef,
104105
setThreadError: () => {},
@@ -206,10 +207,10 @@ it("keeps the message cursor and recovers a custom answer when choosing an optio
206207
current: {
207208
getSendContext: () => ({ answeringPendingUserInput: false }),
208209
resetCursorState,
209-
} as ChatComposerHandle,
210+
} as unknown as ChatComposerHandle,
210211
};
211212
useComposerDraftStore.getState().setPrompt(target, message);
212-
await using screen = await render(
213+
await using _screen = await render(
213214
<PendingRequestsProbe
214215
environmentId={environmentId}
215216
projection={projection}

0 commit comments

Comments
 (0)