Skip to content

Fix: Prevent Tiled Gallery crash and add changelog entry (#49606) #50025

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
jeherve merged 3 commits into from
Jul 3, 2026
+16 −2
Merged

Fix: Prevent Tiled Gallery crash and add changelog entry (#49606) #50025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afc0583
Fix: Prevent Tiled Gallery crash and add changelog entry (#49606)
Tejas-Raj01 Jun 27, 2026
9a632da
Merge remote-tracking branch 'upstream/trunk' into fix/tiled-gallery-…
Tejas-Raj01 Jun 28, 2026
894966c
Fix: Update image extraction to use href instead of link for core/ima…
Tejas-Raj01 Jul 3, 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
4 changes: 4 additions & 0 deletions projects/plugins/jetpack/changelog/fix-tiled-gallery-crash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: bugfix

Tiled Gallery: prevent editor crash when transforming a core gallery block.
14 changes: 12 additions & 2 deletions projects/plugins/jetpack/extensions/blocks/tiled-gallery/editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const exampleAttributes = {
* @param {Array} images - Array of image objects
* @return {Array} Array of image objects which have id and url
*/
function getValidImages( images ) {
function getValidImages( images = [] ) {
return images.filter( ( { id, url } ) => id && url );
}
registerJetpackBlockFromMetadata( metadata, {
Expand Down Expand Up @@ -98,7 +98,17 @@ registerJetpackBlockFromMetadata( metadata, {
{
type: 'block',
blocks: [ 'core/gallery', 'jetpack/slideshow' ],
transform: ( { images } ) => {
transform: ( { images = [] }, innerBlocks ) => {
if ( ! images.length && innerBlocks?.length ) {
images = innerBlocks
.filter( b => b.name === 'core/image' && b.attributes?.url )
.map( ( { attributes } ) => ( {
id: attributes.id,
url: attributes.url,
link: attributes.href,
alt: attributes.alt,
} ) );
}
const validImages = getValidImages( images );
if ( validImages.length > 0 ) {
return createBlock( metadata.name, {
Expand Down
Loading