Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
feat(web): collapse the question prompt from its header (#6773)
Jaroslav Brtis40ab7bf32a81
diff --git a/apps/web/src/components/chat/ComposerPendingUserInputPanel.test.tsx b/apps/web/src/components/chat/ComposerPendingUserInputPanel.test.tsxnew file mode 100644index 000000000..817182190--- /dev/null+++ b/apps/web/src/components/chat/ComposerPendingUserInputPanel.test.tsx@@ -0,0 +1,61 @@+import { ApprovalRequestId } from "@t3tools/contracts";+import { renderToStaticMarkup } from "react-dom/server";+import { describe, expect, it } from "vite-plus/test";++import { ComposerPendingUserInputPanel } from "./ComposerPendingUserInputPanel";+import type { PendingUserInput } from "../../session-logic";++const prompt: PendingUserInput = {+ requestId: ApprovalRequestId.make("request-1"),+ createdAt: "2026-08-15T00:00:00.000Z",+ questions: [+ {+ id: "question-1",+ header: "Approach",+ question: "Which approach should the migration take?",+ options: [+ { label: "Incremental", description: "Move one module at a time" },+ { label: "Big bang", description: "Move everything in one release" },+ ],+ multiSelect: false,+ },+ ],+};++function renderPanel() {+ return renderToStaticMarkup(+ <ComposerPendingUserInputPanel+ pendingUserInputs={[prompt]}+ respondingRequestIds={[]}+ answers={{}}+ questionIndex={0}+ onToggleOption={() => {}}+ onAdvance={() => {}}+ />,+ );+}++describe("ComposerPendingUserInputPanel", () => {+ it("renders the header as a disclosure control for the question body", () => {+ const markup = renderPanel();++ const toggle = markup.match(/<button[^>]*data-pending-user-input-toggle="[^"]*"[^>]*>/)?.[0];+ expect(toggle).toBeDefined();+ expect(toggle).toContain('data-pending-user-input-toggle="expanded"');+ expect(toggle).toContain('aria-expanded="true"');+ expect(toggle).toContain('type="button"');++ const controlledId = toggle?.match(/aria-controls="([^"]+)"/)?.[1];+ expect(controlledId).toBeDefined();+ expect(markup).toMatch(new RegExp(`<div[^>]*\\sid="${controlledId}"`));+ });++ it("starts expanded so the question and its options are visible", () => {+ const markup = renderPanel();++ expect(markup).toContain("Approach");+ expect(markup).toContain("Which approach should the migration take?");+ expect(markup).toContain("Incremental");+ expect(markup).toContain("Big bang");+ });+});diff --git a/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx b/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsxindex ceac45c94..75dc5a6f5 100644--- a/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx+++ b/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx@@ -5,7 +5,8 @@ import {derivePendingUserInputProgress,type PendingUserInputDraftAnswer,} from "../../pendingUserInput";-import { CheckIcon } from "lucide-react";+import { CheckIcon, ChevronDownIcon } from "lucide-react";+import { Collapsible, CollapsiblePanel, CollapsibleTrigger } from "../ui/collapsible";import { cn } from "~/lib/utils";interface PendingUserInputPanelProps {@@ -65,6 +66,14 @@ const ComposerPendingUserInputCard = memo(function ComposerPendingUserInputCard(questionId: string;optionLabel: string;} | null>(null);+ // Collapsing hides everything but the header so a tall prompt stops covering+ // the thread the user is trying to read. Scoped to a single question: the card+ // is keyed by request id so the next prompt starts expanded, and storing the+ // collapsed question's id (rather than a bare flag) reopens the card when the+ // prompt advances to its next question, which can happen without a click —+ // sending from the composer advances the active question.+ const [collapsedQuestionId, setCollapsedQuestionId] = useState<string | null>(null);+ const isCollapsed = collapsedQuestionId !== null && collapsedQuestionId === activeQuestion?.id;useEffect(() => {onAdvanceRef.current = onAdvance;@@ -118,9 +127,10 @@ const ComposerPendingUserInputCard = memo(function ComposerPendingUserInputCard(// Keyboard shortcut: number keys 1-9 select corresponding options when focus is// outside editable fields. Multi-select prompts toggle options in place; single-- // select prompts keep the existing auto-advance behavior.+ // select prompts keep the existing auto-advance behavior. Collapsed prompts opt+ // out, since the numbers they refer to are not on screen.useEffect(() => {- if (!activeQuestion || isResponding) return;+ if (!activeQuestion || isResponding || isCollapsed) return;const handler = (event: globalThis.KeyboardEvent) => {if (event.metaKey || event.ctrlKey || event.altKey) return;const target = event.target;@@ -144,7 +154,7 @@ const ComposerPendingUserInputCard = memo(function ComposerPendingUserInputCard(};document.addEventListener("keydown", handler);return () => document.removeEventListener("keydown", handler);- }, [activeQuestion, isResponding]);+ }, [activeQuestion, isCollapsed, isResponding]);if (!activeQuestion) {return null;@@ -153,75 +163,119 @@ const ComposerPendingUserInputCard = memo(function ComposerPendingUserInputCard(const customAnswerActive = progress.customAnswer.trim().length > 0;return (- <div className="px-4 py-3 sm:px-5">- <div className="mb-2 flex items-center gap-3">- <span className="text-secondary-label text-[11px] font-semibold tracking-widest uppercase">- {activeQuestion.header}- </span>- {prompt.questions.length > 1 ? (- <span className="flex h-5 items-center rounded-md bg-muted/60 px-1.5 text-secondary-label text-[10px] font-medium tabular-nums">- {questionIndex + 1}/{prompt.questions.length}+ <Collapsible+ className="py-3"+ open={!isCollapsed}+ onOpenChange={(open) => {+ setCollapsedQuestionId(open ? null : activeQuestion.id);+ }}+ >+ {/* The trigger's wrapper is inset less than the card's text column, and+ the trigger pays the difference back as padding: the hover background+ and focus ring bleed 10px past that column on both sides, while the+ header label and the chevron still line up with the left and right+ edges of the question text below. The negative block margin keeps the+ taller hit area from pushing the panel down. */}+ <div className="px-1.5 sm:px-2.5">+ <CollapsibleTrigger+ title={+ isCollapsed ? "Show the question and its options" : "Hide the question and its options"+ }+ data-pending-user-input-toggle={isCollapsed ? "collapsed" : "expanded"}+ className="group -my-1 flex w-full items-center gap-3 rounded-md px-2.5 py-1.5 text-left outline-none transition-colors duration-150 hover:bg-muted/40 focus-visible:ring-1 focus-visible:ring-primary/25"+ >+ <span className="text-secondary-label text-[11px] font-semibold tracking-widest uppercase group-hover:text-foreground">+ {activeQuestion.header}</span>- ) : null}+ {prompt.questions.length > 1 ? (+ <span className="flex h-5 items-center rounded-md bg-muted/60 px-1.5 text-secondary-label text-[10px] font-medium tabular-nums">+ {questionIndex + 1}/{prompt.questions.length}+ </span>+ ) : null}+ {/* Collapsed, the header is otherwise just a section label and a+ counter, so the question itself is echoed here as a one-line+ reminder of what is being asked. */}+ {isCollapsed ? (+ <span className="min-w-0 flex-1 truncate text-secondary-label text-xs">+ {activeQuestion.question}+ </span>+ ) : null}+ {/* The chevron points at the body: down while it is open below the+ header, up while it is collapsed into it. */}+ <ChevronDownIcon+ aria-hidden="true"+ className={cn(+ "ml-auto size-3.5 shrink-0 text-secondary-label transition-transform duration-150 group-hover:text-foreground",+ isCollapsed && "rotate-180",+ )}+ />+ </CollapsibleTrigger></div>- <p className="text-sm text-foreground/90">{activeQuestion.question}</p>- {activeQuestion.multiSelect ? (- <p className="mt-1 text-secondary-label text-xs">Select one or more options.</p>- ) : null}- <div className="mt-3 space-y-1.5">- {activeQuestion.options.map((option, index) => {- const isOptimisticallySelected =- optimisticSingleSelect?.questionId === activeQuestion.id &&- optimisticSingleSelect.optionLabel === option.label;- const isSelected =- isOptimisticallySelected ||- (!customAnswerActive && progress.selectedOptionLabels.includes(option.label));- const shortcutKey = index < 9 ? index + 1 : null;- const className = cn(- "group flex w-full items-center gap-3 rounded-lg border px-3 py-2 text-left outline-none transition-all duration-150 focus-visible:border-primary/40 focus-visible:ring-1 focus-visible:ring-primary/25",- isSelected- ? "border-primary/30 bg-primary/8 text-foreground"- : "border-transparent bg-muted/22 text-foreground/85 hover:border-border/45 hover:bg-muted/34",- isResponding && "opacity-50 cursor-not-allowed",- !isResponding && "cursor-pointer",- );- const content = (- <>- <div className="min-w-0 flex-1 flex flex-col gap-0.5">- <span className="text-sm font-medium">{option.label}</span>- {option.description && option.description !== option.label ? (- <span className="text-secondary-label text-xs">{option.description}</span>- ) : null}- </div>- {isSelected ? (- <CheckIcon className="size-3.5 shrink-0 text-primary" />- ) : shortcutKey !== null ? (- <kbd- className={cn(- "flex size-5 shrink-0 items-center justify-center rounded border border-border/50 text-[11px] font-medium tabular-nums transition-colors duration-150",- "bg-background/35 text-secondary-label group-hover:border-border/70 group-hover:text-foreground",- )}+ {/* The panel carries the horizontal padding itself: it clips its content+ while the height animates, so the option buttons have to sit inside+ that padding or their focus rings get shaved off at the edges. */}+ <CollapsiblePanel className="px-4 sm:px-5">+ <div className="pt-2 pb-0.5">+ <p className="text-sm text-foreground/90">{activeQuestion.question}</p>+ {activeQuestion.multiSelect ? (+ <p className="mt-1 text-secondary-label text-xs">Select one or more options.</p>+ ) : null}+ <div className="mt-3 space-y-1.5">+ {activeQuestion.options.map((option, index) => {+ const isOptimisticallySelected =+ optimisticSingleSelect?.questionId === activeQuestion.id &&+ optimisticSingleSelect.optionLabel === option.label;+ const isSelected =+ isOptimisticallySelected ||+ (!customAnswerActive && progress.selectedOptionLabels.includes(option.label));+ const shortcutKey = index < 9 ? index + 1 : null;+ const className = cn(+ "group flex w-full items-center gap-3 rounded-lg border px-3 py-2 text-left outline-none transition-all duration-150 focus-visible:border-primary/40 focus-visible:ring-1 focus-visible:ring-primary/25",+ isSelected+ ? "border-primary/30 bg-primary/8 text-foreground"+ : "border-transparent bg-muted/22 text-foreground/85 hover:border-border/45 hover:bg-muted/34",+ isResponding && "opacity-50 cursor-not-allowed",+ !isResponding && "cursor-pointer",+ );+ const content = (+ <>+ <div className="min-w-0 flex-1 flex flex-col gap-0.5">+ <span className="text-sm font-medium">{option.label}</span>+ {option.description && option.description !== option.label ? (+ <span className="text-secondary-label text-xs">{option.description}</span>+ ) : null}+ </div>+ {isSelected ? (+ <CheckIcon className="size-3.5 shrink-0 text-primary" />+ ) : shortcutKey !== null ? (+ <kbd+ className={cn(+ "flex size-5 shrink-0 items-center justify-center rounded border border-border/50 text-[11px] font-medium tabular-nums transition-colors duration-150",+ "bg-background/35 text-secondary-label group-hover:border-border/70 group-hover:text-foreground",+ )}+ >+ {shortcutKey}+ </kbd>+ ) : null}+ </>+ );+ return (+ <button+ key={`${activeQuestion.id}:${option.label}`}+ type="button"+ disabled={isResponding}+ onClick={() => {+ handleOptionSelection(activeQuestion.id, option.label);+ }}+ className={className}>- {shortcutKey}- </kbd>- ) : null}- </>- );- return (- <button- key={`${activeQuestion.id}:${option.label}`}- type="button"- disabled={isResponding}- onClick={() => {- handleOptionSelection(activeQuestion.id, option.label);- }}- className={className}- >- {content}- </button>- );- })}- </div>- </div>+ {content}+ </button>+ );+ })}+ </div>+ </div>+ </CollapsiblePanel>+ </Collapsible>);});