Skip to content

Notes: Show default avatar in the indicator when user avatars are disabled #78849

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 5 commits into from
Jun 1, 2026
Merged

Notes: Show default avatar in the indicator when user avatars are disabled #78849

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40fe471
Add default avataar in notes in block toolbar
hbhalodia Jun 1, 2026
6c5db08
Add changelog entry
hbhalodia Jun 1, 2026
2cf7269
Merge branch 'trunk' into fix/issue-78838
hbhalodia Jun 1, 2026
7a6ff0f
Split components
Mamaduka Jun 1, 2026
40626b9
Remove changelog entry
hbhalodia Jun 1, 2026
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
133 changes: 73 additions & 60 deletions packages/editor/src/components/collab-sidebar/note-indicator-toolbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ import { ToolbarButton } from '@wordpress/components';
import { Stack } from '@wordpress/ui';
import { __, sprintf } from '@wordpress/i18n';
import { useMemo } from '@wordpress/element';
import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
import {
privateApis as blockEditorPrivateApis,
store as blockEditorStore,
} from '@wordpress/block-editor';
import { useSelect } from '@wordpress/data';

/**
* Internal dependencies
Expand All @@ -15,52 +19,24 @@ import { getAvatarBorderColor } from './utils';

const { NoteIconToolbarSlotFill } = unlock( blockEditorPrivateApis );

export function NoteAvatarIndicator( { onClick, note } ) {
const threadParticipants = useMemo( () => {
if ( ! note ) {
return [];
}

const participantsMap = new Map();
const allNotes = [ note, ...note.reply ];

// Sort by date to show participants in chronological order.
allNotes.sort( ( a, b ) => new Date( a.date ) - new Date( b.date ) );

allNotes.forEach( ( entry ) => {
// Track thread participants (original author + repliers).
if ( entry.author_name && entry.author_avatar_urls ) {
if ( ! participantsMap.has( entry.author ) ) {
participantsMap.set( entry.author, {
name: entry.author_name,
avatar:
entry.author_avatar_urls?.[ '48' ] ||
entry.author_avatar_urls?.[ '96' ],
id: entry.author,
date: entry.date,
} );
}
}
} );

return Array.from( participantsMap.values() );
}, [ note ] );

if ( ! threadParticipants.length ) {
return null;
}
function ThreadParticipants( { participants } ) {
const defaultAvatar = useSelect( ( select ) => {
const { getSettings } = select( blockEditorStore );
const { __experimentalDiscussionSettings } = getSettings();
return __experimentalDiscussionSettings?.avatarURL;
}, [] );

// If there are more than 3 participants, show 2 avatars and a "+n" number.
const maxAvatars = 3;
const isOverflow = threadParticipants.length > maxAvatars;
const isOverflow = participants.length > maxAvatars;
const visibleParticipants = isOverflow
? threadParticipants.slice( 0, maxAvatars - 1 )
: threadParticipants;
? participants.slice( 0, maxAvatars - 1 )
: participants;
const overflowCount = Math.max(
0,
threadParticipants.length - visibleParticipants.length
participants.length - visibleParticipants.length
);
const threadHasMoreParticipants = threadParticipants.length > 100;
const threadHasMoreParticipants = participants.length > 100;

// If we hit the note limit, show "100+" instead of exact overflow count.
const overflowText =
Expand All @@ -72,6 +48,62 @@ export function NoteAvatarIndicator( { onClick, note } ) {
overflowCount
);

return (
<Stack direction="row" align="center" gap="xs">
{ visibleParticipants.map( ( participant ) => (
<img
key={ participant.id }
src={ participant.avatar || defaultAvatar }
alt={ participant.name }
className="editor-note-indicator__avatar"
style={ {
borderColor: getAvatarBorderColor( participant.id ),
} }
/>
) ) }
{ overflowCount > 0 && (
<span className="editor-note-indicator__overflow">
{ overflowText }
</span>
) }
</Stack>
);
}

export function NoteAvatarIndicator( { onClick, note } ) {
const threadParticipants = useMemo( () => {
if ( ! note ) {
return [];
}

// Track thread participants (original author + repliers), sorted by
// date so they appear in chronological order.
const participantsMap = new Map();
const allNotes = [ note, ...note.reply ].sort(
( a, b ) => new Date( a.date ) - new Date( b.date )
);

for ( const entry of allNotes ) {
if ( ! entry.author_name || participantsMap.has( entry.author ) ) {
continue;
}

participantsMap.set( entry.author, {
id: entry.author,
name: entry.author_name,
avatar:
entry.author_avatar_urls?.[ '48' ] ||
entry.author_avatar_urls?.[ '96' ],
} );
}

return Array.from( participantsMap.values() );
}, [ note ] );

if ( ! threadParticipants.length ) {
return null;
}

return (
<NoteIconToolbarSlotFill.Fill>
<ToolbarButton
Expand All @@ -80,26 +112,7 @@ export function NoteAvatarIndicator( { onClick, note } ) {
onClick={ () => onClick() }
showTooltip
>
<Stack direction="row" align="center" gap="xs">
{ visibleParticipants.map( ( participant ) => (
<img
key={ participant.id }
src={ participant.avatar }
alt={ participant.name }
className="editor-note-indicator__avatar"
style={ {
borderColor: getAvatarBorderColor(
participant.id
),
} }
/>
) ) }
{ overflowCount > 0 && (
<span className="editor-note-indicator__overflow">
{ overflowText }
</span>
) }
</Stack>
<ThreadParticipants participants={ threadParticipants } />
</ToolbarButton>
</NoteIconToolbarSlotFill.Fill>
);
Expand Down
Loading