Paste: replace iframes with url (#20983)

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

@@ -141,10 +141,7 @@ function RichTextWrapper(
 
  const selectionStart = getSelectionStart();
  const selectionEnd = getSelectionEnd();
- const {
- __experimentalCanUserUseUnfilteredHTML,
- __experimentalUndo: undo,
- } = getSettings();
+ const { __experimentalUndo: undo } = getSettings();
 
  let isSelected;
 
@@ -171,7 +168,6 @@ function RichTextWrapper(
  }
 
  return {
- canUserUseUnfilteredHTML: __experimentalCanUserUseUnfilteredHTML,
  isCaretWithinFormattedText: isCaretWithinFormattedText(),
  selectionStart: isSelected ? selectionStart.offset : undefined,
  selectionEnd: isSelected ? selectionEnd.offset : undefined,
@@ -186,7 +182,6 @@ function RichTextWrapper(
  // retreived from the store on merge.
  // To do: fix this somehow.
  const {
- canUserUseUnfilteredHTML,
  isCaretWithinFormattedText,
  selectionStart,
  selectionEnd,
@@ -394,7 +389,6 @@ function RichTextWrapper(
  plainText,
  mode,
  tagName,
- canUserUseUnfilteredHTML,
  } );
 
  if ( typeof content === 'string' ) {
@@ -437,7 +431,6 @@ function RichTextWrapper(
  onSplit,
  splitValue,
  __unstableEmbedURLOnPaste,
- canUserUseUnfilteredHTML,
  multiline,
  ]
  );

packages/block-library/src/html/index.js

@@ -10,7 +10,6 @@ import { html as icon } from '@wordpress/icons';
 import edit from './edit';
 import metadata from './block.json';
 import save from './save';
-import transforms from './transforms';
 
 const { name } = metadata;
 
@@ -34,7 +33,6 @@ export const settings = {
  className: false,
  html: false,
  },
- transforms,
  edit,
  save,
 };

packages/blocks/README.md

@@ -608,7 +608,6 @@ _Parameters_
 - _options.plainText_ `[string]`: Plain text version.
 - _options.mode_ `[string]`: 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.
 - _options.tagName_ `[Array]`: The tag into which content will be inserted.
-- _options.canUserUseUnfilteredHTML_ `[boolean]`: Whether or not the user can use unfiltered HTML.
 
 _Returns_
 

packages/blocks/src/api/raw-handling/iframe-remover.js

@@ -1,8 +1,3 @@
-/**
- * WordPress dependencies
- */
-import { remove } from '@wordpress/dom';
-
 /**
  * Removes iframes.
  *
@@ -12,6 +7,7 @@ import { remove } from '@wordpress/dom';
  */
 export default function( node ) {
  if ( node.nodeName === 'IFRAME' ) {
- remove( node );
+ const text = node.ownerDocument.createTextNode( node.src );
+ node.parentNode.replaceChild( text, node );
  }
 }

packages/blocks/src/api/raw-handling/paste-handler.js

@@ -126,14 +126,13 @@ function htmlToBlocks( { html, rawTransforms } ) {
  * Converts an HTML string to known blocks. Strips everything else.
  *
  * @param {Object} options
- * @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.canUserUseUnfilteredHTML] Whether or not the user can use unfiltered HTML.
+ * @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.
  *
  * @return {Array|string} A list of blocks or a string, depending on `handlerMode`.
  */
@@ -142,7 +141,6 @@ export function pasteHandler( {
  plainText = '',
  mode = 'AUTO',
  tagName,
- canUserUseUnfilteredHTML = false,
 } ) {
  // First of all, strip any meta tags.
  HTML = HTML.replace( /<meta[^>]+>/g, '' );
@@ -243,15 +241,11 @@ export function pasteHandler( {
  phrasingContentReducer,
  specialCommentConverter,
  commentRemover,
+ iframeRemover,
  figureContentReducer,
  blockquoteNormaliser,
  ];
 
- if ( ! canUserUseUnfilteredHTML ) {
- // Should run before `figureContentReducer`.
- filters.unshift( iframeRemover );
- }
-
  const schema = {
  ...blockContentSchema,
  // Keep top-level phrasing content, normalised by `normaliseBlocks`.

test/integration/blocks-raw-handling.test.js

@@ -398,11 +398,7 @@ describe( 'Blocks raw handling', () => {
  throw new Error( `Expected fixtures for type ${ type }` );
  }
 
- const converted = pasteHandler( {
- HTML,
- plainText,
- canUserUseUnfilteredHTML: true,
- } );
+ const converted = pasteHandler( { HTML, plainText } );
  const serialized =
  typeof converted === 'string'
  ? converted

test/integration/fixtures/iframe-embed-out.html

@@ -1,3 +1,5 @@
-<!-- wp:html -->
-<figure><iframe src="https://www.google.com/maps/embed" width="600" height="450" allowfullscreen=""></iframe></figure>
-<!-- /wp:html -->
+<!-- wp:embed {"url":"https://www.google.com/maps/embed"} -->
+<figure class="wp-block-embed"><div class="wp-block-embed__wrapper">
+https://www.google.com/maps/embed
+</div></figure>
+<!-- /wp:embed -->