From 87b6d60c36936fab7ed029657cc3b379b9d97d16 Mon Sep 17 00:00:00 2001 From: George Mamadashvili Date: Wed, 6 Nov 2024 08:37:54 +0400 Subject: [PATCH 1/2] Cover: Fix media library image selection --- packages/block-library/src/cover/edit/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/block-library/src/cover/edit/index.js b/packages/block-library/src/cover/edit/index.js index 0ad87601bfba8b..422dcaa7c41fa3 100644 --- a/packages/block-library/src/cover/edit/index.js +++ b/packages/block-library/src/cover/edit/index.js @@ -211,7 +211,8 @@ function CoverEdit( { mediaAttributes.url = newMedia?.sizes?.[ sizeSlug ]?.url; } else if ( newMedia?.sizes?.[ imageDefaultSize ] ) { mediaAttributes.sizeSlug = imageDefaultSize; - mediaAttributes.url = newMedia?.sizes?.[ sizeSlug ]?.url; + mediaAttributes.url = + newMedia?.sizes?.[ imageDefaultSize ]?.url; } else { mediaAttributes.sizeSlug = DEFAULT_MEDIA_SIZE_SLUG; } From 9b09c91e41a32242daca5df3aa10cd83e9cb898d Mon Sep 17 00:00:00 2001 From: George Mamadashvili Date: Wed, 6 Nov 2024 08:47:34 +0400 Subject: [PATCH 2/2] Fix sizes for uploaded images --- .../block-library/src/cover/edit/index.js | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/packages/block-library/src/cover/edit/index.js b/packages/block-library/src/cover/edit/index.js index 422dcaa7c41fa3..1202f28cee50cd 100644 --- a/packages/block-library/src/cover/edit/index.js +++ b/packages/block-library/src/cover/edit/index.js @@ -206,13 +206,24 @@ function CoverEdit( { // Try to use the previous selected image size if it's available // otherwise try the default image size or fallback to full size. - if ( sizeSlug && newMedia?.sizes?.[ sizeSlug ] ) { + if ( + sizeSlug && + ( newMedia?.sizes?.[ sizeSlug ] || + newMedia?.media_details?.sizes?.[ sizeSlug ] ) + ) { mediaAttributes.sizeSlug = sizeSlug; - mediaAttributes.url = newMedia?.sizes?.[ sizeSlug ]?.url; - } else if ( newMedia?.sizes?.[ imageDefaultSize ] ) { + mediaAttributes.url = + newMedia?.sizes?.[ sizeSlug ]?.url || + newMedia?.media_details?.sizes?.[ sizeSlug ]?.source_url; + } else if ( + newMedia?.sizes?.[ imageDefaultSize ] || + newMedia?.media_details?.sizes?.[ imageDefaultSize ] + ) { mediaAttributes.sizeSlug = imageDefaultSize; mediaAttributes.url = - newMedia?.sizes?.[ imageDefaultSize ]?.url; + newMedia?.sizes?.[ imageDefaultSize ]?.url || + newMedia?.media_details?.sizes?.[ imageDefaultSize ] + ?.source_url; } else { mediaAttributes.sizeSlug = DEFAULT_MEDIA_SIZE_SLUG; }