fix(atoms): fix ignore outside click class in the Dropdown atom

8base · Jun 4, 2018 · 2ca065b · 2ca065b
1 parent a2be371
commit 2ca065b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/atoms/Dropdown/DropdownBody.js b/src/atoms/Dropdown/DropdownBody.js
@@ -1,7 +1,7 @@
 // @flow
 import fp from 'lodash/fp';
 import React, { PureComponent, Fragment } from 'react';
-import { type HOC, compose, setDisplayName } from 'recompose';
+import { type HOC, compose, setDisplayName, withProps } from 'recompose';
 import onClickOutside from 'react-onclickoutside';
 import { Popper } from 'react-popper';
 import { Portal } from 'react-portal';
@@ -53,8 +53,11 @@ const setOffset = (offset?: PropSizes) => offset && offset !== 'none'
   : fp.identity;
 
 const dropdownBodyEnhancer: HOC<*, DropdownBodyProps> = compose(
-  setDisplayName('DropdownBody'),
+  setDisplayName('Dropdown.Body'),
   withDropdownContext,
+  withProps(
+    ({ dropdown: { outsideClickIgnoreClass }}) => ({ outsideClickIgnoreClass }),
+  ),
   onClickOutside,
 );
 
@@ -75,9 +78,9 @@ class DropdownBodyBase extends PureComponent<DropdownBodyEnhancedProps> {
   }
 
   handleClickOutside = () => {
-    const { closeOnClickOutside, onCloseDropdown } = this.props;
+    const { closeOnClickOutside, dropdown: { closeDropdown }} = this.props;
 
-    closeOnClickOutside && onCloseDropdown && onCloseDropdown();
+    closeOnClickOutside && closeDropdown && closeDropdown();
   }
 
   getPopperPlacement = () => {

diff --git a/src/atoms/Dropdown/DropdownHead.js b/src/atoms/Dropdown/DropdownHead.js
@@ -2,7 +2,7 @@
 
 import React, { PureComponent } from 'react';
 import { Target } from 'react-popper';
-import { compose } from 'recompose';
+import { compose, setDisplayName } from 'recompose';
 
 import { withDropdownContext } from './DropdownContext';
 import { DropdownHeadTag, DropdownPopperTarget } from './DropdownHead.theme';
@@ -26,6 +26,7 @@ type DropdownHeadProps = {|
 |}
 
 const dropdownHeadEnhancer: HOC<*, DropdownHeadProps> = compose(
+  setDisplayName('Dropdown.Head'),
   withDropdownContext,
 );
 

diff --git a/src/atoms/Dropdown/DropdownPlate.js b/src/atoms/Dropdown/DropdownPlate.js
@@ -2,7 +2,7 @@
 
 import React, { Component } from 'react';
 import fp from 'lodash/fp';
-import { compose, withStateHandlers, branch } from 'recompose';
+import { compose, withStateHandlers, branch, setDisplayName } from 'recompose';
 import { Manager } from 'react-popper';
 
 import { DropdownContext } from './DropdownContext';
@@ -91,6 +91,7 @@ class DropdownPlateBase extends Component<DropdownControlledProps> {
 
 /** if component has defaultOpen prop when will add the hoc with isOpen state */
 const dropDownEnhancer: { (any): React$ComponentType<DropdownControlledProps | DropdownUncontroledProps> } = compose(
+  setDisplayName('Dropdown.Plate'),
   branch(
     (props) => !fp.isNil(props.defaultOpen),
     withStateHandlers(