Ensure cite is string when merging quote (#10678)

* Ensure cite is string when merging quote * Ensure createBlock returns string for html source * Don't merge empty paragraphs
WordPress · Oct 17, 2018 · a8b6e73 · a8b6e73
1 parent 0a59f18
commit a8b6e73
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/packages/block-library/src/quote/index.js b/packages/block-library/src/quote/index.js
@@ -198,11 +198,18 @@ export const settings = {
 		);
 	},
 
-	merge( attributes, attributesToMerge ) {
+	merge( attributes, { value, citation } ) {
+		if ( ! value || value === '<p></p>' ) {
+			return {
+				...attributes,
+				citation: attributes.citation + citation,
+			};
+		}
+
 		return {
 			...attributes,
-			value: attributes.value + attributesToMerge.value,
-			citation: attributes.citation + attributesToMerge.citation,
+			value: attributes.value + value,
+			citation: attributes.citation + citation,
 		};
 	},
 

diff --git a/packages/blocks/src/api/factory.js b/packages/blocks/src/api/factory.js
@@ -50,6 +50,10 @@ export function createBlock( name, blockAttributes = {}, innerBlocks = [] ) {
 			result[ key ] = schema.default;
 		}
 
+		if ( schema.source === 'html' && typeof result[ key ] !== 'string' ) {
+			result[ key ] = '';
+		}
+
 		if ( [ 'node', 'children' ].indexOf( schema.source ) !== -1 ) {
 			// Ensure value passed is always an array, which we're expecting in
 			// the RichText component to handle the deprecated value.

diff --git a/test/e2e/specs/blocks/__snapshots__/quote.test.js.snap b/test/e2e/specs/blocks/__snapshots__/quote.test.js.snap
@@ -83,3 +83,9 @@ exports[`Quote can be created by using > at the start of a paragraph block 1`] =
 <blockquote class=\\"wp-block-quote\\"><p>A quote</p><p>Another paragraph</p></blockquote>
 <!-- /wp:quote -->"
 `;
+
+exports[`Quote can be merged into from a paragraph 1`] = `
+"<!-- wp:quote -->
+<blockquote class=\\"wp-block-quote\\"><p>test</p></blockquote>
+<!-- /wp:quote -->"
+`;
diff --git a/test/e2e/specs/blocks/quote.test.js b/test/e2e/specs/blocks/quote.test.js
@@ -102,4 +102,13 @@ describe( 'Quote', () => {
 		await convertBlock( 'Heading' );
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
+
+	it( 'can be merged into from a paragraph', async () => {
+		await insertBlock( 'Quote' );
+		await insertBlock( 'Paragraph' );
+		await page.keyboard.type( 'test' );
+		await pressTimes( 'ArrowLeft', 'test'.length );
+		await page.keyboard.press( 'Backspace' );
+		expect( await getEditedPostContent() ).toMatchSnapshot();
+	} );
 } );