Skip to content

Fix composer deleting newly entered text after deleting draft text #1030

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 3 commits into from
Oct 23, 2025
Merged

Fix composer deleting newly entered text after deleting draft text #1030

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
5a26c13
Fix new input text in the composer deleted after quickly deleting pre…
nuno-vieira Oct 23, 2025
3a9fb2d
Update CHANGELOG.md
nuno-vieira Oct 23, 2025
e075271
Merge branch 'develop' into fix/composer-new-input-text-deleted-after…
nuno-vieira Oct 23, 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

# Upcoming

### 🔄 Changed
### 🐞 Fixed
- Fix composer deleting newly entered text after deleting draft text [#1030](https://github.com/GetStream/stream-chat-swiftui/pull/1030)

# [4.91.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.91.0)
_October 22, 2025_
Expand Down
8 changes: 0 additions & 8 deletions Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,14 +908,6 @@ extension MessageComposerViewModel: EventsControllerDelegate {
fillDraftMessage()
}
}

if let event = event as? DraftDeletedEvent {
let isFromSameThread = messageController?.messageId == event.threadId
let isFromSameChannel = channelController.cid == event.cid && messageController == nil
if isFromSameThread || isFromSameChannel {
clearInputData()
}
}
}
}

Expand Down
68 changes: 0 additions & 68 deletions StreamChatSwiftUITests/Tests/ChatChannel/MessageComposerViewModel_Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,74 +1109,6 @@ class MessageComposerViewModel_Tests: StreamChatTestCase {
XCTAssertEqual(viewModel.text, "Draft")
}

func test_messageComposerVM_draftMessageDeletedEvent() throws {
// Given
let channelController = makeChannelController()
channelController.channel_mock = .mock(cid: .unique, draftMessage: .mock(text: "Draft"))
let viewModel = makeComposerDraftsViewModel(
channelController: channelController,
messageController: nil
)

// When
channelController.channel_mock = .mock(cid: .unique, draftMessage: nil)
let cid = try XCTUnwrap(channelController.cid)
let event = DraftDeletedEvent(cid: cid, threadId: nil, createdAt: .unique)
viewModel.eventsController(viewModel.eventsController, didReceiveEvent: event)

// Then
XCTAssertEqual(viewModel.text, "")
}

func test_messageComposerVM_draftReplyDeletedEvent() throws {
// Given
let channelController = makeChannelController()
let messageController = ChatMessageControllerSUI_Mock.mock(
chatClient: chatClient,
cid: channelController.cid!,
messageId: .unique
)
messageController.message_mock = .mock(draftReply: .mock(text: "Draft"))
let viewModel = makeComposerDraftsViewModel(
channelController: channelController,
messageController: messageController
)

// When
messageController.message_mock = .mock(draftReply: nil)
let cid = try XCTUnwrap(channelController.cid)
let event = DraftDeletedEvent(cid: cid, threadId: messageController.messageId, createdAt: .unique)
viewModel.eventsController(viewModel.eventsController, didReceiveEvent: event)

// Then
XCTAssertEqual(viewModel.text, "")
}

func test_messageComposerVM_draftReplyDeletedEventFromOtherThread_shouldNotUpdate() throws {
// Given
let channelController = makeChannelController()
let messageController = ChatMessageControllerSUI_Mock.mock(
chatClient: chatClient,
cid: channelController.cid!,
messageId: .unique
)
messageController.message_mock = .mock(draftReply: .mock(text: "Draft"))
let viewModel = makeComposerDraftsViewModel(
channelController: channelController,
messageController: messageController
)
viewModel.fillDraftMessage()

// When
messageController.message_mock = .mock(draftReply: nil)
let cid = try XCTUnwrap(channelController.cid)
let event = DraftDeletedEvent(cid: cid, threadId: .unique, createdAt: .unique)
viewModel.eventsController(viewModel.eventsController, didReceiveEvent: event)

// Then
XCTAssertEqual(viewModel.text, "Draft")
}

func test_messageComposerVM_whenLastAssetRemoved_shouldDeleteDraft() {
// Given
let channelController = makeChannelController()
Expand Down
Loading