Blocks: Make sure Reusable Blocks get class name apllied properly

blocks/block-edit/index.js

@@ -36,7 +36,7 @@ export function BlockEdit( props ) {
 	// them preferencially as the render value for the block.
 	const Edit = blockType.edit || blockType.save;
 
-	return <Edit className={ className } { ...props } />;
+	return <Edit { ...props } className={ className } />;
 }
 
 export default withFilters( 'blocks.BlockEdit' )( BlockEdit );

blocks/library/block/index.js

@@ -14,7 +14,8 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { getBlockType, registerBlockType } from '../../api';
+import BlockEdit from '../../block-edit';
+import { registerBlockType } from '../../api';
 import ReusableBlockEditPanel from './edit-panel';
 
 class ReusableBlockEdit extends Component {
@@ -85,14 +86,13 @@ class ReusableBlockEdit extends Component {
 		}
 
 		const reusableBlockAttributes = { ...reusableBlock.attributes, ...attributes };
-		const blockType = getBlockType( reusableBlock.type );
-		const BlockEdit = blockType.edit || blockType.save;
 
 		return [
 			// We fake the block being read-only by wrapping it with an element that has pointer-events: none
 			<div key="edit" style={ { pointerEvents: isEditing ? 'auto' : 'none' } }>
 				<BlockEdit
 					{ ...this.props }
+					name={ reusableBlock.type }
 					focus={ isEditing ? focus : null }
 					attributes={ reusableBlockAttributes }
 					setAttributes={ isEditing ? this.setAttributes : noop }
@@ -160,6 +160,10 @@ registerBlockType( 'core/block', {
 		},
 	},
 
+	supports: {
+		customClassName: false,
+	},
+
 	edit: ConnectedReusableBlockEdit,
 	save: () => null,
 } );