@@ -235,7 +235,7 @@ import {
235235import { SidebarContent , SidebarGroup , useSidebar } from "./ui/sidebar" ;
236236import { SidebarChromeFooter , SidebarChromeHeader } from "./sidebar/SidebarChrome" ;
237237import { SidebarHeaderIconButton , SidebarThreadHeader } from "./sidebar/SidebarThreadHeader" ;
238- import { Popover , PopoverPopup , PopoverTrigger } from "./ui/popover " ;
238+ import { Menu , MenuItem , MenuPopup , MenuSeparator , MenuShortcut , MenuTrigger } from "./ui/menu " ;
239239import { Tooltip , TooltipPopup , TooltipProvider , TooltipTrigger } from "./ui/tooltip" ;
240240import { MiddleTruncate } from "./ui/middle-truncate" ;
241241import {
@@ -440,7 +440,7 @@ function SidebarThreadTooltip({
440440 * Controlled by the row (which also uses the open state to pin its hover
441441 * actions while the menu is up).
442442 */
443- function SnoozePopoverButton ( props : {
443+ function SnoozeMenuButton ( props : {
444444 open : boolean ;
445445 onOpenChange : ( open : boolean ) => void ;
446446 onSnooze : ( preset : Pick < SnoozePreset , "snoozedUntil" > ) => void ;
@@ -454,11 +454,11 @@ function SnoozePopoverButton(props: {
454454 [ open , timestampFormat ] ,
455455 ) ;
456456 return (
457- < Popover open = { open } onOpenChange = { onOpenChange } >
457+ < Menu open = { open } onOpenChange = { onOpenChange } >
458458 < Tooltip >
459459 < TooltipTrigger
460460 render = {
461- < PopoverTrigger
461+ < MenuTrigger
462462 render = {
463463 < button
464464 type = "button"
@@ -475,39 +475,31 @@ function SnoozePopoverButton(props: {
475475 </ TooltipTrigger >
476476 < TooltipPopup > Snooze thread</ TooltipPopup >
477477 </ Tooltip >
478- < PopoverPopup side = "bottom" align = "end" width = "sm" viewportClassName = "p-1 ">
478+ < MenuPopup side = "bottom" align = "end" >
479479 { presets . map ( ( preset ) => (
480- < button
480+ < MenuItem
481481 key = { preset . id }
482- type = "button"
483482 onClick = { ( event ) => {
484483 event . stopPropagation ( ) ;
485- onOpenChange ( false ) ;
486484 onSnooze ( preset ) ;
487485 } }
488- className = "flex w-full cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-left text-xs text-foreground/90 hover:bg-accent hover:text-foreground"
489486 >
490- < span className = "flex-1" > { preset . label } </ span >
491- < span className = "font-mono text-[10px] text-muted-foreground/60 tabular-nums" >
492- { preset . whenLabel }
493- </ span >
494- </ button >
487+ { preset . label }
488+ < MenuShortcut > { preset . whenLabel } </ MenuShortcut >
489+ </ MenuItem >
495490 ) ) }
496- < div className = "my-1 border-t border-border/60" />
497- < button
498- type = "button"
499- className = "flex w-full cursor-pointer rounded-md px-2 py-1.5 text-left text-xs text-foreground/90 hover:bg-accent hover:text-foreground"
491+ < MenuSeparator />
492+ < MenuItem
500493 onClick = { async ( event ) => {
501494 event . stopPropagation ( ) ;
502- onOpenChange ( false ) ;
503495 const choice = await requestCustomSnooze ( ) ;
504496 if ( choice ) onSnooze ( choice ) ;
505497 } }
506498 >
507499 Custom…
508- </ button >
509- </ PopoverPopup >
510- </ Popover >
500+ </ MenuItem >
501+ </ MenuPopup >
502+ </ Menu >
511503 ) ;
512504}
513505
@@ -1883,7 +1875,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
18831875 </ Tooltip >
18841876 ) : null }
18851877 { showSnoozeButton ? (
1886- < SnoozePopoverButton
1878+ < SnoozeMenuButton
18871879 open = { snoozeMenuOpen }
18881880 onOpenChange = { setSnoozeMenuOpen }
18891881 onSnooze = { handleSnoozePreset }
@@ -4492,7 +4484,6 @@ export default function Sidebar() {
44924484 hideIndicator
44934485 value = { item }
44944486 className = "font-medium"
4495- contentClassName = "flex min-w-0 items-center gap-2"
44964487 onContextMenu = { ( event ) => {
44974488 if ( project ) handleProjectSettings ( event , project ) ;
44984489 } }
0 commit comments