Skip to content

fix(tui): skip question reject when dialog is open #45306

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

Open
niho2 wants to merge 1 commit into
base: dev
Choose a base branch
from
+21 −2
Open

fix(tui): skip question reject when dialog is open #45306

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
23 changes: 21 additions & 2 deletions packages/tui/src/routes/session/question.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { useSDK } from "../../context/sdk"
import { SplitBorder } from "../../ui/border"
import { useTuiConfig } from "../../config"
import { useBindings, useOpencodeModeStack } from "../../keymap"
import { useDialog } from "../../ui/dialog"

const QUESTION_MODE = "question"

Expand All @@ -17,6 +18,7 @@ export function QuestionPrompt(props: { request: QuestionRequest; directory?: st
const renderer = useRenderer()
const tuiConfig = useTuiConfig()
const modeStack = useOpencodeModeStack()
const dialog = useDialog()

const questions = createMemo(() => props.request.questions)
const single = createMemo(() => questions().length === 1 && questions()[0]?.multiple !== true)
Expand Down Expand Up @@ -220,6 +222,7 @@ export function QuestionPrompt(props: { request: QuestionRequest; directory?: st
title: "Reject question",
category: "Question",
run() {
if (dialog.stack.length > 0) return
reject()
},
},
Expand Down Expand Up @@ -250,7 +253,15 @@ export function QuestionPrompt(props: { request: QuestionRequest; directory?: st
...(confirm()
? [
{ key: "return", desc: "Submit answer", group: "Question", cmd: () => submit() },
{ key: "escape", desc: "Reject question", group: "Question", cmd: () => reject() },
{
key: "escape",
desc: "Reject question",
group: "Question",
cmd: () => {
if (dialog.stack.length > 0) return
reject()
},
},
...tuiConfig.keybinds.get("app.exit"),
]
: [
Expand Down Expand Up @@ -278,7 +289,15 @@ export function QuestionPrompt(props: { request: QuestionRequest; directory?: st
{ key: "down", desc: "Next answer", group: "Question", cmd: () => moveTo((store.selected + 1) % total) },
{ key: "j", desc: "Next answer", group: "Question", cmd: () => moveTo((store.selected + 1) % total) },
{ key: "return", desc: "Select answer", group: "Question", cmd: () => selectOption() },
{ key: "escape", desc: "Reject question", group: "Question", cmd: () => reject() },
{
key: "escape",
desc: "Reject question",
group: "Question",
cmd: () => {
if (dialog.stack.length > 0) return
reject()
},
},
...tuiConfig.keybinds.get("app.exit"),
]),
],
Expand Down