Separate Paste Handler

packages/blocks/src/api/index.js

@@ -11,7 +11,7 @@ export {
 	getBlockAttributes,
 	parseWithAttributeSchema,
 } from './parser';
-export { default as rawHandler, getPhrasingContentSchema } from './raw-handling';
+export { pasteHandler, rawHandler, getPhrasingContentSchema } from './raw-handling';
 export {
 	default as serialize,
 	getBlockContent,

packages/blocks/src/api/raw-handling/index.js

@@ -65,6 +65,40 @@ function getRawTransformations() {
 		} );
 }
 
+function htmlToBlocks( { html, rawTransformations } ) {
+	const doc = document.implementation.createHTMLDocument( '' );
+
+	doc.body.innerHTML = html;
+
+	return Array.from( doc.body.children ).map( ( node ) => {
+		const rawTransformation = findTransform( rawTransformations, ( { isMatch } ) => isMatch( node ) );
+
+		if ( ! rawTransformation ) {
+			console.warn(
+				'A block registered a raw transformation schema for `' + node.nodeName + '` but did not match it. ' +
+				'Make sure there is a `selector` or `isMatch` property that can match the schema.\n' +
+				'Sanitized HTML: `' + node.outerHTML + '`'
+			);
+
+			return;
+		}
+
+		const { transform, blockName } = rawTransformation;
+
+		if ( transform ) {
+			return transform( node );
+		}
+
+		return createBlock(
+			blockName,
+			getBlockAttributes(
+				getBlockType( blockName ),
+				node.outerHTML
+			)
+		);
+	} );
+}
+
 /**
  * Converts an HTML string to known blocks. Strips everything else.
  *
@@ -79,7 +113,7 @@ function getRawTransformations() {
  *
  * @return {Array|string} A list of blocks or a string, depending on `handlerMode`.
  */
-export default function rawHandler( { HTML = '', plainText = '', mode = 'AUTO', tagName, canUserUseUnfilteredHTML = false } ) {
+export function pasteHandler( { HTML = '', plainText = '', mode = 'AUTO', tagName, canUserUseUnfilteredHTML = false } ) {
 	// First of all, strip any meta tags.
 	HTML = HTML.replace( /<meta[^>]+>/, '' );
 
@@ -176,37 +210,7 @@ export default function rawHandler( { HTML = '', plainText = '', mode = 'AUTO',
 		// Allows us to ask for this information when we get a report.
 		console.log( 'Processed HTML piece:\n\n', piece );
 
-		const doc = document.implementation.createHTMLDocument( '' );
-
-		doc.body.innerHTML = piece;
-
-		return Array.from( doc.body.children ).map( ( node ) => {
-			const rawTransformation = findTransform( rawTransformations, ( { isMatch } ) => isMatch( node ) );
-
-			if ( ! rawTransformation ) {
-				console.warn(
-					'A block registered a raw transformation schema for `' + node.nodeName + '` but did not match it. ' +
-					'Make sure there is a `selector` or `isMatch` property that can match the schema.\n' +
-					'Sanitized HTML: `' + node.outerHTML + '`'
-				);
-
-				return;
-			}
-
-			const { transform, blockName } = rawTransformation;
-
-			if ( transform ) {
-				return transform( node );
-			}
-
-			return createBlock(
-				blockName,
-				getBlockAttributes(
-					getBlockType( blockName ),
-					node.outerHTML
-				)
-			);
-		} );
+		return htmlToBlocks( { html: piece, rawTransformations } );
 	} ) );
 
 	// If we're allowed to return inline content and there is only one block
@@ -225,3 +229,41 @@ export default function rawHandler( { HTML = '', plainText = '', mode = 'AUTO',
 
 	return blocks;
 }
+
+/**
+ * Converts an HTML string to known blocks.
+ *
+ * @param {string} $1.HTML The HTML to convert.
+ *
+ * @return {Array} A list of blocks.
+ */
+export function rawHandler( { HTML = '' } ) {
+	// If we detect block delimiters, parse entirely as blocks.
+	if ( HTML.indexOf( '<!-- wp:' ) !== -1 ) {
+		return parseWithGrammar( HTML );
+	}
+
+	// An array of HTML strings and block objects. The blocks replace matched
+	// shortcodes.
+	const pieces = shortcodeConverter( HTML );
+	const rawTransformations = getRawTransformations();
+	const blockContentSchema = getBlockContentSchema( rawTransformations );
+
+	return compact( flatMap( pieces, ( piece ) => {
+		// Already a block from shortcode.
+		if ( typeof piece !== 'string' ) {
+			return piece;
+		}
+
+		const filters = [
+			specialCommentConverter,
+			figureContentReducer,
+			blockquoteNormaliser,
+		];
+
+		piece = deepFilterHTML( piece, filters, blockContentSchema );
+		piece = normaliseBlocks( piece );
+
+		return htmlToBlocks( { html: piece, rawTransformations } );
+	} ) );
+}

packages/editor/src/components/block-drop-zone/index.js

@@ -11,7 +11,7 @@ import {
 	withFilters,
 } from '@wordpress/components';
 import {
-	rawHandler,
+	pasteHandler,
 	getBlockTransforms,
 	findTransform,
 } from '@wordpress/blocks';
@@ -70,7 +70,7 @@ class BlockDropZone extends Component {
 	}
 
 	onHTMLDrop( HTML, position ) {
-		const blocks = rawHandler( { HTML, mode: 'BLOCKS' } );
+		const blocks = pasteHandler( { HTML, mode: 'BLOCKS' } );
 
 		if ( blocks.length ) {
 			this.props.insertBlocks( blocks, this.getInsertIndex( position ) );

packages/editor/src/components/block-list/block-invalid-warning.js

@@ -94,7 +94,6 @@ const blockToHTML = ( block ) => createBlock( 'core/html', {
 } );
 const blockToBlocks = ( block ) => rawHandler( {
 	HTML: block.originalContent,
-	mode: 'BLOCKS',
 } );
 
 export default withDispatch( ( dispatch, { block } ) => {

packages/editor/src/components/block-settings-menu/block-html-convert-button.js

@@ -12,22 +12,17 @@ import BlockConvertButton from './block-convert-button';
 
 export default compose(
 	withSelect( ( select, { clientId } ) => {
-		const { getBlock, canUserUseUnfilteredHTML } = select( 'core/editor' );
-		const block = getBlock( clientId );
+		const block = select( 'core/editor' ).getBlock( clientId );
+
 		return {
 			block,
-			canUserUseUnfilteredHTML: canUserUseUnfilteredHTML(),
 			shouldRender: ( block && block.name === 'core/html' ),
 		};
 	} ),
-	withDispatch( ( dispatch, { block, canUserUseUnfilteredHTML } ) => ( {
+	withDispatch( ( dispatch, { block } ) => ( {
 		onClick: () => dispatch( 'core/editor' ).replaceBlocks(
 			block.clientId,
-			rawHandler( {
-				HTML: getBlockContent( block ),
-				mode: 'BLOCKS',
-				canUserUseUnfilteredHTML,
-			} ),
+			rawHandler( { HTML: getBlockContent( block ) } ),
 		),
 	} ) ),
 )( BlockConvertButton );

packages/editor/src/components/block-settings-menu/block-unknown-convert-button.js

@@ -12,22 +12,17 @@ import BlockConvertButton from './block-convert-button';
 
 export default compose(
 	withSelect( ( select, { clientId } ) => {
-		const { canUserUseUnfilteredHTML, getBlock } = select( 'core/editor' );
-		const block = getBlock( clientId );
+		const block = select( 'core/editor' ).getBlock( clientId );
+
 		return {
 			block,
-			canUserUseUnfilteredHTML: canUserUseUnfilteredHTML(),
 			shouldRender: ( block && block.name === getFreeformContentHandlerName() ),
 		};
 	} ),
-	withDispatch( ( dispatch, { block, canUserUseUnfilteredHTML } ) => ( {
+	withDispatch( ( dispatch, { block } ) => ( {
 		onClick: () => dispatch( 'core/editor' ).replaceBlocks(
 			block.clientId,
-			rawHandler( {
-				HTML: serialize( block ),
-				mode: 'BLOCKS',
-				canUserUseUnfilteredHTML,
-			} )
+			rawHandler( { HTML: serialize( block ) } )
 		),
 	} ) ),
 )( BlockConvertButton );

packages/editor/src/components/rich-text/index.js

@@ -23,7 +23,7 @@ import {
 import { createBlobURL } from '@wordpress/blob';
 import { BACKSPACE, DELETE, ENTER, rawShortcut } from '@wordpress/keycodes';
 import { withDispatch, withSelect } from '@wordpress/data';
-import { rawHandler, children, getBlockTransforms, findTransform } from '@wordpress/blocks';
+import { pasteHandler, children, getBlockTransforms, findTransform } from '@wordpress/blocks';
 import { withInstanceId, withSafeTimeout, compose } from '@wordpress/compose';
 import { isURL } from '@wordpress/url';
 import {
@@ -306,7 +306,7 @@ export class RichText extends Component {
 		// Note: a pasted file may have the URL as plain text.
 		if ( item && ! html ) {
 			const file = item.getAsFile ? item.getAsFile() : item;
-			const content = rawHandler( {
+			const content = pasteHandler( {
 				HTML: `<img src="${ createBlobURL( file ) }">`,
 				mode: 'BLOCKS',
 				tagName: this.props.tagName,
@@ -358,7 +358,7 @@ export class RichText extends Component {
 			mode = 'AUTO';
 		}
 
-		const content = rawHandler( {
+		const content = pasteHandler( {
 			HTML: html,
 			plainText,
 			mode,

test/integration/__snapshots__/blocks-raw-handling.spec.js.snap

@@ -0,0 +1,35 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Blocks raw handling rawHandler should convert HTML post to blocks with minimal content changes 1`] = `
+"<!-- wp:heading -->
+<h2>Howdy</h2>
+<!-- /wp:heading -->
+
+<!-- wp:image -->
+<figure class=\\"wp-block-image\\"><img src=\\"https://w.org\\" alt=\\"\\"/></figure>
+<!-- /wp:image -->
+
+<!-- wp:paragraph -->
+<p>This is a paragraph.</p>
+<!-- /wp:paragraph -->
+
+<!-- wp:paragraph -->
+<p>Preserve <span style=\\"color:red\\">me</span>!</p>
+<!-- /wp:paragraph -->
+
+<!-- wp:heading {\\"level\\":3} -->
+<h3>More tag</h3>
+<!-- /wp:heading -->
+
+<!-- wp:more -->
+<!--more-->
+<!-- /wp:more -->
+
+<!-- wp:heading {\\"level\\":3} -->
+<h3>Shortcode</h3>
+<!-- /wp:heading -->
+
+<!-- wp:gallery {\\"columns\\":3,\\"linkTo\\":\\"attachment\\"} -->
+<ul class=\\"wp-block-gallery columns-3 is-cropped\\"><li class=\\"blocks-gallery-item\\"><figure><img data-id=\\"1\\" class=\\"wp-image-1\\"/></figure></li></ul>
+<!-- /wp:gallery -->"
+`;