Annotations: Merge assigned block className with incoming prop (#21184)

WordPress · Mar 27, 2020 · d15e01c · d15e01c
1 parent 304a5f0
commit d15e01c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/packages/annotations/src/block/index.js b/packages/annotations/src/block/index.js
@@ -11,7 +11,7 @@ import { withSelect } from '@wordpress/data';
  * @return {Object} The enhanced component.
  */
 const addAnnotationClassName = ( OriginalComponent ) => {
-	return withSelect( ( select, { clientId } ) => {
+	return withSelect( ( select, { clientId, className } ) => {
 		const annotations = select(
 			'core/annotations'
 		).__experimentalGetAnnotationsForBlock( clientId );
@@ -21,6 +21,8 @@ const addAnnotationClassName = ( OriginalComponent ) => {
 				.map( ( annotation ) => {
 					return 'is-annotated-by-' + annotation.source;
 				} )
+				.concat( className )
+				.filter( Boolean )
 				.join( ' ' ),
 		};
 	} )( OriginalComponent );