Skip to content

Commit b150cbb

Browse files
fix(web): close composer menus when their controls hide
Close runtime, traits, model, and overflow menus when responsive layout hides their triggers. Clear stored open state while leaving controls mounted for measurement, and reveal the composer when the model shortcut needs a visible trigger. Implemented with Codex through T3 Code.
1 parent 8309a40 commit b150cbb

6 files changed

Lines changed: 149 additions & 23 deletions

File tree

‎apps/web/src/components/chat/ChatComposer.tsx‎

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ import {
8787
} from "../../promptStashStore";
8888
import { ComposerStashBadge } from "./ComposerStashBadge";
8989
import { ComposerStashMenu } from "./ComposerStashMenu";
90+
import { useComposerMenuState } from "./useComposerMenuState";
9091
import {
9192
ComposerTasksBadge,
9293
ComposerTasksContent,
@@ -908,10 +909,12 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
908909
interactionMode: ProviderInteractionMode;
909910
runtimeMode: RuntimeMode;
910911
size?: "sm" | "xs";
912+
hidden?: boolean;
911913
onToggleInteractionMode: () => void;
912914
onRuntimeModeChange: (mode: RuntimeMode) => void;
913915
}) {
914916
const size = props.size ?? "sm";
917+
const [open, setOpen] = useComposerMenuState(props.hidden);
915918
const runtimeModeOption = runtimeModeConfig[props.runtimeMode];
916919
const RuntimeModeIcon = runtimeModeOption.icon;
917920
const interactionModeTooltip =
@@ -969,6 +972,8 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
969972

970973
<Tooltip>
971974
<Select
975+
open={open}
976+
onOpenChange={setOpen}
972977
value={props.runtimeMode}
973978
onValueChange={(value) => props.onRuntimeModeChange(value!)}
974979
>
@@ -2070,10 +2075,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
20702075
isComposerOwned: true,
20712076
} satisfies Parameters<typeof renderProviderTraitsPicker>[0];
20722077
const providerTraitsPicker = renderProviderTraitsPicker(providerTraitsPickerInput);
2073-
const restingProviderTraitsPicker = renderProviderTraitsPicker({
2074-
...providerTraitsPickerInput,
2075-
size: "xs",
2076-
});
20772078
const {
20782079
controlsRef: restingComposerControlsRef,
20792080
hiddenBlockCount: restingControlsHiddenBlockCount,
@@ -3558,6 +3559,10 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
35583559
// to see or change the model without expanding the composer.
35593560
const composerControlsInStrip = isComposerResting || isComposerCollapsedMobile;
35603561
const composerControlsVisibleInStrip = composerControlsInStrip && restingControlsVisible;
3562+
const composerControlsHidden = composerControlsInStrip && !restingControlsVisible;
3563+
if (composerControlsHidden && isComposerModelPickerOpen) {
3564+
setIsComposerModelPickerOpen(false);
3565+
}
35613566
useLayoutEffect(() => {
35623567
onRestingControlsVisibilityChange(composerControlsVisibleInStrip);
35633568
}, [composerControlsVisibleInStrip, onRestingControlsVisibilityChange]);
@@ -3728,6 +3733,11 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
37283733

37293734
const restingHiddenBlockCount = composerControlsInStrip ? restingControlsHiddenBlockCount : 0;
37303735
const composerControlsCompact = !composerControlsInStrip && isComposerFooterCompact;
3736+
const restingProviderTraitsPicker = renderProviderTraitsPicker({
3737+
...providerTraitsPickerInput,
3738+
size: "xs",
3739+
hidden: composerControlsHidden || restingHiddenBlockCount > 1,
3740+
});
37313741
const restingBlockDefs = [
37323742
...(providerTraitsPicker
37333743
? [
@@ -3750,6 +3760,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
37503760
interactionMode={interactionMode}
37513761
runtimeMode={runtimeMode}
37523762
size={composerControlsInStrip ? "xs" : "sm"}
3763+
hidden={composerControlsHidden || restingHiddenBlockCount > 0}
37533764
onToggleInteractionMode={toggleInteractionMode}
37543765
onRuntimeModeChange={handleRuntimeModeChange}
37553766
/>
@@ -3868,7 +3879,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
38683879
interactionMode={interactionMode}
38693880
runtimeMode={runtimeMode}
38703881
size="xs"
3871-
hidden={hiddenRestingBlockIds.length === 0}
3882+
hidden={composerControlsHidden || hiddenRestingBlockIds.length === 0}
38723883
showInteractionModeToggle={
38733884
planModeUiEnabled && hiddenRestingBlockIds.includes("mode")
38743885
}
@@ -4418,6 +4429,18 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
44184429
// ------------------------------------------------------------------
44194430
// Imperative handle
44204431
// ------------------------------------------------------------------
4432+
const openModelPicker = useCallback(() => {
4433+
if (composerControlsHidden) {
4434+
if (composerBlurFrameRef.current !== null) {
4435+
window.cancelAnimationFrame(composerBlurFrameRef.current);
4436+
composerBlurFrameRef.current = null;
4437+
}
4438+
setIsComposerScrollCollapsed(false);
4439+
setIsComposerFocused(true);
4440+
}
4441+
setIsComposerModelPickerOpen(true);
4442+
}, [composerControlsHidden]);
4443+
44214444
useImperativeHandle(
44224445
composerRef,
44234446
() => ({
@@ -4441,11 +4464,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
44414464
"cursor",
44424465
{ ensureLeadingBoundary: true, citationCommentAnchor: sourceAnchor },
44434466
),
4444-
openModelPicker: () => {
4445-
setIsComposerModelPickerOpen(true);
4446-
},
4467+
openModelPicker,
44474468
toggleModelPicker: () => {
4448-
setIsComposerModelPickerOpen((open) => !open);
4469+
if (isComposerModelPickerOpen) {
4470+
setIsComposerModelPickerOpen(false);
4471+
} else {
4472+
openModelPicker();
4473+
}
44494474
},
44504475
compactContext: compactThreadContext,
44514476
isModelPickerOpen: () => isComposerModelPickerOpen,
@@ -4558,6 +4583,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
45584583
projectSelectionRequired,
45594584
applyPromptReplacement,
45604585
isComposerModelPickerOpen,
4586+
openModelPicker,
45614587
readComposerSnapshot,
45624588
selectedModel,
45634589
selectedModelOptionsForDispatch,

‎apps/web/src/components/chat/CompactComposerControlsMenu.tsx‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ProviderInteractionMode, RuntimeMode } from "@t3tools/contracts";
2-
import { memo, type ReactNode, useState } from "react";
2+
import { memo, type ReactNode } from "react";
33
import { EllipsisIcon } from "lucide-react";
44
import {
55
Menu,
@@ -11,6 +11,7 @@ import {
1111
} from "../ui/menu";
1212
import { ComposerControl, ComposerControlIcon } from "./ComposerControl";
1313
import { composerFloatingLayerProps } from "./composerEventScope";
14+
import { useComposerMenuState } from "./useComposerMenuState";
1415

1516
export const CompactComposerControlsMenu = memo(function CompactComposerControlsMenu(props: {
1617
interactionMode: ProviderInteractionMode;
@@ -28,19 +29,10 @@ export const CompactComposerControlsMenu = memo(function CompactComposerControls
2829
onRuntimeModeChange: (mode: RuntimeMode) => void;
2930
}) {
3031
const size = props.size ?? "sm";
31-
const [open, setOpen] = useState(false);
32-
const hidden = props.hidden ?? false;
33-
// Base UI does not report a close it did not initiate, so clear the state
34-
// when the trigger hides or the menu would reopen by itself when the
35-
// trigger returns.
36-
const [wasHidden, setWasHidden] = useState(hidden);
37-
if (hidden !== wasHidden) {
38-
setWasHidden(hidden);
39-
if (hidden) setOpen(false);
40-
}
32+
const [open, setOpen] = useComposerMenuState(props.hidden);
4133

4234
return (
43-
<Menu open={open && !hidden} onOpenChange={setOpen}>
35+
<Menu open={open} onOpenChange={setOpen}>
4436
<MenuTrigger
4537
render={
4638
<ComposerControl

‎apps/web/src/components/chat/TraitsPicker.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
isClaudeUltrathinkPrompt,
1616
normalizeModelSlug,
1717
} from "@t3tools/shared/model";
18-
import { memo, useCallback, useState } from "react";
18+
import { memo, useCallback } from "react";
1919
import type { VariantProps } from "class-variance-authority";
2020
import { ZapIcon } from "lucide-react";
2121
import { buttonVariants } from "../ui/button";
@@ -39,6 +39,7 @@ import {
3939
type ComposerControlSize,
4040
} from "./ComposerControl";
4141
import { composerFloatingLayerProps } from "./composerEventScope";
42+
import { useComposerMenuState } from "./useComposerMenuState";
4243

4344
type ProviderOptions = ReadonlyArray<ProviderOptionSelection>;
4445

@@ -549,12 +550,14 @@ export const TraitsPicker = memo(function TraitsPicker({
549550
triggerClassName,
550551
isComposerOwned,
551552
size = "sm",
553+
hidden = false,
552554
...persistence
553555
}: TraitsMenuContentProps &
554556
TraitsPersistence & {
555557
size?: ComposerControlSize;
558+
hidden?: boolean;
556559
}) {
557-
const [isMenuOpen, setIsMenuOpen] = useState(false);
560+
const [isMenuOpen, setIsMenuOpen] = useComposerMenuState(hidden);
558561
const { descriptors, primarySelectDescriptor, ultrathinkPromptControlled } =
559562
getTraitsSectionVisibility({
560563
provider,

‎apps/web/src/components/chat/composerProviderState.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ type TraitsRenderInput = {
5353
onPromptChange: (prompt: string) => void;
5454
planModeEnabled: boolean;
5555
size?: ComposerControlSize;
56+
hidden?: boolean;
5657
triggerVariant?: VariantProps<typeof buttonVariants>["variant"];
5758
triggerClassName?: string;
5859
isComposerOwned?: boolean;
@@ -131,6 +132,7 @@ function renderTraitsControl(
131132
onPromptChange,
132133
planModeEnabled,
133134
size,
135+
hidden,
134136
triggerVariant,
135137
triggerClassName,
136138
isComposerOwned,
@@ -162,6 +164,7 @@ function renderTraitsControl(
162164
onPromptChange={onPromptChange}
163165
planModeEnabled={planModeEnabled}
164166
{...(size !== undefined ? { size } : {})}
167+
{...(hidden !== undefined ? { hidden } : {})}
165168
{...(triggerVariant !== undefined ? { triggerVariant } : {})}
166169
{...(triggerClassName !== undefined ? { triggerClassName } : {})}
167170
{...(isComposerOwned ? { isComposerOwned } : {})}
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
import { act, StrictMode, useLayoutEffect } from "react";
2+
import { createRoot, type Root } from "react-dom/client";
3+
import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
4+
5+
import { useComposerMenuState } from "./useComposerMenuState";
6+
7+
let root: Root;
8+
let setOpen: ReturnType<typeof useComposerMenuState>[1];
9+
let committedOpen: boolean[];
10+
let closePopup = vi.fn<() => void>();
11+
12+
function MenuStateProbe({ hidden }: { hidden: boolean }) {
13+
const [open, updateOpen] = useComposerMenuState(hidden);
14+
useLayoutEffect(() => {
15+
setOpen = updateOpen;
16+
committedOpen.push(open);
17+
if (open) return closePopup;
18+
}, [open, updateOpen]);
19+
return null;
20+
}
21+
22+
async function renderMenu(hidden: boolean) {
23+
await act(() => {
24+
root.render(
25+
<StrictMode>
26+
<MenuStateProbe hidden={hidden} />
27+
</StrictMode>,
28+
);
29+
});
30+
}
31+
32+
beforeEach(() => {
33+
// The probe renders no host nodes, but ReactDOM still needs an event target.
34+
const document = {
35+
nodeType: 9,
36+
addEventListener() {},
37+
removeEventListener() {},
38+
};
39+
const container = {
40+
nodeType: 1,
41+
tagName: "DIV",
42+
namespaceURI: "http://www.w3.org/1999/xhtml",
43+
ownerDocument: document,
44+
addEventListener() {},
45+
removeEventListener() {},
46+
};
47+
vi.stubGlobal("document", document);
48+
vi.stubGlobal("window", { document, HTMLIFrameElement: EventTarget });
49+
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
50+
committedOpen = [];
51+
closePopup = vi.fn();
52+
root = createRoot(container as unknown as HTMLElement);
53+
});
54+
55+
afterEach(async () => {
56+
await act(() => root.unmount());
57+
vi.unstubAllGlobals();
58+
});
59+
60+
describe("useComposerMenuState", () => {
61+
it("closes an open popup when its trigger hides and does not reopen when it returns", async () => {
62+
await renderMenu(false);
63+
await act(() => setOpen(true));
64+
expect(committedOpen.at(-1)).toBe(true);
65+
66+
await renderMenu(true);
67+
expect(committedOpen.at(-1)).toBe(false);
68+
expect(closePopup).toHaveBeenCalledTimes(1);
69+
70+
const afterClose = committedOpen.length;
71+
await renderMenu(false);
72+
expect(committedOpen).toHaveLength(afterClose);
73+
expect(committedOpen.at(-1)).toBe(false);
74+
75+
await act(() => setOpen(true));
76+
expect(committedOpen.at(-1)).toBe(true);
77+
await act(() => setOpen(false));
78+
expect(committedOpen.at(-1)).toBe(false);
79+
expect(closePopup).toHaveBeenCalledTimes(2);
80+
});
81+
82+
it("does not commit an open popup requested while its trigger is hidden", async () => {
83+
await renderMenu(true);
84+
await act(() => setOpen(true));
85+
await renderMenu(false);
86+
87+
expect(committedOpen.every((open) => !open)).toBe(true);
88+
expect(closePopup).not.toHaveBeenCalled();
89+
});
90+
});
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { useState } from "react";
2+
3+
/** Clear portaled menus when their measured, still-mounted triggers hide. */
4+
export function useComposerMenuState(hidden = false) {
5+
const [open, setOpen] = useState(false);
6+
// Base UI does not notify us when we close it by changing its open prop.
7+
// Reset the stored state too, so revealing the trigger cannot reopen it.
8+
if (hidden && open) {
9+
setOpen(false);
10+
}
11+
return [open && !hidden, setOpen] as const;
12+
}

0 commit comments

Comments
 (0)