From 72ae189dfb417020e6313763d804c0319ba5213f Mon Sep 17 00:00:00 2001
From: Andrew Duthie <andrew@andrewduthie.com>
Date: Thu, 8 Nov 2018 10:49:17 -0500
Subject: [PATCH] Revert "Components: Remove redundant onClickOutside handler
 from Dropdown (#11253)"

This reverts commit 58725c42980f81dbcf18d921be7ca43507c968e0.
---
 packages/components/src/dropdown/index.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/components/src/dropdown/index.js b/packages/components/src/dropdown/index.js
index c99c0c3e8ea47..c8ba61f4ad183 100644
--- a/packages/components/src/dropdown/index.js
+++ b/packages/components/src/dropdown/index.js
@@ -11,13 +11,12 @@ import Popover from '../popover';
 class Dropdown extends Component {
 	constructor() {
 		super( ...arguments );
-
 		this.toggle = this.toggle.bind( this );
 		this.close = this.close.bind( this );
+		this.clickOutside = this.clickOutside.bind( this );
+		this.bindContainer = this.bindContainer.bind( this );
 		this.refresh = this.refresh.bind( this );
-
 		this.popoverRef = createRef();
-
 		this.state = {
 			isOpen: false,
 		};
@@ -39,6 +38,10 @@ class Dropdown extends Component {
 		}
 	}
 
+	bindContainer( ref ) {
+		this.container = ref;
+	}
+
 	/**
 	 * When contents change height due to user interaction,
 	 * `refresh` can be called to re-render Popover with correct
@@ -56,6 +59,12 @@ class Dropdown extends Component {
 		} ) );
 	}
 
+	clickOutside( event ) {
+		if ( ! this.container.contains( event.target ) ) {
+			this.close();
+		}
+	}
+
 	close() {
 		this.setState( { isOpen: false } );
 	}
@@ -75,7 +84,7 @@ class Dropdown extends Component {
 		const args = { isOpen, onToggle: this.toggle, onClose: this.close };
 
 		return (
-			<div className={ className }>
+			<div className={ className } ref={ this.bindContainer }>
 				{ renderToggle( args ) }
 				{ isOpen && (
 					<Popover
@@ -83,6 +92,7 @@ class Dropdown extends Component {
 						ref={ this.popoverRef }
 						position={ position }
 						onClose={ this.close }
+						onClickOutside={ this.clickOutside }
 						expandOnMobile={ expandOnMobile }
 						headerTitle={ headerTitle }
 					>