Allow pasting iframes (squashed 7 commits)

blocks/api/raw-handling/embedded-content-reducer.js

@@ -0,0 +1,36 @@
+/**
+ * Internal dependencies
+ */
+import { isEmbedded } from './utils';
+
+/**
+ * Browser dependencies
+ */
+const { ELEMENT_NODE } = window.Node;
+
+/**
+ * This filter takes embedded content out of paragraphs.
+ *
+ * @param {Node} node The node to filter.
+ *
+ * @return {void}
+ */
+export default function( node ) {
+	if ( node.nodeType !== ELEMENT_NODE ) {
+		return;
+	}
+
+	if ( ! isEmbedded( node ) ) {
+		return;
+	}
+
+	let wrapper = node;
+
+	while ( wrapper && wrapper.nodeName !== 'P' ) {
+		wrapper = wrapper.parentElement;
+	}
+
+	if ( wrapper ) {
+		wrapper.parentNode.insertBefore( node, wrapper );
+	}
+}

blocks/api/raw-handling/index.js

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { find, get } from 'lodash';
+import { find, get, compact } from 'lodash';
 import showdown from 'showdown';
 
 /**
@@ -22,24 +22,26 @@ import imageCorrector from './image-corrector';
 import blockquoteNormaliser from './blockquote-normaliser';
 import tableNormaliser from './table-normaliser';
 import inlineContentConverter from './inline-content-converter';
+import embeddedContentReducer from './embedded-content-reducer';
 import { deepFilterHTML, isInvalidInline, isNotWhitelisted, isPlain, isInline } from './utils';
 import shortcodeConverter from './shortcode-converter';
 
 /**
  * Converts an HTML string to known blocks. Strips everything else.
  *
- * @param {string} [options.HTML]      The HTML to convert.
- * @param {string} [options.plainText] Plain text version.
- * @param {string} [options.mode]      Handle content as blocks or inline content.
- *                                     * 'AUTO': Decide based on the content passed.
- *                                     * 'INLINE': Always handle as inline content, and return string.
- *                                     * 'BLOCKS': Always handle as blocks, and return array of blocks.
- * @param {Array}  [options.tagName]   The tag into which content will be
- *                                     inserted.
+ * @param {string}  [options.HTML]         The HTML to convert.
+ * @param {string}  [options.plainText]    Plain text version.
+ * @param {string}  [options.mode]         Handle content as blocks or inline content.
+ *                                         * 'AUTO': Decide based on the content passed.
+ *                                         * 'INLINE': Always handle as inline content, and return string.
+ *                                         * 'BLOCKS': Always handle as blocks, and return array of blocks.
+ * @param {Array}   [options.tagName]      The tag into which content will be
+ *                                         inserted.
+ * @param {boolean} [options.allowIframes] Whether or not to allow iframes.
  *
  * @return {Array|string} A list of blocks or a string, depending on `handlerMode`.
  */
-export default function rawHandler( { HTML, plainText = '', mode = 'AUTO', tagName } ) {
+export default function rawHandler( { HTML, plainText = '', mode = 'AUTO', tagName, allowIframes = false } ) {
 	// First of all, strip any meta tags.
 	HTML = HTML.replace( /<meta[^>]+>/, '' );
 
@@ -112,18 +114,20 @@ export default function rawHandler( { HTML, plainText = '', mode = 'AUTO', tagNa
 			msListConverter,
 		] );
 
-		piece = deepFilterHTML( piece, [
+		piece = deepFilterHTML( piece, compact( [
 			listReducer,
 			imageCorrector,
 			// Add semantic formatting before attributes are stripped.
 			formattingTransformer,
 			stripAttributes,
 			commentRemover,
+			! allowIframes && createUnwrapper( ( element ) => element.nodeName === 'IFRAME' ),
+			embeddedContentReducer,
 			createUnwrapper( isNotWhitelisted ),
 			blockquoteNormaliser,
 			tableNormaliser,
 			inlineContentConverter,
-		] );
+		] ) );
 
 		piece = deepFilterHTML( piece, [
 			createUnwrapper( isInvalidInline ),

blocks/api/raw-handling/test/inline-block-corrector.js

@@ -0,0 +1,19 @@
+/**
+ * External dependencies
+ */
+import { equal } from 'assert';
+
+/**
+ * Internal dependencies
+ */
+import embeddedContentReducer from '../embedded-content-reducer';
+import { deepFilterHTML } from '../utils';
+
+describe( 'embeddedContentReducer', () => {
+	it( 'should move inline-block content from paragraph', () => {
+		equal(
+			deepFilterHTML( '<p><strong>test<img></strong></p>', [ embeddedContentReducer ] ),
+			'<img><p><strong>test</strong></p>'
+		);
+	} );
+} );

blocks/api/raw-handling/utils.js

@@ -31,6 +31,11 @@ const inlineWhitelist = {
 	br: {},
 };
 
+const embeddedWhiteList = {
+	img: { attributes: [ 'src', 'alt' ], classes: [ 'alignleft', 'aligncenter', 'alignright', 'alignnone' ] },
+	iframe: { attributes: [ 'src', 'allowfullscreen', 'height', 'width' ] },
+};
+
 const inlineWrapperWhiteList = {
 	figcaption: {},
 	h1: {},
@@ -39,7 +44,7 @@ const inlineWrapperWhiteList = {
 	h4: {},
 	h5: {},
 	h6: {},
-	p: { children: [ 'img' ] },
+	p: {},
 	li: { children: [ 'ul', 'ol', 'li' ] },
 	pre: {},
 	td: {},
@@ -49,7 +54,7 @@ const inlineWrapperWhiteList = {
 const whitelist = {
 	...inlineWhitelist,
 	...inlineWrapperWhiteList,
-	img: { attributes: [ 'src', 'alt' ], classes: [ 'alignleft', 'aligncenter', 'alignright', 'alignnone' ] },
+	...embeddedWhiteList,
 	figure: {},
 	blockquote: {},
 	hr: {},
@@ -63,7 +68,7 @@ const whitelist = {
 };
 
 export function isWhitelisted( element ) {
-	return !! whitelist[ element.nodeName.toLowerCase() ];
+	return !! whitelist.hasOwnProperty( element.nodeName.toLowerCase() );
 }
 
 export function isNotWhitelisted( element ) {
@@ -99,7 +104,7 @@ function isInlineForTag( nodeName, tagName ) {
 
 export function isInline( node, tagName ) {
 	const nodeName = node.nodeName.toLowerCase();
-	return !! inlineWhitelist[ nodeName ] || isInlineForTag( nodeName, tagName );
+	return !! inlineWhitelist.hasOwnProperty( nodeName ) || isInlineForTag( nodeName, tagName );
 }
 
 export function isClassWhitelisted( tag, name ) {
@@ -110,8 +115,21 @@ export function isClassWhitelisted( tag, name ) {
 	);
 }
 
+/**
+ * Whether or not the given node is embedded content.
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Content_categories#Embedded_content
+ *
+ * @param {Node} node The node to check.
+ *
+ * @return {boolean} True if embedded content, false if not.
+ */
+export function isEmbedded( node ) {
+	return !! embeddedWhiteList.hasOwnProperty( node.nodeName.toLowerCase() );
+}
+
 export function isInlineWrapper( node ) {
-	return !! inlineWrapperWhiteList[ node.nodeName.toLowerCase() ];
+	return !! inlineWrapperWhiteList.hasOwnProperty( node.nodeName.toLowerCase() );
 }
 
 export function isAllowedBlock( parentNode, node ) {

blocks/library/html/index.js

@@ -38,6 +38,15 @@ export const settings = {
 		},
 	},
 
+	transforms: {
+		from: [
+			{
+				type: 'raw',
+				isMatch: ( node ) => node.nodeName === 'IFRAME',
+			},
+		],
+	},
+
 	edit: withState( {
 		preview: false,
 	} )( ( { attributes, setAttributes, setState, focus, preview } ) => [

blocks/library/image/index.js

@@ -72,10 +72,9 @@ export const settings = {
 				type: 'raw',
 				isMatch( node ) {
 					const tag = node.nodeName.toLowerCase();
-					const hasText = !! node.textContent.trim();
 					const hasImage = node.querySelector( 'img' );
 
-					return tag === 'img' || ( hasImage && ! hasText ) || ( hasImage && tag === 'figure' );
+					return tag === 'img' || ( hasImage && tag === 'figure' );
 				},
 				transform( node ) {
 					const targetNode = node.parentNode.querySelector( 'figure,img' );

blocks/rich-text/index.js

@@ -371,6 +371,7 @@ export default class RichText extends Component {
 			plainText: this.pastedPlainText,
 			mode,
 			tagName: this.props.tagName,
+			allowIframes: this.context.canUserUseUnfilteredHTML,
 		} );
 
 		if ( typeof content === 'string' ) {
@@ -906,6 +907,7 @@ export default class RichText extends Component {
 
 RichText.contextTypes = {
 	onUndo: noop,
+	canUserUseUnfilteredHTML: noop,
 };
 
 RichText.defaultProps = {

editor/components/block-list/block.js

@@ -18,7 +18,7 @@ import {
 	getSaveElement,
 	isReusableBlock,
 } from '@wordpress/blocks';
-import { withFilters, withContext } from '@wordpress/components';
+import { withFilters, withContext, withAPIData } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
 
 /**
@@ -67,6 +67,7 @@ import {
 	isSelectionEnabled,
 	isTyping,
 	getBlockMode,
+	getCurrentPostType,
 } from '../../store/selectors';
 
 const { BACKSPACE, ESCAPE, DELETE, ENTER, UP, RIGHT, DOWN, LEFT } = keycodes;
@@ -138,6 +139,7 @@ export class BlockListBlock extends Component {
 				renderBlockMenu,
 				showContextualToolbar
 			),
+			canUserUseUnfilteredHTML: get( this.props.user, [ 'data', 'capabilities', 'unfiltered_html' ], false ),
 		};
 	}
 
@@ -601,6 +603,7 @@ const mapStateToProps = ( state, { uid, rootUID } ) => ( {
 	meta: getEditedPostAttribute( state, 'meta' ),
 	mode: getBlockMode( state, uid ),
 	isSelectionEnabled: isSelectionEnabled( state ),
+	postType: getCurrentPostType( state ),
 } );
 
 const mapDispatchToProps = ( dispatch, ownProps ) => ( {
@@ -681,6 +684,7 @@ BlockListBlock.className = 'editor-block-list__block-edit';
 
 BlockListBlock.childContextTypes = {
 	BlockList: noop,
+	canUserUseUnfilteredHTML: noop,
 };
 
 export default compose(
@@ -693,4 +697,7 @@ export default compose(
 		};
 	} ),
 	withFilters( 'editor.BlockListBlock' ),
+	withAPIData( ( { postType } ) => ( {
+		user: `/wp/v2/users/me?post_type=${ postType }&context=edit`,
+	} ) ),
 )( BlockListBlock );

editor/components/block-settings-menu/unknown-converter.js

@@ -2,31 +2,41 @@
  * External dependencies
  */
 import { connect } from 'react-redux';
+import { get } from 'lodash';
 
 /**
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { IconButton } from '@wordpress/components';
+import { IconButton, withAPIData } from '@wordpress/components';
 import { getUnknownTypeHandlerName, rawHandler, serialize } from '@wordpress/blocks';
+import { compose } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
-import { getBlock } from '../../store/selectors';
+import { getBlock, getCurrentPostType } from '../../store/selectors';
 import { replaceBlocks } from '../../store/actions';
 
-export function UnknownConverter( { block, convertToBlocks, small } ) {
+export function UnknownConverter( { block, onReplace, small, user } ) {
 	if ( ! block || getUnknownTypeHandlerName() !== block.name ) {
 		return null;
 	}
 
 	const label = __( 'Convert to blocks' );
 
+	const convertToBlocks = () => {
+		onReplace( block.uid, rawHandler( {
+			HTML: serialize( block ),
+			mode: 'BLOCKS',
+			allowIframes: get( user, [ 'data', 'capabilities', 'unfiltered_html' ], false ),
+		} ) );
+	};
+
 	return (
 		<IconButton
 			className="editor-block-settings-menu__control"
-			onClick={ () => convertToBlocks( block ) }
+			onClick={ convertToBlocks }
 			icon="screenoptions"
 			label={ small ? label : undefined }
 		>
@@ -35,16 +45,17 @@ export function UnknownConverter( { block, convertToBlocks, small } ) {
 	);
 }
 
-export default connect(
-	( state, { uid } ) => ( {
-		block: getBlock( state, uid ),
-	} ),
-	( dispatch, { uid } ) => ( {
-		convertToBlocks( block ) {
-			dispatch( replaceBlocks( uid, rawHandler( {
-				HTML: serialize( block ),
-				mode: 'BLOCKS',
-			} ) ) );
-		},
-	} )
+export default compose(
+	connect(
+		( state, { uid } ) => ( {
+			block: getBlock( state, uid ),
+			postType: getCurrentPostType( state ),
+		} ),
+		{
+			onReplace: replaceBlocks,
+		}
+	),
+	withAPIData( ( { postType } ) => ( {
+		user: `/wp/v2/users/me?post_type=${ postType }&context=edit`,
+	} ) ),
 )( UnknownConverter );