Quote block: Update transforms since the content is now a React.children object

- Avoid data loss while switching blocks

Author: youknowriad

blocks/library/heading/index.js

@@ -1,3 +1,8 @@
+/**
+ * External dependencies
+ */
+import { isString } from 'lodash';
+
 /**
  * Internal dependencies
  */
@@ -38,9 +43,9 @@ registerBlock( 'core/heading', {
 				blocks: [ 'core/text' ],
 				transform: ( { content, align } ) => {
 					if ( Array.isArray( content ) ) {
-						// TODO this appears to always be true?
-						// TODO reject the switch if more than one paragraph
-						content = content[ 0 ];
+						content = wp.element.concatChildren( content.map( ( elt ) =>
+							! elt || isString( elt ) || elt.type !== 'p' ? elt : elt.props.children
+						) );
 					}
 					return {
 						nodeName: 'H2',
@@ -56,7 +61,7 @@ registerBlock( 'core/heading', {
 				blocks: [ 'core/text' ],
 				transform: ( { content, align } ) => {
 					return {
-						content: [ content ],
+						content,
 						align
 					};
 				}

blocks/library/quote/index.js

@@ -1,3 +1,8 @@
+/**
+ * External dependencies
+ */
+import { isString } from 'lodash';
+
 /**
  * Internal dependencies
  */
@@ -54,9 +59,9 @@ registerBlock( 'core/quote', {
 			{
 				type: 'block',
 				blocks: [ 'core/heading' ],
-				transform: ( { content = '' } ) => {
+				transform: ( { content } ) => {
 					return {
-						value: [ content ]
+						value: content
 					};
 				}
 			}
@@ -66,20 +71,23 @@ registerBlock( 'core/quote', {
 				type: 'block',
 				blocks: [ 'core/text' ],
 				transform: ( { value, citation } ) => {
-					let content = value ? value : [];
-					content = citation && citation.trim() ? content.concat( citation ) : content;
 					return {
-						content
+						content: wp.element.concatChildren( value, citation )
 					};
 				}
 			},
 			{
 				type: 'block',
 				blocks: [ 'core/heading' ],
-				transform: ( { value } ) => {
+				transform: ( { value, citation } ) => {
+					if ( Array.isArray( value ) ) {
+						value = wp.element.concatChildren( value.map( ( elt ) =>
+							! elt || isString( elt ) || elt.type !== 'p' ? elt : elt.props.children
+						) );
+					}
 					return {
 						nodeName: 'H2',
-						content: value && value[ 0 ]
+						content: wp.element.concatChildren( value, citation )
 					};
 				}
 			}

element/index.js

@@ -75,7 +75,7 @@ export function renderToString( element ) {
 export function concatChildren( ...childrens ) {
 	return childrens.reduce( ( memo, children, i ) => {
 		Children.forEach( children, ( child, j ) => {
-			if ( 'string' !== typeof child ) {
+			if ( child && 'string' !== typeof child ) {
 				child = cloneElement( child, {
 					key: [ i, j ].join()
 				} );

languages/gutenberg.pot

@@ -28,11 +28,11 @@ msgstr ""
 msgid "Freeform"
 msgstr ""
 
-#: blocks/library/heading/index.js:10
+#: blocks/library/heading/index.js:15
 msgid "Heading"
 msgstr ""
 
-#: blocks/library/heading/index.js:25
+#: blocks/library/heading/index.js:30
 msgid "Heading %s"
 msgstr ""
 
@@ -70,11 +70,11 @@ msgstr ""
 msgid "Justify"
 msgstr ""
 
-#: blocks/library/quote/index.js:11
+#: blocks/library/quote/index.js:16
 msgid "Quote"
 msgstr ""
 
-#: blocks/library/quote/index.js:35
+#: blocks/library/quote/index.js:40
 msgid "Quote style %d"
 msgstr ""