Skip to content

feat(sidebar): expose accordion controlled props on NavigationGroup #806

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

Closed
rsbh wants to merge 1 commit into from
+18 −5
Closed

feat(sidebar): expose accordion controlled props on NavigationGroup #806

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
23 changes: 18 additions & 5 deletions packages/raystack/components/sidebar/sidebar-misc.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
'use client';

import { Accordion as AccordionPrimitive } from '@base-ui/react';
import {
Accordion as AccordionPrimitive,
type AccordionRootProps
} from '@base-ui/react';
import { TriangleDownIcon } from '@radix-ui/react-icons';
import { cx } from 'class-variance-authority';
import { ComponentProps, ReactNode, useContext } from 'react';
Expand Down Expand Up @@ -41,9 +44,13 @@ export function SidebarFooter({
}
SidebarFooter.displayName = 'Sidebar.Footer';

export interface SidebarNavigationGroupProps extends ComponentProps<'section'> {
export interface SidebarNavigationGroupProps
extends ComponentProps<'section'>,
Pick<
AccordionRootProps,
'value' | 'defaultValue' | 'onValueChange' | 'disabled'
> {
label: string;
value?: string;
collapsible?: boolean;
leadingIcon?: ReactNode;
trailingIcon?: ReactNode;
Expand All @@ -62,6 +69,9 @@ export function SidebarNavigationGroup({
className,
label,
value,
defaultValue,
onValueChange,
disabled,
collapsible = false,
leadingIcon,
trailingIcon,
Expand All @@ -70,7 +80,7 @@ export function SidebarNavigationGroup({
...props
}: SidebarNavigationGroupProps) {
const { isCollapsed } = useContext(SidebarContext);
const groupValue = value ?? label;
const groupValue = label;

if (!collapsible) {
return (
Expand Down Expand Up @@ -122,7 +132,10 @@ export function SidebarNavigationGroup({
key={isCollapsed ? 'collapsed' : 'expanded'}
className={styles['nav-group-accordion']}
multiple
defaultValue={[groupValue]}
disabled={disabled}
{...(value !== undefined
? { value, onValueChange }
: { defaultValue: defaultValue ?? [groupValue] })}
>
<AccordionPrimitive.Item
value={groupValue}
Expand Down
Loading