Allow background color again to avoid compatibility errors

WordPress · Feb 7, 2022 · 1ca9bd1 · 1ca9bd1
1 parent c20e700
commit 1ca9bd1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
@@ -104,7 +104,7 @@ Add the avatar of this comment's author. ([Source](https://github.com/WordPress/
 
 -	**Name:** core/comment-author-avatar
 -	**Category:** theme
--	**Supports:** spacing (margin, padding), ~~html~~
+-	**Supports:** color (background, ~~text~~), spacing (margin, padding), ~~html~~
 -	**Attributes:** height, width
 
 ## Comment Author Name

diff --git a/packages/block-library/src/comment-author-avatar/block.json b/packages/block-library/src/comment-author-avatar/block.json
@@ -26,6 +26,10 @@
 			"color": true,
 			"style": true
 		},
+		"color": {
+			"background": true,
+			"text": false
+		},
 		"spacing": {
 			"__experimentalSkipSerialization": true,
 			"margin": true,

diff --git a/packages/block-library/src/comment-template/edit.js b/packages/block-library/src/comment-template/edit.js
@@ -28,11 +28,6 @@ const TEMPLATE = [
 	[ 'core/comment-edit-link' ],
 ];
 
-/**
- * External dependencies
- */
-import { uniqueId } from 'lodash';
-
 /**
  * Component which renders the inner blocks of the Comment Template.
  *
@@ -100,9 +95,9 @@ const CommentsList = ( {
 } ) => (
 	<ol { ...blockProps }>
 		{ comments &&
-			comments.map( ( comment ) => (
+			comments.map( ( comment, index ) => (
 				<BlockContextProvider
-					key={ comment.commentId || uniqueId( 'comment-default' ) }
+					key={ comment.commentId || index }
 					value={ comment }
 				>
 					<CommentTemplateInnerBlocks