@@ -132,17 +132,18 @@ function UserMenu() {
132132 const { me } = useCurrentUser ( )
133133 return (
134134 < DropdownMenu . Root >
135- < DropdownMenu . Trigger
136- className = { cn (
137- buttonStyle ( { size : 'sm' , variant : 'ghost' } ) ,
138- 'flex items-center gap-1.5 !px-2 !border-secondary'
139- ) }
140- aria-label = "User menu"
141- >
142- < Profile16Icon className = "text-tertiary" />
143- < span className = "normal-case text-sans-md text-default" >
144- { me . displayName || 'User' }
145- </ span >
135+ < DropdownMenu . Trigger aria-label = "User menu" >
136+ < div
137+ className = { cn (
138+ buttonStyle ( { size : 'sm' , variant : 'ghost' } ) ,
139+ 'flex items-center gap-1.5 !px-2 !border-secondary'
140+ ) }
141+ >
142+ < Profile16Icon className = "text-tertiary" />
143+ < span className = "normal-case text-sans-md text-default" >
144+ { me . displayName || 'User' }
145+ </ span >
146+ </ div >
146147 </ DropdownMenu . Trigger >
147148 < DropdownMenu . Content gap = { 8 } >
148149 < DropdownMenu . LinkItem to = { pb . profile ( ) } > Settings</ DropdownMenu . LinkItem >
@@ -160,16 +161,15 @@ function UserMenu() {
160161function SiloSystemPicker ( { level } : { level : 'silo' | 'system' } ) {
161162 return (
162163 < DropdownMenu . Root >
163- < DropdownMenu . Trigger
164- className = "flex items-center rounded border px-2 py-1.5 text-sans-md text-default border-secondary hover:bg-hover"
165- aria-label = "Switch between system and silo"
166- >
167- < div className = "flex items-center text-tertiary" >
168- { level === 'system' ? < Servers16Icon /> : < Organization16Icon /> }
164+ < DropdownMenu . Trigger aria-label = "Switch between system and silo" >
165+ < div className = "active-clicked flex items-center rounded border px-2 py-1.5 text-sans-md text-default border-secondary hover:bg-hover" >
166+ < div className = "flex items-center text-tertiary" >
167+ { level === 'system' ? < Servers16Icon /> : < Organization16Icon /> }
168+ </ div >
169+ < div className = "ml-1.5 mr-3" > { level === 'system' ? 'System' : 'Silo' } </ div >
170+ { /* aria-hidden is a tip from the Reach docs */ }
171+ < SelectArrows6Icon className = "text-quaternary" aria-hidden />
169172 </ div >
170- < div className = "ml-1.5 mr-3" > { level === 'system' ? 'System' : 'Silo' } </ div >
171- { /* aria-hidden is a tip from the Reach docs */ }
172- < SelectArrows6Icon className = "text-quaternary" aria-hidden />
173173 </ DropdownMenu . Trigger >
174174 < DropdownMenu . Content className = "mt-2 max-h-80 overflow-y-auto" anchor = "bottom start" >
175175 < SystemSiloItem to = { pb . silos ( ) } label = "System" isSelected = { level === 'system' } />
0 commit comments