From 8bdf51d4df2f5dde57054c9469565e70fb86520e Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Thu, 30 Jul 2026 09:47:48 +0100 Subject: [PATCH 01/12] Playlist: Improve audio conversion and track selection --- packages/block-library/CHANGELOG.md | 2 + packages/block-library/src/playlist/edit.js | 6 +- packages/block-library/src/playlist/index.js | 2 + .../src/playlist/test/edit-component.js | 71 +++++++++++++++---- .../src/playlist/test/transforms.js | 61 ++++++++++++++++ .../block-library/src/playlist/transforms.js | 23 ++++++ 6 files changed, 148 insertions(+), 17 deletions(-) create mode 100644 packages/block-library/src/playlist/test/transforms.js create mode 100644 packages/block-library/src/playlist/transforms.js diff --git a/packages/block-library/CHANGELOG.md b/packages/block-library/CHANGELOG.md index 2f873d8b49bea0..916e841634d3ef 100644 --- a/packages/block-library/CHANGELOG.md +++ b/packages/block-library/CHANGELOG.md @@ -10,6 +10,8 @@ - Playlist Track: Use a dedicated icon for the block toolbar. ([#80959](https://github.com/WordPress/gutenberg/pull/80959)) - Playlist: Expose the parent "Add track" toolbar control to selected Playlist Track child blocks via block toolbar sharing ([#80368](https://github.com/WordPress/gutenberg/pull/80368)). +- Playlist: Allow selecting audio tracks individually in the Media Library without holding Shift or Command, and add an Audio block transform that creates a one-track Playlist. +- Gallery: Rename the dynamic variation's "Convert to images" action to "Detach", and confirm it in a dialog explaining that the gallery will keep its current images but stop updating automatically ([#80727](https://github.com/WordPress/gutenberg/pull/80727)). - Page List: Rename the "Edit" action to "Detach", and confirm it in a dialog explaining that the list will keep its current pages but stop adding new ones automatically, matching the Gallery block ([#80847](https://github.com/WordPress/gutenberg/pull/80847)). - Tabs: Start new tabs with an empty label showing a "Tab title" placeholder instead of a generic "Tab" ([#81009](https://github.com/WordPress/gutenberg/pull/81009)). diff --git a/packages/block-library/src/playlist/edit.js b/packages/block-library/src/playlist/edit.js index cc8ddaf8ec4c0d..5830d025627d19 100644 --- a/packages/block-library/src/playlist/edit.js +++ b/packages/block-library/src/playlist/edit.js @@ -460,7 +460,7 @@ const PlaylistEdit = ( { } } onSelect={ onSelectTracks } accept="audio/*" - multiple + multiple="add" handleUpload={ false } allowedTypes={ ALLOWED_MEDIA_TYPES } onError={ onUploadError } @@ -476,7 +476,7 @@ const PlaylistEdit = ( { name={ __( 'Add track' ) } onSelect={ onAddTracks } accept="audio/*" - multiple + multiple="add" handleUpload={ false } allowedTypes={ ALLOWED_MEDIA_TYPES } onError={ onUploadError } @@ -671,7 +671,7 @@ const PlaylistEdit = ( { initBlock( { name, metadata, settings } ); diff --git a/packages/block-library/src/playlist/test/edit-component.js b/packages/block-library/src/playlist/test/edit-component.js index 9edafeeead9a56..5c6a9cb0510b4b 100644 --- a/packages/block-library/src/playlist/test/edit-component.js +++ b/packages/block-library/src/playlist/test/edit-component.js @@ -2,25 +2,34 @@ import { fireEvent, render, screen } from '@testing-library/react'; import { useDispatch, useSelect } from '@wordpress/data'; import PlaylistEdit from '../edit'; +let mediaPlaceholderProps; +let mediaReplaceFlowProps; + jest.mock( '@wordpress/block-editor', () => ( { store: {}, BlockControls: ( { children } ) =>
{ children }
, BlockIcon: () => , InspectorControls: ( { children } ) =>
{ children }
, - MediaPlaceholder: () =>
, - MediaReplaceFlow: ( { name, onSelect } ) => ( - - ), + MediaPlaceholder: ( props ) => { + mediaPlaceholderProps = props; + return
; + }, + MediaReplaceFlow: ( props ) => { + mediaReplaceFlowProps = props; + return ( + + ); + }, useBlockProps: () => ( { className: 'wp-block-playlist' } ), useInnerBlocksProps: ( blockProps ) => ( { ...blockProps, @@ -100,6 +109,8 @@ describe( 'PlaylistEdit', () => { let selectBlock; beforeEach( () => { + mediaPlaceholderProps = undefined; + mediaReplaceFlowProps = undefined; replaceInnerBlocks = jest.fn(); selectBlock = jest.fn(); useDispatch.mockReturnValue( { @@ -121,6 +132,38 @@ describe( 'PlaylistEdit', () => { } ); } ); + it( 'lets users select audio tracks individually from the Media Library', () => { + useSelect.mockReturnValue( { + innerBlockTracks: [], + } ); + + render( + + ); + + expect( mediaPlaceholderProps.multiple ).toBe( 'add' ); + } ); + + it( 'lets users select additional audio tracks individually from the Media Library', () => { + render( + + ); + + expect( mediaReplaceFlowProps.multiple ).toBe( 'add' ); + } ); + it( 'keeps track blocks mounted when the tracklist is hidden', () => { render( { + beforeAll( () => { + registerBlockType( playlistMetadata, playlistSettings ); + registerBlockType( playlistTrackMetadata, { edit: () => null } ); + registerBlockType( audioMetadata, { edit: () => null } ); + } ); + + afterAll( () => { + unregisterBlockType( playlistMetadata.name ); + unregisterBlockType( playlistTrackMetadata.name ); + unregisterBlockType( audioMetadata.name ); + } ); + + it( 'converts an Audio block into a Playlist with its audio as a track', () => { + const audio = createBlock( 'core/audio', { + blob: 'blob:https://example.com/track', + caption: 'A playlist caption', + id: 123, + src: 'https://example.com/track.mp3', + } ); + + const [ playlist ] = switchToBlockType( audio, 'core/playlist' ); + + expect( playlist ).toMatchObject( { + name: 'core/playlist', + attributes: { + caption: 'A playlist caption', + }, + } ); + expect( playlist.innerBlocks ).toEqual( [ + expect.objectContaining( { + name: 'core/playlist-track', + attributes: expect.objectContaining( { + blob: 'blob:https://example.com/track', + id: 123, + src: 'https://example.com/track.mp3', + } ), + } ), + ] ); + } ); +} ); diff --git a/packages/block-library/src/playlist/transforms.js b/packages/block-library/src/playlist/transforms.js new file mode 100644 index 00000000000000..57b0dfce09bc5a --- /dev/null +++ b/packages/block-library/src/playlist/transforms.js @@ -0,0 +1,23 @@ +/** + * WordPress dependencies + */ +import { createBlock } from '@wordpress/blocks'; + +const transforms = { + from: [ + { + type: 'block', + blocks: [ 'core/audio' ], + transform: ( { blob, caption, id, src } ) => + createBlock( 'core/playlist', { caption }, [ + createBlock( 'core/playlist-track', { + blob, + id, + src, + } ), + ] ), + }, + ], +}; + +export default transforms; From 9d1177a49f48b3ea4301fd460e61efa50b860a4c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 30 Jul 2026 12:44:38 +0000 Subject: [PATCH 02/12] Playlist Track: use checkbox-style multi-select in Add flow --- .../block-library/src/playlist-track/edit.js | 14 ++++++++ .../src/playlist-track/test/edit.js | 33 +++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/packages/block-library/src/playlist-track/edit.js b/packages/block-library/src/playlist-track/edit.js index 5e333bb1147c16..fa4efb15da3766 100644 --- a/packages/block-library/src/playlist-track/edit.js +++ b/packages/block-library/src/playlist-track/edit.js @@ -156,6 +156,20 @@ const PlaylistTrackEdit = ( { variant="toolbar" /> + { !! addTracks && ( + + + + ) } { ); } ); + it( 'allows tracks to be added from the track toolbar', () => { + const addTracks = jest.fn(); + renderEdit( { addTracks } ); + + fireEvent.click( screen.getByRole( 'button', { name: 'Add' } ) ); + + expect( addTracks ).toHaveBeenCalledWith( {} ); + } ); + + it( 'renders the add track control in a different toolbar group from replace', () => { + renderEdit( { addTracks: jest.fn() } ); + + expect( + within( screen.getByTestId( 'block-controls-other' ) ).getByRole( + 'button', + { name: 'Replace' } + ) + ).toBeInTheDocument(); + expect( + within( screen.getByTestId( 'block-controls-block' ) ).getByRole( + 'button', + { name: 'Add' } + ) + ).toBeInTheDocument(); + } ); + + it( 'lets users select additional audio tracks individually from the Media Library', () => { + renderEdit( { addTracks: jest.fn() } ); + + expect( mockMediaReplaceFlowProps.name ).toBe( 'Add' ); + expect( mockMediaReplaceFlowProps.multiple ).toBe( 'add' ); + } ); + it( 'preserves the current track source when a replacement upload fails', () => { const { setAttributes } = renderEdit(); From 3d562962c158d4e01c986884450de7046f0c01ae Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Thu, 30 Jul 2026 17:53:57 +0100 Subject: [PATCH 03/12] Playlist: Preserve audio transform attributes --- .../src/playlist/test/transforms.js | 38 +++++++++++++++++++ .../block-library/src/playlist/transforms.js | 27 +++++++++---- 2 files changed, 57 insertions(+), 8 deletions(-) diff --git a/packages/block-library/src/playlist/test/transforms.js b/packages/block-library/src/playlist/test/transforms.js index aedb087626c6e6..fe56c48d490c5d 100644 --- a/packages/block-library/src/playlist/test/transforms.js +++ b/packages/block-library/src/playlist/test/transforms.js @@ -58,4 +58,42 @@ describe( 'Playlist transforms', () => { } ), ] ); } ); + + it( 'preserves shared layout attributes when converting Audio to Playlist', () => { + const audio = createBlock( 'core/audio', { + align: 'wide', + anchor: 'my-audio', + style: { + spacing: { + margin: { top: '1rem' }, + padding: { bottom: '2rem' }, + }, + }, + } ); + + const [ playlist ] = switchToBlockType( audio, 'core/playlist' ); + + expect( playlist.attributes ).toMatchObject( { + align: 'wide', + anchor: 'my-audio', + style: { + spacing: { + margin: { top: '1rem' }, + padding: { bottom: '2rem' }, + }, + }, + } ); + } ); + + it( 'converts Audio without an attachment ID', () => { + const audio = createBlock( 'core/audio', { + src: 'https://example.com/track.mp3', + } ); + + const [ playlist ] = switchToBlockType( audio, 'core/playlist' ); + + expect( playlist.innerBlocks[ 0 ].attributes ).not.toHaveProperty( + 'id' + ); + } ); } ); diff --git a/packages/block-library/src/playlist/transforms.js b/packages/block-library/src/playlist/transforms.js index 57b0dfce09bc5a..5af2a398b31d2b 100644 --- a/packages/block-library/src/playlist/transforms.js +++ b/packages/block-library/src/playlist/transforms.js @@ -8,14 +8,25 @@ const transforms = { { type: 'block', blocks: [ 'core/audio' ], - transform: ( { blob, caption, id, src } ) => - createBlock( 'core/playlist', { caption }, [ - createBlock( 'core/playlist-track', { - blob, - id, - src, - } ), - ] ), + transform: ( { align, anchor, blob, caption, id, src, style } ) => + createBlock( + 'core/playlist', + { + caption, + ...( align && { align } ), + ...( anchor && { anchor } ), + ...( style?.spacing && { + style: { spacing: style.spacing }, + } ), + }, + [ + createBlock( 'core/playlist-track', { + blob, + src, + ...( id !== undefined && { id } ), + } ), + ] + ), }, ], }; From 0169a56693c334dd2593177ccdcd7be14b7b1002 Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Mon, 3 Aug 2026 09:58:17 +0100 Subject: [PATCH 04/12] Playlist: Keep track add control shared --- .../block-library/src/playlist-track/edit.js | 14 -------- .../src/playlist-track/test/edit.js | 33 ------------------- 2 files changed, 47 deletions(-) diff --git a/packages/block-library/src/playlist-track/edit.js b/packages/block-library/src/playlist-track/edit.js index fa4efb15da3766..5e333bb1147c16 100644 --- a/packages/block-library/src/playlist-track/edit.js +++ b/packages/block-library/src/playlist-track/edit.js @@ -156,20 +156,6 @@ const PlaylistTrackEdit = ( { variant="toolbar" /> - { !! addTracks && ( - - - - ) } { ); } ); - it( 'allows tracks to be added from the track toolbar', () => { - const addTracks = jest.fn(); - renderEdit( { addTracks } ); - - fireEvent.click( screen.getByRole( 'button', { name: 'Add' } ) ); - - expect( addTracks ).toHaveBeenCalledWith( {} ); - } ); - - it( 'renders the add track control in a different toolbar group from replace', () => { - renderEdit( { addTracks: jest.fn() } ); - - expect( - within( screen.getByTestId( 'block-controls-other' ) ).getByRole( - 'button', - { name: 'Replace' } - ) - ).toBeInTheDocument(); - expect( - within( screen.getByTestId( 'block-controls-block' ) ).getByRole( - 'button', - { name: 'Add' } - ) - ).toBeInTheDocument(); - } ); - - it( 'lets users select additional audio tracks individually from the Media Library', () => { - renderEdit( { addTracks: jest.fn() } ); - - expect( mockMediaReplaceFlowProps.name ).toBe( 'Add' ); - expect( mockMediaReplaceFlowProps.multiple ).toBe( 'add' ); - } ); - it( 'preserves the current track source when a replacement upload fails', () => { const { setAttributes } = renderEdit(); From 6f272d0611653cb77f194f768009833968c227df Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Mon, 3 Aug 2026 10:06:39 +0100 Subject: [PATCH 05/12] Playlist: Add track to audio transform --- packages/block-library/CHANGELOG.md | 2 +- .../block-library/src/playlist-track/index.js | 2 + .../src/playlist-track/test/transforms.js | 49 +++++++++++++++++++ .../src/playlist-track/transforms.js | 21 ++++++++ .../src/playlist/test/transforms.js | 1 + .../block-library/src/playlist/transforms.js | 2 + 6 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 packages/block-library/src/playlist-track/test/transforms.js create mode 100644 packages/block-library/src/playlist-track/transforms.js diff --git a/packages/block-library/CHANGELOG.md b/packages/block-library/CHANGELOG.md index 916e841634d3ef..b98b4fb72510b4 100644 --- a/packages/block-library/CHANGELOG.md +++ b/packages/block-library/CHANGELOG.md @@ -10,7 +10,7 @@ - Playlist Track: Use a dedicated icon for the block toolbar. ([#80959](https://github.com/WordPress/gutenberg/pull/80959)) - Playlist: Expose the parent "Add track" toolbar control to selected Playlist Track child blocks via block toolbar sharing ([#80368](https://github.com/WordPress/gutenberg/pull/80368)). -- Playlist: Allow selecting audio tracks individually in the Media Library without holding Shift or Command, and add an Audio block transform that creates a one-track Playlist. +- Playlist: Allow selecting audio tracks individually in the Media Library without holding Shift or Command, transform an Audio block into a one-track Playlist, and transform a Playlist Track back to Audio. ([#80926](https://github.com/WordPress/gutenberg/pull/80926)) - Gallery: Rename the dynamic variation's "Convert to images" action to "Detach", and confirm it in a dialog explaining that the gallery will keep its current images but stop updating automatically ([#80727](https://github.com/WordPress/gutenberg/pull/80727)). - Page List: Rename the "Edit" action to "Detach", and confirm it in a dialog explaining that the list will keep its current pages but stop adding new ones automatically, matching the Gallery block ([#80847](https://github.com/WordPress/gutenberg/pull/80847)). - Tabs: Start new tabs with an empty label showing a "Tab title" placeholder instead of a generic "Tab" ([#81009](https://github.com/WordPress/gutenberg/pull/81009)). diff --git a/packages/block-library/src/playlist-track/index.js b/packages/block-library/src/playlist-track/index.js index fdbe585acdfe7e..0ec6d64021132c 100644 --- a/packages/block-library/src/playlist-track/index.js +++ b/packages/block-library/src/playlist-track/index.js @@ -2,6 +2,7 @@ import { playlistTrack as icon } from '@wordpress/icons'; import initBlock from '../utils/init-block'; import metadata from './block.json'; import edit from './edit'; +import transforms from './transforms'; const { name } = metadata; export { metadata, name }; @@ -9,6 +10,7 @@ export { metadata, name }; export const settings = { icon, edit, + transforms, }; export const init = () => initBlock( { name, metadata, settings } ); diff --git a/packages/block-library/src/playlist-track/test/transforms.js b/packages/block-library/src/playlist-track/test/transforms.js new file mode 100644 index 00000000000000..b2a9c58a2eed6c --- /dev/null +++ b/packages/block-library/src/playlist-track/test/transforms.js @@ -0,0 +1,49 @@ +/** + * WordPress dependencies + */ +import { + createBlock, + registerBlockType, + switchToBlockType, + unregisterBlockType, +} from '@wordpress/blocks'; + +/** + * Internal dependencies + */ +import { + metadata as playlistTrackMetadata, + settings as playlistTrackSettings, +} from '../index'; +import audioMetadata from '../../audio/block.json'; + +describe( 'Playlist Track transforms', () => { + beforeAll( () => { + registerBlockType( playlistTrackMetadata, playlistTrackSettings ); + registerBlockType( audioMetadata, { edit: () => null } ); + } ); + + afterAll( () => { + unregisterBlockType( playlistTrackMetadata.name ); + unregisterBlockType( audioMetadata.name ); + } ); + + it( 'converts a Playlist Track into Audio with its source data', () => { + const playlistTrack = createBlock( 'core/playlist-track', { + blob: 'blob:https://example.com/track', + id: 123, + src: 'https://example.com/track.mp3', + } ); + + const [ audio ] = switchToBlockType( playlistTrack, 'core/audio' ); + + expect( audio ).toMatchObject( { + name: 'core/audio', + attributes: { + blob: 'blob:https://example.com/track', + id: 123, + src: 'https://example.com/track.mp3', + }, + } ); + } ); +} ); diff --git a/packages/block-library/src/playlist-track/transforms.js b/packages/block-library/src/playlist-track/transforms.js new file mode 100644 index 00000000000000..f62f1f8c84dedf --- /dev/null +++ b/packages/block-library/src/playlist-track/transforms.js @@ -0,0 +1,21 @@ +/** + * WordPress dependencies + */ +import { createBlock } from '@wordpress/blocks'; + +const transforms = { + to: [ + { + type: 'block', + blocks: [ 'core/audio' ], + transform: ( { blob, id, src } ) => + createBlock( 'core/audio', { + blob, + src, + ...( id !== undefined && { id } ), + } ), + }, + ], +}; + +export default transforms; diff --git a/packages/block-library/src/playlist/test/transforms.js b/packages/block-library/src/playlist/test/transforms.js index fe56c48d490c5d..2737da5c439c62 100644 --- a/packages/block-library/src/playlist/test/transforms.js +++ b/packages/block-library/src/playlist/test/transforms.js @@ -54,6 +54,7 @@ describe( 'Playlist transforms', () => { blob: 'blob:https://example.com/track', id: 123, src: 'https://example.com/track.mp3', + title: 'track.mp3', } ), } ), ] ); diff --git a/packages/block-library/src/playlist/transforms.js b/packages/block-library/src/playlist/transforms.js index 5af2a398b31d2b..1986d9652c0ef1 100644 --- a/packages/block-library/src/playlist/transforms.js +++ b/packages/block-library/src/playlist/transforms.js @@ -2,6 +2,7 @@ * WordPress dependencies */ import { createBlock } from '@wordpress/blocks'; +import { getFilename } from '@wordpress/url'; const transforms = { from: [ @@ -23,6 +24,7 @@ const transforms = { createBlock( 'core/playlist-track', { blob, src, + ...( src && { title: getFilename( src ) } ), ...( id !== undefined && { id } ), } ), ] From 693c9fa717d7884c377dc9afb86d795659547779 Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Wed, 5 Aug 2026 13:15:03 +0100 Subject: [PATCH 06/12] Playlist: Fix audio block transformations --- packages/block-library/CHANGELOG.md | 2 +- .../block-library/src/playlist-track/index.js | 2 - .../src/playlist-track/test/transforms.js | 49 ----------- .../src/playlist-track/transforms.js | 21 ----- .../src/playlist/test/transforms.js | 85 +++++++++++++++++++ .../block-library/src/playlist/transforms.js | 79 +++++++++++++---- 6 files changed, 148 insertions(+), 90 deletions(-) delete mode 100644 packages/block-library/src/playlist-track/test/transforms.js delete mode 100644 packages/block-library/src/playlist-track/transforms.js diff --git a/packages/block-library/CHANGELOG.md b/packages/block-library/CHANGELOG.md index b98b4fb72510b4..235869ca5d956a 100644 --- a/packages/block-library/CHANGELOG.md +++ b/packages/block-library/CHANGELOG.md @@ -10,7 +10,7 @@ - Playlist Track: Use a dedicated icon for the block toolbar. ([#80959](https://github.com/WordPress/gutenberg/pull/80959)) - Playlist: Expose the parent "Add track" toolbar control to selected Playlist Track child blocks via block toolbar sharing ([#80368](https://github.com/WordPress/gutenberg/pull/80368)). -- Playlist: Allow selecting audio tracks individually in the Media Library without holding Shift or Command, transform an Audio block into a one-track Playlist, and transform a Playlist Track back to Audio. ([#80926](https://github.com/WordPress/gutenberg/pull/80926)) +- Playlist: Allow selecting audio tracks individually in the Media Library without holding Shift or Command, transform multiple Audio blocks into a Playlist, and transform a one-track Playlist into Audio. ([#80926](https://github.com/WordPress/gutenberg/pull/80926)) - Gallery: Rename the dynamic variation's "Convert to images" action to "Detach", and confirm it in a dialog explaining that the gallery will keep its current images but stop updating automatically ([#80727](https://github.com/WordPress/gutenberg/pull/80727)). - Page List: Rename the "Edit" action to "Detach", and confirm it in a dialog explaining that the list will keep its current pages but stop adding new ones automatically, matching the Gallery block ([#80847](https://github.com/WordPress/gutenberg/pull/80847)). - Tabs: Start new tabs with an empty label showing a "Tab title" placeholder instead of a generic "Tab" ([#81009](https://github.com/WordPress/gutenberg/pull/81009)). diff --git a/packages/block-library/src/playlist-track/index.js b/packages/block-library/src/playlist-track/index.js index 0ec6d64021132c..fdbe585acdfe7e 100644 --- a/packages/block-library/src/playlist-track/index.js +++ b/packages/block-library/src/playlist-track/index.js @@ -2,7 +2,6 @@ import { playlistTrack as icon } from '@wordpress/icons'; import initBlock from '../utils/init-block'; import metadata from './block.json'; import edit from './edit'; -import transforms from './transforms'; const { name } = metadata; export { metadata, name }; @@ -10,7 +9,6 @@ export { metadata, name }; export const settings = { icon, edit, - transforms, }; export const init = () => initBlock( { name, metadata, settings } ); diff --git a/packages/block-library/src/playlist-track/test/transforms.js b/packages/block-library/src/playlist-track/test/transforms.js deleted file mode 100644 index b2a9c58a2eed6c..00000000000000 --- a/packages/block-library/src/playlist-track/test/transforms.js +++ /dev/null @@ -1,49 +0,0 @@ -/** - * WordPress dependencies - */ -import { - createBlock, - registerBlockType, - switchToBlockType, - unregisterBlockType, -} from '@wordpress/blocks'; - -/** - * Internal dependencies - */ -import { - metadata as playlistTrackMetadata, - settings as playlistTrackSettings, -} from '../index'; -import audioMetadata from '../../audio/block.json'; - -describe( 'Playlist Track transforms', () => { - beforeAll( () => { - registerBlockType( playlistTrackMetadata, playlistTrackSettings ); - registerBlockType( audioMetadata, { edit: () => null } ); - } ); - - afterAll( () => { - unregisterBlockType( playlistTrackMetadata.name ); - unregisterBlockType( audioMetadata.name ); - } ); - - it( 'converts a Playlist Track into Audio with its source data', () => { - const playlistTrack = createBlock( 'core/playlist-track', { - blob: 'blob:https://example.com/track', - id: 123, - src: 'https://example.com/track.mp3', - } ); - - const [ audio ] = switchToBlockType( playlistTrack, 'core/audio' ); - - expect( audio ).toMatchObject( { - name: 'core/audio', - attributes: { - blob: 'blob:https://example.com/track', - id: 123, - src: 'https://example.com/track.mp3', - }, - } ); - } ); -} ); diff --git a/packages/block-library/src/playlist-track/transforms.js b/packages/block-library/src/playlist-track/transforms.js deleted file mode 100644 index f62f1f8c84dedf..00000000000000 --- a/packages/block-library/src/playlist-track/transforms.js +++ /dev/null @@ -1,21 +0,0 @@ -/** - * WordPress dependencies - */ -import { createBlock } from '@wordpress/blocks'; - -const transforms = { - to: [ - { - type: 'block', - blocks: [ 'core/audio' ], - transform: ( { blob, id, src } ) => - createBlock( 'core/audio', { - blob, - src, - ...( id !== undefined && { id } ), - } ), - }, - ], -}; - -export default transforms; diff --git a/packages/block-library/src/playlist/test/transforms.js b/packages/block-library/src/playlist/test/transforms.js index 2737da5c439c62..66aa29a49a0aa5 100644 --- a/packages/block-library/src/playlist/test/transforms.js +++ b/packages/block-library/src/playlist/test/transforms.js @@ -60,6 +60,42 @@ describe( 'Playlist transforms', () => { ] ); } ); + it( 'converts multiple selected Audio blocks into one Playlist', () => { + const audioBlocks = [ + createBlock( 'core/audio', { + blob: 'blob:https://example.com/first-track', + id: 123, + src: 'https://example.com/first-track.mp3', + } ), + createBlock( 'core/audio', { + blob: 'blob:https://example.com/second-track', + src: 'https://example.com/second-track.mp3', + } ), + ]; + + const [ playlist ] = switchToBlockType( audioBlocks, 'core/playlist' ); + + expect( playlist.innerBlocks ).toEqual( [ + expect.objectContaining( { + name: 'core/playlist-track', + attributes: expect.objectContaining( { + blob: 'blob:https://example.com/first-track', + id: 123, + src: 'https://example.com/first-track.mp3', + title: 'first-track.mp3', + } ), + } ), + expect.objectContaining( { + name: 'core/playlist-track', + attributes: expect.objectContaining( { + blob: 'blob:https://example.com/second-track', + src: 'https://example.com/second-track.mp3', + title: 'second-track.mp3', + } ), + } ), + ] ); + } ); + it( 'preserves shared layout attributes when converting Audio to Playlist', () => { const audio = createBlock( 'core/audio', { align: 'wide', @@ -97,4 +133,53 @@ describe( 'Playlist transforms', () => { 'id' ); } ); + + it( 'converts a one-track Playlist into Audio', () => { + const playlist = createBlock( + 'core/playlist', + { + align: 'wide', + anchor: 'my-playlist', + caption: 'A playlist caption', + style: { spacing: { margin: { top: '1rem' } } }, + }, + [ + createBlock( 'core/playlist-track', { + blob: 'blob:https://example.com/track', + id: 123, + src: 'https://example.com/track.mp3', + } ), + ] + ); + + const [ audio ] = switchToBlockType( playlist, 'core/audio' ); + + expect( audio ).toMatchObject( { + name: 'core/audio', + attributes: { + align: 'wide', + anchor: 'my-playlist', + blob: 'blob:https://example.com/track', + id: 123, + src: 'https://example.com/track.mp3', + style: { spacing: { margin: { top: '1rem' } } }, + }, + } ); + expect( audio.attributes.caption.toString() ).toBe( + 'A playlist caption' + ); + } ); + + it( 'does not convert a Playlist with multiple tracks into Audio', () => { + const playlist = createBlock( 'core/playlist', {}, [ + createBlock( 'core/playlist-track', { + src: 'https://example.com/first-track.mp3', + } ), + createBlock( 'core/playlist-track', { + src: 'https://example.com/second-track.mp3', + } ), + ] ); + + expect( switchToBlockType( playlist, 'core/audio' ) ).toBeNull(); + } ); } ); diff --git a/packages/block-library/src/playlist/transforms.js b/packages/block-library/src/playlist/transforms.js index 1986d9652c0ef1..348df15ff94fae 100644 --- a/packages/block-library/src/playlist/transforms.js +++ b/packages/block-library/src/playlist/transforms.js @@ -4,31 +4,76 @@ import { createBlock } from '@wordpress/blocks'; import { getFilename } from '@wordpress/url'; +const getPlaylistAttributes = ( { align, anchor, caption, style } ) => ( { + caption, + ...( align && { align } ), + ...( anchor && { anchor } ), + ...( style?.spacing && { + style: { spacing: style.spacing }, + } ), +} ); + +const createPlaylistTrack = ( { blob, id, src } ) => + createBlock( 'core/playlist-track', { + blob, + src, + ...( src && { title: getFilename( src ) } ), + ...( id !== undefined && { id } ), + } ); + const transforms = { from: [ { type: 'block', blocks: [ 'core/audio' ], - transform: ( { align, anchor, blob, caption, id, src, style } ) => - createBlock( + transform: ( audio ) => { + return createBlock( + 'core/playlist', + getPlaylistAttributes( audio ), + [ createPlaylistTrack( audio ) ] + ); + }, + }, + { + type: 'block', + isMultiBlock: true, + blocks: [ 'core/audio' ], + transform: ( attributes ) => { + const [ firstAudio ] = attributes; + return createBlock( 'core/playlist', + getPlaylistAttributes( firstAudio ), + attributes.map( createPlaylistTrack ) + ); + }, + }, + ], + to: [ + { + type: 'block', + blocks: [ 'core/audio' ], + isMatch: ( {}, block ) => + block.innerBlocks.length === 1 && + block.innerBlocks[ 0 ].name === 'core/playlist-track', + transform: ( + { align, anchor, caption, style }, + [ { - caption, - ...( align && { align } ), - ...( anchor && { anchor } ), - ...( style?.spacing && { - style: { spacing: style.spacing }, - } ), + attributes: { blob, id, src }, }, - [ - createBlock( 'core/playlist-track', { - blob, - src, - ...( src && { title: getFilename( src ) } ), - ...( id !== undefined && { id } ), - } ), - ] - ), + ] + ) => + createBlock( 'core/audio', { + blob, + src, + caption, + ...( align && { align } ), + ...( anchor && { anchor } ), + ...( style?.spacing && { + style: { spacing: style.spacing }, + } ), + ...( id !== undefined && { id } ), + } ), }, ], }; From b7a68144538baf4dc5fa2c675f6effe14fd1aee2 Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Thu, 6 Aug 2026 11:19:31 +0100 Subject: [PATCH 07/12] Playlist: Cover transform discovery --- .../block-library/src/playlist/test/transforms.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/block-library/src/playlist/test/transforms.js b/packages/block-library/src/playlist/test/transforms.js index 66aa29a49a0aa5..f628c82014223a 100644 --- a/packages/block-library/src/playlist/test/transforms.js +++ b/packages/block-library/src/playlist/test/transforms.js @@ -3,6 +3,7 @@ */ import { createBlock, + getPossibleBlockTransformations, registerBlockType, switchToBlockType, unregisterBlockType, @@ -152,6 +153,12 @@ describe( 'Playlist transforms', () => { ] ); + expect( getPossibleBlockTransformations( [ playlist ] ) ).toEqual( + expect.arrayContaining( [ + expect.objectContaining( { name: 'core/audio' } ), + ] ) + ); + const [ audio ] = switchToBlockType( playlist, 'core/audio' ); expect( audio ).toMatchObject( { @@ -170,7 +177,7 @@ describe( 'Playlist transforms', () => { ); } ); - it( 'does not convert a Playlist with multiple tracks into Audio', () => { + it( 'does not offer Playlist to Audio for multiple tracks', () => { const playlist = createBlock( 'core/playlist', {}, [ createBlock( 'core/playlist-track', { src: 'https://example.com/first-track.mp3', @@ -180,6 +187,10 @@ describe( 'Playlist transforms', () => { } ), ] ); - expect( switchToBlockType( playlist, 'core/audio' ) ).toBeNull(); + expect( getPossibleBlockTransformations( [ playlist ] ) ).not.toEqual( + expect.arrayContaining( [ + expect.objectContaining( { name: 'core/audio' } ), + ] ) + ); } ); } ); From ac5ba01fa468f038dc68d765f3b12ef4e755461f Mon Sep 17 00:00:00 2001 From: Ben Dwyer Date: Mon, 10 Aug 2026 11:09:47 +0100 Subject: [PATCH 08/12] Update packages/block-library/src/playlist/transforms.js Co-authored-by: Aki Hamano <54422211+t-hamano@users.noreply.github.com> --- .../block-library/src/playlist/transforms.js | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/packages/block-library/src/playlist/transforms.js b/packages/block-library/src/playlist/transforms.js index 348df15ff94fae..095ad233e86e08 100644 --- a/packages/block-library/src/playlist/transforms.js +++ b/packages/block-library/src/playlist/transforms.js @@ -23,29 +23,23 @@ const createPlaylistTrack = ( { blob, id, src } ) => const transforms = { from: [ - { - type: 'block', - blocks: [ 'core/audio' ], - transform: ( audio ) => { - return createBlock( - 'core/playlist', - getPlaylistAttributes( audio ), - [ createPlaylistTrack( audio ) ] - ); - }, - }, { type: 'block', isMultiBlock: true, blocks: [ 'core/audio' ], - transform: ( attributes ) => { - const [ firstAudio ] = attributes; - return createBlock( + transform: ( attributes ) => + createBlock( 'core/playlist', - getPlaylistAttributes( firstAudio ), - attributes.map( createPlaylistTrack ) - ); - }, + { ...attributes[ 0 ] }, + attributes.map( ( { blob, id, src } ) => + createBlock( 'core/playlist-track', { + blob, + id, + src, + title: getFilename( src ), + } ) + ) + ), }, ], to: [ From 2b7f2042f5ddee2b8f43204558cd11db3be0df8a Mon Sep 17 00:00:00 2001 From: Ben Dwyer Date: Mon, 10 Aug 2026 11:10:02 +0100 Subject: [PATCH 09/12] Update packages/block-library/src/playlist/transforms.js Co-authored-by: Aki Hamano <54422211+t-hamano@users.noreply.github.com> --- .../block-library/src/playlist/transforms.js | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/packages/block-library/src/playlist/transforms.js b/packages/block-library/src/playlist/transforms.js index 095ad233e86e08..27753ac0d64e5b 100644 --- a/packages/block-library/src/playlist/transforms.js +++ b/packages/block-library/src/playlist/transforms.js @@ -49,24 +49,15 @@ const transforms = { isMatch: ( {}, block ) => block.innerBlocks.length === 1 && block.innerBlocks[ 0 ].name === 'core/playlist-track', - transform: ( - { align, anchor, caption, style }, - [ - { - attributes: { blob, id, src }, - }, - ] - ) => + transform: ( { style, ...attributes }, [ track ] ) => createBlock( 'core/audio', { - blob, - src, - caption, - ...( align && { align } ), - ...( anchor && { anchor } ), + ...attributes, ...( style?.spacing && { style: { spacing: style.spacing }, } ), - ...( id !== undefined && { id } ), + blob: track.attributes.blob, + id: track.attributes.id, + src: track.attributes.src, } ), }, ], From fc4b70c3d2b4c2b336039f75ada40276eec5d15c Mon Sep 17 00:00:00 2001 From: Ben Dwyer Date: Mon, 10 Aug 2026 11:43:32 +0100 Subject: [PATCH 10/12] fix linting --- .../block-library/src/playlist/transforms.js | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/packages/block-library/src/playlist/transforms.js b/packages/block-library/src/playlist/transforms.js index 27753ac0d64e5b..0eb4f0d52a2351 100644 --- a/packages/block-library/src/playlist/transforms.js +++ b/packages/block-library/src/playlist/transforms.js @@ -1,26 +1,6 @@ -/** - * WordPress dependencies - */ import { createBlock } from '@wordpress/blocks'; import { getFilename } from '@wordpress/url'; -const getPlaylistAttributes = ( { align, anchor, caption, style } ) => ( { - caption, - ...( align && { align } ), - ...( anchor && { anchor } ), - ...( style?.spacing && { - style: { spacing: style.spacing }, - } ), -} ); - -const createPlaylistTrack = ( { blob, id, src } ) => - createBlock( 'core/playlist-track', { - blob, - src, - ...( src && { title: getFilename( src ) } ), - ...( id !== undefined && { id } ), - } ); - const transforms = { from: [ { From 14db1b07d80389a96694cac3f5710ecdc0cc3b20 Mon Sep 17 00:00:00 2001 From: Ben Dwyer Date: Mon, 10 Aug 2026 11:59:08 +0100 Subject: [PATCH 11/12] fix linting --- packages/block-library/src/playlist/test/transforms.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/block-library/src/playlist/test/transforms.js b/packages/block-library/src/playlist/test/transforms.js index f628c82014223a..7c4ebfcc3042b0 100644 --- a/packages/block-library/src/playlist/test/transforms.js +++ b/packages/block-library/src/playlist/test/transforms.js @@ -1,6 +1,3 @@ -/** - * WordPress dependencies - */ import { createBlock, getPossibleBlockTransformations, @@ -8,10 +5,6 @@ import { switchToBlockType, unregisterBlockType, } from '@wordpress/blocks'; - -/** - * Internal dependencies - */ import { metadata as playlistMetadata, settings as playlistSettings, From fd849b358f25492a5b29fcd8d222b01f7ca30fbe Mon Sep 17 00:00:00 2001 From: Aki Hamano <54422211+t-hamano@users.noreply.github.com> Date: Mon, 10 Aug 2026 20:11:05 +0900 Subject: [PATCH 12/12] Remove irrelevant changelog entry --- packages/block-library/CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/block-library/CHANGELOG.md b/packages/block-library/CHANGELOG.md index 235869ca5d956a..f32a65962d65f2 100644 --- a/packages/block-library/CHANGELOG.md +++ b/packages/block-library/CHANGELOG.md @@ -11,7 +11,6 @@ - Playlist Track: Use a dedicated icon for the block toolbar. ([#80959](https://github.com/WordPress/gutenberg/pull/80959)) - Playlist: Expose the parent "Add track" toolbar control to selected Playlist Track child blocks via block toolbar sharing ([#80368](https://github.com/WordPress/gutenberg/pull/80368)). - Playlist: Allow selecting audio tracks individually in the Media Library without holding Shift or Command, transform multiple Audio blocks into a Playlist, and transform a one-track Playlist into Audio. ([#80926](https://github.com/WordPress/gutenberg/pull/80926)) -- Gallery: Rename the dynamic variation's "Convert to images" action to "Detach", and confirm it in a dialog explaining that the gallery will keep its current images but stop updating automatically ([#80727](https://github.com/WordPress/gutenberg/pull/80727)). - Page List: Rename the "Edit" action to "Detach", and confirm it in a dialog explaining that the list will keep its current pages but stop adding new ones automatically, matching the Gallery block ([#80847](https://github.com/WordPress/gutenberg/pull/80847)). - Tabs: Start new tabs with an empty label showing a "Tab title" placeholder instead of a generic "Tab" ([#81009](https://github.com/WordPress/gutenberg/pull/81009)).