Task/htl 111365 fix props override for collapse and close (#1530)

* task(HTL-111365): Fix props override for collapse and close * Rush change
priceline · Nov 8, 2024 · 3deed57 · 3deed57
1 parent 58388e4
commit 3deed57
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/...gn-system/task-HTL-111365-fix-props-override-for-collapse-and-close_2024-11-08-16-49.json b/...gn-system/task-HTL-111365-fix-props-override-for-collapse-and-close_2024-11-08-16-49.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "pcln-design-system",
+      "comment": "Fix storybook buttons",
+      "type": "minor"
+    }
+  ],
+  "packageName": "pcln-design-system"
+}
diff --git a/packages/core/src/Drawer/Drawer.stories.tsx b/packages/core/src/Drawer/Drawer.stories.tsx
@@ -21,9 +21,9 @@ function DrawerStory(props) {
         heading='Header'
         isOpen={isOpen}
         isCollapsed={isCollapsed}
+        {...props}
         onClose={includeCloseButton ? () => setIsOpen(false) : undefined}
         onCollapse={includeCollapseButton ? () => setIsCollapsed((isCollapsed) => !isCollapsed) : undefined}
-        {...props}
       >
         {props.children}
       </Drawer>

diff --git a/packages/core/src/Drawer/Drawer.tsx b/packages/core/src/Drawer/Drawer.tsx
@@ -79,8 +79,8 @@ export const Drawer: React.FC<DrawerProps> = ({
           maxHeight={isMobile ? ['290px', '400px', '480px', 'calc(100vh - 64px)'] : props.height ?? '100%'}
           maxWidth={isMobile ? '100%' : ['400px', '600px', '800px', '100%']}
           width={isMobile ? '100%' : props.width}
-          height={!isCollapsed && props.height ? props.height : 'fit-content'}
           {...props}
+          height={!isCollapsed && props.height ? props.height : 'fit-content'}
         >
           <DrawerRoot
             data-testid='drawer'