Skip to content

Image block: Remove extra lookup for external image dimensions in lightbox #52178

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
artemiomorales merged 1 commit into from
Jun 30, 2023
Merged

Image block: Remove extra lookup for external image dimensions in lightbox #52178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions lib/block-supports/behaviors.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,8 @@ function gutenberg_render_behaviors_support_lightbox( $block_content, $block ) {
$img_uploaded_srcset = wp_get_attachment_image_srcset( $block['attrs']['id'] );
} else {
$img_uploaded_src = $z->get_attribute( 'src' );
$img_dimensions = wp_getimagesize( $img_uploaded_src );
$img_width = $img_dimensions[0];
$img_height = $img_dimensions[1];
$img_width = 'none';
$img_height = 'none';
$img_uploaded_srcset = '';
}

Expand Down
14 changes: 12 additions & 2 deletions packages/block-library/src/image/view-interactivity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,18 @@ store( {
} );

function setZoomStyles( imgDom, context, event ) {
let targetWidth = context.core.image.targetWidth;
let targetHeight = context.core.image.targetHeight;
// Typically, we use the image's full-sized dimensions. If those
// dimensions have not been set (i.e. an external image with only one size),
// the image's dimensions in the lightbox are the same
// as those of the image in the content.
let targetWidth =
context.core.image.targetWidth !== 'none'
? context.core.image.targetWidth
: event.target.nextElementSibling.naturalWidth;
let targetHeight =
context.core.image.targetHeight !== 'none'
? context.core.image.targetHeight
: event.target.nextElementSibling.naturalHeight;

// Since the lightbox image has `position:absolute`, it
// ignores its parent's padding, so we need to set padding here
Expand Down