use the new unified component as default, migrate usages

WordPress · Jul 31, 2019 · 3bd1883 · 3bd1883
1 parent f20e703
commit 3bd1883
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 43 deletions.
diff --git a/packages/block-editor/src/components/block-preview/index.js b/packages/block-editor/src/components/block-preview/index.js
@@ -24,44 +24,10 @@ import BlockList from '../block-list';
  *
  * @return {WPElement} Rendered element.
  */
-function BlockPreview( props ) {
-	return (
-		<div style={{background:'red'}} className="editor-block-preview block-editor-block-preview">
-			<div className="editor-block-preview__title block-editor-block-preview__title">{ __( 'Preview' ) }</div>
-			<BlockPreviewContent { ...props } />
-		</div>
-	);
-}
-
-export function BlockPreviewContent( { blocks, settings } ) {
+function BlockPreview( { blocks, settings, className, isScaled } ) {
 	if ( ! blocks ) {
 		return null;
 	}
-
-	return (
-		<Disabled style={{background:'red'}} className="editor-block-preview__content block-editor-block-preview__content editor-styles-wrapper" aria-hidden>
-			<BlockEditorProvider
-				value={ castArray( blocks ) }
-				settings={ settings }
-			>
-				<BlockList />
-			</BlockEditorProvider>
-		</Disabled>
-	);
-}
-
-export default withSelect( ( select ) => {
-	return {
-		settings: select( 'core/block-editor' ).getSettings(),
-	};
-} )( BlockPreview );
-
-export const UnifiedBlockPreview = withSelect( ( select ) => {
-	return {
-		settings: select( 'core/block-editor' ).getSettings(),
-	};
-} )( ( { name, attributes, innerBlocks, settings, className, isScaled } ) => {
-	const block = createBlock( name, attributes, innerBlocks );
 	return (
 		<Disabled
 			aria-hidden
@@ -76,11 +42,17 @@ export const UnifiedBlockPreview = withSelect( ( select ) => {
 			) }
 		>
 			<BlockEditorProvider
-				value={ [ block ] }
+				value={ castArray( blocks ) }
 				settings={ settings }
 			>
 				<BlockList />
 			</BlockEditorProvider>
 		</Disabled>
 	);
-} );
+}
+
+export default withSelect( ( select ) => {
+	return {
+		settings: select( 'core/block-editor' ).getSettings(),
+	};
+} )( BlockPreview );
diff --git a/packages/block-editor/src/components/block-styles/index.js b/packages/block-editor/src/components/block-styles/index.js
@@ -17,7 +17,7 @@ import { getBlockType, cloneBlock } from '@wordpress/blocks';
 /**
  * Internal dependencies
  */
-import { UnifiedBlockPreview } from '../block-preview';
+import BlockPreview from '../block-preview';
 
 /**
  * Returns the active style from the given className.
@@ -122,7 +122,7 @@ function BlockStyles( {
 						aria-label={ style.label || style.name }
 					>
 						<div className="editor-block-styles__item-preview block-editor-block-styles__item-preview">
-							<UnifiedBlockPreview
+							<BlockPreview
 								isScaled
 								blocks={ cloneBlock( block, {
 									className: styleClassName,

diff --git a/packages/block-editor/src/components/block-switcher/index.js b/packages/block-editor/src/components/block-switcher/index.js
@@ -19,7 +19,7 @@ import { compose } from '@wordpress/compose';
  */
 import BlockIcon from '../block-icon';
 import BlockStyles from '../block-styles';
-import { UnifiedBlockPreview } from '../block-preview';
+import BlockPreview from '../block-preview';
 import BlockTypesList from '../block-types-list';
 
 export class BlockSwitcher extends Component {
@@ -162,7 +162,7 @@ export class BlockSwitcher extends Component {
 						{ ( hoveredClassName !== null ) &&
 							<div className="block-editor-block-switcher__preview">
 								<div className="block-editor-block-switcher__preview-title">{ __( 'Preview' ) }</div>
-								<UnifiedBlockPreview
+								<BlockPreview
 									className="block-editor-block-switcher__preview-content"
 									blocks={
 										cloneBlock( blocks[ 0 ], {

diff --git a/packages/block-editor/src/components/inserter/menu.js b/packages/block-editor/src/components/inserter/menu.js
@@ -37,7 +37,7 @@ import { addQueryArgs } from '@wordpress/url';
 /**
  * Internal dependencies
  */
-import { UnifiedBlockPreview } from '../block-preview';
+import BlockPreview from '../block-preview';
 import BlockTypesList from '../block-types-list';
 import ChildBlocks from './child-blocks';
 
@@ -353,7 +353,7 @@ export class InserterMenu extends Component {
 				{ hoveredItem && isReusableBlock( hoveredItem ) &&
 					<div className="block-editor-inserter__preview">
 						<div className="block-editor-inserter__preview-title">{ __( 'Preview' ) }</div>
-						<UnifiedBlockPreview
+						<BlockPreview
 							className="block-editor-inserter__preview-content"
 							blocks={ createBlock( hoveredItem.name, hoveredItem.initialAttributes ) }
 						/>