Restore Unquote button

WordPress · Jun 26, 2023 · 8d9a173 · 8d9a173
1 parent d81637e
commit 8d9a173
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 9 deletions.
diff --git a/packages/block-editor/src/components/block-switcher/block-transformations-menu.js b/packages/block-editor/src/components/block-switcher/block-transformations-menu.js
@@ -5,6 +5,7 @@ import { __ } from '@wordpress/i18n';
 import { MenuGroup, MenuItem } from '@wordpress/components';
 import {
 	getBlockMenuDefaultClassName,
+	getBlockType,
 	switchToBlockType,
 } from '@wordpress/blocks';
 import { useState, useMemo } from '@wordpress/element';
@@ -15,6 +16,7 @@ import { useState, useMemo } from '@wordpress/element';
 import BlockIcon from '../block-icon';
 import PreviewBlockPopover from './preview-block-popover';
 import BlockVariationTransformations from './block-variation-transformations';
+import { useConvertToGroupButtonProps } from '../convert-to-group-buttons';
 
 /**
  * Helper hook to group transformations to display them in a specific order in the UI.
@@ -76,6 +78,8 @@ const BlockTransformationsMenu = ( {
 
 	const { priorityTextTransformations, restTransformations } =
 		useGroupedTransforms( possibleBlockTransformations );
+	const selectedClientIds = blocks.map( ( { clientId } ) => clientId );
+	const { onUngroup } = useConvertToGroupButtonProps( selectedClientIds );
 	// We have to check if both content transformations(priority and rest) are set
 	// in order to create a separate MenuGroup for them.
 	const hasBothContentTransformations =
@@ -87,8 +91,24 @@ const BlockTransformationsMenu = ( {
 			setHoveredTransformItemName={ setHoveredTransformItemName }
 		/>
 	);
+	const [ firstSelectedBlock ] = blocks;
+	const { name: firstSelectedBlockName } = firstSelectedBlock;
+	const { name, icon } = getBlockType( firstSelectedBlockName );
 	return (
 		<>
+			{ onUngroup && (
+				<MenuGroup className={ className }>
+					<MenuItem
+						className={ getBlockMenuDefaultClassName( name ) }
+						onClick={ () => {
+							onUngroup();
+						} }
+					>
+						<BlockIcon icon={ icon } showColors />
+						{ onUngroup.__experimentalLabel || __( 'Ungroup' ) }
+					</MenuItem>
+				</MenuGroup>
+			) }
 			<MenuGroup label={ __( 'Transform to' ) } className={ className }>
 				{ hoveredTransformItemName && (
 					<PreviewBlockPopover

diff --git a/packages/block-library/src/quote/transforms.js b/packages/block-library/src/quote/transforms.js
@@ -2,6 +2,20 @@
  * WordPress dependencies
  */
 import { createBlock } from '@wordpress/blocks';
+import { __ } from '@wordpress/i18n';
+
+function ungroup( { citation }, innerBlocks ) {
+	return citation
+		? [
+				...innerBlocks,
+				createBlock( 'core/paragraph', {
+					content: citation,
+				} ),
+		  ]
+		: innerBlocks;
+}
+
+ungroup.__experimentalLabel = __( 'Unquote' );
 
 const transforms = {
 	from: [
@@ -127,15 +141,7 @@ const transforms = {
 				),
 		},
 	],
-	ungroup: ( { citation }, innerBlocks ) =>
-		citation
-			? [
-					...innerBlocks,
-					createBlock( 'core/paragraph', {
-						content: citation,
-					} ),
-			  ]
-			: innerBlocks,
+	ungroup,
 };
 
 export default transforms;