@@ -113,10 +113,6 @@ export function SidebarUpdatePill() {
113113}
114114
115115function SidebarUpdateControl ( ) {
116- "use no memo" ;
117- // Base UI loses focus restoration when React Compiler caches this Popover subtree
118- // across mixed hover and keyboard open cycles.
119-
120116 const state = useDesktopUpdateState ( ) ;
121117 const [ isActionPending , setIsActionPending ] = useState ( false ) ;
122118 const [ checkAnimationKey , setCheckAnimationKey ] = useState ( 0 ) ;
@@ -166,8 +162,16 @@ function SidebarUpdateControl() {
166162 ) ;
167163
168164 useEffect ( ( ) => {
169- if ( ! showReleaseNotesPopover ) releaseNotesPopoverHandle . close ( ) ;
170- } , [ releaseNotesPopoverHandle , showReleaseNotesPopover ] ) ;
165+ if ( ! showReleaseNotesPopover ) {
166+ releaseNotesPopoverHandle . close ( ) ;
167+ return ;
168+ }
169+
170+ const trigger = document . getElementById ( releaseNotesTriggerId ) ;
171+ if ( trigger ?. matches ( ":focus-visible" ) ) {
172+ releaseNotesPopoverHandle . open ( releaseNotesTriggerId ) ;
173+ }
174+ } , [ releaseNotesPopoverHandle , releaseNotesTriggerId , showReleaseNotesPopover ] ) ;
171175
172176 const handleAction = useCallback ( async ( ) => {
173177 const bridge = window . desktopBridge ;
@@ -345,18 +349,47 @@ function SidebarUpdateControl() {
345349
346350 return (
347351 < SidebarMenuItem className = "ml-auto shrink-0" >
348- { showReleaseNotesPopover && state ? (
349- < Popover
350- handle = { releaseNotesPopoverHandle }
351- onOpenChange = { handleSidebarUpdateReleaseNotesPopoverOpenChange }
352- >
353- < PopoverTrigger
354- closeDelay = { 150 }
355- handle = { releaseNotesPopoverHandle }
352+ < Popover
353+ handle = { releaseNotesPopoverHandle }
354+ onOpenChange = { ( open , details ) => {
355+ if ( open && ! showReleaseNotesPopover ) {
356+ details . cancel ( ) ;
357+ return ;
358+ }
359+ handleSidebarUpdateReleaseNotesPopoverOpenChange ( open , details ) ;
360+ } }
361+ >
362+ < Tooltip disabled = { showReleaseNotesPopover } >
363+ < TooltipTrigger
356364 id = { releaseNotesTriggerId }
357- openOnHover
358- render = { updateButton }
365+ render = {
366+ < PopoverTrigger
367+ { ...( ! showReleaseNotesPopover
368+ ? {
369+ "aria-controls" : undefined ,
370+ "aria-expanded" : undefined ,
371+ "aria-haspopup" : undefined ,
372+ }
373+ : { } ) }
374+ closeDelay = { 150 }
375+ handle = { releaseNotesPopoverHandle }
376+ id = { releaseNotesTriggerId }
377+ openOnHover = { showReleaseNotesPopover }
378+ render = { updateButton }
379+ />
380+ }
359381 />
382+ { ! showReleaseNotesPopover ? (
383+ < TooltipPopup
384+ align = "center"
385+ side = "top"
386+ variant = { showUpdateDetails ? "glass" : "default" }
387+ >
388+ { tooltip }
389+ </ TooltipPopup >
390+ ) : null }
391+ </ Tooltip >
392+ { showReleaseNotesPopover && state ? (
360393 < PopoverPopup
361394 align = "center"
362395 aria-label = "Nightly update release notes"
@@ -380,15 +413,8 @@ function SidebarUpdateControl() {
380413 tooltip = { tooltip }
381414 />
382415 </ PopoverPopup >
383- </ Popover >
384- ) : (
385- < Tooltip >
386- < TooltipTrigger render = { updateButton } />
387- < TooltipPopup align = "center" side = "top" variant = { showUpdateDetails ? "glass" : "default" } >
388- { tooltip }
389- </ TooltipPopup >
390- </ Tooltip >
391- ) }
416+ ) : null }
417+ </ Popover >
392418 </ SidebarMenuItem >
393419 ) ;
394420}
0 commit comments