Blocks: Simplify BlockContent context HOC implementation

packages/blocks/src/block-content-provider/index.js

@@ -40,29 +40,25 @@ const BlockContentProvider = ( { children, innerBlocks } ) => {
 	};
 
 	return (
-		<Provider value={ { BlockContent } }>
+		<Provider value={ BlockContent }>
 			{ children }
 		</Provider>
 	);
 };
 
 /**
- * A Higher Order Component used to inject BlockContent context to the
+ * A Higher Order Component used to inject BlockContent using context to the
  * wrapped component.
  *
- * @param {Function} mapContextToProps Function called on every context change,
- *                                     expected to return object of props to
- *                                     merge with the component's own props.
- *
- * @return {Component} Enhanced component with injected context as props.
+ * @return {Component} Enhanced component with injected BlockContent as prop.
  */
-export const withBlockContentContext = ( mapContextToProps ) => createHigherOrderComponent( ( OriginalComponent ) => {
+export const withBlockContentContext = createHigherOrderComponent( ( OriginalComponent ) => {
 	return ( props ) => (
 		<Consumer>
 			{ ( context ) => (
 				<OriginalComponent
 					{ ...props }
-					{ ...mapContextToProps( context, props ) }
+					BlockContent={ context }
 				/>
 			) }
 		</Consumer>

packages/editor/src/components/inner-blocks/index.js

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { pick, identity, isEqual, map } from 'lodash';
+import { pick, isEqual, map } from 'lodash';
 import classnames from 'classnames';
 
 /**
@@ -149,8 +149,6 @@ InnerBlocks = compose( [
 ] )( InnerBlocks );
 
 InnerBlocks.Content = withBlockContentContext(
-	identity
-)(
 	( { BlockContent } ) => <BlockContent />
 );