added message thread in message actions

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelView.swift

@@ -76,6 +76,7 @@ public struct ChatChannelView<Factory: ViewFactory>: View {
         .overlay(
             viewModel.reactionsShown ?
                 factory.makeReactionsOverlayView(
+                    channel: viewModel.channel,
                     currentSnapshot: viewModel.currentSnapshot!,
                     messageDisplayInfo: messageDisplayInfo!,
                     onBackgroundTap: {
@@ -86,5 +87,8 @@ public struct ChatChannelView<Factory: ViewFactory>: View {
                 .edgesIgnoringSafeArea(.all)
                 : nil
         )
+        .onAppear {
+            viewModel.reactionsShown = false
+        }
     }
 }

Sources/StreamChatSwiftUI/ChatChannel/Reactions/MessageActions/DefaultMessageActions.swift

@@ -3,6 +3,7 @@
 //
 
 import StreamChat
+import SwiftUI
 
 extension MessageAction {
     /// Returns the default message actions.
@@ -12,38 +13,35 @@ extension MessageAction {
     ///     - chatClient: the chat client.
     ///     - onDimiss: called when the action is executed.
     ///  - Returns: array of `MessageAction`.
-    public static func defaultActions(
+    public static func defaultActions<Factory: ViewFactory>(
+        factory: Factory,
         for message: ChatMessage,
+        channel: ChatChannel,
         chatClient: ChatClient,
         onDismiss: @escaping () -> Void,
         onError: @escaping (Error) -> Void
     ) -> [MessageAction] {
-        guard let channelId = message.cid else {
-            return []
-        }
-        
         var messageActions = [MessageAction]()
 
         if !message.isPartOfThread {
-            let replyThreadAction = {
-                onDismiss()
-            }
-            
-            let replyThread = MessageAction(
+            var replyThread = MessageAction(
                 title: L10n.Message.Actions.threadReply,
                 iconName: "icn_thread_reply",
-                action: replyThreadAction,
+                action: onDismiss,
                 confirmationPopup: nil,
                 isDestructive: false
             )
 
+            let destination = factory.makeMessageThreadDestination()
+            replyThread.navigationDestination = AnyView(destination(channel, message))
+            
             messageActions.append(replyThread)
         }
 
         if message.isSentByCurrentUser {
             let deleteAction = deleteMessageAction(
                 for: message,
-                channelId: channelId,
+                channel: channel,
                 chatClient: chatClient,
                 onDismiss: onDismiss,
                 onError: onError
@@ -53,7 +51,7 @@ extension MessageAction {
         } else {
             let flagAction = flagMessageAction(
                 for: message,
-                channelId: channelId,
+                channel: channel,
                 chatClient: chatClient,
                 onDismiss: onDismiss,
                 onError: onError
@@ -67,13 +65,13 @@ extension MessageAction {
 
     private static func deleteMessageAction(
         for message: ChatMessage,
-        channelId: ChannelId,
+        channel: ChatChannel,
         chatClient: ChatClient,
         onDismiss: @escaping () -> Void,
         onError: @escaping (Error) -> Void
     ) -> MessageAction {
         let messageController = chatClient.messageController(
-            cid: channelId,
+            cid: channel.cid,
             messageId: message.id
         )
 
@@ -106,13 +104,13 @@ extension MessageAction {
 
     private static func flagMessageAction(
         for message: ChatMessage,
-        channelId: ChannelId,
+        channel: ChatChannel,
         chatClient: ChatClient,
         onDismiss: @escaping () -> Void,
         onError: @escaping (Error) -> Void
     ) -> MessageAction {
         let messageController = chatClient.messageController(
-            cid: channelId,
+            cid: channel.cid,
             messageId: message.id
         )
 

Sources/StreamChatSwiftUI/ChatChannel/Reactions/MessageActions/MessageActionsView.swift

@@ -21,19 +21,32 @@ public struct MessageActionsView: View {
         VStack(spacing: 0) {
             ForEach(viewModel.messageActions) { action in
                 VStack(spacing: 0) {
-                    Button {
-                        if action.confirmationPopup != nil {
-                            viewModel.alertAction = action
-                        } else {
-                            action.action()
+                    if let destination = action.navigationDestination {
+                        NavigationLink {
+                            destination
+                        } label: {
+                            ActionItemView(
+                                title: action.title,
+                                iconName: action.iconName,
+                                isDestructive: action.isDestructive,
+                                boldTitle: false
+                            )
+                        }
+                    } else {
+                        Button {
+                            if action.confirmationPopup != nil {
+                                viewModel.alertAction = action
+                            } else {
+                                action.action()
+                            }
+                        } label: {
+                            ActionItemView(
+                                title: action.title,
+                                iconName: action.iconName,
+                                isDestructive: action.isDestructive,
+                                boldTitle: false
+                            )
                         }
-                    } label: {
-                        ActionItemView(
-                            title: action.title,
-                            iconName: action.iconName,
-                            isDestructive: action.isDestructive,
-                            boldTitle: false
-                        )
                     }
 
                     Divider()

Sources/StreamChatSwiftUI/ChatChannel/Reactions/MessageActions/MessageActionsViewModel.swift

@@ -30,6 +30,7 @@ public struct MessageAction: Identifiable, Equatable {
     public var action: () -> Void
     public let confirmationPopup: ConfirmationPopup?
     public let isDestructive: Bool
+    public var navigationDestination: AnyView?
 
     public init(
         title: String,

Sources/StreamChatSwiftUI/ChatChannel/Reactions/ReactionsOverlayView.swift

@@ -2,12 +2,14 @@
 // Copyright © 2021 Stream.io Inc. All rights reserved.
 //
 
+import StreamChat
 import SwiftUI
 
 public struct ReactionsOverlayView<Factory: ViewFactory>: View {
     @StateObject var viewModel: ReactionsOverlayViewModel
 
     var factory: Factory
+    var channel: ChatChannel
     var currentSnapshot: UIImage
     var messageDisplayInfo: MessageDisplayInfo
     var onBackgroundTap: () -> Void
@@ -19,6 +21,7 @@ public struct ReactionsOverlayView<Factory: ViewFactory>: View {
 
     public init(
         factory: Factory,
+        channel: ChatChannel,
         currentSnapshot: UIImage,
         messageDisplayInfo: MessageDisplayInfo,
         onBackgroundTap: @escaping () -> Void
@@ -28,12 +31,14 @@ public struct ReactionsOverlayView<Factory: ViewFactory>: View {
                 message: messageDisplayInfo.message
             )
         )
+        self.channel = channel
         self.factory = factory
         self.currentSnapshot = currentSnapshot
         self.messageDisplayInfo = messageDisplayInfo
         self.onBackgroundTap = onBackgroundTap
         messageActionsCount = factory.supportedMessageActions(
             for: messageDisplayInfo.message,
+            channel: channel,
             onDismiss: {},
             onError: { _ in }
         ).count
@@ -85,6 +90,7 @@ public struct ReactionsOverlayView<Factory: ViewFactory>: View {
 
                 factory.makeMessageActionsView(
                     for: messageDisplayInfo.message,
+                    channel: channel,
                     onDismiss: onBackgroundTap,
                     onError: { _ in
                         viewModel.errorShown = true

Sources/StreamChatSwiftUI/DefaultViewFactory.swift

@@ -396,11 +396,14 @@ extension ViewFactory {
 
     public func supportedMessageActions(
         for message: ChatMessage,
+        channel: ChatChannel,
         onDismiss: @escaping () -> Void,
         onError: @escaping (Error) -> Void
     ) -> [MessageAction] {
         MessageAction.defaultActions(
+            factory: self,
             for: message,
+            channel: channel,
             chatClient: chatClient,
             onDismiss: onDismiss,
             onError: onError
@@ -409,11 +412,13 @@ extension ViewFactory {
 
     public func makeMessageActionsView(
         for message: ChatMessage,
+        channel: ChatChannel,
         onDismiss: @escaping () -> Void,
         onError: @escaping (Error) -> Void
     ) -> some View {
         let messageActions = supportedMessageActions(
             for: message,
+            channel: channel,
             onDismiss: onDismiss,
             onError: onError
         )
@@ -428,12 +433,14 @@ extension ViewFactory {
     }
 
     public func makeReactionsOverlayView(
+        channel: ChatChannel,
         currentSnapshot: UIImage,
         messageDisplayInfo: MessageDisplayInfo,
         onBackgroundTap: @escaping () -> Void
     ) -> some View {
         ReactionsOverlayView(
             factory: self,
+            channel: channel,
             currentSnapshot: currentSnapshot,
             messageDisplayInfo: messageDisplayInfo,
             onBackgroundTap: onBackgroundTap

Sources/StreamChatSwiftUI/ViewFactory.swift

@@ -375,11 +375,13 @@ public protocol ViewFactory: AnyObject {
     /// Returns the supported  message actions.
     /// - Parameters:
     ///  - message: the message where the actions are applied.
+    ///  - channel: the channel of the message.
     ///  - onDismiss: handler when the more actions view is dismissed.
     ///  - onError: handler when an error happened.
     /// - Returns: list of `MessageAction` items.
     func supportedMessageActions(
         for message: ChatMessage,
+        channel: ChatChannel,
         onDismiss: @escaping () -> Void,
         onError: @escaping (Error) -> Void
     ) -> [MessageAction]
@@ -388,11 +390,13 @@ public protocol ViewFactory: AnyObject {
     /// Creates the message actions view.
     /// - Parameters:
     ///  - message: the message where the actions are applied.
+    ///  - channel: the channel of the message.
     ///  - onDismiss: handler when the more actions view is dismissed.
     ///  - onError: handler when an error happened.
     /// - Returns: view displayed in the message actions slot.
     func makeMessageActionsView(
         for message: ChatMessage,
+        channel: ChatChannel,
         onDismiss: @escaping () -> Void,
         onError: @escaping (Error) -> Void
     ) -> MessageActionsViewType
@@ -408,11 +412,13 @@ public protocol ViewFactory: AnyObject {
     associatedtype ReactionsOverlayViewType
     /// Creates the reactions overlay view.
     /// - Parameters:
+    ///  - channel: the channel of the message.
     ///  - currentSnapshot: current snapshot of the screen (in case blur effect is needed).
     ///  - messageDisplayInfo: information about the displayed message.
     ///  - onBackgroundTap: called when the background is tapped (to dismiss the view).
     /// - Returns: view displayed in the reactions overlay slot.
     func makeReactionsOverlayView(
+        channel: ChatChannel,
         currentSnapshot: UIImage,
         messageDisplayInfo: MessageDisplayInfo,
         onBackgroundTap: @escaping () -> Void

StreamChatSwiftUITests/Tests/ChatChannel/MessageActionsViewModel_Tests.swift

@@ -24,18 +24,20 @@ class MessageActionsViewModel_Tests: XCTestCase {
     func test_messageActionsViewModel_confirmationAlertShown() {
         // Given
         let actions = MessageAction.defaultActions(
+            factory: DefaultViewFactory.shared,
             for: .mock(
                 id: .unique,
                 cid: .unique,
                 text: "test",
                 author: .mock(id: .unique)
             ),
+            channel: .mockDMChannel(),
             chatClient: chatClient,
             onDismiss: {},
             onError: { _ in }
         )
         let viewModel = MessageActionsViewModel(messageActions: actions)
-        let action = actions[0]
+        let action = actions[1]
 
         // When
         viewModel.alertAction = action

StreamChatSwiftUITests/Tests/ChatChannel/MessageComposerViewModel_Tests.swift

@@ -315,7 +315,10 @@ class MessageComposerViewModel_Tests: XCTestCase {
 
     private func makeComposerViewModel() -> MessageComposerViewModel {
         let channelController = makeChannelController()
-        let viewModel = MessageComposerViewModel(channelController: channelController)
+        let viewModel = MessageComposerViewModel(
+            channelController: channelController,
+            messageController: nil
+        )
         return viewModel
     }
 

StreamChatSwiftUITests/Tests/ChatChannel/ReactionsOverlayView_Tests.swift

@@ -35,6 +35,7 @@ class ReactionsOverlayView_Tests: XCTestCase {
         let view = VerticallyCenteredView {
             ReactionsOverlayView(
                 factory: DefaultViewFactory.shared,
+                channel: .mockDMChannel(),
                 currentSnapshot: UIImage(systemName: "checkmark")!,
                 messageDisplayInfo: MessageDisplayInfo(
                     message: .mock(id: .unique, cid: .unique, text: "test", author: .mock(id: .unique)),