Skip to content

Commit 5893781

Browse files
feat(web): fold composer collapse triggers into one multi-select row
Co-Authored-By: Claude Code <[email protected]>
1 parent da4de72 commit 5893781

3 files changed

Lines changed: 34 additions & 53 deletions

File tree

‎apps/web/src/components/settings/SettingsPanels.tsx‎

Lines changed: 27 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ import {
128128
} from "../ui/number-field";
129129
import { Select, SelectItem, SelectPopup, SelectTrigger, SelectValue } from "../ui/select";
130130
import { Switch } from "../ui/switch";
131+
import { Toggle, ToggleGroup } from "../ui/toggle-group";
131132
import { stackedThreadToast, toastManager } from "../ui/toast";
132133
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
133134
import { ThemeLibrary } from "./ThemeSettings";
@@ -542,11 +543,9 @@ export function useSettingsRestore(onRestored?: () => void) {
542543
...(settings.showSkillsInSlashMenu !== DEFAULT_UNIFIED_SETTINGS.showSkillsInSlashMenu
543544
? ["Show skills in slash menu"]
544545
: []),
545-
...(settings.composerCollapseOnBlur !== DEFAULT_UNIFIED_SETTINGS.composerCollapseOnBlur
546-
? ["Collapse composer when it loses focus"]
547-
: []),
548-
...(settings.composerCollapseOnScroll !== DEFAULT_UNIFIED_SETTINGS.composerCollapseOnScroll
549-
? ["Collapse composer when scrolling"]
546+
...(settings.composerCollapseOnBlur !== DEFAULT_UNIFIED_SETTINGS.composerCollapseOnBlur ||
547+
settings.composerCollapseOnScroll !== DEFAULT_UNIFIED_SETTINGS.composerCollapseOnScroll
548+
? ["Collapse composer"]
550549
: []),
551550
...(settings.contextWindowMeterEnabled !== DEFAULT_UNIFIED_SETTINGS.contextWindowMeterEnabled
552551
? ["Context window indicator"]
@@ -2345,55 +2344,42 @@ export function GeneralSettingsPanel() {
23452344
/>
23462345

23472346
<SettingsRow
2348-
{...searchableSetting("composer-collapse-on-blur")}
2349-
description="Rest the composer of an existing thread into a single line when you click or tab away from it."
2350-
resetAction={
2351-
settings.composerCollapseOnBlur !== DEFAULT_UNIFIED_SETTINGS.composerCollapseOnBlur ? (
2352-
<SettingResetButton
2353-
label="collapse composer on blur"
2354-
onClick={() =>
2355-
updateSettings({
2356-
composerCollapseOnBlur: DEFAULT_UNIFIED_SETTINGS.composerCollapseOnBlur,
2357-
})
2358-
}
2359-
/>
2360-
) : null
2361-
}
2362-
control={
2363-
<Switch
2364-
checked={settings.composerCollapseOnBlur}
2365-
onCheckedChange={(checked) =>
2366-
updateSettings({ composerCollapseOnBlur: Boolean(checked) })
2367-
}
2368-
aria-label="Collapse composer when it loses focus"
2369-
/>
2370-
}
2371-
/>
2372-
2373-
<SettingsRow
2374-
{...searchableSetting("composer-collapse-on-scroll")}
2375-
description="Rest a focused composer when you scroll the conversation. Scrolling toward the end while already there never collapses it."
2347+
{...searchableSetting("composer-collapse")}
2348+
description="Rest the composer of an existing thread into a single line when it loses focus, when you scroll the conversation, or both. Deselect both to keep it expanded."
23762349
resetAction={
2350+
settings.composerCollapseOnBlur !== DEFAULT_UNIFIED_SETTINGS.composerCollapseOnBlur ||
23772351
settings.composerCollapseOnScroll !==
2378-
DEFAULT_UNIFIED_SETTINGS.composerCollapseOnScroll ? (
2352+
DEFAULT_UNIFIED_SETTINGS.composerCollapseOnScroll ? (
23792353
<SettingResetButton
2380-
label="collapse composer on scroll"
2354+
label="collapse composer"
23812355
onClick={() =>
23822356
updateSettings({
2357+
composerCollapseOnBlur: DEFAULT_UNIFIED_SETTINGS.composerCollapseOnBlur,
23832358
composerCollapseOnScroll: DEFAULT_UNIFIED_SETTINGS.composerCollapseOnScroll,
23842359
})
23852360
}
23862361
/>
23872362
) : null
23882363
}
23892364
control={
2390-
<Switch
2391-
checked={settings.composerCollapseOnScroll}
2392-
onCheckedChange={(checked) =>
2393-
updateSettings({ composerCollapseOnScroll: Boolean(checked) })
2365+
<ToggleGroup
2366+
multiple
2367+
aria-label="Collapse composer"
2368+
variant="segmented"
2369+
value={[
2370+
...(settings.composerCollapseOnBlur ? ["blur"] : []),
2371+
...(settings.composerCollapseOnScroll ? ["scroll"] : []),
2372+
]}
2373+
onValueChange={(next) =>
2374+
updateSettings({
2375+
composerCollapseOnBlur: next.includes("blur"),
2376+
composerCollapseOnScroll: next.includes("scroll"),
2377+
})
23942378
}
2395-
aria-label="Collapse composer when scrolling"
2396-
/>
2379+
>
2380+
<Toggle value="blur">On blur</Toggle>
2381+
<Toggle value="scroll">On scroll</Toggle>
2382+
</ToggleGroup>
23972383
}
23982384
/>
23992385

‎apps/web/src/components/settings/settingsSearch.ts‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -203,16 +203,12 @@ export const SETTINGS_SEARCH_ITEMS = [
203203
searchTerms: ["command menu dollar $ slash /"],
204204
},
205205
{
206-
id: "composer-collapse-on-blur",
207-
title: "Collapse composer when it loses focus",
206+
id: "composer-collapse",
207+
title: "Collapse composer",
208208
to: "/settings/general",
209-
searchTerms: ["composer rest resting collapse blur focus click away shrink minimize"],
210-
},
211-
{
212-
id: "composer-collapse-on-scroll",
213-
title: "Collapse composer when scrolling",
214-
to: "/settings/general",
215-
searchTerms: ["composer rest resting collapse scroll wheel conversation timeline shrink"],
209+
searchTerms: [
210+
"composer rest resting blur focus click away scroll wheel conversation timeline shrink minimize",
211+
],
216212
},
217213
{
218214
id: "provider-update-checks",

‎docs/user/composer.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ the composer loses focus. At wider sizes, scrolling the conversation also rests
5656
except when scrolling toward the end while already there. When the thread-context strip has room,
5757
the model and mode controls stay available beside the thread context; otherwise they return when the
5858
composer is focused. Focus the composer or start typing to expand it again. New-thread layouts keep
59-
the full composer. Both triggers are optional: turn off **Settings → General → Collapse composer
60-
when it loses focus** to keep the composer expanded until you scroll, or **Collapse composer when
61-
scrolling** to rest it only when it loses focus. Turn off both and the composer stays expanded.
59+
the full composer. **Settings → General → Collapse composer** chooses which triggers rest it:
60+
**On blur**, **On scroll**, both, or neither. Deselect both and the composer stays expanded.
6261

6362
At phone-sized web or desktop window widths, existing threads animate between their compact and
6463
expanded layouts. Up to three image attachments remain visible in either resting layout, followed

0 commit comments

Comments
 (0)