Skip to content

Commit abb2bcb

Browse files
content [nfc]: Rename UserMention widget to Mention
And update it to accept the generic `MentionNode` node.
1 parent 08b8563 commit abb2bcb

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

lib/widgets/content.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,9 +1037,9 @@ class _InlineContentBuilder {
10371037
case InlineCodeNode():
10381038
return _buildInlineCode(node);
10391039

1040-
case UserMentionNode():
1040+
case MentionNode():
10411041
return WidgetSpan(alignment: PlaceholderAlignment.middle,
1042-
child: UserMention(ambientTextStyle: widget.style, node: node));
1042+
child: Mention(ambientTextStyle: widget.style, node: node));
10431043

10441044
case UnicodeEmojiNode():
10451045
return TextSpan(text: node.emojiUnicode, recognizer: _recognizer,
@@ -1117,15 +1117,15 @@ class _InlineContentBuilder {
11171117

11181118
const kInlineCodeFontSizeFactor = 0.825;
11191119

1120-
class UserMention extends StatelessWidget {
1121-
const UserMention({
1120+
class Mention extends StatelessWidget {
1121+
const Mention({
11221122
super.key,
11231123
required this.ambientTextStyle,
11241124
required this.node,
11251125
});
11261126

11271127
final TextStyle ambientTextStyle;
1128-
final UserMentionNode node;
1128+
final MentionNode node;
11291129

11301130
@override
11311131
Widget build(BuildContext context) {

test/widgets/content_test.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ void main() {
658658
});
659659
});
660660

661-
group('UserMention', () {
661+
group('Mention', () {
662662
testContentSmoke(ContentExample.userMentionPlain);
663663
testContentSmoke(ContentExample.userMentionSilent);
664664
testContentSmoke(ContentExample.groupMentionPlain);
@@ -670,10 +670,10 @@ void main() {
670670
testContentSmoke(ContentExample.legacyChannelWildcardMentionSilent);
671671
testContentSmoke(ContentExample.legacyChannelWildcardMentionSilentClassOrderReversed);
672672

673-
UserMention? findUserMentionInSpan(InlineSpan rootSpan) {
674-
UserMention? result;
673+
Mention? findMentionWidgetInSpan(InlineSpan rootSpan) {
674+
Mention? result;
675675
rootSpan.visitChildren((span) {
676-
if (span case (WidgetSpan(child: UserMention() && var widget))) {
676+
if (span case (WidgetSpan(child: Mention() && var widget))) {
677677
result = widget;
678678
return false;
679679
}
@@ -682,7 +682,7 @@ void main() {
682682
return result;
683683
}
684684

685-
TextStyle textStyleFromWidget(WidgetTester tester, UserMention widget, String mentionText) {
685+
TextStyle textStyleFromWidget(WidgetTester tester, Mention widget, String mentionText) {
686686
return mergedStyleOf(tester,
687687
findAncestor: find.byWidget(widget), mentionText)!;
688688
}
@@ -691,7 +691,7 @@ void main() {
691691
await checkFontSizeRatio(tester,
692692
targetHtml: '<span class="user-mention" data-user-id="13313">@Chris Bobbe</span>',
693693
targetFontSizeFinder: (rootSpan) {
694-
final widget = findUserMentionInSpan(rootSpan);
694+
final widget = findMentionWidgetInSpan(rootSpan);
695695
final style = textStyleFromWidget(tester, widget!, '@Chris Bobbe');
696696
return style.fontSize!;
697697
});
@@ -704,7 +704,7 @@ void main() {
704704
'<p><span class="user-mention silent" data-user-id="2187">Greg Price</span></p>'),
705705
styleFinder: (tester) {
706706
return textStyleFromWidget(tester,
707-
tester.widget(find.byType(UserMention)), 'Greg Price');
707+
tester.widget(find.byType(Mention)), 'Greg Price');
708708
});
709709

710710
// TODO(#647):
@@ -718,7 +718,7 @@ void main() {
718718
'<h1><span class="user-mention silent" data-user-id="13313">Chris Bobbe</span></h1>'),
719719
styleFinder: (tester) {
720720
return textStyleFromWidget(tester,
721-
tester.widget(find.byType(UserMention)), 'Chris Bobbe');
721+
tester.widget(find.byType(Mention)), 'Chris Bobbe');
722722
});
723723

724724
// TODO(#647):

0 commit comments

Comments
 (0)