Skip to content

fix: sidebar collapse/expand toggle not working after first interaction #72

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
kzamanbd merged 4 commits into from
Apr 1, 2026
Merged

fix: sidebar collapse/expand toggle not working after first interaction #72

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff48f7a
fix: resolve sidebar collapse/expand toggle not working after first i…
kzamanbd Mar 27, 2026
e30e198
Merge branch 'main' into fix/sidebar-collapse-toggle
kzamanbd Mar 31, 2026
a1cf889
Merge branch 'main' into fix/sidebar-collapse-toggle
kzamanbd Apr 1, 2026
5d1e910
Update layout-menu.tsx
kzamanbd Apr 1, 2026
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
165 changes: 80 additions & 85 deletions src/components/wordpress/layout-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
forwardRef,
useCallback,
useEffect,
useId,
useMemo,
useState,
type HTMLAttributes,
Expand All @@ -24,7 +25,6 @@ import {
SidebarProvider,
useSidebarOptional,
} from "../ui/sidebar";
import { Collapsible } from "@base-ui/react/collapsible";

/* ============================================
Sidebar provider detection
Expand Down Expand Up @@ -369,6 +369,7 @@ function MenuItemRenderer({
[item, activeItemId]
);
const [open, setOpen] = useState(containsActive);
const submenuId = useId();

// Auto-expand when a descendant becomes active
useEffect(() => {
Expand All @@ -378,9 +379,8 @@ function MenuItemRenderer({
const handleClick = useCallback(() => {
if (hasChildren) {
setOpen((o) => !o);
} else {
item.onClick?.();
}
item.onClick?.();
onItemClick?.(item);
}, [hasChildren, item, onItemClick]);

Expand Down Expand Up @@ -441,52 +441,47 @@ function MenuItemRenderer({
// Parent item with children at depth 0
if (hasChildren && depth === 0) {
return (
<Collapsible.Root open={open} onOpenChange={setOpen}>
<SidebarMenuItem data-testid={item.testId}>
<Collapsible.Trigger
render={
<SidebarMenuButton
tooltip={item.label}
isActive={isActive}
onClick={() => onItemClick?.(item)}
<SidebarMenuItem data-testid={item.testId}>
<SidebarMenuButton
render={item.href ? <a href={item.href} /> : undefined}
tooltip={item.label}
isActive={isActive}
onClick={handleClick}
className={cn(
menuItemClassName,
isActive && activeItemClassName,
item.className,
)}
data-active={isActive || undefined}
disabled={item.disabled}
aria-expanded={open}
aria-controls={submenuId}
>
{item.icon && (
<span className="flex shrink-0 [&_svg]:size-4">{item.icon}</span>
)}
<span className="min-w-0 flex-1">
<span className="block truncate">{item.label}</span>
{item.secondaryLabel && (
<span
className={cn(
menuItemClassName,
isActive && activeItemClassName,
item.className,
"block truncate text-xs",
isActive ? "opacity-90" : "text-muted-foreground"
)}
data-active={isActive || undefined}
disabled={item.disabled}
/>
}
>
{item.icon && (
<span className="flex shrink-0 [&_svg]:size-4">{item.icon}</span>
>
{item.secondaryLabel}
</span>
)}
<span className="min-w-0 flex-1">
<span className="block truncate">{item.label}</span>
{item.secondaryLabel && (
<span
className={cn(
"block truncate text-xs",
isActive ? "opacity-90" : "text-muted-foreground"
)}
>
{item.secondaryLabel}
</span>
)}
</span>
<ChevronRight
className={cn(
"ml-auto size-4 shrink-0 transition-transform duration-200",
open && "rotate-90"
)}
/>
</Collapsible.Trigger>
<Collapsible.Panel
render={
<SidebarMenuSub />
}
>
</span>
<ChevronRight
className={cn(
"ml-auto size-4 shrink-0 transition-transform duration-200",
open && "rotate-90"
)}
/>
</SidebarMenuButton>
{open && (
<SidebarMenuSub id={submenuId}>
{item.children!.map((child) => (
<SubMenuItemRenderer
key={child.id}
Expand All @@ -499,9 +494,9 @@ function MenuItemRenderer({
renderItem={renderItem}
/>
))}
</Collapsible.Panel>
</SidebarMenuItem>
</Collapsible.Root>
</SidebarMenuSub>
)}
</SidebarMenuItem>
);
}

Expand Down Expand Up @@ -529,6 +524,7 @@ function SubMenuItemRenderer({
[item, activeItemId]
);
const [open, setOpen] = useState(containsActive);
const submenuId = useId();

useEffect(() => {
if (containsActive) setOpen(true);
Expand All @@ -537,9 +533,8 @@ function SubMenuItemRenderer({
const handleClick = useCallback(() => {
if (hasChildren) {
setOpen((o) => !o);
} else {
item.onClick?.();
}
item.onClick?.();
onItemClick?.(item);
}, [hasChildren, item, onItemClick]);

Expand Down Expand Up @@ -582,38 +577,38 @@ function SubMenuItemRenderer({

// Nested parent sub-item
return (
<Collapsible.Root open={open} onOpenChange={setOpen}>
<SidebarMenuSubItem data-testid={item.testId}>
<Collapsible.Trigger
render={
<SidebarMenuSubButton
isActive={isActive}
onClick={() => onItemClick?.(item)}
className={cn(
menuItemClassName,
isActive && activeItemClassName,
item.className,
)}
data-active={isActive || undefined}
/>
}
>
{item.icon && (
<span className="flex shrink-0 [&_svg]:size-4">{item.icon}</span>
<SidebarMenuSubItem data-testid={item.testId}>
<SidebarMenuSubButton
render={
item.href
? <a href={item.href} />
: <button type="button" disabled={item.disabled} />
}
isActive={isActive}
onClick={handleClick}
className={cn(
menuItemClassName,
isActive && activeItemClassName,
item.className,
)}
data-active={isActive || undefined}
aria-disabled={item.disabled || undefined}
aria-expanded={open}
aria-controls={submenuId}
>
{item.icon && (
<span className="flex shrink-0 [&_svg]:size-4">{item.icon}</span>
)}
<span className="min-w-0 flex-1 truncate">{item.label}</span>
<ChevronRight
className={cn(
"ml-auto size-4 shrink-0 transition-transform duration-200",
open && "rotate-90"
)}
<span className="min-w-0 flex-1 truncate">{item.label}</span>
<ChevronRight
className={cn(
"ml-auto size-4 shrink-0 transition-transform duration-200",
open && "rotate-90"
)}
/>
</Collapsible.Trigger>
<Collapsible.Panel
render={
<SidebarMenuSub />
}
>
/>
</SidebarMenuSubButton>
{open && (
<SidebarMenuSub id={submenuId}>
{item.children!.map((child) => (
<SubMenuItemRenderer
key={child.id}
Expand All @@ -626,8 +621,8 @@ function SubMenuItemRenderer({
renderItem={renderItem}
/>
))}
</Collapsible.Panel>
</SidebarMenuSubItem>
</Collapsible.Root>
</SidebarMenuSub>
)}
</SidebarMenuSubItem>
);
}
Loading