Skip to content

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

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 #3854

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
66ac00d
Fix new input text in the composer deleted after quickly deleting pre…
nuno-vieira Oct 23, 2025
32a0ee1
Merge branch 'develop' into fix/composer-new-input-text-deleted-after…
nuno-vieira Oct 23, 2025
e5c631d
Update CHANGELOG.md
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
4 changes: 3 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,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

# Upcoming

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

# [4.91.0](https://github.com/GetStream/stream-chat-swift/releases/tag/4.91.0)
_October 22, 2025_
Expand Down
5 changes: 0 additions & 5 deletions Sources/StreamChatUI/ChatChannel/ChatChannelVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,11 +586,6 @@ open class ChatChannelVC: _ViewController,
draftUpdatedEvent.cid == channelController.cid, draftUpdatedEvent.draftMessage.threadId == nil {
messageComposerVC.content.draftMessage(draft)
}

if let draftDeletedEvent = event as? DraftDeletedEvent,
draftDeletedEvent.cid == channelController.cid, draftDeletedEvent.threadId == nil {
messageComposerVC.content.clear()
}
}

// MARK: - AudioQueuePlayerDatasource
Expand Down
2 changes: 0 additions & 2 deletions Sources/StreamChatUI/ChatThread/ChatThreadVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,6 @@ open class ChatThreadVC: _ViewController,
if let draft = messageController.message?.draftReply {
messageComposerVC.content.draftMessage(draft)
}
case let event as DraftDeletedEvent where event.threadId == messageController.messageId:
messageComposerVC.content.clear()
default:
break
}
Expand Down
14 changes: 0 additions & 14 deletions Tests/StreamChatUITests/SnapshotTests/ChatChannel/ChatChannelVC_Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1636,20 +1636,6 @@ final class ChatChannelVC_Tests: XCTestCase {

AssertSnapshot(vc, variants: [.defaultLight])
}

func test_channelWithDraftMessage_whenDraftIsDeletedFromEvent_updatesDraftInComposer() {
let channel = ChatChannel.mock(cid: .unique, draftMessage: nil)
channelControllerMock.channel_mock = channel

vc.messageComposerVC.content.draftMessage(.mock(text: "Draft Message"))
XCTAssertFalse(vc.messageComposerVC.content.text.isEmpty)

channelControllerMock.mockCid = channel.cid
let event = DraftDeletedEvent(cid: channel.cid, threadId: nil, createdAt: .unique)
vc.eventsController(vc.eventsController, didReceiveEvent: event)

XCTAssertTrue(vc.messageComposerVC.content.text.isEmpty)
}
}

private extension ChatChannelVC_Tests {
Expand Down
19 changes: 0 additions & 19 deletions Tests/StreamChatUITests/SnapshotTests/ChatThread/ChatThreadVC_Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,25 +360,6 @@ final class ChatThreadVC_Tests: XCTestCase {
AssertSnapshot(vc, variants: [.defaultLight])
}

func test_threadWithDraftReply_whenDraftIsDeletedFromEvent_removesDraftFromComposer() {
let cid = ChannelId.unique
let parentMessage = ChatMessage.mock(
id: messageControllerMock.messageId,
cid: cid,
text: "Parent message",
author: .mock(id: .unique),
draftReply: .mock(text: "Draft Message")
)
vc.messageComposerVC.content.draftMessage(.mock(text: "Draft"))

XCTAssertFalse(vc.messageComposerVC.content.text.isEmpty)

let updateDraftEvent = DraftDeletedEvent(cid: cid, threadId: messageControllerMock.messageId, createdAt: .unique)
vc.eventsController(vc.eventsController, didReceiveEvent: updateDraftEvent)

XCTAssertTrue(vc.messageComposerVC.content.text.isEmpty)
}

// MARK: - audioQueuePlayerNextAssetURL

func test_audioQueuePlayerNextAssetURL_callsNextAvailableVoiceRecordingProvideWithExpectedInputAndReturnsValue() throws {
Expand Down
Loading