fix(dropdown): merge valueItemContainerProps more intelligently

fix #202
Headstorm · Oct 18, 2020 · 74625e7 · 74625e7
1 parent 5cca7ef
commit 74625e7
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/packages/foundry-react-ui/src/components/Dropdown/Dropdown.tsx b/packages/foundry-react-ui/src/components/Dropdown/Dropdown.tsx
@@ -423,16 +423,19 @@ const Dropdown = ({
     >
       <Button
         StyledContainer={StyledValueContainer}
-        containerProps={{
-          isOpen,
-        }}
         id={`${name}-button-value`}
         color={defaultedColor}
         onClick={(e: React.MouseEvent) => e.preventDefault()}
         onMouseDown={clickHandler}
         variant={variant}
         containerRef={valueContainerRef}
         {...valueContainerProps}
+        containerProps={{
+          isOpen,
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-expect-error
+          ...(valueContainerProps ? valueContainerProps.containerProps : {}),
+        }}
       >
         <StyledValueItem
           {...valueItemProps}