Skip to content

Fixes keyboard focus escaping the lightbox overlay when navigating a gallery with Tab/Shift+Tab. #75852

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
t-hamano merged 3 commits into from
Feb 24, 2026
Merged

Fixes keyboard focus escaping the lightbox overlay when navigating a gallery with Tab/Shift+Tab. #75852

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c71b2d6
Fix lightbox overlay callback registration in image block
namankhare Feb 24, 2026
c7d874a
Fix lightbox focus management during keyboard navigation
namankhare Feb 24, 2026
0103187
Revert accounting hidden element
namankhare Feb 24, 2026
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
Prev Previous commit
Next Next commit
Fix lightbox focus management during keyboard navigation
  • Loading branch information
@namankhare
namankhare committed Feb 24, 2026
commit c7d874a0cae53464352b9fb11dd98c5ab02ec7b0
10 changes: 8 additions & 2 deletions packages/block-library/src/image/view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,11 +271,17 @@ const { state, actions, callbacks } = store(
// Traps focus within the overlay.
const focusableElements = Array.from(
document.querySelectorAll( focusableSelectors )
);
).filter( ( element ) => ! element.hidden );
const firstFocusableElement = focusableElements[ 0 ];
const lastFocusableElement =
focusableElements[ focusableElements.length - 1 ];
if (
// If focus is not on any of the known focusable
// elements (e.g. on the overlay div itself),
// move it to the first focusable element.
if ( ! focusableElements.includes( event.target ) ) {
event.preventDefault();
firstFocusableElement.focus();
} else if (
event.shiftKey &&
event.target === firstFocusableElement
) {
Expand Down