scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-09-20 00:11:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 08ce747e74 into 8b12f21439

Browse source
This commit is contained in:
roomote-v0[bot] 2026-04-14 13:28:04 -05:00 • committed by GitHub
commit 3466d3b0bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webview-ui/src/components/chat/ChatTextArea.tsx
View file

@ -491,8 +491,8 @@ 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/Shift+Enter = newline, Ctrl/Cmd+Enter = send
if (event.ctrlKey || event.metaKey) {
event.preventDefault()
resetHistoryNavigation()
onSend()

6
webview-ui/src/components/chat/__tests__/ChatTextArea.spec.tsx
View file

@ -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({
@ -1118,8 +1118,8 @@ describe("ChatTextArea", () => {
cancelable: true,
})
fireEvent(textarea, shiftEnterEvent)
expect(onSend).toHaveBeenCalledTimes(2)
expect(shiftEnterEvent.defaultPrevented).toBe(true)
expect(onSend).toHaveBeenCalledTimes(1) // Shift+Enter should NOT send
expect(shiftEnterEvent.defaultPrevented).toBe(false) // Should allow newline
})
})
})