Skip to content

Fix: Hide resolved comments in unpinned mode #71409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mamaduka merged 2 commits into from
Sep 12, 2025
Merged

Fix: Hide resolved comments in unpinned mode #71409

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f06eaa6
fix: show only unresolved comments in unpinned mode
R1shabh-Gupta Aug 29, 2025
c93350f
refactor: combine filter conditions to avoid double iteration
R1shabh-Gupta Sep 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions packages/editor/src/components/collab-sidebar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ export default function CollabSidebar() {
} );

// Process comments to build the tree structure
const { resultComments, sortedThreads } = useMemo( () => {
const { resultComments, unresolvedSortedThreads } = useMemo( () => {
// Create a compare to store the references to all objects by id
const compare = {};
const result = [];
Expand All @@ -291,7 +291,7 @@ export default function CollabSidebar() {
} );

if ( 0 === result?.length ) {
return { resultComments: [], sortedThreads: [] };
return { resultComments: [], unresolvedSortedThreads: [] };
}

const updatedResult = result.map( ( item ) => ( {
Expand All @@ -305,11 +305,18 @@ export default function CollabSidebar() {
updatedResult.map( ( thread ) => [ thread.id, thread ] )
);

const sortedComments = blockCommentIds
// Get comments by block order, filter out undefined threads, and exclude resolved comments.
const unresolvedSortedComments = blockCommentIds
.map( ( id ) => threadIdMap.get( id ) )
.filter( ( thread ) => thread !== undefined );
.filter(
( thread ) =>
thread !== undefined && thread.status !== 'approved'
);

return { resultComments: updatedResult, sortedThreads: sortedComments };
return {
resultComments: updatedResult,
unresolvedSortedThreads: unresolvedSortedComments,
};
}, [ threads, blocks ] );

// Get the global styles to set the background color of the sidebar.
Expand Down Expand Up @@ -358,7 +365,7 @@ export default function CollabSidebar() {
headerClassName="editor-collab-sidebar__header"
>
<CollabSidebarContent
comments={ sortedThreads }
comments={ unresolvedSortedThreads }
showCommentBoard={ showCommentBoard }
setShowCommentBoard={ setShowCommentBoard }
styles={ {
Expand Down
Loading