EPMRPP-81950 || modal focus issue fix (#3933)

reportportal · Jul 23, 2024 · 46e801d · 46e801d
1 parent 5c7f530
commit 46e801d
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/app/src/componentLibrary/modal/modalLayout/modalLayout.jsx b/app/src/componentLibrary/modal/modalLayout/modalLayout.jsx
@@ -81,9 +81,6 @@ export const ModalLayout = ({
   useEffect(() => {
     document.addEventListener('keydown', onKeydown, false);
     setShown(true);
-    if (modalRef && modalRef.current) {
-      modalRef.current.focus();
-    }
 
     return () => document.removeEventListener('keydown', onKeydown, false);
   }, []);
@@ -111,6 +108,7 @@ export const ModalLayout = ({
               animate={{ opacity: 1, marginTop: modalMargin }}
               exit={{ opacity: 0, marginTop: -modalMargin }}
               transition={{ duration: 0.3 }}
+              onAnimationComplete={() => modalRef.current?.focus()}
             >
               <ModalHeader title={title} headerNode={headerNode} onClose={closeModal} />
               <Scrollbars