made changes as per github feedback

poojabhimani12 · Aug 29, 2024 · b8b0292 · b8b0292
2 parents 4104869 + 9de8c69
commit b8b0292
Show file tree

Hide file tree

Showing 10 changed files with 1,331 additions and 1,872 deletions.
diff --git a/lib/experiments-page.php b/lib/experiments-page.php
@@ -165,12 +165,12 @@ function gutenberg_initialize_experiments_settings() {
 
 	add_settings_field(
 		'gutenberg-block-comment',
-		__( 'Enable multi-user commenting on blocks', 'gutenberg' ),
+		__( 'Comments', 'gutenberg' ),
 		'gutenberg_display_experiment_field',
 		'gutenberg-experiments',
 		'gutenberg_experiments_section',
 		array(
-			'label' => __( 'Comments', 'gutenberg' ),
+			'label' => __( 'Enable multi-user commenting on blocks', 'gutenberg' ),
 			'id'    => 'gutenberg-block-comment',
 		)
 	);

diff --git a/packages/block-editor/src/components/block-toolbar/index.js b/packages/block-editor/src/components/block-toolbar/index.js
@@ -99,10 +99,10 @@ export function PrivateBlockToolbar( {
 				!! getBlockAttributes( clientId )?.metadata?.bindings
 		);
 
-		// eslint-disable-next-line @wordpress/data-no-store-string-literals
-		const commentID = select( 'core/block-editor' ).getBlock(
-			selectedBlockClientId
-		)?.attributes?.blockCommentId;
+		const commentID =
+			// eslint-disable-next-line @wordpress/data-no-store-string-literals
+			select( 'core/block-editor' ).getBlock( selectedBlockClientId )
+				?.attributes?.blockCommentId || null;
 
 		return {
 			blockClientId: selectedBlockClientId,

diff --git a/packages/block-editor/src/components/collab/block-comment-menu-item.js b/packages/block-editor/src/components/collab/block-comment-menu-item.js
@@ -6,14 +6,14 @@ import { MenuItem } from '@wordpress/components';
 import { collabComment } from '@wordpress/icons';
 import { useDispatch } from '@wordpress/data';
 
-export default function BlockCommentMenuItem( { clientId, onClose } ) {
-
+export default function BlockCommentMenuItem( { onClose } ) {
+	// eslint-disable-next-line @wordpress/data-no-store-string-literals
 	const { openGeneralSidebar } = useDispatch( 'core/edit-post' );
 
 	const openCollabBoard = () => {
 		onClose();
-		openGeneralSidebar("edit-post/collab-sidebar");
-	}
+		openGeneralSidebar( 'edit-post/collab-sidebar' );
+	};
 
 	return (
 		<MenuItem
@@ -22,6 +22,6 @@ export default function BlockCommentMenuItem( { clientId, onClose } ) {
 			aria-haspopup="dialog"
 		>
 			{ __( 'Add Comment' ) }
-		</MenuItem>	 
+		</MenuItem>
 	);
 }
diff --git a/packages/block-editor/src/components/collab/test/__snapshots__/index.js.snap b/packages/block-editor/src/components/collab/test/__snapshots__/index.js.snap