Add logic to prevent ungroup option when the group block has no inner…

… blocks (#16332)
WordPress · Jun 29, 2019 · b0ed6f5 · b0ed6f5
1 parent 0a3c5c0
commit b0ed6f5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/packages/e2e-tests/specs/block-grouping.test.js b/packages/e2e-tests/specs/block-grouping.test.js
@@ -102,6 +102,13 @@ describe( 'Block Grouping', () => {
 
 			expect( await getEditedPostContent() ).toMatchSnapshot();
 		} );
+
+		it( 'does not allow ungrouping a group block that has no children', async () => {
+			await insertBlock( 'Group' );
+			await clickBlockToolbarButton( 'More options' );
+			const ungroupButtons = await page.$x( '//button[text()="Ungroup"]' );
+			expect( ungroupButtons ).toHaveLength( 0 );
+		} );
 	} );
 
 	describe( 'Container Block availability', () => {

diff --git a/packages/editor/src/components/convert-to-group-buttons/convert-button.js b/packages/editor/src/components/convert-to-group-buttons/convert-button.js
@@ -72,8 +72,8 @@ export default compose( [
 			! isSingleContainerBlock
 		);
 
-		// Do we have a single Group Block selected?
-		const isUngroupable = isSingleContainerBlock;
+		// Do we have a single Group Block selected and does that group have inner blocks?
+		const isUngroupable = isSingleContainerBlock && !! blocksSelection[ 0 ].innerBlocks.length;
 
 		return {
 			isGroupable,