From 283b254feaaae4a78ed6ddc198822da916455975 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Tue, 10 Nov 2026 07:27:32 -0500 Subject: [PATCH] fix: Keep sidebar row active while the add menu is open --- app/components/Sidebar/components/SidebarActions.tsx | 6 ++++-- app/components/Sidebar/components/SidebarLink.tsx | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/components/Sidebar/components/SidebarActions.tsx b/app/components/Sidebar/components/SidebarActions.tsx index d4552ca886..40b030c305 100644 --- a/app/components/Sidebar/components/SidebarActions.tsx +++ b/app/components/Sidebar/components/SidebarActions.tsx @@ -6,9 +6,11 @@ import NudeButton from "~/components/NudeButton"; /** * Selector list matching a sidebar row that is hovered, pressed, or has one * of its menus open. Radix marks the open trigger with `data-state="open"`: - * the row itself for a context menu, a descendant button for a dropdown. + * the row itself for a context menu, a descendant button for a dropdown. A + * tooltip on a dropdown trigger replaces its `data-state`, so an expanded menu + * trigger is also matched. */ -export const hoveredOrMenuOpen = `&:hover, &:active, &[data-state="open"], &:has([data-state="open"])`; +export const hoveredOrMenuOpen = `&:hover, &:active, &[data-state="open"], &:has([data-state="open"]), &:has([aria-haspopup="menu"][aria-expanded="true"])`; /** * Trailing action buttons for a sidebar row. Hidden until the row reveals diff --git a/app/components/Sidebar/components/SidebarLink.tsx b/app/components/Sidebar/components/SidebarLink.tsx index accab8a248..21ee5760bf 100644 --- a/app/components/Sidebar/components/SidebarLink.tsx +++ b/app/components/Sidebar/components/SidebarLink.tsx @@ -368,7 +368,8 @@ const Link = styled.a<{ } &: ${hover}, - &:has([data-state="open"]) { + &:has([data-state="open"]), + &:has([aria-haspopup="menu"][aria-expanded="true"]) { ${HiddenDisclosure} { opacity: 1; }