Skip to content

feat: migrate to stable Base UI Drawer #722

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 3 commits into from
Mar 30, 2026
Merged

feat: migrate to stable Base UI Drawer #722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b38f37
feat: update Base UI and migrate to stable Drawer
rohanchkrabrty Mar 30, 2026
4c7c12a
chore: update lock file
rohanchkrabrty Mar 30, 2026
71b7630
fix: breaking tests
rohanchkrabrty Mar 30, 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
16 changes: 4 additions & 12 deletions apps/www/src/components/playground/drawer-examples.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,28 @@ export function DrawerExamples() {
<PlaygroundLayout title='Drawer'>
<Flex gap='medium' wrap='wrap'>
<Drawer side='top'>
<Drawer.Trigger asChild>
<Button>Top Drawer</Button>
</Drawer.Trigger>
<Drawer.Trigger render={<Button />}>Top Drawer</Drawer.Trigger>
<Drawer.Content side='top'>
<Drawer.Title>Top Drawer</Drawer.Title>
<Drawer.Description>Slides in from the Top</Drawer.Description>
</Drawer.Content>
</Drawer>
<Drawer side='right'>
<Drawer.Trigger asChild>
<Button>Right Drawer</Button>
</Drawer.Trigger>
<Drawer.Trigger render={<Button />}>Right Drawer</Drawer.Trigger>
<Drawer.Content side='right'>
<Drawer.Title>Right Drawer</Drawer.Title>
<Drawer.Description>Slides in from the Right</Drawer.Description>
</Drawer.Content>
</Drawer>
<Drawer side='left'>
<Drawer.Trigger asChild>
<Button>Left Drawer</Button>
</Drawer.Trigger>
<Drawer.Trigger render={<Button />}>Left Drawer</Drawer.Trigger>
<Drawer.Content side='left'>
<Drawer.Title>Left Drawer</Drawer.Title>
<Drawer.Description>Slides in from the Left</Drawer.Description>
</Drawer.Content>
</Drawer>
<Drawer side='bottom'>
<Drawer.Trigger asChild>
<Button>Bottom Drawer</Button>
</Drawer.Trigger>
<Drawer.Trigger render={<Button />}>Bottom Drawer</Drawer.Trigger>
<Drawer.Content side='bottom'>
<Drawer.Title>Bottom Drawer</Drawer.Title>
<Drawer.Description>Slides in from the Bottom</Drawer.Description>
Expand Down
24 changes: 6 additions & 18 deletions apps/www/src/content/docs/components/drawer/demo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ import { getPropsString } from '@/lib/utils';
export const getCode = (props: Record<string, unknown>) => {
return `
<Drawer${getPropsString(props)}>
<Drawer.Trigger>
<Button>Drawer</Button>
</Drawer.Trigger>
<Drawer.Trigger render={<Button />}>Drawer</Drawer.Trigger>
<Drawer.Content${getPropsString(props)}>
<Drawer.Header>
<Drawer.Title>Drawer</Drawer.Title>
Expand Down Expand Up @@ -38,9 +36,7 @@ export const basicDemo = {
type: 'code',
code: `
<Drawer side="right">
<Drawer.Trigger>
<Button>Open Drawer</Button>
</Drawer.Trigger>
<Drawer.Trigger render={<Button />}>Open Drawer</Drawer.Trigger>
<Drawer.Content>
<Drawer.Header>
<Drawer.Title>Drawer Title</Drawer.Title>
Expand All @@ -58,9 +54,7 @@ export const positionDemo = {
code: `
<Flex gap="medium">
<Drawer side="top">
<Drawer.Trigger>
<Button>Top Drawer</Button>
</Drawer.Trigger>
<Drawer.Trigger render={<Button />}>Top Drawer</Drawer.Trigger>
<Drawer.Content side="top">
<Drawer.Header>
<Drawer.Title>Top Drawer</Drawer.Title>
Expand All @@ -70,9 +64,7 @@ export const positionDemo = {
</Drawer.Content>
</Drawer>
<Drawer side="right">
<Drawer.Trigger>
<Button>Right Drawer</Button>
</Drawer.Trigger>
<Drawer.Trigger render={<Button />}>Right Drawer</Drawer.Trigger>
<Drawer.Content side="right">
<Drawer.Header>
<Drawer.Title>Right Drawer</Drawer.Title>
Expand All @@ -82,9 +74,7 @@ export const positionDemo = {
</Drawer.Content>
</Drawer>
<Drawer side="left">
<Drawer.Trigger>
<Button>Left Drawer</Button>
</Drawer.Trigger>
<Drawer.Trigger render={<Button />}>Left Drawer</Drawer.Trigger>
<Drawer.Content side="left">
<Drawer.Header>
<Drawer.Title>Left Drawer</Drawer.Title>
Expand All @@ -94,9 +84,7 @@ export const positionDemo = {
</Drawer.Content>
</Drawer>
<Drawer side="bottom">
<Drawer.Trigger>
<Button>Bottom Drawer</Button>
</Drawer.Trigger>
<Drawer.Trigger render={<Button />}>Bottom Drawer</Drawer.Trigger>
<Drawer.Content side="bottom">
<Drawer.Header>
<Drawer.Title>Bottom Drawer</Drawer.Title>
Expand Down
8 changes: 2 additions & 6 deletions packages/raystack/components/drawer/__tests__/drawer.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ const BasicDrawer = ({
side?: 'top' | 'right' | 'bottom' | 'left';
} & Record<string, unknown>) => (
<Drawer side={side} {...props}>
<Drawer.Trigger>
<Button>{TRIGGER_TEXT}</Button>
</Drawer.Trigger>
<Drawer.Trigger render={<Button />}>{TRIGGER_TEXT}</Drawer.Trigger>
<Drawer.Content side={side} showCloseButton={showCloseButton}>
<Drawer.Header>
<Drawer.Title>{DRAWER_TITLE}</Drawer.Title>
Expand Down Expand Up @@ -134,9 +132,7 @@ describe('Drawer', () => {
const user = userEvent.setup();
render(
<Drawer side='right'>
<Drawer.Trigger>
<Button>{TRIGGER_TEXT}</Button>
</Drawer.Trigger>
<Drawer.Trigger render={<Button />}>{TRIGGER_TEXT}</Drawer.Trigger>
<Drawer.Content className='custom-drawer'>
<Drawer.Header>
<Drawer.Title>{DRAWER_TITLE}</Drawer.Title>
Expand Down
2 changes: 1 addition & 1 deletion packages/raystack/components/drawer/drawer-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client';

import { DrawerPreview as DrawerPrimitive } from '@base-ui/react/drawer';
import { Drawer as DrawerPrimitive } from '@base-ui/react/drawer';
import { Cross1Icon } from '@radix-ui/react-icons';
import { cva, cx, type VariantProps } from 'class-variance-authority';
import { ReactNode } from 'react';
Expand Down
2 changes: 1 addition & 1 deletion packages/raystack/components/drawer/drawer-misc.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client';

import { DrawerPreview as DrawerPrimitive } from '@base-ui/react/drawer';
import { Drawer as DrawerPrimitive } from '@base-ui/react/drawer';
import { cx } from 'class-variance-authority';
import { ComponentProps, type ReactNode } from 'react';
import styles from './drawer.module.css';
Expand Down
2 changes: 1 addition & 1 deletion packages/raystack/components/drawer/drawer-root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client';

import { DrawerPreview as DrawerPrimitive } from '@base-ui/react/drawer';
import { Drawer as DrawerPrimitive } from '@base-ui/react/drawer';

type Side = 'top' | 'right' | 'bottom' | 'left';

Expand Down
2 changes: 1 addition & 1 deletion packages/raystack/components/drawer/drawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DrawerPreview as DrawerPrimitive } from '@base-ui/react/drawer';
import { Drawer as DrawerPrimitive } from '@base-ui/react/drawer';
import { DrawerContent } from './drawer-content';
import {
DrawerBody,
Expand Down
1 change: 1 addition & 0 deletions packages/raystack/components/scroll-area/scroll-area-scrollbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export function ScrollAreaScrollbar({
return (
<ScrollAreaPrimitive.Scrollbar
orientation={orientation}
keepMounted
className={cx(styles.scrollbar, styles[`scrollbar-${type}`], className)}
{...props}
>
Expand Down
2 changes: 1 addition & 1 deletion packages/raystack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"vitest": "^3.2.4"
},
"dependencies": {
"@base-ui/react": "^1.2.0",
"@base-ui/react": "^1.3.0",
"@base-ui/utils": "^0.2.6",
"@radix-ui/react-icons": "^1.3.2",
"@tanstack/match-sorter-utils": "^8.8.4",
Expand Down
87 changes: 34 additions & 53 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading