Merge pull request #38 from perimetre/fix/allow-tooltip-to-get-more-p…

…roperties fix/allow tooltip to get more properties
perimetre · May 19, 2021 · f7a39a4 · f7a39a4
2 parents ebb8b54 + 10738d8
commit f7a39a4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+## [3.0.2] - 2021-05-19
+
+### Changes
+
+- Moved props ordering on Dropdown so other properties can be overidden to allow for further customization
+
 ## [3.0.1] - 2021-04-30
 
 ## Fixed

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@perimetre/ui",
   "description": "A component library made by @perimetre",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/perimetre/ui.git"

diff --git a/src/components/Dropdown/index.tsx b/src/components/Dropdown/index.tsx
@@ -16,7 +16,7 @@ type DropdownContentOrList =
   | DropdownItem[]
   | ((getLinkList: (items: DropdownItem[]) => React.ReactNode) => JSX.Element);
 
-export type DropdownProps = Omit<TooltipProps, 'arrow' | 'content'> & {
+export type DropdownProps = Omit<TooltipProps, 'content'> & {
   /**
    * A list of items or a function that returns a react component with what should be displayed in the dropdown's header
    */
@@ -57,9 +57,6 @@ export const Dropdown: React.FC<DropdownProps> = forwardRef<Element, DropdownPro
     return (
       <Tooltip
         placement="bottom-start"
-        {...props}
-        ref={ref}
-        interactive
         arrow={false}
         trigger="click"
         contentClassName="p-0"
@@ -80,6 +77,9 @@ export const Dropdown: React.FC<DropdownProps> = forwardRef<Element, DropdownPro
             }
           ]
         }}
+        {...props}
+        interactive
+        ref={ref}
         content={
           <>
             {header && (