From 91822b759dbc02b37a817d17bd66bdded84b5621 Mon Sep 17 00:00:00 2001
From: Mitchell Austin <mr.fye@oneandthesame.net>
Date: Fri, 14 Jul 2023 12:58:46 -0700
Subject: [PATCH] `Modal`: Fix loss of focus when clicking outside

---
 packages/components/src/modal/index.tsx | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/components/src/modal/index.tsx b/packages/components/src/modal/index.tsx
index d9c7b602b8392..09f67a8d24240 100644
--- a/packages/components/src/modal/index.tsx
+++ b/packages/components/src/modal/index.tsx
@@ -170,6 +170,15 @@ function UnforwardedModal(
 		[ hasScrolledContent ]
 	);
 
+	const onOverlayPress: React.PointerEventHandler< HTMLDivElement > = (
+		event
+	) => {
+		if ( event.target === event.currentTarget ) {
+			event.preventDefault();
+			onRequestClose( event );
+		}
+	};
+
 	return createPortal(
 		// eslint-disable-next-line jsx-a11y/no-static-element-interactions
 		<div
@@ -179,6 +188,9 @@ function UnforwardedModal(
 				overlayClassName
 			) }
 			onKeyDown={ handleEscapeKeyDown }
+			onPointerDown={
+				shouldCloseOnClickOutside ? onOverlayPress : undefined
+			}
 		>
 			<StyleProvider document={ document }>
 				<div