@@ -128,6 +128,7 @@ import {
128128} from "../ui/number-field" ;
129129import { Select , SelectItem , SelectPopup , SelectTrigger , SelectValue } from "../ui/select" ;
130130import { Switch } from "../ui/switch" ;
131+ import { Toggle , ToggleGroup } from "../ui/toggle-group" ;
131132import { stackedThreadToast , toastManager } from "../ui/toast" ;
132133import { Tooltip , TooltipPopup , TooltipTrigger } from "../ui/tooltip" ;
133134import { 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
0 commit comments