Skip to content

msglist: In single-conversation view, make recipient headers not tappable. #1193

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
merged 2 commits into from
Jan 29, 2025
Merged

msglist: In single-conversation view, make recipient headers not tappable. #1193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4b0b80
msglist [nfc]: Move _containsDifferentChannels to StreamMessageRecipi…
lakshya1goel Jan 24, 2025
abec662
msglist: In single-conversation view, make recipient headers not tapp…
lakshya1goel Jan 29, 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
68 changes: 41 additions & 27 deletions lib/widgets/message_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,27 +884,12 @@ class RecipientHeader extends StatelessWidget {
final Message message;
final Narrow narrow;

static bool _containsDifferentChannels(Narrow narrow) {
switch (narrow) {
case CombinedFeedNarrow():
case MentionsNarrow():
case StarredMessagesNarrow():
return true;

case ChannelNarrow():
case TopicNarrow():
case DmNarrow():
return false;
}
}

@override
Widget build(BuildContext context) {
final message = this.message;
return switch (message) {
StreamMessage() => StreamMessageRecipientHeader(message: message,
showStream: _containsDifferentChannels(narrow)),
DmMessage() => DmRecipientHeader(message: message),
StreamMessage() => StreamMessageRecipientHeader(message: message, narrow: narrow),
DmMessage() => DmRecipientHeader(message: message, narrow: narrow),
};
}
}
Expand Down Expand Up @@ -1018,11 +1003,25 @@ class StreamMessageRecipientHeader extends StatelessWidget {
const StreamMessageRecipientHeader({
super.key,
required this.message,
required this.showStream,
required this.narrow,
});

final StreamMessage message;
final bool showStream;
final Narrow narrow;

static bool _containsDifferentChannels(Narrow narrow) {
switch (narrow) {
case CombinedFeedNarrow():
case MentionsNarrow():
case StarredMessagesNarrow():
return true;

case ChannelNarrow():
case TopicNarrow():
case DmNarrow():
return false;
}
}

@override
Widget build(BuildContext context) {
Expand All @@ -1049,7 +1048,7 @@ class StreamMessageRecipientHeader extends StatelessWidget {
}

final Widget streamWidget;
if (!showStream) {
if (!_containsDifferentChannels(narrow)) {
streamWidget = const SizedBox(width: 16);
} else {
final stream = store.streams[message.streamId];
Expand Down Expand Up @@ -1109,9 +1108,14 @@ class StreamMessageRecipientHeader extends StatelessWidget {
]));

return GestureDetector(
onTap: () => Navigator.push(context,
MessageListPage.buildRoute(context: context,
narrow: TopicNarrow.ofMessage(message))),
// When already in a topic narrow, disable tap interaction that would just
// push a MessageListPage for the same topic narrow.
// TODO(#1039) simplify by removing topic-narrow condition if we remove
// recipient headers in topic narrows
onTap: narrow is TopicNarrow ? null
: () => Navigator.push(context,
MessageListPage.buildRoute(context: context,
narrow: TopicNarrow.ofMessage(message))),
onLongPress: () => showTopicActionSheet(context,
channelId: message.streamId, topic: topic),
child: ColoredBox(
Expand All @@ -1130,9 +1134,14 @@ class StreamMessageRecipientHeader extends StatelessWidget {
}

class DmRecipientHeader extends StatelessWidget {
const DmRecipientHeader({super.key, required this.message});
const DmRecipientHeader({
super.key,
required this.message,
required this.narrow,
});

final DmMessage message;
final Narrow narrow;

@override
Widget build(BuildContext context) {
Expand All @@ -1153,9 +1162,14 @@ class DmRecipientHeader extends StatelessWidget {
final messageListTheme = MessageListTheme.of(context);

return GestureDetector(
onTap: () => Navigator.push(context,
MessageListPage.buildRoute(context: context,
narrow: DmNarrow.ofMessage(message, selfUserId: store.selfUserId))),
// When already in a DM narrow, disable tap interaction that would just
// push a MessageListPage for the same DM narrow.
// TODO(#1244) simplify by removing DM-narrow condition if we remove
// recipient headers in DM narrows
onTap: narrow is DmNarrow ? null
: () => Navigator.push(context,
MessageListPage.buildRoute(context: context,
narrow: DmNarrow.ofMessage(message, selfUserId: store.selfUserId))),
child: ColoredBox(
color: messageListTheme.dmRecipientHeaderBg,
child: Padding(
Expand Down
88 changes: 88 additions & 0 deletions test/widgets/message_list_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,6 +927,54 @@ void main() {
await tester.pump();
tester.widget(find.text('new stream name'));
});

testWidgets('navigates to TopicNarrow on tapping topic in ChannelNarrow', (tester) async {
final pushedRoutes = <Route<void>>[];
final navObserver = TestNavigatorObserver()
..onPushed = (route, prevRoute) => pushedRoutes.add(route);
final channel = eg.stream();
final message = eg.streamMessage(stream: channel, topic: 'topic name');
await setupMessageListPage(tester,
narrow: ChannelNarrow(channel.streamId),
streams: [channel],
messages: [message],
navObservers: [navObserver]);

assert(pushedRoutes.length == 1);
pushedRoutes.clear();

connection.prepare(json: eg.newestGetMessagesResult(
foundOldest: true, messages: [message]).toJson());
await tester.tap(find.descendant(
of: find.byType(StreamMessageRecipientHeader),
matching: find.text('topic name')));
await tester.pump();
check(pushedRoutes).single.isA<WidgetRoute>().page.isA<MessageListPage>()
.initNarrow.equals(TopicNarrow.ofMessage(message));
await tester.pumpAndSettle();
});

testWidgets('does not navigate on tapping topic in TopicNarrow', (tester) async {
final pushedRoutes = <Route<void>>[];
final navObserver = TestNavigatorObserver()
..onPushed = (route, prevRoute) => pushedRoutes.add(route);
final channel = eg.stream();
final message = eg.streamMessage(stream: channel, topic: 'topic name');
await setupMessageListPage(tester,
narrow: TopicNarrow.ofMessage(message),
streams: [channel],
messages: [message],
navObservers: [navObserver]);

assert(pushedRoutes.length == 1);
pushedRoutes.clear();

await tester.tap(find.descendant(
of: find.byType(StreamMessageRecipientHeader),
matching: find.text('topic name')));
await tester.pump();
check(pushedRoutes).isEmpty();
});
});

group('DmRecipientHeader', () {
Expand Down Expand Up @@ -992,6 +1040,46 @@ void main() {
tester.widget(find.textContaining(RegExp("Dec 1[89], 2022")));
tester.widget(find.textContaining(RegExp("Aug 2[23], 2022")));
});

testWidgets('navigates to DmNarrow on tapping recipient header in CombinedFeedNarrow', (tester) async {
final pushedRoutes = <Route<void>>[];
final navObserver = TestNavigatorObserver()
..onPushed = (route, prevRoute) => pushedRoutes.add(route);
final dmMessage = eg.dmMessage(from: eg.selfUser, to: [eg.otherUser]);
await setupMessageListPage(tester,
narrow: const CombinedFeedNarrow(),
messages: [dmMessage],
navObservers: [navObserver]);

assert(pushedRoutes.length == 1);
pushedRoutes.clear();

connection.prepare(json: eg.newestGetMessagesResult(
foundOldest: true, messages: [dmMessage]).toJson());
await tester.tap(find.byType(DmRecipientHeader));
await tester.pump();
check(pushedRoutes).single.isA<WidgetRoute>().page.isA<MessageListPage>()
.initNarrow.equals(DmNarrow.withUser(eg.otherUser.userId, selfUserId: eg.selfUser.userId));
await tester.pumpAndSettle();
});

testWidgets('does not navigate on tapping recipient header in DmNarrow', (tester) async {
final pushedRoutes = <Route<void>>[];
final navObserver = TestNavigatorObserver()
..onPushed = (route, prevRoute) => pushedRoutes.add(route);
final dmMessage = eg.dmMessage(from: eg.selfUser, to: [eg.otherUser]);
await setupMessageListPage(tester,
narrow: DmNarrow.withUser(eg.otherUser.userId, selfUserId: eg.selfUser.userId),
messages: [dmMessage],
navObservers: [navObserver]);

assert(pushedRoutes.length == 1);
pushedRoutes.clear();

await tester.tap(find.byType(DmRecipientHeader));
await tester.pump();
check(pushedRoutes).isEmpty();
});
});

group('formatHeaderDate', () {
Expand Down