Skip to content

fix: Shift+Enter now inserts newline when Ctrl+Enter to send is enabled #10829

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

Draft
roomote wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −5
Draft

fix: Shift+Enter now inserts newline when Ctrl+Enter to send is enabled #10829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions webview-ui/src/components/chat/ChatTextArea.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,13 +495,14 @@ export const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
// Handle Enter key based on enterBehavior setting
if (event.key === "Enter" && !isComposing) {
if (enterBehavior === "newline") {
// New behavior: Enter = newline, Shift+Enter or Ctrl+Enter = send
if (event.shiftKey || event.ctrlKey || event.metaKey) {
// New behavior: Enter = newline, Ctrl/Cmd+Enter = send
// Shift+Enter also inserts newline (consistent with standard text editing)
if (event.ctrlKey || event.metaKey) {
event.preventDefault()
resetHistoryNavigation()
onSend()
}
// Otherwise, let Enter create newline (don't preventDefault)
// Otherwise, let Enter/Shift+Enter create newline (don't preventDefault)
} else {
// Default behavior: Enter = send, Shift+Enter = newline
if (!event.shiftKey) {
Expand Down
18 changes: 16 additions & 2 deletions webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ describe("ChatTextArea", () => {
expect(shiftEnterEvent.defaultPrevented).toBe(false)
})

it("should treat Ctrl/Cmd/Shift+Enter as send and plain Enter as newline in newline mode", () => {
it("should treat Ctrl/Cmd+Enter as send and plain Enter/Shift+Enter as newline in newline mode", () => {
const onSend = vi.fn()

;(useExtensionState as ReturnType<typeof vi.fn>).mockReturnValue({
Expand All @@ -1096,11 +1096,13 @@ describe("ChatTextArea", () => {

const textarea = container.querySelector("textarea")!

// Plain Enter should NOT send (allows newline)
const plainEnterEvent = new KeyboardEvent("keydown", { key: "Enter", bubbles: true, cancelable: true })
fireEvent(textarea, plainEnterEvent)
expect(onSend).not.toHaveBeenCalled()
expect(plainEnterEvent.defaultPrevented).toBe(false)

// Ctrl+Enter SHOULD send
const ctrlEnterEvent = new KeyboardEvent("keydown", {
key: "Enter",
ctrlKey: true,
Expand All @@ -1111,15 +1113,27 @@ describe("ChatTextArea", () => {
expect(onSend).toHaveBeenCalledTimes(1)
expect(ctrlEnterEvent.defaultPrevented).toBe(true)

// Shift+Enter should NOT send (allows newline, consistent with standard text editing)
const shiftEnterEvent = new KeyboardEvent("keydown", {
key: "Enter",
shiftKey: true,
bubbles: true,
cancelable: true,
})
fireEvent(textarea, shiftEnterEvent)
expect(onSend).toHaveBeenCalledTimes(1) // Still 1, not incremented
expect(shiftEnterEvent.defaultPrevented).toBe(false) // Should not prevent default

// Cmd+Enter (metaKey) SHOULD send
const metaEnterEvent = new KeyboardEvent("keydown", {
key: "Enter",
metaKey: true,
bubbles: true,
cancelable: true,
})
fireEvent(textarea, metaEnterEvent)
expect(onSend).toHaveBeenCalledTimes(2)
expect(shiftEnterEvent.defaultPrevented).toBe(true)
expect(metaEnterEvent.defaultPrevented).toBe(true)
})
})
})
Expand Down
Loading