Improve transformations to only transform to blocks that can be inser…

…ted on the root block
WordPress · Jun 6, 2018 · 33a2421 · 33a2421
1 parent 5984cdf
commit 33a2421
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 28 deletions.
diff --git a/editor/components/block-settings-menu/block-transformations.js b/editor/components/block-settings-menu/block-transformations.js
@@ -1,13 +1,13 @@
 /**
  * External dependencies
  */
-import { noop } from 'lodash';
+import { castArray, filter, first, mapKeys, noop, sortBy } from 'lodash';
 
 /**
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { IconButton } from '@wordpress/components';
+import { IconButton, ifCondition } from '@wordpress/components';
 import { getPossibleBlockTransformations, switchToBlockType } from '@wordpress/blocks';
 import { compose, Fragment } from '@wordpress/element';
 import { withSelect, withDispatch } from '@wordpress/data';
@@ -17,9 +17,16 @@ import { withSelect, withDispatch } from '@wordpress/data';
  */
 import './style.scss';
 
-function BlockTransformations( { blocks, small = false, onTransform, onClick = noop, isLocked, itemsRole } ) {
-	const possibleBlockTransformations = getPossibleBlockTransformations( blocks );
-	if ( isLocked || ! possibleBlockTransformations.length ) {
+function BlockTransformations( { blocks, small = false, onTransform, onClick = noop, inserterItems, itemsRole } ) {
+	const itemsByName = mapKeys( inserterItems, ( { name } ) => name );
+	const possibleBlockTransformations = sortBy(
+		filter(
+			getPossibleBlockTransformations( blocks ),
+			( block ) => !! itemsByName[ block.name ]
+		),
+		( block ) => -itemsByName[ block.name ].frecency,
+	);
+	if ( ! possibleBlockTransformations.length ) {
 		return null;
 	}
 	return (
@@ -52,13 +59,14 @@ function BlockTransformations( { blocks, small = false, onTransform, onClick = n
 }
 export default compose( [
 	withSelect( ( select, { uids } ) => {
-		const { getEditorSettings, getBlocksByUID } = select( 'core/editor' );
-		const { templateLock } = getEditorSettings();
+		const { getBlocksByUID, getBlockRootUID, getInserterItems } = select( 'core/editor' );
+		const rootUID = getBlockRootUID( first( castArray( uids ) ) );
 		return {
-			isLocked: !! templateLock,
 			blocks: getBlocksByUID( uids ),
+			inserterItems: getInserterItems( rootUID ),
 		};
 	} ),
+	ifCondition( ( { inserterItems } ) => inserterItems.length > 0 ),
 	withDispatch( ( dispatch, ownProps ) => ( {
 		onTransform( blocks, name ) {
 			dispatch( 'core/editor' ).replaceBlocks(

diff --git a/editor/components/block-switcher/index.js b/editor/components/block-switcher/index.js
@@ -1,8 +1,13 @@
+/**
+ * External dependencies
+ */
+import { castArray, filter, first, mapKeys, sortBy } from 'lodash';
+
 /**
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { Dropdown, Dashicon, IconButton, Toolbar, NavigableMenu } from '@wordpress/components';
+import { Dropdown, Dashicon, IconButton, ifCondition, Toolbar, NavigableMenu } from '@wordpress/components';
 import { getBlockType, getPossibleBlockTransformations, switchToBlockType } from '@wordpress/blocks';
 import { compose } from '@wordpress/element';
 import { keycodes } from '@wordpress/utils';
@@ -19,10 +24,17 @@ import BlockIcon from '../block-icon';
  */
 const { DOWN } = keycodes;
 
-export function BlockSwitcher( { blocks, onTransform, isLocked } ) {
-	const allowedBlocks = getPossibleBlockTransformations( blocks );
+export function BlockSwitcher( { blocks, onTransform, inserterItems } ) {
+	const itemsByName = mapKeys( inserterItems, ( { name } ) => name );
+	const possibleBlockTransformations = sortBy(
+		filter(
+			getPossibleBlockTransformations( blocks ),
+			( block ) => !! itemsByName[ block.name ]
+		),
+		( block ) => -itemsByName[ block.name ].frecency,
+	);
 
-	if ( isLocked || ! allowedBlocks.length ) {
+	if ( ! possibleBlockTransformations.length ) {
 		return null;
 	}
 
@@ -71,7 +83,7 @@ export function BlockSwitcher( { blocks, onTransform, isLocked } ) {
 						role="menu"
 						aria-label={ __( 'Block types' ) }
 					>
-						{ allowedBlocks.map( ( { name, title, icon } ) => (
+						{ possibleBlockTransformations.map( ( { name, title, icon } ) => (
 							<IconButton
 								key={ name }
 								onClick={ () => {
@@ -97,14 +109,15 @@ export function BlockSwitcher( { blocks, onTransform, isLocked } ) {
 }
 
 export default compose(
-	withSelect( ( select, ownProps ) => {
-		const { getBlock, getEditorSettings } = select( 'core/editor' );
-		const { templateLock } = getEditorSettings();
+	withSelect( ( select, { uids } ) => {
+		const { getBlocksByUID, getBlockRootUID, getInserterItems } = select( 'core/editor' );
+		const rootUID = getBlockRootUID( first( castArray( uids ) ) );
 		return {
-			blocks: ownProps.uids.map( getBlock ),
-			isLocked: !! templateLock,
+			blocks: getBlocksByUID( uids ),
+			inserterItems: getInserterItems( rootUID ),
 		};
 	} ),
+	ifCondition( ( { inserterItems } ) => inserterItems.length > 0 ),
 	withDispatch( ( dispatch, ownProps ) => ( {
 		onTransform( blocks, name ) {
 			dispatch( 'core/editor' ).replaceBlocks(

diff --git a/editor/components/block-switcher/test/__snapshots__/index.js.snap b/editor/components/block-switcher/test/__snapshots__/index.js.snap
@@ -1,10 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`BlockSwitcher should render switcher with blocks 1`] = `
-<Dropdown
-  className="editor-block-switcher"
-  contentClassName="editor-block-switcher__popover"
-  renderContent={[Function]}
-  renderToggle={[Function]}
-/>
-`;
+exports[`BlockSwitcher should render switcher with blocks 1`] = `""`;
diff --git a/editor/components/block-switcher/test/__snapshots__/multi-blocks-switcher.js.snap b/editor/components/block-switcher/test/__snapshots__/multi-blocks-switcher.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`MultiBlocksSwitcher should return a BlockSwitcher element matching the snapshot. 1`] = `
-<WithSelect(WithDispatch(BlockSwitcher))
+<WithSelect(IfCondition(WithDispatch(BlockSwitcher)))
   key="switcher"
   uids={
     Array [

diff --git a/editor/components/block-switcher/test/index.js b/editor/components/block-switcher/test/index.js
@@ -94,9 +94,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' );
 		};