Merge pull request #686 from WordPress/fix/create-block-defaults

Include block default attributes in created block
WordPress · May 9, 2017 · 90cc25b · 90cc25b
2 parents 00bd33b + f0dbc37
commit 90cc25b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/blocks/api/factory.js b/blocks/api/factory.js
@@ -17,10 +17,20 @@ import { getBlockSettings } from './registration';
  * @return {Object}             Block object
  */
 export function createBlock( blockType, attributes = {} ) {
+	const blockSettings = getBlockSettings( blockType );
+
+	let defaultAttributes;
+	if ( blockSettings ) {
+		defaultAttributes = blockSettings.defaultAttributes;
+	}
+
 	return {
 		uid: uuid(),
 		blockType,
-		attributes
+		attributes: {
+			...defaultAttributes,
+			...attributes
+		}
 	};
 }
 

diff --git a/blocks/api/test/factory.js b/blocks/api/test/factory.js
@@ -19,12 +19,18 @@ describe( 'block factory', () => {
 
 	describe( 'createBlock()', () => {
 		it( 'should create a block given its blockType and attributes', () => {
+			registerBlock( 'core/test-block', {
+				defaultAttributes: {
+					includesDefault: true
+				}
+			} );
 			const block = createBlock( 'core/test-block', {
 				align: 'left'
 			} );
 
 			expect( block.blockType ).to.eql( 'core/test-block' );
 			expect( block.attributes ).to.eql( {
+				includesDefault: true,
 				align: 'left'
 			} );
 			expect( block.uid ).to.be.a( 'string' );