Skip to content

fix(app): ignore IME composition keys in question dock custom input #49155

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

Closed
sawa-zen wants to merge 1 commit into from
+16 −2
Closed

fix(app): ignore IME composition keys in question dock custom input #49155

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
18 changes: 16 additions & 2 deletions packages/app/src/pages/session/composer/session-question-dock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { For, Show, createEffect, createMemo, onCleanup, onMount, type Component } from "solid-js"
import { For, Show, createEffect, createMemo, createSignal, onCleanup, onMount, type Component } from "solid-js"
import { createStore } from "solid-js/store"
import { useMutation } from "@tanstack/solid-query"
import { Button } from "@opencode-ai/ui/button"
Expand Down Expand Up @@ -103,6 +103,12 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
const customLabel = () => language.t("ui.messagePart.option.typeOwnAnswer")
const customPlaceholder = () => language.t("ui.question.custom.placeholder")

// Track IME composition explicitly: on some platforms (e.g. Safari) `compositionend`
// fires before the confirming Enter keydown, so `event.isComposing` alone is not enough.
// Same pattern as `isImeComposing` in `components/prompt-input.tsx`.
const [composing, setComposing] = createSignal(false)
const isImeComposing = (event: KeyboardEvent) => event.isComposing || composing() || event.keyCode === 229

const last = createMemo(() => store.tab >= total() - 1)
const collapse = useSpring(() => (store.minimized ? 1 : 0), { visualDuration: 0.3, bounce: 0 })
const hidden = createMemo(() => Math.max(0, Math.min(1, collapse())))
Expand Down Expand Up @@ -324,14 +330,16 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
if (event.defaultPrevented) return

if (event.key === "Escape") {
// Let IME composition (e.g. Esc to dismiss candidates) finish instead of rejecting.
if (isImeComposing(event)) return
event.preventDefault()
void reject()
return
}

const mod = (event.metaKey || event.ctrlKey) && !event.altKey
if (mod && event.key === "Enter") {
if (event.repeat) return
if (event.repeat || isImeComposing(event)) return
event.preventDefault()
next()
return
Expand Down Expand Up @@ -614,6 +622,10 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
rows={1}
disabled={sending()}
onKeyDown={(e) => {
// Ignore Enter/Escape used to confirm or cancel IME composition
// (e.g. Japanese kana-kanji conversion), otherwise focus jumps
// out of the input to the option card. See #49154.
if (isImeComposing(e)) return
if (e.key === "Escape") {
e.preventDefault()
setStore("editing", false)
Expand All @@ -625,6 +637,8 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
e.preventDefault()
commitCustom()
}}
onCompositionStart={() => setComposing(true)}
onCompositionEnd={() => setComposing(false)}
onInput={(e) => {
customUpdate(e.currentTarget.value)
resizeInput(e.currentTarget)
Expand Down
Loading