feat(CModal): restore focus to the previously focused element once the modal is hidden

mrholek · mrholek · commit 3294c5af470a · 2023-09-09T14:21:31.000+02:00
diff --git a/packages/coreui-react/src/components/modal/CModal.tsx b/packages/coreui-react/src/components/modal/CModal.tsx
@@ -133,6 +133,10 @@ export const CModal = forwardRef<HTMLDivElement, CModalProps>(
         activeElementRef.current = document.activeElement as HTMLElement | null
         document.addEventListener('mouseup', handleClickOutside)
         document.addEventListener('keydown', handleKeyDown)
+      } else {
+        if (activeElementRef.current) {
+          activeElementRef.current.focus()
+        }
       }
 
       return () => {
@@ -148,10 +152,6 @@ export const CModal = forwardRef<HTMLDivElement, CModalProps>(
 
       setVisible(false)
 
-      if (activeElementRef.current) {
-        activeElementRef.current.focus()
-      }
-
       return onClose && onClose()
     }
 
