Skip to content

Commit 8cc9ca3

Browse files
committed
fix(web): keep rejected composer sends focused
1 parent 16f7778 commit 8cc9ca3

3 files changed

Lines changed: 31 additions & 4 deletions

File tree

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
975975
const composerEditorRef = useRef<ComposerPromptEditorHandle>(null);
976976
const composerFormRef = useRef<HTMLFormElement>(null);
977977
const composerSurfaceRef = useRef<HTMLDivElement>(null);
978+
const providerInputRejectedRef = useRef(false);
978979
const composerSelectLockRef = useRef(false);
979980
const composerMenuOpenRef = useRef(false);
980981
const composerMenuItemsRef = useRef<ComposerCommandItem[]>([]);
@@ -1863,7 +1864,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
18631864
prompt: promptRef.current,
18641865
submissionTarget: activePendingProgress ? "pending-user-input" : "provider-turn",
18651866
event,
1866-
onSend,
1867+
onSend: (sendEvent) => {
1868+
// ChatView reports its final composed-input preflight through the
1869+
// composer handle before its first asynchronous send step.
1870+
providerInputRejectedRef.current = false;
1871+
onSend(sendEvent);
1872+
return !providerInputRejectedRef.current;
1873+
},
18671874
});
18681875
setComposerSubmissionError(submission.validationMessage);
18691876
if (!submission.didDispatch) return;
@@ -2666,6 +2673,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
26662673
providerInput,
26672674
submissionTarget: "provider-turn",
26682675
});
2676+
providerInputRejectedRef.current = validationMessage !== null;
26692677
setProviderInputSubmissionError(validationMessage);
26702678
return validationMessage === null;
26712679
},

‎apps/web/src/components/chat/composerSubmission.test.ts‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ describe("submitComposerDraft", () => {
1515
prompt: draft,
1616
submissionTarget: "provider-turn",
1717
event: { preventDefault },
18-
onSend: () => dispatchedDrafts.push(draft),
18+
onSend: () => {
19+
dispatchedDrafts.push(draft);
20+
},
1921
});
2022
validationMessage = result.validationMessage;
2123
};
@@ -85,6 +87,20 @@ describe("submitComposerDraft", () => {
8587
expect(onSend).toHaveBeenCalledOnce();
8688
});
8789

90+
it("does not finish submission when the send boundary rejects composed provider input", () => {
91+
const preventDefault = vi.fn();
92+
93+
const result = submitComposerDraft({
94+
prompt: "Sendable raw draft",
95+
submissionTarget: "provider-turn",
96+
event: { preventDefault },
97+
onSend: () => false,
98+
});
99+
100+
expect(result).toEqual({ validationMessage: null, didDispatch: false });
101+
expect(preventDefault).toHaveBeenCalledOnce();
102+
});
103+
88104
it("allows fully composed provider input at the shared character limit", () => {
89105
const onSend = vi.fn();
90106

‎apps/web/src/components/chat/composerSubmission.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export function getComposerSubmissionValidationMessage(
2727
export function submitComposerDraft(
2828
options: ComposerSubmissionInput & {
2929
event: ComposerSubmitEvent | undefined;
30-
onSend: (event?: ComposerSubmitEvent) => void;
30+
onSend: (event?: ComposerSubmitEvent) => boolean | void;
3131
},
3232
): { validationMessage: string | null; didDispatch: boolean } {
3333
const validationMessage = getComposerSubmissionValidationMessage(options);
@@ -36,6 +36,9 @@ export function submitComposerDraft(
3636
return { validationMessage, didDispatch: false };
3737
}
3838

39-
options.onSend(options.event);
39+
if (options.onSend(options.event) === false) {
40+
options.event?.preventDefault();
41+
return { validationMessage: null, didDispatch: false };
42+
}
4043
return { validationMessage: null, didDispatch: true };
4144
}

0 commit comments

Comments
 (0)