Skip to content

Compose: Fix 'useFocusOnMount' cleanup callback #62053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mamaduka merged 1 commit into from
May 28, 2024
Merged

Compose: Fix 'useFocusOnMount' cleanup callback #62053

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions packages/compose/src/hooks/use-focus-on-mount/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
/**
* WordPress dependencies
*/
import { useRef, useEffect, useCallback } from '@wordpress/element';
import { useRef, useEffect } from '@wordpress/element';
import { focus } from '@wordpress/dom';

/**
* Internal dependencies
*/
import useRefEffect from '../use-ref-effect';

/**
* Hook used to focus the first tabbable element on mount.
*
Expand Down Expand Up @@ -50,15 +55,7 @@ export default function useFocusOnMount( focusOnMount = 'firstElement' ) {
focusOnMountRef.current = focusOnMount;
}, [ focusOnMount ] );

useEffect( () => {
return () => {
if ( timerId.current ) {
clearTimeout( timerId.current );
}
};
}, [] );

return useCallback( ( node ) => {
return useRefEffect( ( node ) => {
Copy link
Member

@tyxla tyxla May 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice use of useRefEffect 👍

if ( ! node || focusOnMountRef.current === false ) {
return;
}
Expand All @@ -80,5 +77,11 @@ export default function useFocusOnMount( focusOnMount = 'firstElement' ) {
}

setFocus( node );

return () => {
if ( timerId.current ) {
clearTimeout( timerId.current );
}
};
}, [] );
}