File tree Expand file tree Collapse file tree 1 file changed +7
-0
lines changed
packages/coreui-react/src/components/modal Expand file tree Collapse file tree 1 file changed +7
-0
lines changed Original file line number Diff line number Diff line change @@ -111,6 +111,7 @@ export const CModal = forwardRef<HTMLDivElement, CModalProps>(
111111 } ,
112112 ref ,
113113 ) => {
114+ const activeElementRef = useRef < HTMLElement | null > ( null )
114115 const modalRef = useRef < HTMLDivElement > ( null )
115116 const modalContentRef = useRef < HTMLDivElement > ( null )
116117 const forkedRef = useForkedRef ( ref , modalRef )
@@ -129,6 +130,7 @@ export const CModal = forwardRef<HTMLDivElement, CModalProps>(
129130
130131 useEffect ( ( ) => {
131132 if ( _visible ) {
133+ activeElementRef . current = document . activeElement as HTMLElement | null
132134 document . addEventListener ( 'mouseup' , handleClickOutside )
133135 document . addEventListener ( 'keydown' , handleKeyDown )
134136 }
@@ -145,6 +147,11 @@ export const CModal = forwardRef<HTMLDivElement, CModalProps>(
145147 }
146148
147149 setVisible ( false )
150+
151+ if ( activeElementRef . current ) {
152+ activeElementRef . current . focus ( )
153+ }
154+
148155 return onClose && onClose ( )
149156 }
150157
You can’t perform that action at this time.
0 commit comments