Skip to content

Fix race condition when clearing text #966

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
Sep 19, 2025
Merged

Fix race condition when clearing text #966

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
ddc9d47
Fix race condition when clearing text (#955)
DanielCardonaRojas Sep 19, 2025
9692c6c
Adjust tests and add a changelog entry
testableapple Sep 19, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Fix replacing an image while editing a message not showing the new image in the message list [#956](https://github.com/GetStream/stream-chat-swiftui/pull/956)
- Improve precision when scrolling to the newest message with long text [#958](https://github.com/GetStream/stream-chat-swiftui/pull/958)
- Fix draft attachments being sent with local file urls to the server [#964](https://github.com/GetStream/stream-chat-swiftui/pull/964)
- Fix race condition when clearing text in a regular TextField [#955](https://github.com/GetStream/stream-chat-swiftui/pull/955)
### 🔄 Changed
- Change the gallery header view to show the message timestamp instead of online status [#962](https://github.com/GetStream/stream-chat-swiftui/pull/962)

Expand Down
1 change: 0 additions & 1 deletion Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,6 @@ open class MessageComposerViewModel: ObservableObject {
}

private func clearInputData() {
text = ""
addedAssets = []
addedFileURLs = []
addedVoiceRecordings = []
Expand Down
15 changes: 12 additions & 3 deletions StreamChatSwiftUITests/Tests/ChatChannel/MessageComposerViewModel_Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,8 +996,12 @@ class MessageComposerViewModel_Tests: StreamChatTestCase {
viewModel.sendMessage(quotedMessage: nil, editedMessage: nil) {}

// Then
// Sending a message will clear the input, deleting the draft message.
XCTAssertEqual(channelController.deleteDraftMessage_callCount, 1)
let expectation = XCTestExpectation(description: "Text cleared")
DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) {
XCTAssertEqual(channelController.deleteDraftMessage_callCount, 1)
expectation.fulfill()
}
wait(for: [expectation], timeout: 1.0)
}

func test_messageComposerVM_whenMessagePublished_deleteDraftReply() {
Expand All @@ -1020,7 +1024,12 @@ class MessageComposerViewModel_Tests: StreamChatTestCase {
viewModel.sendMessage(quotedMessage: nil, editedMessage: nil) {}

// Then
XCTAssertEqual(messageController.deleteDraftReply_callCount, 1)
let expectation = XCTestExpectation(description: "Text cleared")
DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) {
XCTAssertEqual(messageController.deleteDraftReply_callCount, 1)
expectation.fulfill()
}
wait(for: [expectation], timeout: 1.0)
}

func test_messageComposerVM_draftMessageUpdatedEvent() throws {
Expand Down
Loading