Skip to content

compose: Fix bug where topic input not filled on quote-and-reply #1952

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −4
Open

compose: Fix bug where topic input not filled on quote-and-reply #1952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/widgets/action_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,7 +1409,7 @@ class QuoteAndReplyButton extends MessageActionSheetMenuItemButton {
composeBoxController!;
if (
composeBoxController is StreamComposeBoxController
&& composeBoxController.topic.textNormalized == kNoTopicTopic
&& composeBoxController.topic.isTopicVacuous
&& message is StreamMessage
) {
composeBoxController.topic.setTopic(message.topic);
Expand Down
1 change: 1 addition & 0 deletions test/model/autocomplete_checks.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ extension ComposeContentControllerChecks on Subject<ComposeContentController> {

extension ComposeTopicControllerChecks on Subject<ComposeTopicController> {
Subject<AutocompleteIntent<TopicAutocompleteQuery>?> get autocompleteIntent => has((c) => c.autocompleteIntent(), 'autocompleteIntent');
Subject<String> get textNormalized => has((c) => c.textNormalized, 'textNormalized');
}

extension AutocompleteIntentChecks on Subject<AutocompleteIntent<AutocompleteQuery>> {
Expand Down
33 changes: 30 additions & 3 deletions test/widgets/action_sheet_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import '../api/fake_api.dart';
import '../api/model/model_checks.dart';
import '../example_data.dart' as eg;
import '../flutter_checks.dart';
import '../model/autocomplete_checks.dart';
import '../model/binding.dart';
import '../model/content_test.dart';
import '../model/test_store.dart';
Expand Down Expand Up @@ -1674,8 +1675,33 @@ void main() {
check(contentController).not((it) => it.validationErrors.contains(ContentValidationError.quoteAndReplyInProgress));
}

testWidgets('in channel narrow', (tester) async {
final message = eg.streamMessage();
testWidgets('in channel narrow with different, non-vacuous topic', (tester) async {
final message = eg.streamMessage(topic: 'some topic');
await setupToMessageActionSheet(tester, message: message, narrow: ChannelNarrow(message.streamId));

final composeBoxController = findComposeBoxController(tester) as StreamComposeBoxController;
final contentController = composeBoxController.content;

// Ensure channel-topics are loaded before testing quote & reply behavior
connection.prepare(body:
jsonEncode(GetStreamTopicsResult(topics: [eg.getStreamTopicsEntry()]).toJson()));
final topicController = composeBoxController.topic;
topicController.value = TextEditingValue(text: 'other topic');

final valueBefore = contentController.value;
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');
await tapQuoteAndReplyButton(tester);
checkLoadingState(store, contentController, valueBefore: valueBefore, message: message);
await tester.pump(Duration.zero); // message is fetched; compose box updates
check(composeBoxController.contentFocusNode.hasFocus).isTrue();
checkSuccessState(store, contentController,
valueBefore: valueBefore, message: message, rawContent: 'Hello world');
check(topicController).textNormalized.equals('other topic');
});

testWidgets('in channel narrow with empty topic', (tester) async {
// Regression test for https://github.com/zulip/zulip-flutter/issues/1469
final message = eg.streamMessage(topic: 'some topic');
await setupToMessageActionSheet(tester, message: message, narrow: ChannelNarrow(message.streamId));

final composeBoxController = findComposeBoxController(tester) as StreamComposeBoxController;
Expand All @@ -1685,7 +1711,7 @@ void main() {
connection.prepare(body:
jsonEncode(GetStreamTopicsResult(topics: [eg.getStreamTopicsEntry()]).toJson()));
final topicController = composeBoxController.topic;
topicController.value = const TextEditingValue(text: kNoTopicTopic);
topicController.value = const TextEditingValue(text: '');

final valueBefore = contentController.value;
prepareRawContentResponseSuccess(message: message, rawContent: 'Hello world');
Expand All @@ -1695,6 +1721,7 @@ void main() {
check(composeBoxController.contentFocusNode.hasFocus).isTrue();
checkSuccessState(store, contentController,
valueBefore: valueBefore, message: message, rawContent: 'Hello world');
check(topicController).textNormalized.equals('some topic');
});

group('in topic narrow', () {
Expand Down