Skip to content

fix(core): fix StreamDraftListController.deleteDraft removing the wrong draft #3054

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
VelikovPetar merged 3 commits into from
Oct 9, 2026
+29 −18
Merged

fix(core): fix StreamDraftListController.deleteDraft removing the wrong draft #3054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56eeee0
fix(core): remove the deleted channel draft, not a thread draft, from…
VelikovPetar Oct 9, 2026
17026ca
chore(core): restore the deleteDraft dartdoc
VelikovPetar Oct 9, 2026
edb7e60
chore(core): simplify the draft list CHANGELOG entry
VelikovPetar Oct 9, 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
6 changes: 6 additions & 0 deletions packages/stream_chat_flutter_core/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## Upcoming

🐞 Fixed

- Fixed `StreamDraftListController.deleteDraft` removing the wrong draft.

## 10.5.0

✅ Added
Expand Down
23 changes: 5 additions & 18 deletions packages/stream_chat_flutter_core/lib/src/stream_draft_list_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,14 +219,7 @@ class StreamDraftListController extends PagedValueNotifier<String, Draft> {
final currentDrafts = [
...currentItems.merge(
[draft],
key: (draft) {
var predicate = draft.channelCid;
if (draft.parentId case final parentId?) {
predicate += parentId;
}

return predicate;
},
key: _draftKey,
update: (original, updated) => updated,
),
];
Expand All @@ -241,16 +234,8 @@ class StreamDraftListController extends PagedValueNotifier<String, Draft> {
/// Returns `true` if the draft is deleted successfully. Otherwise, `false`.
bool deleteDraft(Draft draft) {
final currentDrafts = [...currentItems];
final removeIndex = currentDrafts.indexWhere(
(it) {
var predicate = it.channelCid == draft.channelCid;
if (draft.parentId case final parentId?) {
predicate &= it.parentId == parentId;
}

return predicate;
},
);
final draftKey = _draftKey(draft);
final removeIndex = currentDrafts.indexWhere((it) => _draftKey(it) == draftKey);

if (removeIndex < 0) return false;
currentDrafts.removeAt(removeIndex);
Expand All @@ -259,6 +244,8 @@ class StreamDraftListController extends PagedValueNotifier<String, Draft> {
return true;
}

static (String, String?) _draftKey(Draft draft) => (draft.channelCid, draft.parentId);

// Unsubscribes from all draft list events.
void _unsubscribeFromDraftListEvents() {
if (_draftEventSubscription != null) {
Expand Down
18 changes: 18 additions & 0 deletions packages/stream_chat_flutter_core/test/stream_draft_list_controller_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,24 @@ void main() {
expect(remainingDraftTexts, contains('Thread Draft 2'));
expect(remainingDraftTexts, isNot(contains('Thread Draft 1')));
});

test('deleteDraft removes only the channel draft when a thread draft of the same channel precedes it', () {
final threadDraft = generateDraft(
channelCid: 'messaging:123',
text: 'Thread Draft',
parentId: 'parent1',
);
final channelDraft = generateDraft(
channelCid: 'messaging:123',
text: 'Channel Draft',
);
final controller = StreamDraftListController.fromValue(
PagedValue<String, Draft>(items: [threadDraft, channelDraft]),
client: client,
)..deleteDraft(channelDraft);

expect(controller.value.asSuccess.items, equals([threadDraft]));
});
});

group('Order preservation', () {
Expand Down
Loading