Issue Summary

On closing the modal dialog, the keyboard focus does not return to the triggering element.

Steps to Reproduce

1. Open the Confluence instance.
2. Navigate to the site navigation and activate the "Administration" control.
3. Navigate to "General configuration" and activate it.
4. Navigate to "Migration Assistant" and activate it to open the migration assistant.
5. Using a screen reader or keyboard, activate the "Begin Assessing/View app assessment" and "Begin Preparing" buttons to open a modal.
6. Close the dialog by activating the "Close" button, then try to navigate further using the "Tab" or "Down Arrow" key.
7. Observe that focus moves to the beginning of the page.

Screen Recording 1:

Screen Recording1.mkv

Screen Recording 2:

https://jira.atlassian.com/secure/attachment/471318/Screen%20Recording2.mkv

Actual Results

When closing the "Assess Your Apps" and "Connect to Cloud" modals by activating the "Close" button, the programmatic focus does not return to the triggering element, such as the "Begin Assessing/View App Assessment" and "Begin preparing" buttons. Instead, the focus is moved to the beginning of the page. This forces screen reader users and keyboard-only users to tab pass the content on the page before they can interact with the content after the triggering element.

Expected Results

The programmatic focus should be set on the triggering element of the dialog as soon as the dialog is closed.

Set the keyboard focus to the triggering element of the dialog using JavaScript's .focus() method.

Workaround

Currently there is no known workaround for this behavior. A workaround will be added here when available

Environment

MacBook Pro (16-inch, 2021)
macOS Sonoma 14.7
Operations - Windows11
Chrome - Version 131.0.6778.70 (Official Build) (64-bit)
Safari- Version 18.0
Firefox- Version 131.0.3 (64-bit)
JAWS- Version 2023
NVDA- Version 2024.4
VoiceOver - Version Latest