Fixed a bug with threads with custom attachments

Author: martinmitrevski

CHANGELOG.md

@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### 🐞 Fixed
 - Fixed a bug with channel list refreshing after deeplinking
 - Navigation bar iPad resizing issue
+- Fixed a bug with thread with custom attachments dismissed
 
 ### 🔄 Changed
 - Docs restructuring

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelView.swift

@@ -97,6 +97,19 @@ public struct ChatChannelView<Factory: ViewFactory>: View, KeyboardReadable {
                         utils.messageListConfig.messagePopoverEnabled && messageDisplayInfo != nil && !viewModel
                             .reactionsShown
                     ) ? 0 : 1)
+                    
+                    NavigationLink(
+                        isActive: $viewModel.threadMessageShown
+                    ) {
+                        if let message = viewModel.threadMessage {
+                            let threadDestination = factory.makeMessageThreadDestination()
+                            threadDestination(channel, message)
+                        } else {
+                            EmptyView()
+                        }
+                    } label: {
+                        EmptyView()
+                    }
                 }
                 .accentColor(colors.tintColor)
                 .overlay(

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift

@@ -82,6 +82,14 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
 
     @Published public var editedMessage: ChatMessage?
     @Published public var channelHeaderType: ChannelHeaderType = .regular
+    @Published public var threadMessage: ChatMessage?
+    @Published public var threadMessageShown = false {
+        didSet {
+            if threadMessageShown == false {
+                threadMessage = nil
+            }
+        }
+    }
 
     public var channel: ChatChannel? {
         channelController.channel
@@ -125,10 +133,27 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
             object: nil
         )
 
+        if messageController == nil {
+            NotificationCenter.default.addObserver(
+                self,
+                selector: #selector(selectedMessageThread(notification:)),
+                name: NSNotification.Name(MessageRepliesConstants.selectedMessageThread),
+                object: nil
+            )
+        }
+                
         channelName = channel?.name ?? ""
         checkHeaderType()
     }
 
+    @objc
+    private func selectedMessageThread(notification: Notification) {
+        if let message = notification.userInfo?[MessageRepliesConstants.selectedMessage] as? ChatMessage {
+            threadMessage = message
+            threadMessageShown = true
+        }
+    }
+    
     @objc
     private func didReceiveMemoryWarning() {
         Nuke.ImageCache.shared.removeAll()

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageRepliesView.swift

@@ -5,6 +5,11 @@
 import StreamChat
 import SwiftUI
 
+enum MessageRepliesConstants {
+    static let selectedMessageThread = "selectedMessageThread"
+    static let selectedMessage = "selectedMessage"
+}
+
 /// View shown below a message, when there are replies to it.
 struct MessageRepliesView<Factory: ViewFactory>: View {
 
@@ -16,14 +21,15 @@ struct MessageRepliesView<Factory: ViewFactory>: View {
     var message: ChatMessage
     var replyCount: Int
 
-    var threadDestination: Factory.MessageThreadDestination {
-        let threadDestination = factory.makeMessageThreadDestination()
-        return threadDestination(channel, message)
-    }
-    
     var body: some View {
-        NavigationLink {
-            LazyView(threadDestination)
+        Button {
+            // NOTE: this is used to avoid breaking changes.
+            // Will be updated in a major release.
+            NotificationCenter.default.post(
+                name: NSNotification.Name(MessageRepliesConstants.selectedMessageThread),
+                object: nil,
+                userInfo: [MessageRepliesConstants.selectedMessage: message]
+            )
         } label: {
             HStack {
                 if !message.isSentByCurrentUser {

StreamChatSwiftUITests/Tests/ChatChannel/ChatChannelViewModel_Tests.swift

@@ -356,6 +356,35 @@ class ChatChannelViewModel_Tests: StreamChatTestCase {
         XCTAssert(readsString != newChannelReadsString)
     }
 
+    func test_chatChannelVM_threadMessage() {
+        // Given
+        let channelController = makeChannelController()
+        let viewModel = ChatChannelViewModel(channelController: channelController)
+        let message = ChatMessage.mock(
+            id: .unique,
+            cid: .unique,
+            text: "Some text",
+            author: .mock(id: .unique)
+        )
+        
+        // When
+        NotificationCenter.default.post(
+            name: NSNotification.Name(MessageRepliesConstants.selectedMessageThread),
+            object: nil,
+            userInfo: [MessageRepliesConstants.selectedMessage: message]
+        )
+        
+        // Then
+        XCTAssert(viewModel.threadMessage == message)
+        XCTAssert(viewModel.threadMessageShown == true)
+        
+        // When
+        viewModel.threadMessageShown = false
+        
+        // Then
+        XCTAssert(viewModel.threadMessage == nil)
+    }
+    
     // MARK: - private
 
     private func makeChannelController(