Parser: Treat attributes with "undefined" source as "comment" attributes

WordPress · Nov 10, 2017 · 456f054 · 456f054
1 parent 5f10764
commit 456f054
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 20 deletions.
diff --git a/blocks/api/parser.js b/blocks/api/parser.js
@@ -99,7 +99,8 @@ export function matcherFromSource( sourceConfig ) {
 export function getBlockAttribute( attributeKey, attributeSchema, innerHTML, commentAttributes ) {
 	let value;
 	switch ( attributeSchema.source ) {
-		case 'comment':
+		// undefined source means that it's an attribute serialized to the block's "comment"
+		case undefined:
 			value = commentAttributes ? commentAttributes[ attributeKey ] : undefined;
 			break;
 		case 'attribute':

diff --git a/blocks/api/raw-handling/shortcode-converter.js b/blocks/api/raw-handling/shortcode-converter.js
@@ -41,10 +41,7 @@ export default function( HTML ) {
 				getBlockAttributes(
 					{
 						...blockType,
-						attributes: mapValues( transform.attributes, attribute => ( {
-							source: 'comment',
-							...attribute,
-						} ) ),
+						attributes: transform.attributes,
 					},
 					match.shortcode.content,
 					attributes,

diff --git a/blocks/api/registration.js b/blocks/api/registration.js
@@ -3,7 +3,7 @@
 /**
  * External dependencies
  */
-import { get, isFunction, some, mapValues } from 'lodash';
+import { get, isFunction, some } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -116,15 +116,12 @@ export function registerBlockType( name, settings ) {
 
 	const attributes = settings.attributes ?
 		settings.attributes :
-		get( window._wpBlocksAttributes, name );
+		get( window._wpBlocksAttributes, name, {} );
 
 	const block = blocks[ name ] = {
 		...settings,
 		name,
-		attributes: mapValues( attributes, ( attribute ) => ( {
-			source: 'comment',
-			...attribute,
-		} ) ),
+		attributes,
 	};
 
 	return block;

diff --git a/blocks/api/serializer.js b/blocks/api/serializer.js
@@ -102,7 +102,7 @@ export function getCommentAttributes( allAttributes, blockType ) {
 		}
 
 		// Ignore values sources from content and post meta
-		if ( attributeSchema.source !== 'comment' ) {
+		if ( attributeSchema.source !== undefined ) {
 			return result;
 		}
 

diff --git a/blocks/api/test/parser.js b/blocks/api/test/parser.js
@@ -83,7 +83,6 @@ describe( 'block parser', () => {
 				'number',
 				{
 					type: 'number',
-					source: 'comment',
 				},
 				'',
 				{ number: 10 }
@@ -138,12 +137,10 @@ describe( 'block parser', () => {
 					},
 					align: {
 						type: 'string',
-						source: 'comment',
 					},
 					topic: {
 						type: 'string',
 						default: 'none',
-						source: 'comment',
 					},
 				},
 			};

diff --git a/blocks/api/test/registration.js b/blocks/api/test/registration.js
@@ -160,7 +160,6 @@ describe( 'blocks', () => {
 				title: 'block title',
 				icon: 'block-default',
 				attributes: { ok: {
-					source: 'comment',
 					type: 'boolean',
 				} },
 			} );

diff --git a/blocks/api/test/serializer.js b/blocks/api/test/serializer.js
@@ -174,11 +174,9 @@ describe( 'block serializer', () => {
 				},
 				category: {
 					type: 'string',
-					source: 'comment',
 				},
 				ripeness: {
 					type: 'string',
-					source: 'comment',
 				},
 			} } );
 
@@ -195,11 +193,9 @@ describe( 'block serializer', () => {
 			}, { attributes: {
 				fruit: {
 					type: 'string',
-					source: 'comment',
 				},
 				ripeness: {
 					type: 'string',
-					source: 'comment',
 				},
 			} } );