Skip to content

fix: forward proper classnames to sidebar component #550

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
rohanchkrabrty merged 1 commit into from
Dec 2, 2025
Merged

fix: forward proper classnames to sidebar component #550

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
6 changes: 5 additions & 1 deletion packages/raystack/components/sidebar/sidebar-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ export const SidebarItem = forwardRef<HTMLAnchorElement, SidebarItemProps>(
leadingIcon
)}
</Flex>
{!isCollapsed && <span className={styles['nav-text']}>{children}</span>}
{!isCollapsed && (
<span className={cx(styles['nav-text'], classNames?.text)}>
{children}
</span>
)}
</>
);

Expand Down
3 changes: 2 additions & 1 deletion packages/raystack/components/sidebar/sidebar-main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use client';

import { cx } from 'class-variance-authority';
import { ComponentPropsWithoutRef, forwardRef } from 'react';
import { Flex } from '../flex';
import styles from './sidebar.module.css';
Expand All @@ -10,7 +11,7 @@ export const SidebarMain = forwardRef<
>(({ className, children, ...props }, ref) => (
<Flex
ref={ref}
className={styles.main}
className={cx(styles.main, className)}
direction='column'
role='group'
aria-label='Main navigation'
Expand Down
4 changes: 2 additions & 2 deletions packages/raystack/components/sidebar/sidebar-misc.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const SidebarHeader = forwardRef<
<Flex
align='center'
ref={ref}
className={styles.header}
className={cx(styles.header, className)}
role='banner'
{...props}
>
Expand All @@ -27,7 +27,7 @@ export const SidebarFooter = forwardRef<
>(({ className, children, ...props }, ref) => (
<Flex
ref={ref}
className={styles.footer}
className={cx(styles.footer, className)}
direction='column'
role='group'
aria-label='Footer navigation'
Expand Down
6 changes: 2 additions & 4 deletions packages/raystack/components/sidebar/sidebar-root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client';

import { cva } from 'class-variance-authority';
import { cx } from 'class-variance-authority';
import { Collapsible } from 'radix-ui';
import {
ComponentPropsWithoutRef,
Expand All @@ -23,8 +23,6 @@ export const SidebarContext = createContext<SidebarContextValue>({
isCollapsed: false
});

const root = cva(styles.root);

export interface SidebarRootProps
extends ComponentPropsWithoutRef<typeof Collapsible.Root> {
position?: 'left' | 'right';
Expand Down Expand Up @@ -71,7 +69,7 @@ export const SidebarRoot = forwardRef<
<Tooltip.Provider>
<Collapsible.Root
ref={ref}
className={root({ className })}
className={cx(styles.root, className)}
data-position={position}
data-state={open ? 'expanded' : 'collapsed'}
data-collapse-disabled={!collapsible}
Expand Down