Restore priority on embed block for raw transforming (#6572)

* Restore priority on embed block for raw transforming * Add priority to paragraph instead of embed
WordPress · May 3, 2018 · 853d4c0 · 853d4c0
1 parent 3a37ebc
commit 853d4c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/blocks/api/raw-handling/index.js b/blocks/api/raw-handling/index.js
@@ -1,14 +1,14 @@
 /**
  * External dependencies
  */
-import { find, flatMap, filter, compact } from 'lodash';
+import { flatMap, filter, compact } from 'lodash';
 // Also polyfills Element#matches.
 import 'element-closest';
 
 /**
  * Internal dependencies
  */
-import { createBlock, getBlockTransforms } from '../factory';
+import { createBlock, getBlockTransforms, findTransform } from '../factory';
 import { getBlockType } from '../registration';
 import { getBlockAttributes, parseWithGrammar } from '../parser';
 import normaliseBlocks from './normalise-blocks';
@@ -169,7 +169,7 @@ export default function rawHandler( { HTML = '', plainText = '', mode = 'AUTO',
 		doc.body.innerHTML = piece;
 
 		return Array.from( doc.body.children ).map( ( node ) => {
-			const rawTransformation = find( rawTransformations, ( { isMatch } ) => isMatch( node ) );
+			const rawTransformation = findTransform( rawTransformations, ( { isMatch } ) => isMatch( node ) );
 
 			if ( ! rawTransformation ) {
 				warn(

diff --git a/core-blocks/paragraph/index.js b/core-blocks/paragraph/index.js
@@ -341,6 +341,8 @@ export const settings = {
 		from: [
 			{
 				type: 'raw',
+				// Paragraph is a fallback and should be matched last.
+				priority: 20,
 				selector: 'p',
 				schema: {
 					p: {