Skip to content

fix(desktop): keep sidebar section actions visible while ⋮ menu is open #1584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wesbillman merged 1 commit into from
Jul 8, 2026
Merged

fix(desktop): keep sidebar section actions visible while ⋮ menu is open #1584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions desktop/src/features/sidebar/ui/AppSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ export function AppSidebar({
const [isNewDmOpenInternal, setIsNewDmOpenInternal] = React.useState(false);
const isNewDmOpen = isNewDmOpenProp ?? isNewDmOpenInternal;
const setIsNewDmOpen = onNewDmOpenChange ?? setIsNewDmOpenInternal;
const [dmActionsMenuOpen, setDmActionsMenuOpen] = React.useState(false);
const scrollRef = React.useRef<HTMLDivElement>(null);
useSidebarScrollLock(scrollRef);

Expand Down Expand Up @@ -760,6 +761,7 @@ export function AppSidebar({
<SectionActionsMenu
sectionLabel="direct messages"
testId="section-actions-dms"
onOpenChange={setDmActionsMenuOpen}
onNewMessage={() => setIsNewDmOpen(true)}
sortMode={sortModeFor("dms")}
onSortModeChange={(mode) => setSortModeFor("dms", mode)}
Expand All @@ -783,6 +785,7 @@ export function AppSidebar({
selectedChannelId={selectedChannelId}
testId="dm-list"
title="Direct messages"
sectionActionsOpen={dmActionsMenuOpen}
unreadChannelCounts={unreadChannelCounts}
unreadChannelIds={unreadChannelIds}
mutedChannelIds={mutedChannelIds}
Expand Down
14 changes: 11 additions & 3 deletions desktop/src/features/sidebar/ui/CustomChannelSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
Trash2,
} from "lucide-react";

import { useRef } from "react";
import { useRef, useState } from "react";
import type * as React from "react";

import type { ChannelSortMode } from "@/features/sidebar/lib/channelSortPreference";
Expand Down Expand Up @@ -63,7 +63,7 @@ import { StatusEmoji } from "@/features/user-status/ui/StatusEmoji";
const SECTION_LABEL_BUTTON_CLASS =
"group/section-label flex w-fit max-w-[calc(100%-3rem)] cursor-pointer appearance-none items-center gap-1 text-left transition-colors hover:text-sidebar-foreground focus-visible:text-sidebar-foreground";
const SECTION_LABEL_CHEVRON_CLASS =
"relative size-2.5 shrink-0 text-current opacity-0 transition-[color,opacity] group-hover/sidebar-section:opacity-100 group-hover/section-label:opacity-100 group-focus-within/sidebar-section:opacity-100 group-focus-visible/section-label:opacity-100";
"relative size-2.5 shrink-0 text-current opacity-0 transition-[color,opacity] group-hover/sidebar-section:opacity-100 group-hover/section-label:opacity-100 group-focus-within/sidebar-section:opacity-100 group-focus-visible/section-label:opacity-100 group-data-[section-actions-open=true]/sidebar-section:opacity-100";
const SECTION_LABEL_CHEVRON_ICON_CLASS =
"absolute left-1/2 top-1/2 size-2.5 -translate-x-1/2 -translate-y-1/2";

Expand Down Expand Up @@ -119,6 +119,7 @@ export function SectionActionsMenu({
sectionLabel,
testId,
visibilityClassName = SECTION_ACTION_VISIBILITY_CLASS,
onOpenChange,
hasUnread,
onMarkAllRead,
onBrowse,
Expand All @@ -139,6 +140,7 @@ export function SectionActionsMenu({
sectionLabel: string;
testId?: string;
visibilityClassName?: string;
onOpenChange?: (open: boolean) => void;
hasUnread?: boolean;
onMarkAllRead?: () => void;
onBrowse?: () => void;
Expand All @@ -161,7 +163,7 @@ export function SectionActionsMenu({
const showSort = Boolean(sortMode && onSortModeChange);

return (
<DropdownMenu>
<DropdownMenu onOpenChange={onOpenChange}>
<DropdownMenuTrigger asChild>
<button
aria-label={`More actions for ${sectionLabel}`}
Expand Down Expand Up @@ -403,6 +405,7 @@ export function ChannelGroupSection({
onLeaveChannel?: (channel: Channel) => void;
}) {
const contentId = `sidebar-${listTestId}`;
const [actionsMenuOpen, setActionsMenuOpen] = useState(false);

const channelList =
items.length > 0 ? (
Expand Down Expand Up @@ -472,6 +475,7 @@ export function ChannelGroupSection({
const sectionContent = (
<SidebarGroup
className={cn("group/sidebar-section select-none", groupClassName)}
data-section-actions-open={actionsMenuOpen || undefined}
>
<ChannelSectionHeader
contentId={contentId}
Expand All @@ -492,6 +496,7 @@ export function ChannelGroupSection({
<SectionActionsMenu
sectionLabel={title}
testId={actionsTestId}
onOpenChange={setActionsMenuOpen}
hasUnread={hasUnread}
onMarkAllRead={onMarkAllRead}
onBrowse={onBrowseClick}
Expand Down Expand Up @@ -592,6 +597,7 @@ export function CustomChannelSection({
onLeaveChannel?: (channel: Channel) => void;
}) {
const contentId = `sidebar-section-${section.id}`;
const [actionsMenuOpen, setActionsMenuOpen] = useState(false);

return (
<SortableSectionShell sectionId={section.id}>
Expand All @@ -602,6 +608,7 @@ export function CustomChannelSection({
"group/sidebar-section select-none",
isDragging && "opacity-30",
)}
data-section-actions-open={actionsMenuOpen || undefined}
>
{/* modal={false}: Rename/Delete section open a modal dialog;
a modal ContextMenu would leave `pointer-events: none` stuck on
Expand Down Expand Up @@ -652,6 +659,7 @@ export function CustomChannelSection({
<SectionActionsMenu
sectionLabel={section.name}
testId={`section-actions-${section.id}`}
onOpenChange={setActionsMenuOpen}
hasUnread={hasUnread}
onMarkAllRead={onMarkSectionRead}
onRenameSection={onRenameSection}
Expand Down
9 changes: 7 additions & 2 deletions desktop/src/features/sidebar/ui/SidebarSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import {
const SECTION_LABEL_BUTTON_CLASS =
"group/section-label flex w-fit max-w-[calc(100%-3rem)] cursor-pointer appearance-none items-center gap-1 text-left transition-colors hover:text-sidebar-foreground focus-visible:text-sidebar-foreground";
const SECTION_LABEL_CHEVRON_CLASS =
"relative size-2.5 shrink-0 text-current opacity-0 transition-[color,opacity] group-hover/sidebar-section:opacity-100 group-hover/section-label:opacity-100 group-focus-within/sidebar-section:opacity-100 group-focus-visible/section-label:opacity-100";
"relative size-2.5 shrink-0 text-current opacity-0 transition-[color,opacity] group-hover/sidebar-section:opacity-100 group-hover/section-label:opacity-100 group-focus-within/sidebar-section:opacity-100 group-focus-visible/section-label:opacity-100 group-data-[section-actions-open=true]/sidebar-section:opacity-100";
const SECTION_LABEL_CHEVRON_ICON_CLASS =
"absolute left-1/2 top-1/2 size-2.5 -translate-x-1/2 -translate-y-1/2";
const SIDEBAR_ROW_ACTION_VISIBILITY_CLASS =
Expand Down Expand Up @@ -357,6 +357,7 @@ export function SidebarSection({
mutedChannelIds,
onMuteChannel,
onUnmuteChannel,
sectionActionsOpen,
}: {
action?: React.ReactNode;
activeWorkingByChannelId?: ReadonlyMap<string, ActiveChannelTurnSummary>;
Expand All @@ -383,6 +384,7 @@ export function SidebarSection({
mutedChannelIds?: ReadonlySet<string>;
onMuteChannel?: (channelId: string) => void;
onUnmuteChannel?: (channelId: string) => void;
sectionActionsOpen?: boolean;
}) {
if (items.length === 0 && !action && !emptyState) {
return null;
Expand All @@ -392,7 +394,10 @@ export function SidebarSection({
const canToggle = Boolean(onToggleCollapsed);

return (
<SidebarGroup className="group/sidebar-section select-none">
<SidebarGroup
className="group/sidebar-section select-none"
data-section-actions-open={sectionActionsOpen || undefined}
Comment thread
klopez4212 marked this conversation as resolved.
>
<div className="relative">
<SidebarGroupLabel asChild={canToggle}>
{canToggle ? (
Expand Down
2 changes: 1 addition & 1 deletion desktop/src/features/sidebar/ui/sidebarSectionStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ export const SECTION_ICON_BUTTON_CLASS =
"flex size-6 items-center justify-center rounded-[4px] p-1 text-sidebar-foreground/50 transition-colors hover:bg-sidebar-border/35 hover:text-sidebar-foreground focus-visible:bg-sidebar-border/35 focus-visible:text-sidebar-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-sidebar-ring [&>svg]:size-4 [&>svg]:shrink-0";

export const SECTION_ACTION_VISIBILITY_CLASS =
"opacity-0 transition-opacity group-hover/sidebar-section:opacity-100 group-focus-within/sidebar-section:opacity-100";
"opacity-0 transition-opacity group-hover/sidebar-section:opacity-100 group-focus-within/sidebar-section:opacity-100 group-data-[section-actions-open=true]/sidebar-section:opacity-100";
Loading