Skip to content

fix(ui): add focus management to the shared Modal#370

Open
cavidelizade wants to merge 1 commit into
Devlaner:mainfrom
cavidelizade:fix/modal-a11y
Open

fix(ui): add focus management to the shared Modal#370
cavidelizade wants to merge 1 commit into
Devlaner:mainfrom
cavidelizade:fix/modal-a11y

Conversation

@cavidelizade

Copy link
Copy Markdown
Contributor

Summary

The shared Modal had role="dialog", aria-modal and Escape handling, but it never moved focus into the dialog, didn't trap Tab (keyboard focus could land on the page behind it), and didn't return focus to the trigger on close. Most modals reuse this primitive, so the gap repeated everywhere.

Linked issues

Closes #347

Type of change

  • Bug fix (fix:)

Surface

  • UI (apps/web/)

What changed

  • Move focus to the first focusable field (or the dialog) when it opens.
  • Trap Tab/Shift+Tab within the dialog.
  • Restore focus to the previously focused element on close.
  • Give the title a unique useId() for aria-labelledby instead of a shared static modal-title id (which would collide if two modals ever mounted).

Scope note

Issue #347 also lists the bespoke page-editor dropdowns and the inline confirm dialog in IssueDetailPage. This PR fixes the shared Modal, which is the widest-reaching piece; the dropdowns/inline dialog are worth a follow-up (they don't share this primitive).

Test plan

  • npm run typecheck + npm run lint pass
  • Manual: open a modal, focus starts inside it, Tab cycles within it, Escape closes it, and focus returns to the element that opened it

AI assistance

  • AI tools were used, tool(s): Claude Code (Opus 4.8), commits carry a Co-Authored-By: trailer

The shared Modal had dialog roles and Escape, but it never moved focus into the
dialog, didn't trap Tab (so keyboard focus wandered onto the page behind it),
and didn't return focus to the trigger on close. Since most modals reuse this
primitive, that gap repeated everywhere.

Move focus to the first field on open, trap Tab/Shift+Tab within the dialog,
restore focus to the previously focused element on close, and give the title a
unique id for aria-labelledby (instead of a shared static one).

Closes Devlaner#347

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@cavidelizade
cavidelizade requested a review from a team as a code owner July 16, 2026 21:27
@coderabbitai

coderabbitai Bot commented Jul 16, 2026

Copy link
Copy Markdown

Warning

Review limit reached

@cavidelizade, you've reached your PR review limit, so we couldn't start this review.

Next review available in: 33 minutes

Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available.
You're only billed for reviews past your plan's rate limits ($0.25/file).

How can I continue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews.

How do review limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: ce03470d-9ec8-4c07-acc6-6f4e333f2c21

📥 Commits

Reviewing files that changed from the base of the PR and between 61bc903 and 332cf5e.

📒 Files selected for processing (1)
  • apps/web/src/components/ui/Modal.tsx
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Shared Modal/Dropdown and inline dialogs lack focus trap, Escape and roles

1 participant