From d750345d416c5018ce9113654a17a06398c85545 Mon Sep 17 00:00:00 2001
From: Jorge <jorge.costa@developer.pt>
Date: Wed, 6 Jun 2018 18:20:43 +0100
Subject: [PATCH] Improve transformations to only transform to blocks that can
 be inserted on the root block

---
 .../src/components/block-switcher/index.js    | 32 +++++++++++--------
 .../components/block-switcher/test/index.js   | 16 ++++++++--
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/packages/editor/src/components/block-switcher/index.js b/packages/editor/src/components/block-switcher/index.js
index 02f417a2f54bd0..5fc7dd372c3433 100644
--- a/packages/editor/src/components/block-switcher/index.js
+++ b/packages/editor/src/components/block-switcher/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { castArray, get, some } from 'lodash';
+import { castArray, filter, first, get, mapKeys, sortBy } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -36,19 +36,27 @@ export class BlockSwitcher extends Component {
 	}
 
 	render() {
-		const { blocks, onTransform, isLocked } = this.props;
+		const { blocks, onTransform, inserterItems } = this.props;
 		const { hoveredClassName } = this.state;
 
 		if ( ! blocks || ! blocks.length ) {
 			return null;
 		}
 
-		const allowedBlocks = getPossibleBlockTransformations( blocks );
+		const itemsByName = mapKeys( inserterItems, ( { name } ) => name );
+		const possibleBlockTransformations = sortBy(
+			filter(
+				getPossibleBlockTransformations( blocks ),
+				( block ) => !! itemsByName[ block.name ]
+			),
+			( block ) => -itemsByName[ block.name ].frecency,
+		);
+
 		const sourceBlockName = blocks[ 0 ].name;
 		const blockType = getBlockType( sourceBlockName );
 		const hasStyles = blocks.length === 1 && get( blockType, [ 'styles' ], [] ).length !== 0;
 
-		if ( ! hasStyles && ( ! allowedBlocks.length || isLocked ) ) {
+		if ( ! hasStyles && ( ! possibleBlockTransformations.length ) ) {
 			return null;
 		}
 
@@ -97,13 +105,13 @@ export class BlockSwitcher extends Component {
 								/>
 							</PanelBody>
 						}
-						{ allowedBlocks.length !== 0 && ! isLocked &&
+						{ possibleBlockTransformations.length !== 0 &&
 							<PanelBody
 								title={ __( 'Transform To:' ) }
 								initialOpen
 							>
 								<BlockTypesList
-									items={ allowedBlocks.map( ( destinationBlockType ) => ( {
+									items={ possibleBlockTransformations.map( ( destinationBlockType ) => ( {
 										id: destinationBlockType.name,
 										icon: destinationBlockType.icon,
 										title: destinationBlockType.title,
@@ -131,14 +139,12 @@ export class BlockSwitcher extends Component {
 }
 
 export default compose(
-	withSelect( ( select, ownProps ) => {
-		const { getBlock, getBlockRootClientId, getTemplateLock } = select( 'core/editor' );
+	withSelect( ( select, { clientIds } ) => {
+		const { getBlocksByClientId, getBlockRootClientId, getInserterItems } = select( 'core/editor' );
+		const rootClientId = getBlockRootClientId( first( castArray( clientIds ) ) );
 		return {
-			blocks: ownProps.clientIds.map( getBlock ),
-			isLocked: some(
-				castArray( ownProps.clientIds ),
-				( clientId ) => !! getTemplateLock( getBlockRootClientId( clientId ) )
-			),
+			blocks: getBlocksByClientId( clientIds ),
+			inserterItems: getInserterItems( rootClientId ),
 		};
 	} ),
 	withDispatch( ( dispatch, ownProps ) => ( {
diff --git a/packages/editor/src/components/block-switcher/test/index.js b/packages/editor/src/components/block-switcher/test/index.js
index 1d9734a0852c1e..26a71eeb4a2138 100644
--- a/packages/editor/src/components/block-switcher/test/index.js
+++ b/packages/editor/src/components/block-switcher/test/index.js
@@ -92,7 +92,11 @@ describe( 'BlockSwitcher', () => {
 		const blocks = [
 			headingBlock1,
 		];
-		const wrapper = shallow( <BlockSwitcher blocks={ blocks } /> );
+		const inserterItems = [
+			{ name: 'core/paragraph', frecency: 1 },
+		];
+
+		const wrapper = shallow( <BlockSwitcher blocks={ blocks } inserterItems={ inserterItems } /> );
 
 		expect( wrapper ).toMatchSnapshot();
 	} );
@@ -122,9 +126,17 @@ describe( 'BlockSwitcher', () => {
 			headingBlock1,
 		];
 
+		const inserterItems = [
+			{ name: 'core/quote', frecency: 1 },
+			{ name: 'core/cover-image', frecency: 2 },
+			{ name: 'core/paragraph', frecency: 3 },
+			{ name: 'core/heading', frecency: 4 },
+			{ name: 'core/text', frecency: 5 },
+		];
+
 		const onTransformStub = jest.fn();
 		const getDropdown = () => {
-			const blockSwitcher = shallow( <BlockSwitcher blocks={ blocks } onTransform={ onTransformStub } /> );
+			const blockSwitcher = shallow( <BlockSwitcher blocks={ blocks } onTransform={ onTransformStub } inserterItems={ inserterItems } /> );
 			return blockSwitcher.find( 'Dropdown' );
 		};