Skip to content
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

Try using dialog element for image lightbox #68725

Draft
wants to merge 4 commits into
base: trunk
Choose a base branch
from
+29 −8
Draft

Try using dialog element for image lightbox #68725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
836ca5c
Try using dialog element for image lightbox.
felixarntz Jan 16, 2025
3cfba60
Remove discouraged tabindex attribute on dialog.
felixarntz Jan 16, 2025
c13d618
Fix default dialog style.
felixarntz Jan 16, 2025
9136c18
Try explicitly opening/closing dialog.
felixarntz Jan 16, 2025
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
7 changes: 3 additions & 4 deletions packages/block-library/src/image/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,14 +269,14 @@ function block_core_image_print_lightbox_overlay() {
}

echo <<<HTML
<div
<dialog
class="wp-lightbox-overlay zoom"
data-wp-interactive="core/image"
data-wp-context='{}'
data-wp-bind--role="state.roleAttribute"
data-wp-bind--aria-label="state.currentImage.ariaLabel"
data-wp-bind--aria-modal="state.ariaModal"
data-wp-class--active="state.overlayEnabled"
data-wp-bind--open="state.overlayEnabled"
data-wp-class--show-closing-animation="state.showClosingAnimation"
data-wp-watch="callbacks.setOverlayFocus"
data-wp-on--keydown="actions.handleKeydown"
Expand All @@ -287,7 +287,6 @@ class="wp-lightbox-overlay zoom"
data-wp-on-async-window--resize="callbacks.setOverlayStyles"
data-wp-on-async-window--scroll="actions.handleScroll"
data-wp-bind--style="state.overlayStyles"
tabindex="-1"
>
<button type="button" aria-label="$close_button_label" style="fill: $close_button_color" class="close-button">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="20" height="20" aria-hidden="true" focusable="false"><path d="m13.06 12 6.47-6.47-1.06-1.06L12 10.94 5.53 4.47 4.47 5.53 10.94 12l-6.47 6.47 1.06 1.06L12 13.06l6.47 6.47 1.06-1.06L13.06 12Z"></path></svg>
Expand All @@ -303,7 +302,7 @@ class="wp-lightbox-overlay zoom"
</figure>
</div>
<div class="scrim" style="background-color: $background_color" aria-hidden="true"></div>
</div>
</dialog>
HTML;
}

Expand Down
16 changes: 12 additions & 4 deletions packages/block-library/src/image/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,15 @@
opacity: 0.9;
}

&:is(dialog) {
margin: 0;
padding: 0;
border: 0;
}

// When fading, make the image come in slightly slower
// or faster than the scrim to give a sense of depth.
&.active {
&[open] {
visibility: visible;
@media not (prefers-reduced-motion) {
animation: both turn-on-visibility 0.25s;
Expand All @@ -292,7 +298,8 @@
}
}
&.show-closing-animation {
&:not(.active) {
&:not([open]) {
display: block;
@media not (prefers-reduced-motion) {
animation: both turn-off-visibility 0.35s;
}
Expand All @@ -306,7 +313,7 @@

@media not (prefers-reduced-motion) {
&.zoom {
&.active {
&[open] {
opacity: 1;
visibility: visible;
animation: none;
Expand All @@ -322,7 +329,8 @@
}
}
&.show-closing-animation {
&:not(.active) {
&:not([open]) {
display: block;
animation: none;
.lightbox-image-container {
animation: lightbox-zoom-out 0.4s;
Expand Down
14 changes: 14 additions & 0 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 @@ -102,6 +102,13 @@ const { state, actions, callbacks } = store(

// Computes the styles of the overlay for the animation.
callbacks.setOverlayStyles();

const lightboxOverlay = document.querySelector(
'dialog#wp-core-image-lightbox-overlay'
);
if ( lightboxOverlay ) {
lightboxOverlay.showModal();
}
},
hideLightbox() {
if ( state.overlayEnabled ) {
Expand All @@ -126,6 +133,13 @@ const { state, actions, callbacks } = store(
// Resets the current image id to mark the overlay as closed.
state.currentImageId = null;
}, 450 );

const lightboxOverlay = document.querySelector(
'dialog#wp-core-image-lightbox-overlay'
);
if ( lightboxOverlay ) {
lightboxOverlay.close();
}
}
},
handleKeydown( event ) {
Expand Down
Loading