Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions mobile/lib/features/channels/message_content.dart
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ class MessageContent extends HookConsumerWidget {
var segment = mentionParts[i];
for (final name in mentionNames.values) {
if (name.contains(' ')) {
final nbspName = name.replaceAll(' ', '\u00A0');
final normalizedName = _markdownMentionName(name);
segment = segment.replaceAllMapped(
RegExp('@${RegExp.escape(name)}', caseSensitive: false),
(m) => '@$nbspName',
(m) => '@$normalizedName',
);
}
}
Expand Down Expand Up @@ -716,11 +716,13 @@ RegExp _buildPrefixPattern({
);
}

String _markdownMentionName(String name) => name.replaceAll(' ', '\u00A0');

Iterable<String> _mentionAliases(Iterable<String> mentionNames) sync* {
for (final name in mentionNames) {
final trimmed = name.trim();
if (trimmed.isEmpty) continue;
yield trimmed;
yield _markdownMentionName(trimmed);
final firstName = trimmed.split(RegExp(r'\s+')).first;
if (firstName.isNotEmpty) {
yield firstName;
Expand Down
17 changes: 17 additions & 0 deletions mobile/test/features/channels/message_content_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,23 @@ void main() {
expect(find.text('@Alice'), findsOneWidget);
});

testWidgets('highlights an entire multi-word display name', (
tester,
) async {
await tester.pumpWidget(
_testable(
const MessageContent(
content: 'Hey @Kenny Lopez can you review this?',
mentionNames: {'pk1': 'Kenny Lopez'},
),
),
);

expect(find.text('@Kenny Lopez'), findsOneWidget);
expect(find.text('@Kenny'), findsNothing);
expect(_allRichText(tester), isNot(contains('Lopez Lopez')));
});

testWidgets('renders unknown @mention as-is', (tester) async {
await tester.pumpWidget(
_testable(
Expand Down
Loading