Handle block (un)wrapping in a separate PR

WordPress · Apr 11, 2018 · 8929b5f · 8929b5f
1 parent bf8c171
commit 8929b5f
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 120 deletions.
diff --git a/blocks/library/list/index.js b/blocks/library/list/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { find, compact, get, initial, last, isEmpty } from 'lodash';
+import { find, compact, get, isEmpty } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -61,21 +61,6 @@ export const settings = {
 					} );
 				},
 			},
-			{
-				type: 'block',
-				blocks: [ 'core/quote' ],
-				transform: ( { value, citation } ) => {
-					const items = value.map( p => get( p, 'children.props.children' ) );
-					if ( ! isEmpty( citation ) ) {
-						items.push( citation );
-					}
-					const hasItems = ! items.every( isEmpty );
-					return createBlock( 'core/list', {
-						nodeName: 'UL',
-						values: hasItems ? items.map( ( content, index ) => <li key={ index }>{ content }</li> ) : [],
-					} );
-				},
-			},
 			{
 				type: 'raw',
 				isMatch: ( node ) => node.nodeName === 'OL' || node.nodeName === 'UL',
@@ -111,18 +96,6 @@ export const settings = {
 							content: [ content ],
 						} ) ),
 			},
-			{
-				type: 'block',
-				blocks: [ 'core/quote' ],
-				transform: ( { values } ) => {
-					return createBlock( 'core/quote', {
-						value: compact( ( values.length === 1 ? values : initial( values ) )
-							.map( ( value ) => get( value, 'props.children', null ) ) )
-							.map( ( children ) => ( { children: <p>{ children }</p> } ) ),
-						citation: ( values.length === 1 ? undefined : [ get( last( values ), 'props.children' ) ] ),
-					} );
-				},
-			},
 		],
 	},
 

diff --git a/blocks/library/pullquote/index.js b/blocks/library/pullquote/index.js
@@ -46,18 +46,6 @@ export const settings = {
 
 	attributes: blockAttributes,
 
-	transforms: {
-		to: [
-			{
-				type: 'unwrap',
-				transform: ( { citation }, innerBlocks ) => [
-					...innerBlocks,
-					createBlock( 'core/paragraph', { content: citation } ),
-				],
-			},
-		],
-	},
-
 	getEditWrapperProps( attributes ) {
 		const { align } = attributes;
 		if ( 'left' === align || 'right' === align || 'wide' === align || 'full' === align ) {

diff --git a/blocks/library/quote/index.js b/blocks/library/quote/index.js
@@ -73,15 +73,6 @@ export const settings = {
 				},
 			},
 		],
-		to: [
-			{
-				type: 'unwrap',
-				transform: ( { citation }, innerBlocks ) => [
-					...innerBlocks,
-					createBlock( 'core/paragraph', { content: citation } ),
-				],
-			},
-		],
 	},
 
 	edit: withState( {

diff --git a/editor/components/block-settings-menu/block-unwrap.js b/editor/components/block-settings-menu/block-unwrap.js
diff --git a/editor/components/block-settings-menu/index.js b/editor/components/block-settings-menu/index.js
@@ -18,7 +18,6 @@ import BlockModeToggle from './block-mode-toggle';
 import BlockRemoveButton from './block-remove-button';
 import BlockDuplicateButton from './block-duplicate-button';
 import BlockTransformations from './block-transformations';
-import BlockUnwrap from './block-unwrap';
 import SharedBlockSettings from './shared-block-settings';
 import UnknownConverter from './unknown-converter';
 import { selectBlock } from '../../store/actions';
@@ -67,7 +66,6 @@ function BlockSettingsMenu( {
 						<BlockRemoveButton key="remove" uids={ uids } role="menuitem" />,
 						<BlockDuplicateButton key="duplicate" uids={ uids } rootUID={ rootUID } role="menuitem" />,
 						count === 1 && <SharedBlockSettings key="shared-block" uid={ uids[ 0 ] } onToggle={ onClose } itemsRole="menuitem" />,
-						<BlockUnwrap key="block-unwrap" uids={ uids } onClick={ onClose } role="menuitem" />,
 						<BlockTransformations key="transformations" uids={ uids } onClick={ onClose } itemsRole="menuitem" />,
 					] } ) }
 				</NavigableMenu>