Add more paste matchers

WordPress · Jul 1, 2017 · 7c066a2 · 7c066a2
1 parent 9f3ecef
commit 7c066a2
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 2 deletions.
diff --git a/blocks/library/heading/index.js b/blocks/library/heading/index.js
@@ -69,6 +69,14 @@ registerBlockType( 'core/heading', {
 					} );
 				},
 			},
+			{
+				type: 'raw',
+				matcher: ( node ) => /H\d/.test( node.nodeName ),
+				attributes: {
+					content: children( 'h1,h2,h3,h4,h5,h6' ),
+					nodeName: prop( 'h1,h2,h3,h4,h5,h6', 'nodeName' ),
+				},
+			},
 		],
 		to: [
 			{

diff --git a/blocks/library/image/index.js b/blocks/library/image/index.js
@@ -32,6 +32,23 @@ registerBlockType( 'core/image', {
 		caption: children( 'figcaption' ),
 	},
 
+	transforms: {
+		from: [
+			{
+				type: 'raw',
+				matcher: ( node ) => (
+					node.nodeName === 'IMG' ||
+					( ! node.textContent && node.querySelector( 'img' ) )
+				),
+				attributes: {
+					url: attr( 'img', 'src' ),
+					alt: attr( 'img', 'alt' ),
+					caption: children( 'figcaption' ),
+				},
+			},
+		],
+	},
+
 	getEditWrapperProps( attributes ) {
 		const { align } = attributes;
 		if ( 'left' === align || 'right' === align || 'wide' === align || 'full' === align ) {

diff --git a/blocks/library/list/index.js b/blocks/library/list/index.js
@@ -102,7 +102,14 @@ registerBlockType( 'core/list', {
 					} );
 				},
 			},
-
+			{
+				type: 'raw',
+				matcher: ( node ) => node.nodeName === 'OL' || node.nodeName === 'UL',
+				attributes: {
+					nodeName: prop( 'ol,ul', 'nodeName' ),
+					values: children( 'ol,ul' ),
+				},
+			},
 		],
 		to: [
 			{

diff --git a/blocks/library/text/index.js b/blocks/library/text/index.js
@@ -35,7 +35,11 @@ registerBlockType( 'core/text', {
 		from: [
 			{
 				type: 'raw',
-				matcher: ( node ) => node.nodeName === 'P',
+				matcher: ( node ) => (
+					node.nodeName === 'P' &&
+					// Do not allow embedded content.
+					! node.querySelector( 'audio, canvas, embed, iframe, img, math, object, svg, video' )
+				),
 				attributes: {
 					content: query( 'p', children() ),
 				},