From 9f8377841694354b5d2aa19f687995df8ced4a5b Mon Sep 17 00:00:00 2001 From: Camilacslopes Date: Mon, 29 Jul 2024 09:30:42 -0300 Subject: [PATCH 1/3] feat: add test version to new drawer position --- package-lock.json | 4 +-- package.json | 2 +- src/components/Drawer.tsx | 43 ++++++++++++++--------- src/stories/components/Drawer.stories.tsx | 4 +-- 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 29b0317..295d7b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ikonintegration/ui", - "version": "1.0.94", + "version": "1.0.95-alpha-1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@ikonintegration/ui", - "version": "1.0.94", + "version": "1.0.95-alpha-1", "license": "MIT", "dependencies": { "@ariakit/react": "^0.4.7", diff --git a/package.json b/package.json index e91e021..4f7863a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ikonintegration/ui", - "version": "1.0.94", + "version": "1.0.95-alpha-1", "type": "module", "license": "MIT", "publishConfig": { diff --git a/src/components/Drawer.tsx b/src/components/Drawer.tsx index d8bf512..37fc143 100644 --- a/src/components/Drawer.tsx +++ b/src/components/Drawer.tsx @@ -5,20 +5,22 @@ import { cn } from '@/lib/utils'; const { Trigger, Portal, Close } = DrawerPrimitive; -function Root({ - shouldScaleBackground = true, - ...props -}: React.ComponentProps & { +type DrawerRootProps = React.ComponentProps & { shouldScaleBackground?: boolean; -}) { - return ( - - ); -} -Root.displayName = 'Drawer'; + direction?: 'bottom' | 'right'; +}; + +const Root = React.forwardRef< + React.ElementRef, + DrawerRootProps +>(({ shouldScaleBackground = true, direction = 'bottom', ...props }) => ( + +)); +Root.displayName = 'DrawerRoot'; const Overlay = React.forwardRef< React.ElementRef, @@ -37,19 +39,26 @@ Overlay.displayName = DrawerPrimitive.Overlay.displayName; const Content = React.forwardRef< React.ElementRef, - React.ComponentPropsWithoutRef ->(({ className, children, ...props }, ref) => ( + React.ComponentPropsWithoutRef & { + direction?: 'bottom' | 'right'; + } +>(({ className, children, direction = 'bottom', ...props }, ref) => ( -
+ {direction === 'bottom' && ( +
+ )} {children} diff --git a/src/stories/components/Drawer.stories.tsx b/src/stories/components/Drawer.stories.tsx index 2274d52..78cf43e 100644 --- a/src/stories/components/Drawer.stories.tsx +++ b/src/stories/components/Drawer.stories.tsx @@ -23,11 +23,11 @@ function Template() { } return ( - + - +
Move Goal From 56b3d3480249e4da6b347ba2f3bf15e216abd5c8 Mon Sep 17 00:00:00 2001 From: Camilacslopes Date: Mon, 29 Jul 2024 09:43:10 -0300 Subject: [PATCH 2/3] feat: add final version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 295d7b5..b0693dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ikonintegration/ui", - "version": "1.0.95-alpha-1", + "version": "1.0.95", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@ikonintegration/ui", - "version": "1.0.95-alpha-1", + "version": "1.0.95", "license": "MIT", "dependencies": { "@ariakit/react": "^0.4.7", diff --git a/package.json b/package.json index 4f7863a..a556b8f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ikonintegration/ui", - "version": "1.0.95-alpha-1", + "version": "1.0.95", "type": "module", "license": "MIT", "publishConfig": { From f515a705cdd08a36fc678a916f1834f34a428990 Mon Sep 17 00:00:00 2001 From: Camilacslopes Date: Thu, 8 Aug 2024 13:13:44 -0300 Subject: [PATCH 3/3] fix: update version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b0693dc..87c83a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ikonintegration/ui", - "version": "1.0.95", + "version": "1.0.99", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@ikonintegration/ui", - "version": "1.0.95", + "version": "1.0.99", "license": "MIT", "dependencies": { "@ariakit/react": "^0.4.7", diff --git a/package.json b/package.json index e710713..be7e463 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ikonintegration/ui", - "version": "1.0.96-alpha-1", + "version": "1.0.99", "type": "module", "license": "MIT", "publishConfig": {