diff --git a/apps/www/src/components/playground/drawer-examples.tsx b/apps/www/src/components/playground/drawer-examples.tsx index 78339de11..9b49338dd 100644 --- a/apps/www/src/components/playground/drawer-examples.tsx +++ b/apps/www/src/components/playground/drawer-examples.tsx @@ -8,36 +8,28 @@ export function DrawerExamples() { - - - + }>Top Drawer Top Drawer Slides in from the Top - - - + }>Right Drawer Right Drawer Slides in from the Right - - - + }>Left Drawer Left Drawer Slides in from the Left - - - + }>Bottom Drawer Bottom Drawer Slides in from the Bottom diff --git a/apps/www/src/content/docs/components/drawer/demo.ts b/apps/www/src/content/docs/components/drawer/demo.ts index fe539fafd..8764c714e 100644 --- a/apps/www/src/content/docs/components/drawer/demo.ts +++ b/apps/www/src/content/docs/components/drawer/demo.ts @@ -5,9 +5,7 @@ import { getPropsString } from '@/lib/utils'; export const getCode = (props: Record) => { return ` - - - + }>Drawer Drawer @@ -38,9 +36,7 @@ export const basicDemo = { type: 'code', code: ` - - - + }>Open Drawer Drawer Title @@ -58,9 +54,7 @@ export const positionDemo = { code: ` - - - + }>Top Drawer Top Drawer @@ -70,9 +64,7 @@ export const positionDemo = { - - - + }>Right Drawer Right Drawer @@ -82,9 +74,7 @@ export const positionDemo = { - - - + }>Left Drawer Left Drawer @@ -94,9 +84,7 @@ export const positionDemo = { - - - + }>Bottom Drawer Bottom Drawer diff --git a/packages/raystack/components/drawer/__tests__/drawer.test.tsx b/packages/raystack/components/drawer/__tests__/drawer.test.tsx index 00f6877bf..e3392bffd 100644 --- a/packages/raystack/components/drawer/__tests__/drawer.test.tsx +++ b/packages/raystack/components/drawer/__tests__/drawer.test.tsx @@ -21,9 +21,7 @@ const BasicDrawer = ({ side?: 'top' | 'right' | 'bottom' | 'left'; } & Record) => ( - - - + }>{TRIGGER_TEXT} {DRAWER_TITLE} @@ -134,9 +132,7 @@ describe('Drawer', () => { const user = userEvent.setup(); render( - - - + }>{TRIGGER_TEXT} {DRAWER_TITLE} diff --git a/packages/raystack/components/drawer/drawer-content.tsx b/packages/raystack/components/drawer/drawer-content.tsx index 4d9676def..094b872c5 100644 --- a/packages/raystack/components/drawer/drawer-content.tsx +++ b/packages/raystack/components/drawer/drawer-content.tsx @@ -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'; diff --git a/packages/raystack/components/drawer/drawer-misc.tsx b/packages/raystack/components/drawer/drawer-misc.tsx index 3cd74a509..2c7d8fc72 100644 --- a/packages/raystack/components/drawer/drawer-misc.tsx +++ b/packages/raystack/components/drawer/drawer-misc.tsx @@ -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'; diff --git a/packages/raystack/components/drawer/drawer-root.tsx b/packages/raystack/components/drawer/drawer-root.tsx index e30bb4f07..1a19ec49d 100644 --- a/packages/raystack/components/drawer/drawer-root.tsx +++ b/packages/raystack/components/drawer/drawer-root.tsx @@ -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'; diff --git a/packages/raystack/components/drawer/drawer.tsx b/packages/raystack/components/drawer/drawer.tsx index 2f0439d0a..0272481bc 100644 --- a/packages/raystack/components/drawer/drawer.tsx +++ b/packages/raystack/components/drawer/drawer.tsx @@ -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, diff --git a/packages/raystack/components/scroll-area/scroll-area-scrollbar.tsx b/packages/raystack/components/scroll-area/scroll-area-scrollbar.tsx index 9321932d4..4bc2862d4 100644 --- a/packages/raystack/components/scroll-area/scroll-area-scrollbar.tsx +++ b/packages/raystack/components/scroll-area/scroll-area-scrollbar.tsx @@ -19,6 +19,7 @@ export function ScrollAreaScrollbar({ return ( diff --git a/packages/raystack/package.json b/packages/raystack/package.json index 36f01acd5..001fbe6b1 100644 --- a/packages/raystack/package.json +++ b/packages/raystack/package.json @@ -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", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 03170b508..6b5a678e3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -173,8 +173,8 @@ importers: packages/raystack: dependencies: '@base-ui/react': - specifier: ^1.2.0 - version: 1.2.0(@types/react@19.1.9)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + specifier: ^1.3.0 + version: 1.3.0(@types/react@19.1.9)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) '@base-ui/utils': specifier: ^0.2.6 version: 0.2.6(@types/react@19.1.9)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) @@ -962,10 +962,6 @@ packages: resolution: {integrity: sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA==} engines: {node: '>=6.9.0'} - '@babel/runtime@7.27.0': - resolution: {integrity: sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==} - engines: {node: '>=6.9.0'} - '@babel/runtime@7.28.6': resolution: {integrity: sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==} engines: {node: '>=6.9.0'} @@ -994,8 +990,8 @@ packages: resolution: {integrity: sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==} engines: {node: '>=6.9.0'} - '@base-ui/react@1.2.0': - resolution: {integrity: sha512-O6aEQHcm+QyGTFY28xuwRD3SEJGZOBDpyjN2WvpfWYFVhg+3zfXPysAILqtM0C1kWC82MccOE/v1j+GHXE4qIw==} + '@base-ui/react@1.3.0': + resolution: {integrity: sha512-FwpKqZbPz14AITp1CVgf4AjhKPe1OeeVKSBMdgD10zbFlj3QSWelmtCMLi2+/PFZZcIm3l87G7rwtCZJwHyXWA==} engines: {node: '>=14.0.0'} peerDependencies: '@types/react': ^17 || ^18 || ^19 @@ -1005,16 +1001,6 @@ packages: '@types/react': optional: true - '@base-ui/utils@0.2.5': - resolution: {integrity: sha512-oYC7w0gp76RI5MxprlGLV0wze0SErZaRl3AAkeP3OnNB/UBMb6RqNf6ZSIlxOc9Qp68Ab3C2VOcJQyRs7Xc7Vw==} - peerDependencies: - '@types/react': ^17 || ^18 || ^19 - react: ^17 || ^18 || ^19 - react-dom: ^17 || ^18 || ^19 - peerDependenciesMeta: - '@types/react': - optional: true - '@base-ui/utils@0.2.6': resolution: {integrity: sha512-yQ+qeuqohwhsNpoYDqqXaLllYAkPCP4vYdDrVo8FQXaAPfHWm1pG/Vm+jmGTA5JFS0BAIjookyapuJFY8F9PIw==} peerDependencies: @@ -1440,27 +1426,30 @@ packages: '@floating-ui/core@1.7.3': resolution: {integrity: sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==} + '@floating-ui/core@1.7.5': + resolution: {integrity: sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==} + '@floating-ui/dom@1.6.7': resolution: {integrity: sha512-wmVfPG5o2xnKDU4jx/m4w5qva9FWHcnZ8BvzEe90D/RpwsJaTAVYPEPdQ8sbr/N8zZTAHlZUTQdqg8ZUbzHmng==} '@floating-ui/dom@1.7.4': resolution: {integrity: sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==} + '@floating-ui/dom@1.7.6': + resolution: {integrity: sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==} + '@floating-ui/react-dom@2.1.1': resolution: {integrity: sha512-4h84MJt3CHrtG18mGsXuLCHMrug49d7DFkU0RMIyshRveBeyV2hmV/pDaF2Uxtu8kgq5r46llp5E5FQiR0K2Yg==} peerDependencies: react: '>=16.8.0' react-dom: '>=16.8.0' - '@floating-ui/react-dom@2.1.6': - resolution: {integrity: sha512-4JX6rEatQEvlmgU80wZyq9RT96HZJa88q8hp0pBd+LrczeDI4o6uA2M+uvxngVHo4Ihr8uibXxH6+70zhAFrVw==} + '@floating-ui/react-dom@2.1.8': + resolution: {integrity: sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A==} peerDependencies: react: '>=16.8.0' react-dom: '>=16.8.0' - '@floating-ui/utils@0.2.10': - resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==} - '@floating-ui/utils@0.2.11': resolution: {integrity: sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==} @@ -9812,10 +9801,6 @@ snapshots: dependencies: regenerator-runtime: 0.14.1 - '@babel/runtime@7.27.0': - dependencies: - regenerator-runtime: 0.14.1 - '@babel/runtime@7.28.6': {} '@babel/template@7.25.9': @@ -9864,12 +9849,12 @@ snapshots: '@babel/helper-string-parser': 7.25.9 '@babel/helper-validator-identifier': 7.25.9 - '@base-ui/react@1.2.0(@types/react@19.1.9)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': + '@base-ui/react@1.3.0(@types/react@19.1.9)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: '@babel/runtime': 7.28.6 - '@base-ui/utils': 0.2.5(@types/react@19.1.9)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) - '@floating-ui/react-dom': 2.1.6(react-dom@19.2.1(react@19.2.1))(react@19.2.1) - '@floating-ui/utils': 0.2.10 + '@base-ui/utils': 0.2.6(@types/react@19.1.9)(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@floating-ui/react-dom': 2.1.8(react-dom@19.2.1(react@19.2.1))(react@19.2.1) + '@floating-ui/utils': 0.2.11 react: 19.2.1 react-dom: 19.2.1(react@19.2.1) tabbable: 6.4.0 @@ -9877,17 +9862,6 @@ snapshots: optionalDependencies: '@types/react': 19.1.9 - '@base-ui/utils@0.2.5(@types/react@19.1.9)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': - dependencies: - '@babel/runtime': 7.28.6 - '@floating-ui/utils': 0.2.10 - react: 19.2.1 - react-dom: 19.2.1(react@19.2.1) - reselect: 5.1.1 - use-sync-external-store: 1.6.0(react@19.2.1) - optionalDependencies: - '@types/react': 19.1.9 - '@base-ui/utils@0.2.6(@types/react@19.1.9)(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: '@babel/runtime': 7.28.6 @@ -10158,21 +10132,30 @@ snapshots: '@floating-ui/core@1.6.4': dependencies: - '@floating-ui/utils': 0.2.10 + '@floating-ui/utils': 0.2.11 '@floating-ui/core@1.7.3': dependencies: - '@floating-ui/utils': 0.2.10 + '@floating-ui/utils': 0.2.11 + + '@floating-ui/core@1.7.5': + dependencies: + '@floating-ui/utils': 0.2.11 '@floating-ui/dom@1.6.7': dependencies: '@floating-ui/core': 1.6.4 - '@floating-ui/utils': 0.2.10 + '@floating-ui/utils': 0.2.11 '@floating-ui/dom@1.7.4': dependencies: '@floating-ui/core': 1.7.3 - '@floating-ui/utils': 0.2.10 + '@floating-ui/utils': 0.2.11 + + '@floating-ui/dom@1.7.6': + dependencies: + '@floating-ui/core': 1.7.5 + '@floating-ui/utils': 0.2.11 '@floating-ui/react-dom@2.1.1(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: @@ -10180,14 +10163,12 @@ snapshots: react: 19.2.1 react-dom: 19.2.1(react@19.2.1) - '@floating-ui/react-dom@2.1.6(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': + '@floating-ui/react-dom@2.1.8(react-dom@19.2.1(react@19.2.1))(react@19.2.1)': dependencies: - '@floating-ui/dom': 1.7.4 + '@floating-ui/dom': 1.7.6 react: 19.2.1 react-dom: 19.2.1(react@19.2.1) - '@floating-ui/utils@0.2.10': {} - '@floating-ui/utils@0.2.11': {} '@formatjs/intl-localematcher@0.6.2': @@ -10512,8 +10493,6 @@ snapshots: '@parcel/logger': 2.12.0 '@parcel/utils': 2.12.0 lmdb: 2.8.5 - transitivePeerDependencies: - - '@swc/helpers' '@parcel/cache@2.9.2(@parcel/core@2.12.0)': dependencies: @@ -11338,6 +11317,8 @@ snapshots: '@parcel/types': 2.12.0(@parcel/core@2.12.0) '@parcel/utils': 2.12.0 nullthrows: 1.1.1 + transitivePeerDependencies: + - '@swc/helpers' '@parcel/workers@2.9.2(@parcel/core@2.12.0)': dependencies: @@ -17559,7 +17540,7 @@ snapshots: regenerator-transform@0.15.2: dependencies: - '@babel/runtime': 7.27.0 + '@babel/runtime': 7.28.6 regex-recursion@6.0.2: dependencies: