Skip to content

fix(modal): prevent focus on modal container with negative tabindex #41607

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

killerdevildog
Copy link

@killerdevildog killerdevildog commented Jul 21, 2025

Fixes #41606 - Extra focus stop on hidden element at end of modal

When a modal has no focusable children, the FocusTrap was focusing the modal container element (which has tabindex="-1"). This created an unwanted focus stop for keyboard users navigating with Tab.

The fix prevents focusing elements with negative tabindex values, which are not meant to be part of the normal tab sequence.

  • Modified FocusTrap._handleFocusin to check tabIndex >= 0 before focusing trap element
  • Updated test to expect the new behavior (no focus on negative tabindex elements)

Description

Motivation & Context

Type of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Refactoring (non-breaking change)
  • Breaking change (fix or feature that would change existing functionality)

Checklist

  • I have read the contributing guidelines
  • [[email protected] lint ] My code follows the code style of the project (using npm run lint)
  • My change introduces changes to the documentation
  • I have updated the documentation accordingly
  • I have added tests to cover my changes
  • All new and existing tests passed

Live previews

Related issues

Fixes twbs#41606 - Extra focus stop on hidden element at end of modal

When a modal has no focusable children, the FocusTrap was focusing
the modal container element (which has tabindex="-1"). This created
an unwanted focus stop for keyboard users navigating with Tab.

The fix prevents focusing elements with negative tabindex values,
which are not meant to be part of the normal tab sequence.

- Modified FocusTrap._handleFocusin to check tabIndex >= 0 before focusing trap element
- Updated test to expect the new behavior (no focus on negative tabindex elements)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

There is an extra focus stop on hidden element at the end of modal.
2 participants