@@ -6,10 +6,9 @@ import type {
66} from "@t3tools/contracts" ;
77import { createModelSelection } from "@t3tools/shared/model" ;
88import { BotIcon , PencilRulerIcon } from "lucide-react" ;
9- import { type ComponentProps , memo , useId , useRef , useState } from "react" ;
9+ import { type ComponentProps , memo , useRef } from "react" ;
1010
1111import type { ContextWindowSnapshot } from "../../lib/contextWindow" ;
12- import { Menu as MenuPrimitive } from "@base-ui/react/menu" ;
1312import { Menu , MenuPopup , MenuTrigger } from "../ui/menu" ;
1413import { Tooltip , TooltipPopup , TooltipTrigger } from "../ui/tooltip" ;
1514import { ComposerControl , ComposerControlIcon } from "./ComposerControl" ;
@@ -20,6 +19,7 @@ import { resolveModelPickerSelectedModel } from "./ModelPickerContent";
2019import { ProviderModelPicker } from "./ProviderModelPicker" ;
2120import { runtimeModeConfig } from "./runtimeModeConfig" ;
2221import { useComposerMenuState } from "./useComposerMenuState" ;
22+ import { ComposerMenuSegment , ComposerMenuSegments } from "./ComposerMenuSegments" ;
2323
2424export type RuntimeModeOption = { mode : RuntimeMode } & ( typeof runtimeModeConfig ) [ RuntimeMode ] ;
2525const supervisedRuntimeModeOption = {
@@ -153,90 +153,44 @@ export const ComposerFooterModeControls = memo(function ComposerFooterModeContro
153153 ) ;
154154} ) ;
155155
156- /**
157- * Permission modes as one horizontal toggle, with the shown mode named below.
158- * Each segment is a real menu radio item, so arrow keys reach it from the rest of the menu
159- * and a pick closes the menu. Lives inside a Menu: the permissions chip, the effort menu,
160- * or the overflow menu.
161- */
162156export function ComposerPermissionsSection ( props : {
163157 runtimeMode : RuntimeMode ;
164158 runtimeModeOptions : ReadonlyArray <
165159 { mode : RuntimeMode } & ( typeof runtimeModeConfig ) [ RuntimeMode ]
166160 > ;
167161 onRuntimeModeChange : ( mode : RuntimeMode ) => void ;
168162} ) {
169- // Hover or keyboard focus previews a mode's name and description before a pick.
170- const [ previewMode , setPreviewMode ] = useState < RuntimeMode | null > ( null ) ;
171- const shownMode = previewMode ?? props . runtimeMode ;
172- const shown =
173- props . runtimeModeOptions . find ( ( option ) => option . mode === shownMode ) ??
163+ const selected =
164+ props . runtimeModeOptions . find ( ( option ) => option . mode === props . runtimeMode ) ??
174165 supervisedRuntimeModeOption ;
175- const descriptionId = useId ( ) ;
176166 return (
177167 < div data-composer-permissions className = "grid w-72 gap-1.5 px-2 py-1.5" >
178- < div className = "font-medium text-muted-foreground text-xs" > Permissions</ div >
179- < MenuPrimitive . RadioGroup
168+ < div className = "flex min-h-5 items-center justify-between gap-3" >
169+ < span className = "font-medium text-muted-foreground text-xs" > Permissions</ span >
170+ < span className = "text-sm" > { selected . label } </ span >
171+ </ div >
172+ < ComposerMenuSegments
180173 aria-label = "Permissions"
181174 value = { props . runtimeMode }
182175 onValueChange = { ( value : RuntimeMode ) => {
183176 if ( value !== props . runtimeMode ) props . onRuntimeModeChange ( value ) ;
184177 } }
185- className = "flex gap-0.5 rounded-lg bg-input/40 p-0.5"
186- // Menus navigate with Up/Down only; the row reads horizontally, so Left/Right move too.
187- onKeyDown = { ( event ) => {
188- if ( event . key !== "ArrowLeft" && event . key !== "ArrowRight" ) return ;
189- const items = Array . from (
190- event . currentTarget . querySelectorAll < HTMLElement > ( '[role="menuitemradio"]' ) ,
191- ) ;
192- const index = items . findIndex ( ( item ) => item === document . activeElement ) ;
193- const next = items [ index + ( event . key === "ArrowRight" ? 1 : - 1 ) ] ;
194- if ( index < 0 || ! next ) return ;
195- event . preventDefault ( ) ;
196- event . stopPropagation ( ) ;
197- next . focus ( ) ;
198- } }
199178 >
200179 { props . runtimeModeOptions . map ( ( option ) => {
201180 const OptionIcon = option . icon ;
202181 return (
203- < MenuPrimitive . RadioItem
182+ < ComposerMenuSegment
204183 key = { option . mode }
205184 value = { option . mode }
206185 label = { option . label }
207- aria-label = { option . label }
208- aria-describedby = { `${ descriptionId } -${ option . mode } ` }
186+ description = { option . description }
209187 closeOnClick
210- onPointerEnter = { ( ) => setPreviewMode ( option . mode ) }
211- onPointerLeave = { ( ) => setPreviewMode ( null ) }
212- onFocus = { ( ) => setPreviewMode ( option . mode ) }
213- onBlur = { ( ) => setPreviewMode ( null ) }
214- className = "flex h-6 flex-1 cursor-pointer items-center justify-center rounded-md text-muted-foreground outline-none data-checked:bg-input/72 data-checked:text-foreground data-highlighted:text-foreground not-data-checked:data-highlighted:bg-accent focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-inset"
215188 >
216189 < OptionIcon aria-hidden = "true" className = "size-3.5" />
217- </ MenuPrimitive . RadioItem >
190+ </ ComposerMenuSegment >
218191 ) ;
219192 } ) }
220- </ MenuPrimitive . RadioGroup >
221- { /* Static per-mode descriptions for screen readers; the preview below is visual only. */ }
222- { props . runtimeModeOptions . map ( ( option ) => (
223- < span key = { option . mode } id = { `${ descriptionId } -${ option . mode } ` } className = "sr-only" >
224- { option . description }
225- </ span >
226- ) ) }
227- < div className = "grid gap-0.5" aria-hidden = "true" >
228- < span
229- className = {
230- shownMode === props . runtimeMode
231- ? "text-foreground text-sm"
232- : "text-muted-foreground text-sm"
233- }
234- >
235- { shown . label }
236- </ span >
237- { /* Two lines reserved so the menu does not shift while you preview modes. */ }
238- < span className = "min-h-8 text-muted-foreground text-xs leading-4" > { shown . description } </ span >
239- </ div >
193+ </ ComposerMenuSegments >
240194 </ div >
241195 ) ;
242196}
0 commit comments