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

Remove modifier checks from prompt history navigation (#5467)

Browse source
This commit is contained in:
Matt Rubens 2025-07-08 11:19:46 -04:00 • committed by GitHub
parent a9a87c2e0f
commit 6ab57fae43
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 85 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -445,13 +445,15 @@ describe("ChatTextArea", () => {
})
})
it("should navigate to previous prompt on arrow up", () => {
it("should navigate to previous prompt on arrow up when cursor is at beginning", () => {
const setInputValue = vi.fn()
const { container } = render(
<ChatTextArea {...defaultProps} setInputValue={setInputValue} inputValue="" />,
)
const textarea = container.querySelector("textarea")!
// Ensure cursor is at the beginning
textarea.setSelectionRange(0, 0)
// Simulate arrow up key press
fireEvent.keyDown(textarea, { key: "ArrowUp" })
@ -755,6 +757,86 @@ describe("ChatTextArea", () => {
fireEvent.keyDown(textarea, { key: "ArrowUp" })
expect(setInputValue).toHaveBeenCalledWith("Message 2")
})
it("should not navigate history with arrow up when cursor is not at beginning", () => {
const setInputValue = vi.fn()
const { container } = render(
<ChatTextArea {...defaultProps} setInputValue={setInputValue} inputValue="Some text here" />,
)
const textarea = container.querySelector("textarea")!
// Set cursor to middle of text (not at beginning)
textarea.setSelectionRange(5, 5)
// Clear any calls from initial render
setInputValue.mockClear()
// Simulate arrow up key press
fireEvent.keyDown(textarea, { key: "ArrowUp" })
// Should not navigate history, allowing default behavior (move cursor to start)
expect(setInputValue).not.toHaveBeenCalled()
})
it("should navigate history with arrow up when cursor is at beginning", () => {
const setInputValue = vi.fn()
const { container } = render(
<ChatTextArea {...defaultProps} setInputValue={setInputValue} inputValue="Some text here" />,
)
const textarea = container.querySelector("textarea")!
// Set cursor to beginning of text
textarea.setSelectionRange(0, 0)
// Clear any calls from initial render
setInputValue.mockClear()
// Simulate arrow up key press
fireEvent.keyDown(textarea, { key: "ArrowUp" })
// Should navigate to history since cursor is at beginning
expect(setInputValue).toHaveBeenCalledWith("Third prompt")
})
it("should navigate history with Command+Up when cursor is at beginning", () => {
const setInputValue = vi.fn()
const { container } = render(
<ChatTextArea {...defaultProps} setInputValue={setInputValue} inputValue="Some text here" />,
)
const textarea = container.querySelector("textarea")!
// Set cursor to beginning of text
textarea.setSelectionRange(0, 0)
// Clear any calls from initial render
setInputValue.mockClear()
// Simulate Command+Up key press
fireEvent.keyDown(textarea, { key: "ArrowUp", metaKey: true })
// Should navigate to history since cursor is at beginning (same as regular Up)
expect(setInputValue).toHaveBeenCalledWith("Third prompt")
})
it("should not navigate history with Command+Up when cursor is not at beginning", () => {
const setInputValue = vi.fn()
const { container } = render(
<ChatTextArea {...defaultProps} setInputValue={setInputValue} inputValue="Some text here" />,
)
const textarea = container.querySelector("textarea")!
// Set cursor to middle of text (not at beginning)
textarea.setSelectionRange(5, 5)
// Clear any calls from initial render
setInputValue.mockClear()
// Simulate Command+Up key press
fireEvent.keyDown(textarea, { key: "ArrowUp", metaKey: true })
// Should not navigate history, allowing default behavior (same as regular Up)
expect(setInputValue).not.toHaveBeenCalled()
})
})
})

28
webview-ui/src/components/chat/hooks/usePromptHistory.ts
View file

@ -139,32 +139,8 @@ export const usePromptHistory = ({
const isAtBeginning = selectionStart === 0 && selectionEnd === 0
const isAtEnd = selectionStart === value.length && selectionEnd === value.length
// Check for modifier keys (Alt or Cmd/Ctrl)
const hasModifier = event.altKey || event.metaKey || event.ctrlKey
// Handle explicit history navigation with Alt+Up/Down
if (hasModifier && (event.key === "ArrowUp" || event.key === "ArrowDown")) {
event.preventDefault()
if (event.key === "ArrowUp") {
// Save current input if starting navigation
if (historyIndex === -1) {
setTempInput(inputValue)
}
return navigateToHistory(historyIndex + 1, textarea, "start")
} else {
// ArrowDown
if (historyIndex > 0) {
return navigateToHistory(historyIndex - 1, textarea, "end")
} else if (historyIndex === 0) {
returnToCurrentInput(textarea, "end")
return true
}
}
}
// Handle smart navigation without modifiers
if (!hasSelection && !hasModifier) {
// Handle smart navigation
if (!hasSelection) {
// Only navigate history with UP if cursor is at the very beginning
if (event.key === "ArrowUp" && isAtBeginning) {
event.preventDefault()