Do not change the API

vishalkakadiya · Jan 3, 2018 · eb7b0b7 · eb7b0b7
1 parent 47c682c
commit eb7b0b7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/blocks/api/factory.js b/blocks/api/factory.js
@@ -26,17 +26,15 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import { getBlockType, getBlockTypes } from './registration';
-import { getBlockAttributes } from './parser';
 
 /**
  * Returns a block object given its type and attributes.
  *
- * @param  {String}  name             Block name
- * @param  {Object}  blockAttributes  Block attributes
- * @param  {?String} innerHTML        Block HTML
- * @return {Object}                   Block object
+ * @param  {String} name             Block name
+ * @param  {Object} blockAttributes  Block attributes
+ * @return {Object}                  Block object
  */
-export function createBlock( name, blockAttributes = {}, innerHTML ) {
+export function createBlock( name, blockAttributes = {} ) {
 	// Get the type definition associated with a registered block.
 	const blockType = getBlockType( name );
 
@@ -59,7 +57,7 @@ export function createBlock( name, blockAttributes = {}, innerHTML ) {
 		uid: uuid(),
 		name,
 		isValid: true,
-		attributes: innerHTML ? getBlockAttributes( blockType, innerHTML, attributes ) : attributes,
+		attributes,
 	};
 }
 

diff --git a/blocks/library/image/index.js b/blocks/library/image/index.js
@@ -9,7 +9,7 @@ import { createMediaFromFile } from '@wordpress/utils';
  */
 import './style.scss';
 import './editor.scss';
-import { registerBlockType, createBlock } from '../../api';
+import { registerBlockType, createBlock, getBlockAttributes, getBlockType } from '../../api';
 import ImageBlock from './block';
 
 registerBlockType( 'core/image', {
@@ -76,8 +76,10 @@ registerBlockType( 'core/image', {
 					const targetNode = node.parentNode.querySelector( 'figure,img' );
 					const matches = /align(left|center|right)/.exec( targetNode.className );
 					const align = matches ? matches[ 1 ] : undefined;
+					const blockType = getBlockType( 'core/image' );
+					const attributes = getBlockAttributes( blockType, targetNode.outerHTML, { align } );
 
-					return createBlock( 'core/image', { align }, targetNode.outerHTML );
+					return createBlock( 'core/image', attributes );
 				},
 			},
 			{