Add check to the merge function in headings and paragraph blocks

If trying to merge a blank heading or paragraph, if this check isn't performed, the result is the string 'Null' appearing in the text.
WordPress · Feb 27, 2019 · 3db51db · 3db51db
1 parent ede3258
commit 3db51db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/block-library/src/heading/index.js b/packages/block-library/src/heading/index.js
@@ -168,7 +168,7 @@ export const settings = {
 
 	merge( attributes, attributesToMerge ) {
 		return {
-			content: attributes.content + attributesToMerge.content,
+			content: ( attributes.content || '' ) + ( attributesToMerge.content || '' ),
 		};
 	},
 

diff --git a/packages/block-library/src/paragraph/index.js b/packages/block-library/src/paragraph/index.js
@@ -212,7 +212,7 @@ export const settings = {
 
 	merge( attributes, attributesToMerge ) {
 		return {
-			content: attributes.content + attributesToMerge.content,
+			content: ( attributes.content || '' ) + ( attributesToMerge.content || '' ),
 		};
 	},