From cfad7f3d872610ef4bc66510c4c3ba451395a81f Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Mon, 3 May 2021 11:27:27 +0100
Subject: [PATCH] Remove the block wrapper component (#31419)

---
 .../block-list/block-wrapper-elements.js      | 26 ----------------
 .../components/block-list/block-wrapper.js    | 31 -------------------
 .../block-list/block-wrapper.native.js        | 11 -------
 packages/block-editor/src/components/index.js |  1 -
 .../src/components/index.native.js            |  1 -
 5 files changed, 70 deletions(-)
 delete mode 100644 packages/block-editor/src/components/block-list/block-wrapper-elements.js
 delete mode 100644 packages/block-editor/src/components/block-list/block-wrapper.js
 delete mode 100644 packages/block-editor/src/components/block-list/block-wrapper.native.js

diff --git a/packages/block-editor/src/components/block-list/block-wrapper-elements.js b/packages/block-editor/src/components/block-list/block-wrapper-elements.js
deleted file mode 100644
index ce8eb456c9772..0000000000000
--- a/packages/block-editor/src/components/block-list/block-wrapper-elements.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * HTML elements that can be used as a block wrapper.
- */
-const ELEMENTS = [
-	'p',
-	'div',
-	'h1',
-	'h2',
-	'h3',
-	'h4',
-	'h5',
-	'h6',
-	'ol',
-	'ul',
-	'li',
-	'figure',
-	'nav',
-	'pre',
-	'header',
-	'section',
-	'aside',
-	'footer',
-	'main',
-];
-
-export default ELEMENTS;
diff --git a/packages/block-editor/src/components/block-list/block-wrapper.js b/packages/block-editor/src/components/block-list/block-wrapper.js
deleted file mode 100644
index a06a644320cda..0000000000000
--- a/packages/block-editor/src/components/block-list/block-wrapper.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { forwardRef } from '@wordpress/element';
-import deprecated from '@wordpress/deprecated';
-
-/**
- * Internal dependencies
- */
-import ELEMENTS from './block-wrapper-elements';
-import { useBlockProps } from './use-block-props';
-
-const BlockComponent = forwardRef(
-	( { children, tagName: TagName = 'div', ...props }, ref ) => {
-		deprecated( 'wp.blockEditor.__experimentalBlock', {
-			since: '5.6',
-			alternative: 'wp.blockEditor.useBlockProps',
-		} );
-		const blockProps = useBlockProps( { ...props, ref } );
-		return <TagName { ...blockProps }>{ children }</TagName>;
-	}
-);
-
-const ExtendedBlockComponent = ELEMENTS.reduce( ( acc, element ) => {
-	acc[ element ] = forwardRef( ( props, ref ) => {
-		return <BlockComponent { ...props } ref={ ref } tagName={ element } />;
-	} );
-	return acc;
-}, BlockComponent );
-
-export const Block = ExtendedBlockComponent;
diff --git a/packages/block-editor/src/components/block-list/block-wrapper.native.js b/packages/block-editor/src/components/block-list/block-wrapper.native.js
deleted file mode 100644
index 507e17bb982ec..0000000000000
--- a/packages/block-editor/src/components/block-list/block-wrapper.native.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Internal dependencies
- */
-import ELEMENTS from './block-wrapper-elements';
-
-const ExtendedBlockComponent = ELEMENTS.reduce( ( acc, element ) => {
-	acc[ element ] = element;
-	return acc;
-}, String );
-
-export const Block = ExtendedBlockComponent;
diff --git a/packages/block-editor/src/components/index.js b/packages/block-editor/src/components/index.js
index 758b92dcc37ed..bb694e9191588 100644
--- a/packages/block-editor/src/components/index.js
+++ b/packages/block-editor/src/components/index.js
@@ -94,7 +94,6 @@ export { default as __experimentalUseResizeCanvas } from './use-resize-canvas';
 export { default as BlockInspector } from './block-inspector';
 export { default as BlockList } from './block-list';
 export { useBlockProps } from './block-list/use-block-props';
-export { Block as __experimentalBlock } from './block-list/block-wrapper';
 export { LayoutStyle as __experimentalLayoutStyle } from './block-list/layout';
 export { default as BlockMover } from './block-mover';
 export { default as BlockPreview } from './block-preview';
diff --git a/packages/block-editor/src/components/index.native.js b/packages/block-editor/src/components/index.native.js
index e17beff7d73dc..bb6175c5ffe93 100644
--- a/packages/block-editor/src/components/index.native.js
+++ b/packages/block-editor/src/components/index.native.js
@@ -70,7 +70,6 @@ export { default as DefaultBlockAppender } from './default-block-appender';
 export { default as __unstableEditorStyles } from './editor-styles';
 export { default as Inserter } from './inserter';
 export { useBlockProps } from './block-list/use-block-props';
-export { Block as __experimentalBlock } from './block-list/block-wrapper';
 export { default as FloatingToolbar } from './floating-toolbar';
 
 // State Related Components