Use in InnerBlocks.Content internally

WordPress · Oct 12, 2020 · f3ce3f2 · f3ce3f2
1 parent 1a0cec1
commit f3ce3f2
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 32 deletions.
diff --git a/packages/block-editor/src/components/inner-blocks/index.js b/packages/block-editor/src/components/inner-blocks/index.js
@@ -11,7 +11,6 @@ import { forwardRef, useRef } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
 import {
 	getBlockType,
-	withBlockContentContext,
 	__unstableGetInnerBlocksProps as getInnerBlocksProps,
 } from '@wordpress/blocks';
 
@@ -190,9 +189,7 @@ useInnerBlocksProps.save = getInnerBlocksProps;
 ForwardedInnerBlocks.DefaultBlockAppender = DefaultBlockAppender;
 ForwardedInnerBlocks.ButtonBlockAppender = ButtonBlockAppender;
 
-ForwardedInnerBlocks.Content = withBlockContentContext(
-	( { BlockContent } ) => <BlockContent />
-);
+ForwardedInnerBlocks.Content = () => useInnerBlocksProps.save().children;
 
 /**
  * @see https://github.com/WordPress/gutenberg/blob/master/packages/block-editor/src/components/inner-blocks/README.md

diff --git a/packages/block-library/src/buttons/save.js b/packages/block-library/src/buttons/save.js
@@ -1,12 +1,8 @@
 /**
  * WordPress dependencies
  */
-import { InnerBlocks, useBlockProps } from '@wordpress/block-editor';
+import { useBlockProps, useInnerBlocksProps } from '@wordpress/block-editor';
 
 export default function save() {
-	return (
-		<div { ...useBlockProps.save() }>
-			<InnerBlocks.Content />
-		</div>
-	);
+	return <div { ...useInnerBlocksProps.save( useBlockProps.save() ) } />;
 }
diff --git a/packages/block-library/src/cover/save.js b/packages/block-library/src/cover/save.js
@@ -7,7 +7,7 @@ import classnames from 'classnames';
  * WordPress dependencies
  */
 import {
-	InnerBlocks,
+	useInnerBlocksProps,
 	getColorClassName,
 	__experimentalGetGradientClass,
 	useBlockProps,
@@ -122,9 +122,11 @@ export default function save( { attributes } ) {
 					style={ videoStyle }
 				/>
 			) }
-			<div className="wp-block-cover__inner-container">
-				<InnerBlocks.Content />
-			</div>
+			<div
+				{ ...useInnerBlocksProps.save( {
+					className: 'wp-block-cover__inner-container',
+				} ) }
+			/>
 		</div>
 	);
 }
diff --git a/packages/block-library/src/group/save.js b/packages/block-library/src/group/save.js
@@ -1,16 +1,18 @@
 /**
  * WordPress dependencies
  */
-import { InnerBlocks, useBlockProps } from '@wordpress/block-editor';
+import { useInnerBlocksProps, useBlockProps } from '@wordpress/block-editor';
 
 export default function save( { attributes } ) {
 	const { tagName: Tag } = attributes;
 
 	return (
 		<Tag { ...useBlockProps.save() }>
-			<div className="wp-block-group__inner-container">
-				<InnerBlocks.Content />
-			</div>
+			<div
+				{ ...useInnerBlocksProps.save( {
+					className: 'wp-block-group__inner-container',
+				} ) }
+			/>
 		</Tag>
 	);
 }
diff --git a/packages/block-library/src/media-text/save.js b/packages/block-library/src/media-text/save.js
@@ -7,7 +7,7 @@ import { noop, isEmpty } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { InnerBlocks, useBlockProps } from '@wordpress/block-editor';
+import { useInnerBlocksProps, useBlockProps } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
@@ -95,9 +95,11 @@ export default function save( { attributes } ) {
 			>
 				{ ( mediaTypeRenders[ mediaType ] || noop )() }
 			</figure>
-			<div className="wp-block-media-text__content">
-				<InnerBlocks.Content />
-			</div>
+			<div
+				{ ...useInnerBlocksProps.save( {
+					className: 'wp-block-media-text__content',
+				} ) }
+			/>
 		</div>
 	);
 }
diff --git a/packages/blocks/src/api/serializer.js b/packages/blocks/src/api/serializer.js
@@ -24,7 +24,6 @@ import {
 	getUnregisteredTypeHandlerName,
 } from './registration';
 import { normalizeBlockType } from './utils';
-import BlockContentProvider from '../block-content-provider';
 
 /**
  * @typedef {Object} WPBlockSerializationOptions Serialization Options.
@@ -139,9 +138,9 @@ export function getSaveElement(
 	let element = save( { attributes, innerBlocks } );
 
 	if (
+		! blockType.apiVersion &&
 		isObject( element ) &&
-		hasFilter( 'blocks.getSaveContent.extraProps' ) &&
-		! blockType.apiVersion
+		hasFilter( 'blocks.getSaveContent.extraProps' )
 	) {
 		/**
 		 * Filters the props applied to the block save result element.
@@ -169,18 +168,12 @@ export function getSaveElement(
 	 * @param {WPBlock}   blockType  Block type definition.
 	 * @param {Object}    attributes Block attributes.
 	 */
-	element = applyFilters(
+	return applyFilters(
 		'blocks.getSaveElement',
 		element,
 		blockType,
 		attributes
 	);
-
-	return (
-		<BlockContentProvider innerBlocks={ innerBlocks }>
-			{ element }
-		</BlockContentProvider>
-	);
 }
 
 /**