Improve child blocks API's and UI.

blocks/api/index.js

@@ -34,6 +34,8 @@ export {
 	getBlockSupport,
 	hasBlockSupport,
 	isSharedBlock,
+	getChildBlockNames,
+	hasChildBlocks,
 } from './registration';
 export {
 	isUnmodifiedDefaultBlock,

blocks/api/registration.js

@@ -288,3 +288,25 @@ export function hasBlockSupport( nameOrType, feature, defaultSupports ) {
 export function isSharedBlock( blockOrType ) {
 	return blockOrType.name === 'core/block';
 }
+/**
+ * Returns an array with the child blocks of a given block.
+ *
+ * @param {string} blockName Block type name.
+ *
+ * @return {Array} Array of child block names.
+ */
+
+export const getChildBlockNames = ( blockName ) => {
+	return select( 'core/blocks' ).getChildBlockNames( blockName );
+};
+
+/**
+ * Returns a boolean indicating if a block has child blocks or not.
+ *
+ * @param {string} blockName Block type name.
+ *
+ * @return {boolean} True if a block contains child blocks and false otherwise.
+ */
+export const hasChildBlocks = ( blockName ) => {
+	return select( 'core/blocks' ).hasChildBlocks( blockName );
+};

blocks/store/selectors.js

@@ -2,6 +2,7 @@
  * External dependencies
  */
 import createSelector from 'rememo';
+import { filter, includes, map } from 'lodash';
 
 /**
  * Returns all the available block types.
@@ -61,3 +62,37 @@ export function getDefaultBlockName( state ) {
 export function getFallbackBlockName( state ) {
 	return state.fallbackBlockName;
 }
+
+/**
+ * Returns an array with the child blocks of a given block.
+ *
+ * @param {Object} state     Data state.
+ * @param {string} blockName Block type name.
+ *
+ * @return {Array} Array of child block names.
+ */
+export const getChildBlockNames = createSelector(
+	( state, blockName ) => {
+		return map(
+			filter( state.blockTypes, ( blockType ) => {
+				return includes( blockType.parent, blockName );
+			} ),
+			( { name } ) => name
+		);
+	},
+	( state ) => [
+		state.blockTypes,
+	]
+);
+
+/**
+ * Returns a boolean indicating if a block has child blocks or not.
+ *
+ * @param {Object} state     Data state.
+ * @param {string} blockName Block type name.
+ *
+ * @return {boolean} True if a block contains child blocks and false otherwise.
+ */
+export const hasChildBlocks = ( state, blockName ) => {
+	return getChildBlockNames( state, blockName ).length > 0;
+};

blocks/store/test/selectors.js

@@ -0,0 +1,137 @@
+/**
+ * Internal dependencies
+ */
+import { getChildBlockNames } from '../selectors';
+
+describe( 'selectors', () => {
+	describe( 'getChildBlockNames', () => {
+		it( 'should return an empty array if state is empty', () => {
+			const state = {};
+
+			expect( getChildBlockNames( state, 'parent1' ) ).toHaveLength( 0 );
+		} );
+
+		it( 'should return an empty array if no childs exist', () => {
+			const state = {
+				blockTypes: [
+					{
+						name: 'child1',
+						parent: [ 'parent1' ],
+					},
+					{
+						name: 'child2',
+						parent: [ 'parent2' ],
+					},
+					{
+						name: 'parent3',
+					},
+				],
+			};
+
+			expect( getChildBlockNames( state, 'parent3' ) ).toHaveLength( 0 );
+		} );
+
+		it( 'should return an empty array if the parent block is not found', () => {
+			const state = {
+				blockTypes: [
+					{
+						name: 'child1',
+						parent: [ 'parent1' ],
+					},
+					{
+						name: 'parent1',
+					},
+				],
+			};
+
+			expect( getChildBlockNames( state, 'parent3' ) ).toHaveLength( 0 );
+		} );
+
+		it( 'should return an array with the child block names', () => {
+			const state = {
+				blockTypes: [
+					{
+						name: 'child1',
+						parent: [ 'parent1' ],
+					},
+					{
+						name: 'child2',
+						parent: [ 'parent2' ],
+					},
+					{
+						name: 'child3',
+						parent: [ 'parent1' ],
+					},
+					{
+						name: 'child4',
+					},
+					{
+						name: 'parent1',
+					},
+					{
+						name: 'parent2',
+					},
+				],
+			};
+
+			expect( getChildBlockNames( state, 'parent1' ) ).toEqual( [ 'child1', 'child3' ] );
+		} );
+
+		it( 'should return an array with the child block names even if only one child exists', () => {
+			const state = {
+				blockTypes: [
+					{
+						name: 'child1',
+						parent: [ 'parent1' ],
+					},
+					{
+						name: 'child2',
+						parent: [ 'parent2' ],
+					},
+					{
+						name: 'child4',
+					},
+					{
+						name: 'parent1',
+					},
+					{
+						name: 'parent2',
+					},
+				],
+			};
+
+			expect( getChildBlockNames( state, 'parent1' ) ).toEqual( [ 'child1' ] );
+		} );
+
+		it( 'should return an array with the child block names even if childs have multiple parents', () => {
+			const state = {
+				blockTypes: [
+					{
+						name: 'child1',
+						parent: [ 'parent1' ],
+					},
+					{
+						name: 'child2',
+						parent: [ 'parent1', 'parent2' ],
+					},
+					{
+						name: 'child3',
+						parent: [ 'parent1' ],
+					},
+					{
+						name: 'child4',
+					},
+					{
+						name: 'parent1',
+					},
+					{
+						name: 'parent2',
+					},
+				],
+			};
+
+			expect( getChildBlockNames( state, 'parent1' ) ).toEqual( [ 'child1', 'child2', 'child3' ] );
+			expect( getChildBlockNames( state, 'parent2' ) ).toEqual( [ 'child2' ] );
+		} );
+	} );
+} );

edit-post/assets/stylesheets/_variables.scss

@@ -26,7 +26,7 @@ $admin-sidebar-width-big: 190px;
 $admin-sidebar-width-collapsed: 36px;
 
 // Visuals
-$shadow-popover: 0 3px 20px rgba( $dark-gray-900, .1 ), 0 1px 3px rgba( $dark-gray-900, .1 );
+$shadow-popover: 0 3px 30px rgba( $dark-gray-900, .1 );
 $shadow-toolbar: 0 2px 10px rgba( $dark-gray-900, .1 ), 0 0 2px rgba( $dark-gray-900, .1 );
 $shadow-below-only: 0 5px 10px rgba( $dark-gray-900, .1 ), 0 2px 2px rgba( $dark-gray-900, .1 );
 

editor/components/inserter/child-blocks.js

@@ -0,0 +1,29 @@
+/**
+ * Internal dependencies
+ */
+import './style.scss';
+import ItemList from './item-list';
+import BlockIcon from '../block-icon';
+
+function ChildBlocks( { rootBlockIcon, rootBlockTitle, items, ...props } ) {
+	if ( ! items || ! items.length ) {
+		return null;
+	}
+	return (
+		<div className="editor-inserter__child-blocks">
+			{ ( rootBlockIcon || rootBlockTitle ) && (
+				<div className="editor-inserter__parent-block-header">
+					{ rootBlockIcon && (
+						<div className="editor-inserter__parent-block-icon">
+							<BlockIcon icon={ rootBlockIcon } />
+						</div>
+					) }
+					{ rootBlockTitle && <h2>{ rootBlockTitle }</h2> }
+				</div>
+			) }
+			<ItemList items={ items } { ...props } />
+		</div>
+	);
+}
+
+export default ChildBlocks;

editor/components/inserter/index.js

@@ -41,6 +41,7 @@ class Inserter extends Component {
 			title,
 			children,
 			onInsertBlock,
+			rootUID,
 		} = this.props;
 
 		if ( items.length === 0 ) {
@@ -74,7 +75,7 @@ class Inserter extends Component {
 						onClose();
 					};
 
-					return <InserterMenu items={ items } onSelect={ onSelect } />;
+					return <InserterMenu items={ items } onSelect={ onSelect } rootUID={ rootUID } />;
 				} }
 			/>
 		);
@@ -96,6 +97,7 @@ export default compose( [
 			insertionPoint,
 			selectedBlock: getSelectedBlock(),
 			items: getInserterItems( rootUID ),
+			rootUID,
 		};
 	} ),
 	withDispatch( ( dispatch, ownProps ) => ( {

editor/components/inserter/item-list.js

@@ -74,7 +74,15 @@ class ItemList extends Component {
 						<button
 							role="menuitem"
 							key={ item.id }
-							className={ classnames( 'editor-inserter__item', getBlockMenuDefaultClassName( item.id ) ) }
+							className={
+								classnames(
+									'editor-inserter__item',
+									getBlockMenuDefaultClassName( item.id ),
+									{
+										'editor-inserter__item-with-childs': item.hasChildBlocks,
+									}
+								)
+							}
 							onClick={ () => onSelect( item ) }
 							tabIndex={ isCurrent || item.isDisabled ? null : '-1' }
 							disabled={ item.isDisabled }