Ensure return of focus from modal when closed

WordPress · Jun 26, 2023 · a689fea · a689fea
1 parent 1671c16
commit a689fea
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/components/src/modal/index.tsx b/packages/components/src/modal/index.tsx
@@ -174,7 +174,11 @@ function UnforwardedModal(
 	);
 
 	const onOverlayPress: PointerEventHandler< HTMLDivElement > = ( event ) => {
-		if ( event.target === event.currentTarget ) onRequestClose( event );
+		if ( event.target === event.currentTarget ) {
+			// Retains focus within the modal so that `useFocusReturn` works.
+			event.preventDefault();
+			onRequestClose( event );
+		}
 	};
 
 	return createPortal(