From 07c85f6838164210516cb01dde2332999244657e Mon Sep 17 00:00:00 2001
From: karthick-murugan <karthick.murugan02@gmail.com>
Date: Thu, 28 Nov 2024 12:08:09 +0530
Subject: [PATCH] Feedback Changes

---
 .../src/components/collab-sidebar/comments.js | 60 ++++++++++++++++++-
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/packages/editor/src/components/collab-sidebar/comments.js b/packages/editor/src/components/collab-sidebar/comments.js
index 808ea0acf04b3..5e5b3397cd96d 100644
--- a/packages/editor/src/components/collab-sidebar/comments.js
+++ b/packages/editor/src/components/collab-sidebar/comments.js
@@ -6,7 +6,7 @@ import clsx from 'clsx';
 /**
  * WordPress dependencies
  */
-import { useState, RawHTML } from '@wordpress/element';
+import { useState, RawHTML, useEffect } from '@wordpress/element';
 import {
 	__experimentalHStack as HStack,
 	__experimentalVStack as VStack,
@@ -17,7 +17,7 @@ import {
 } from '@wordpress/components';
 import { Icon, check, published, moreVertical } from '@wordpress/icons';
 import { __, _x } from '@wordpress/i18n';
-import { useSelect } from '@wordpress/data';
+import { useSelect, useDispatch } from '@wordpress/data';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 
 /**
@@ -46,6 +46,8 @@ export function Comments( {
 } ) {
 	const [ actionState, setActionState ] = useState( false );
 	const [ isConfirmDialogOpen, setIsConfirmDialogOpen ] = useState( false );
+	const [ activeClientId, setActiveClientId ] = useState( null );
+	const [ blocksList, setBlocksList ] = useState( null );
 
 	const handleConfirmDelete = () => {
 		onCommentDelete( actionState.id );
@@ -72,6 +74,59 @@ export function Comments( {
 		);
 	}, [] );
 
+	const { selectedClientBlocks, selectedActiveClientId } = useSelect(
+		( select ) => {
+			const clientID =
+				select( blockEditorStore ).getSelectedBlockClientId();
+			const selClientBlocks = select( blockEditorStore ).getBlocks();
+
+			const getBlockCommentId =
+				select( blockEditorStore ).getBlock( clientID )?.attributes
+					?.blockCommentId ?? false;
+
+			return {
+				selectedClientBlocks: selClientBlocks,
+				selectedActiveClientId: getBlockCommentId || null,
+			};
+		},
+		[]
+	);
+
+	useEffect( () => {
+		setBlocksList( selectedClientBlocks );
+
+		if ( selectedActiveClientId ) {
+			setActiveClientId( selectedActiveClientId );
+		}
+	}, [ selectedClientBlocks, selectedActiveClientId ] );
+
+	const findBlockByCommentId = ( blocks, commentId ) => {
+		for ( const block of blocks ) {
+			if ( block.attributes.blockCommentId === commentId ) {
+				return block;
+			}
+			if ( block.innerBlocks && block.innerBlocks.length > 0 ) {
+				const foundBlock = findBlockByCommentId(
+					block.innerBlocks,
+					commentId
+				);
+				if ( foundBlock ) {
+					return foundBlock;
+				}
+			}
+		}
+		return null;
+	};
+
+	const { selectBlock } = useDispatch( blockEditorStore );
+	const handleThreadClick = ( thread ) => {
+		const block = findBlockByCommentId( blocksList, thread.id );
+		console.log( 'block', block );
+		if ( block ) {
+			selectBlock( block.clientId ); // Use the action to select the block
+		}
+	};
+
 	const CommentBoard = ( { thread, parentThread } ) => {
 		return (
 			<>
@@ -202,6 +257,7 @@ export function Comments( {
 						) }
 						id={ thread.id }
 						spacing="3"
+						onClick={ () => handleThreadClick( thread ) }
 					>
 						<CommentBoard thread={ thread } />
 						{ 0 < thread?.reply?.length &&