List: allow pasting pre/code (#45016)

WordPress · Nov 30, 2022 · 74a71e2 · 74a71e2
1 parent 796b800
commit 74a71e2
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 3 deletions.
diff --git a/packages/block-library/src/code/transforms.js b/packages/block-library/src/code/transforms.js
@@ -43,7 +43,9 @@ const transforms = {
 			type: 'block',
 			blocks: [ 'core/paragraph' ],
 			transform: ( { content } ) => {
-				return createBlock( 'core/paragraph', { content } );
+				return createBlock( 'core/paragraph', {
+					content: content.replace( /\n/g, '<br>' ),
+				} );
 			},
 		},
 	],

diff --git a/packages/block-library/src/list-item/utils.js b/packages/block-library/src/list-item/utils.js
@@ -8,6 +8,7 @@ import { createBlock, switchToBlockType } from '@wordpress/blocks';
  */
 import { name as listItemName } from './block.json';
 import { name as listName } from '../list/block.json';
+import { name as paragraphName } from '../paragraph/block.json';
 
 export function createListItem( listItemAttributes, listAttributes, children ) {
 	return createBlock(
@@ -19,6 +20,14 @@ export function createListItem( listItemAttributes, listAttributes, children ) {
 	);
 }
 
+function convertBlockToList( block ) {
+	const list = switchToBlockType( block, listName );
+	if ( list ) return list;
+	const paragraph = switchToBlockType( block, paragraphName );
+	if ( paragraph ) return switchToBlockType( paragraph, listName );
+	return null;
+}
+
 export function convertToListItems( blocks ) {
 	const listItems = [];
 
@@ -27,7 +36,7 @@ export function convertToListItems( blocks ) {
 			listItems.push( block );
 		} else if ( block.name === listName ) {
 			listItems.push( ...block.innerBlocks );
-		} else if ( ( block = switchToBlockType( block, listName ) ) ) {
+		} else if ( ( block = convertBlockToList( block ) ) ) {
 			for ( const { innerBlocks } of block ) {
 				listItems.push( ...innerBlocks );
 			}

diff --git a/packages/block-library/src/preformatted/transforms.js b/packages/block-library/src/preformatted/transforms.js
@@ -34,7 +34,10 @@ const transforms = {
 			type: 'block',
 			blocks: [ 'core/paragraph' ],
 			transform: ( attributes ) =>
-				createBlock( 'core/paragraph', attributes ),
+				createBlock( 'core/paragraph', {
+					...attributes,
+					content: attributes.content.replace( /\n/g, '<br>' ),
+				} ),
 		},
 		{
 			type: 'block',

diff --git a/...tor/various/__snapshots__/Copy-cut-paste-should-paste-preformatted-in-list-1-chromium.txt b/...tor/various/__snapshots__/Copy-cut-paste-should-paste-preformatted-in-list-1-chromium.txt
@@ -0,0 +1,5 @@
+<!-- wp:list -->
+<ul><!-- wp:list-item -->
+<li>xy</li>
+<!-- /wp:list-item --></ul>
+<!-- /wp:list -->
diff --git a/test/e2e/specs/editor/various/copy-cut-paste.spec.js b/test/e2e/specs/editor/various/copy-cut-paste.spec.js
@@ -433,4 +433,19 @@ test.describe( 'Copy/cut/paste', () => {
 			await page.evaluate( () => document.activeElement.innerHTML )
 		).toBe( 'axyb' );
 	} );
+
+	test( 'should paste preformatted in list', async ( {
+		page,
+		pageUtils,
+		editor,
+	} ) => {
+		await pageUtils.setClipboardData( {
+			html: '<pre>x</pre>',
+		} );
+		await editor.insertBlock( { name: 'core/list' } );
+		await pageUtils.pressKeyWithModifier( 'primary', 'v' );
+		// Ensure the selection is correct.
+		await page.keyboard.type( 'y' );
+		expect( await editor.getEditedPostContent() ).toMatchSnapshot();
+	} );
 } );