fix(mouseup): do not reset when active element is in downshift (#383)

Closes #356

src/downshift.js

@@ -14,6 +14,7 @@ import {
   getA11yStatusMessage,
   unwrapArray,
   isDOMElement,
+  isOrContainsNode,
   getElementProps,
   noop,
   requiredProp,
@@ -850,16 +851,15 @@ class Downshift extends Component {
       const onMouseUp = event => {
         const {document} = this.props.environment
         this.isMouseDown = false
-        const targetIsRoot = event.target === this._rootNode
-        const rootContainsTarget =
-          this._rootNode && this._rootNode.contains(event.target)
-        const targetInDownshift = targetIsRoot || rootContainsTarget
-        const targetIsDownshiftInput =
-          this.inputId && document.activeElement.id === this.inputId
+        const targetInDownshift =
+          this._rootNode && isOrContainsNode(this._rootNode, event.target)
+        const activeElementInDownshift =
+          this._rootNode &&
+          isOrContainsNode(this._rootNode, document.activeElement)
         if (
           !targetInDownshift &&
-          this.getState().isOpen &&
-          !targetIsDownshiftInput
+          !activeElementInDownshift &&
+          this.getState().isOpen
         ) {
           this.reset({type: Downshift.stateChangeTypes.mouseUp}, () =>
             this.props.onOuterClick(this.getStateAndHelpers()),

src/utils.js

@@ -107,6 +107,15 @@ function scrollIntoView(node, rootNode) {
   // the item is within the scrollable area (do nothing)
 }
 
+/**
+ * @param {HTMLElement} parent the parent node
+ * @param {HTMLElement} child the child node
+ * @return {Boolean} whether the parent is the child or the child is in the parent
+ */
+function isOrContainsNode(parent, child) {
+  return parent === child || parent.contains(child)
+}
+
 /**
  * Simple debounce implementation. Will call the given
  * function once after the time given has passed since
@@ -287,6 +296,7 @@ export {
   unwrapArray,
   isDOMElement,
   getElementProps,
+  isOrContainsNode,
   noop,
   requiredProp,
   setIdCounter,