From 25f07fb19bef96b987588f6e26ea7478194e9c65 Mon Sep 17 00:00:00 2001
From: Kai Hao <kevin830726@gmail.com>
Date: Wed, 26 May 2021 01:49:05 +0800
Subject: [PATCH] Address code reviews

---
 packages/components/src/popover/index.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/components/src/popover/index.js b/packages/components/src/popover/index.js
index 33cd215ed21851..befbb5b9139f78 100644
--- a/packages/components/src/popover/index.js
+++ b/packages/components/src/popover/index.js
@@ -233,7 +233,6 @@ const Popover = (
 	{
 		headerTitle,
 		onClose,
-		onKeyDown,
 		children,
 		className,
 		noArrow = true,
@@ -505,7 +504,8 @@ const Popover = (
 	const mergedRefs = useMergeRefs( [
 		ref,
 		containerRef,
-		closeEventRef,
+		// Don't register the event at all if there's no onClose callback.
+		onClose ? closeEventRef : null,
 		focusOnMount ? constrainedTabbingRef : null,
 		focusOnMount ? focusReturnRef : null,
 		focusOnMount ? focusOnMountRef : null,
@@ -595,7 +595,6 @@ const Popover = (
 				}
 			) }
 			{ ...contentProps }
-			onKeyDown={ onKeyDown }
 			{ ...focusOutsideProps }
 			ref={ mergedRefs }
 			tabIndex="-1"