Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
173 changes: 28 additions & 145 deletions packages/app/src/components/prompt-input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ import { usePlatform } from "@/context/platform"
import { useSessionLayout } from "@/pages/session/session-layout"
import { createSessionTabs } from "@/pages/session/helpers"
import { promptEnabled, promptProbe } from "@/testing/prompt"
import { useSettings } from "@/context/settings"
import { createTextFragment, getCursorPosition, setCursorPosition, setRangeEdge } from "./prompt-input/editor-dom"
import { createPromptAttachments } from "./prompt-input/attachments"
import { ACCEPTED_FILE_TYPES } from "./prompt-input/files"
import {
canNavigateHistoryAtCursor,
navigatePromptHistory,
prependHistoryEntry,
type PromptHistoryComment,
Expand All @@ -54,6 +54,7 @@ import { PromptPopover, type AtOption, type SlashCommand } from "./prompt-input/
import { PromptContextItems } from "./prompt-input/context-items"
import { PromptImageAttachments } from "./prompt-input/image-attachments"
import { PromptDragOverlay } from "./prompt-input/drag-overlay"
import { createPromptInputKeydown } from "./prompt-input/textarea-keybindings"
import { promptPlaceholder } from "./prompt-input/placeholder"
import { ImagePreview } from "@opencode-ai/ui/image-preview"

Expand Down Expand Up @@ -115,6 +116,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
const language = useLanguage()
const platform = usePlatform()
const { params, tabs, view } = useSessionLayout()
const settings = useSettings()
let editorRef!: HTMLDivElement
let fileInputRef: HTMLInputElement | undefined
let scrollRef!: HTMLDivElement
Expand Down Expand Up @@ -1097,153 +1099,34 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
onSubmit: props.onSubmit,
})

const handleKeyDown = (event: KeyboardEvent) => {
if ((event.metaKey || event.ctrlKey) && !event.altKey && !event.shiftKey && event.key.toLowerCase() === "u") {
event.preventDefault()
if (store.mode !== "normal") return
pick()
return
}

if (event.key === "Backspace") {
const selection = window.getSelection()
if (selection && selection.isCollapsed) {
const node = selection.anchorNode
const offset = selection.anchorOffset
if (node && node.nodeType === Node.TEXT_NODE) {
const text = node.textContent ?? ""
if (/^\u200B+$/.test(text) && offset > 0) {
const range = document.createRange()
range.setStart(node, 0)
range.collapse(true)
selection.removeAllRanges()
selection.addRange(range)
}
}
}
}

if (event.key === "!" && store.mode === "normal") {
const cursorPosition = getCursorPosition(editorRef)
if (cursorPosition === 0) {
setStore("mode", "shell")
setStore("popover", null)
event.preventDefault()
return
}
}

if (event.key === "Escape") {
if (store.popover) {
closePopover()
event.preventDefault()
event.stopPropagation()
return
}

if (store.mode === "shell") {
setStore("mode", "normal")
event.preventDefault()
event.stopPropagation()
return
}

if (working()) {
abort()
event.preventDefault()
event.stopPropagation()
return
}

if (escBlur()) {
editorRef.blur()
event.preventDefault()
event.stopPropagation()
return
}
}

if (store.mode === "shell") {
const { collapsed, cursorPosition, textLength } = getCaretState()
if (event.key === "Backspace" && collapsed && cursorPosition === 0 && textLength === 0) {
setStore("mode", "normal")
event.preventDefault()
return
}
}

// Handle Shift+Enter BEFORE IME check - Shift+Enter is never used for IME input
// and should always insert a newline regardless of composition state
if (event.key === "Enter" && event.shiftKey) {
const { handleKeyDown } = createPromptInputKeydown({
mode: () => store.mode,
popover: () => store.popover,
historyIndex: () => store.historyIndex,
working,
escBlur,
pick,
closePopover,
setMode,
blur: () => editorRef.blur(),
abort: () => void abort(),
addLine: () => {
addPart({ type: "text", content: "\n", start: 0, end: 0 })
event.preventDefault()
return
}

if (event.key === "Enter" && isImeComposing(event)) {
return
}

const ctrl = event.ctrlKey && !event.metaKey && !event.altKey && !event.shiftKey

if (store.popover) {
if (event.key === "Tab") {
selectPopoverActive()
event.preventDefault()
return
}
const nav = event.key === "ArrowUp" || event.key === "ArrowDown" || event.key === "Enter"
const ctrlNav = ctrl && (event.key === "n" || event.key === "p")
if (nav || ctrlNav) {
if (store.popover === "at") {
atOnKeyDown(event)
event.preventDefault()
return
}
if (store.popover === "slash") {
slashOnKeyDown(event)
}
event.preventDefault()
return
}
}

if (ctrl && event.code === "KeyG") {
if (store.popover) {
closePopover()
event.preventDefault()
return
}
if (working()) {
abort()
event.preventDefault()
}
return
}

if (event.key === "ArrowUp" || event.key === "ArrowDown") {
if (event.altKey || event.ctrlKey || event.metaKey) return
const { collapsed } = getCaretState()
if (!collapsed) return

const cursorPosition = getCursorPosition(editorRef)
const textContent = prompt
},
submit: handleSubmit,
isIme: isImeComposing,
getCaret: getCaretState,
getCursor: () => getCursorPosition(editorRef),
getText: () =>
prompt
.current()
.map((part) => ("content" in part ? part.content : ""))
.join("")
const direction = event.key === "ArrowUp" ? "up" : "down"
if (!canNavigateHistoryAtCursor(direction, textContent, cursorPosition, store.historyIndex >= 0)) return
if (navigateHistory(direction)) {
event.preventDefault()
}
return
}

// Note: Shift+Enter is handled earlier, before IME check
if (event.key === "Enter" && !event.shiftKey) {
handleSubmit(event)
}
}
.join(""),
pickPopover: selectPopoverActive,
atKey: atOnKeyDown,
slashKey: slashOnKeyDown,
history: navigateHistory,
})

return (
<div class="relative size-full _max-h-[320px] flex flex-col gap-0">
Expand Down
Loading
Loading