trial: remove double sidebars & use just one to see if the issue is fixed

yashjawale · yashjawale · commit 9f65fac8f9d2 · 2025-09-09T18:26:55.000+05:30
diff --git a/packages/editor/src/components/collab-sidebar/constants.js b/packages/editor/src/components/collab-sidebar/constants.js
@@ -1,2 +1 @@
-export const collabHistorySidebarName = 'edit-post/collab-history-sidebar';
 export const collabSidebarName = 'edit-post/collab-sidebar';
diff --git a/packages/editor/src/components/collab-sidebar/index.js b/packages/editor/src/components/collab-sidebar/index.js
@@ -20,7 +20,7 @@ import { store as interfaceStore } from '@wordpress/interface';
  * Internal dependencies
  */
 import PluginSidebar from '../plugin-sidebar';
-import { collabHistorySidebarName, collabSidebarName } from './constants';
+import { collabSidebarName } from './constants';
 import { Comments } from './comments';
 import { AddComment } from './add-comment';
 import { store as editorStore } from '../../store';
@@ -257,7 +257,7 @@ export default function CollabSidebar() {
 
 	const openCollabBoard = () => {
 		setShowCommentBoard( true );
-		enableComplementaryArea( 'core', 'edit-post/collab-sidebar' );
+		enableComplementaryArea( 'core', collabSidebarName );
 	};
 
 	const [ blocks ] = useEntityBlockEditor( 'postType', postType, {
@@ -339,26 +339,18 @@ export default function CollabSidebar() {
 		<>
 			<AddCommentComponent onClick={ openCollabBoard } />
 			<PluginSidebar
-				identifier={ collabHistorySidebarName }
-				// translators: Comments sidebar title
-				title={ __( 'Comments' ) }
-				icon={ commentIcon }
-			>
-				<CollabSidebarContent
-					comments={ resultComments }
-					showCommentBoard={ showCommentBoard }
-					setShowCommentBoard={ setShowCommentBoard }
-				/>
-			</PluginSidebar>
-			<PluginSidebar
-				isPinnable={ false }
-				header={ false }
+				isPinnable
 				identifier={ collabSidebarName }
 				className="editor-collab-sidebar"
 				headerClassName="editor-collab-sidebar__header"
+				// translators: Comments sidebar title
+				title={ __( 'Comments' ) }
+				icon={ commentIcon }
 			>
 				<CollabSidebarContent
-					comments={ sortedThreads }
+					comments={
+						showCommentBoard ? sortedThreads : resultComments
+					}
 					showCommentBoard={ showCommentBoard }
 					setShowCommentBoard={ setShowCommentBoard }
 					styles={ {

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-export const collabHistorySidebarName = 'edit-post/collab-history-sidebar';`
`2`	`1`	`export const collabSidebarName = 'edit-post/collab-sidebar';`