Include template when not in legacy

WordPress · Jun 22, 2022 · 7f011ec · 7f011ec
1 parent b7cbf97
commit 7f011ec
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/packages/block-library/src/comments/edit/index.js b/packages/block-library/src/comments/edit/index.js
@@ -23,12 +23,12 @@ import { useEntityProp, store as coreStore } from '@wordpress/core-data';
  */
 import CommentsInspectorControls from './comments-inspector-controls';
 import Placeholder from './placeholder';
+import TEMPLATE from './template';
 
 export default function PostCommentsEdit( {
 	attributes,
 	setAttributes,
 	context: { postType, postId },
-	clientId,
 } ) {
 	const { tagName: TagName, textAlign } = attributes;
 
@@ -45,10 +45,6 @@ export default function PostCommentsEdit( {
 				.__experimentalDiscussionSettings
 	);
 
-	const innerBlocks = useSelect( ( select ) =>
-		select( blockEditorStore ).getBlocks( clientId )
-	);
-
 	const isSiteEditor = postType === undefined || postId === undefined;
 
 	const postTypeSupportsComments = useSelect( ( select ) =>
@@ -92,9 +88,11 @@ export default function PostCommentsEdit( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
-	const innerBlocksProps = useInnerBlocksProps( blockProps );
+	const innerBlocksProps = useInnerBlocksProps( blockProps, {
+		template: TEMPLATE,
+	} );
 
-	if ( innerBlocks.length > 0 ) {
+	if ( ! attributes.legacy ) {
 		return (
 			<>
 				<CommentsInspectorControls