Skip to content

feat(ai): add enterToSubmit prop to ChatComposer #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
b-client-vm wants to merge 2 commits into
base: main
Choose a base branch
from
+22 −7
Open

feat(ai): add enterToSubmit prop to ChatComposer #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e91fbf
feat(ai): add enterToSubmit prop to ChatComposer
brendandebeasi May 13, 2026
17392f6
fix(ai): gate ChatComposer send on canSend in keydown
brendandebeasi May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions packages/ai/src/ChatComposer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
usePopover,
} from "@spacedrive/primitives";
import {AnimatePresence, motion} from "framer-motion";
import {type ReactNode} from "react";
import {type KeyboardEvent, type ReactNode} from "react";

import {ModelSelector} from "./ModelSelector";
import type {ModelOption} from "./types";
Expand Down Expand Up @@ -45,6 +45,11 @@ export interface ChatComposerProps {
onOpenVoice?: () => void;
/** Optional content rendered at the far right of the toolbar (before send) */
toolbarExtra?: ReactNode;
/**
* If true (default), Enter sends and Shift+Enter inserts a newline.
* If false, Enter inserts a newline and Cmd/Ctrl/Alt+Enter sends.
*/
enterToSubmit?: boolean;
}

/**
Expand All @@ -62,9 +67,24 @@ export function ChatComposer({
modelSelector,
onOpenVoice,
toolbarExtra,
enterToSubmit = true,
}: ChatComposerProps) {
const canSend = !isSending && draft.trim().length > 0;

const handleKeyDown = (event: KeyboardEvent<HTMLTextAreaElement>) => {
if (event.key !== "Enter" || event.nativeEvent.isComposing) return;
const hasSubmitModifier = event.metaKey || event.ctrlKey || event.altKey;
if (enterToSubmit) {
if (event.shiftKey) return;
event.preventDefault();
if (canSend) onSend();
} else if (hasSubmitModifier) {
if (!canSend) return;
event.preventDefault();
onSend();
}
};
Comment thread
coderabbitai[bot] marked this conversation as resolved.

return (
<>
{heading && (
Expand All @@ -80,12 +100,7 @@ export function ChatComposer({
<textarea
value={draft}
onChange={(event) => onDraftChange(event.target.value)}
onKeyDown={(event) => {
if (event.key === "Enter" && !event.shiftKey) {
event.preventDefault();
onSend();
}
}}
onKeyDown={handleKeyDown}
placeholder={placeholder}
rows={2}
className="text-ink placeholder:text-ink-faint block w-full resize-none rounded-md border-0 bg-transparent text-sm leading-6 outline-none focus:border-0 focus:outline-none focus:ring-0"
Expand Down