EES-5960 update publication modal focus close fix #5707
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Instead of refactoring to use 'triggerButton' like we do on other modals we handle focus manually by focussing the button via a ref. This is to keep the form validation/submit behaviour working as it currently does.
bennettstuart
requested changes
Mar 21, 2025
Comment on lines
75
to
82
| const cancelConfirmModal = () => { | ||
| toggleConfirmModal.off(); | ||
| // This setTimeout is needed because the focus() fn needs to be called | ||
| // on the next tick. Without it, the button doesn't focus. | ||
| // I think the modal tries to handle the focus on close, which prevents | ||
| // our custom focus handling from working at that point. | ||
| setTimeout(() => submitButtonRef.current?.focus(), 0); | ||
| }; |
There was a problem hiding this comment.
Let's use a useEffect instead of setTimeout, to automatically set focus every time the modal closes
useEffect(() => {
if (showConfirmModal === false) {
submitButtonRef.current?.focus();
}
}, [showConfirmModal]);
Comment on lines
174
to
187
| onExit={toggleConfirmModal.off} | ||
| onCancel={toggleConfirmModal.off} | ||
| onExit={cancelConfirmModal} | ||
| onCancel={cancelConfirmModal} |
There was a problem hiding this comment.
Can revert this once we use the useEffect
bennettstuart
deleted the
EES-5960-update-publication-modal-focus-close-fix
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes focus restoration when the 'edit publication' modal is closed in the admin site - returning focus to the modal trigger button.
Instead of refactoring to use 'triggerButton' like we do on other modals, we handle focus manually by focussing the button via a ref.
This is to keep the form validation/submit behaviour working as it currently does.