Fix focus return when dismissed

WordPress · Aug 20, 2023 · 6b08003 · 6b08003
1 parent 74851c8
commit 6b08003
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/packages/components/src/modal/index.tsx b/packages/components/src/modal/index.tsx
@@ -10,7 +10,6 @@ import type { ForwardedRef, KeyboardEvent, UIEvent } from 'react';
 import {
 	createPortal,
 	useCallback,
-	useEffect,
 	useRef,
 	useState,
 	forwardRef,
@@ -100,7 +99,7 @@ function UnforwardedModal(
 		}
 	}, [ contentRef ] );
 
-	useEffect( () => {
+	useLayoutEffect( () => {
 		openModalCount++;
 
 		if ( openModalCount === 1 ) {