updated the docs

martinmitrevski · martinmitrevski · commit f05af4785472 · 2021-12-15T16:40:26.000+01:00
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageView.swift b/Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageView.swift
@@ -24,7 +24,8 @@ struct MessageView<Factory: ViewFactory>: View {
                 factory.makeCustomAttachmentViewType(
                     for: message,
                     isFirst: isFirst,
-                    availableWidth: contentWidth
+                    availableWidth: contentWidth,
+                    scrolledId: $scrolledId
                 )
             } else if messageTypeResolver.isDeleted(message: message) {
                 factory.makeDeletedMessageView(
diff --git a/Sources/StreamChatSwiftUI/DefaultViewFactory.swift b/Sources/StreamChatSwiftUI/DefaultViewFactory.swift
@@ -228,7 +228,8 @@ extension ViewFactory {
     public func makeCustomAttachmentViewType(
         for message: ChatMessage,
         isFirst: Bool,
-        availableWidth: CGFloat
+        availableWidth: CGFloat,
+        scrolledId: Binding<String?>
     ) -> some View {
         EmptyView()
     }
diff --git a/Sources/StreamChatSwiftUI/ViewFactory.swift b/Sources/StreamChatSwiftUI/ViewFactory.swift
@@ -206,7 +206,8 @@ public protocol ViewFactory: AnyObject {
     func makeCustomAttachmentViewType(
         for message: ChatMessage,
         isFirst: Bool,
-        availableWidth: CGFloat
+        availableWidth: CGFloat,
+        scrolledId: Binding<String?>
     ) -> CustomAttachmentViewType
     
     associatedtype GiphyBadgeViewType: View
diff --git a/StreamChatSwiftUITests/Tests/ChatChannel/__Snapshots__/ReactionsOverlayView_Tests/test_reactionsOverlayView_snapshot.1.png b/StreamChatSwiftUITests/Tests/ChatChannel/__Snapshots__/ReactionsOverlayView_Tests/test_reactionsOverlayView_snapshot.1.png
diff --git a/StreamChatSwiftUITests/Tests/ChatChannelList/__Snapshots__/MoreChannelActionsView_Tests/test_moreChannelActionsView_snapshot.1.png b/StreamChatSwiftUITests/Tests/ChatChannelList/__Snapshots__/MoreChannelActionsView_Tests/test_moreChannelActionsView_snapshot.1.png
diff --git a/StreamChatSwiftUITests/Tests/Utils/ViewFactory_Tests.swift b/StreamChatSwiftUITests/Tests/Utils/ViewFactory_Tests.swift
@@ -253,7 +253,8 @@ class ViewFactory_Tests: XCTestCase {
         let view = viewFactory.makeCustomAttachmentViewType(
             for: message,
             isFirst: true,
-            availableWidth: 300
+            availableWidth: 300,
+            scrolledId: .constant(nil)
         )
         
         // Then
diff --git a/docusaurus/docs/iOS/swiftui/components/attachments.md b/docusaurus/docs/iOS/swiftui/components/attachments.md
@@ -57,11 +57,13 @@ class CustomFactory: ViewFactory {
     func makeMessageTextView(
         for message: ChatMessage,
         isFirst: Bool,
-        availableWidth: CGFloat
+        availableWidth: CGFloat,
+        scrolledId: Binding<String?>
     ) -> some View {
         CustomMessageTextView(
             message: message,
-            isFirst: isFirst
+            isFirst: isFirst,
+            scrolledId: scrolledId
         )
     }
 
@@ -146,7 +148,8 @@ Next, in our `CustomFactory`, we need to return the new view we have created abo
 func makeCustomAttachmentViewType(
     for message: ChatMessage,
     isFirst: Bool,
-    availableWidth: CGFloat
+    availableWidth: CGFloat,
+    scrolledId: Binding<String?>
 ) -> some View {
     CustomAttachmentView(
         message: message,
diff --git a/docusaurus/docs/iOS/swiftui/components/message-reactions.md b/docusaurus/docs/iOS/swiftui/components/message-reactions.md
@@ -42,17 +42,17 @@ The reactions overlay view (shown on long press of a message), also provides acc
 public func supportedMessageActions(
         for message: ChatMessage,
         channel: ChatChannel,
-        onDismiss: @escaping () -> Void,
+        onFinish: @escaping (MessageActionInfo) -> Void,
         onError: @escaping (Error) -> Void
 ) -> [MessageAction] {
     MessageAction.defaultActions(
-            factory: self,
-            for: message,
-            channel: channel,
-            chatClient: chatClient,
-            onDismiss: onDismiss,
-            onError: onError
-        )
+        factory: self,
+        for: message,
+        channel: channel,
+        chatClient: chatClient,
+        onFinish: onFinish,
+        onError: onError
+    )
 }
 
 extension MessageAction {
@@ -61,23 +61,24 @@ extension MessageAction {
         for message: ChatMessage,
         channel: ChatChannel,
         chatClient: ChatClient,
-        onDismiss: @escaping () -> Void,
+        onFinish: @escaping (MessageActionInfo) -> Void,
         onError: @escaping (Error) -> Void
     ) -> [MessageAction] {
         var messageActions = [MessageAction]()
         
+        let replyAction = replyAction(
+            for: message,
+            channel: channel,
+            onFinish: onFinish
+        )
+        messageActions.append(replyAction)
+        
         if !message.isPartOfThread {
-            var replyThread = MessageAction(
-                title: L10n.Message.Actions.threadReply,
-                iconName: "icn_thread_reply",
-                action: onDismiss,
-                confirmationPopup: nil,
-                isDestructive: false
+            let replyThread = threadReplyAction(
+                factory: factory,
+                for: message,
+                channel: channel
             )
-            
-            let destination = factory.makeMessageThreadDestination()
-            replyThread.navigationDestination = AnyView(destination(channel, message))
-            
             messageActions.append(replyThread)
         }
 
@@ -86,7 +87,7 @@ extension MessageAction {
                 for: message,
                 channel: channel,
                 chatClient: chatClient,
-                onDismiss: onDismiss,
+                onFinish: onFinish,
                 onError: onError
             )
             
@@ -96,7 +97,7 @@ extension MessageAction {
                 for: message,
                 channel: channel,
                 chatClient: chatClient,
-                onDismiss: onDismiss,
+                onFinish: onFinish,
                 onError: onError
             )
             
@@ -106,11 +107,54 @@ extension MessageAction {
         return messageActions
     }
     
+    // MARK: - private
+    
+    private static func replyAction(
+        for message: ChatMessage,
+        channel: ChatChannel,
+        onFinish: @escaping (MessageActionInfo) -> Void
+    ) -> MessageAction {
+        let replyAction = MessageAction(
+            title: L10n.Message.Actions.inlineReply,
+            iconName: "icn_inline_reply",
+            action: {
+                onFinish(
+                    MessageActionInfo(
+                        message: message,
+                        identifier: "inlineReply"
+                    )
+                )
+            },
+            confirmationPopup: nil,
+            isDestructive: false
+        )
+        
+        return replyAction
+    }
+    
+    private static func threadReplyAction<Factory: ViewFactory>(
+        factory: Factory,
+        for message: ChatMessage,
+        channel: ChatChannel
+    ) -> MessageAction {
+        var replyThread = MessageAction(
+            title: L10n.Message.Actions.threadReply,
+            iconName: "icn_thread_reply",
+            action: {},
+            confirmationPopup: nil,
+            isDestructive: false
+        )
+        
+        let destination = factory.makeMessageThreadDestination()
+        replyThread.navigationDestination = AnyView(destination(channel, message))
+        return replyThread
+    }
+    
     private static func deleteMessageAction(
         for message: ChatMessage,
         channel: ChatChannel,
         chatClient: ChatClient,
-        onDismiss: @escaping () -> Void,
+        onFinish: @escaping (MessageActionInfo) -> Void,
         onError: @escaping (Error) -> Void
     ) -> MessageAction {
         let messageController = chatClient.messageController(
@@ -123,7 +167,12 @@ extension MessageAction {
                 if let error = error {
                     onError(error)
                 } else {
-                    onDismiss()
+                    onFinish(
+                        MessageActionInfo(
+                            message: message,
+                            identifier: "delete"
+                        )
+                    )
                 }
             }
         }
@@ -149,7 +198,7 @@ extension MessageAction {
         for message: ChatMessage,
         channel: ChatChannel,
         chatClient: ChatClient,
-        onDismiss: @escaping () -> Void,
+        onFinish: @escaping (MessageActionInfo) -> Void,
         onError: @escaping (Error) -> Void
     ) -> MessageAction {
         let messageController = chatClient.messageController(
@@ -162,7 +211,12 @@ extension MessageAction {
                 if let error = error {
                     onError(error)
                 } else {
-                    onDismiss()
+                    onFinish(
+                        MessageActionInfo(
+                            message: message,
+                            identifier: "flag"
+                        )
+                    )
                 }
             }
         }
@@ -183,24 +237,25 @@ extension MessageAction {
         
         return flagMessage
     }
+}
 ```
 
 Alternatively, you can swap the whole `MessageActionsView` with your own implementation, by implementing the `makeMessageActionsView` method in the `ViewFactory`. 
 
 ```swift
 public func makeMessageActionsView(
-        for message: ChatMessage,
-        channel: ChatChannel,
-        onDismiss: @escaping () -> Void,
-        onError: @escaping (Error) -> Void
+    for message: ChatMessage,
+    channel: ChatChannel,
+    onFinish: @escaping (MessageActionInfo) -> Void,
+    onError: @escaping (Error) -> Void
 ) -> some View {
     let messageActions = supportedMessageActions(
         for: message,
         channel: channel,
-        onDismiss: onDismiss,
+        onFinish: onFinish,
         onError: onError
     )
-        
+    
     return MessageActionsView(messageActions: messageActions)
 }
 ```
@@ -209,17 +264,19 @@ Additionally, you can swap the whole `ReactionsOverlayView` with your own implem
 
 ```swift
 public func makeReactionsOverlayView(
-        channel: ChatChannel,
-        currentSnapshot: UIImage,
-        messageDisplayInfo: MessageDisplayInfo,
-        onBackgroundTap: @escaping () -> Void
+    channel: ChatChannel,
+    currentSnapshot: UIImage,
+    messageDisplayInfo: MessageDisplayInfo,
+    onBackgroundTap: @escaping () -> Void,
+    onActionExecuted: @escaping (MessageActionInfo) -> Void
 ) -> some View {
     ReactionsOverlayView(
         factory: self,
         channel: channel,
         currentSnapshot: currentSnapshot,
         messageDisplayInfo: messageDisplayInfo,
-        onBackgroundTap: onBackgroundTap
+        onBackgroundTap: onBackgroundTap,
+        onActionExecuted: onActionExecuted
     )
 }
 ```

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,8 @@ class ViewFactory_Tests: XCTestCase {`
`253`	`253`	`let view = viewFactory.makeCustomAttachmentViewType(`
`254`	`254`	`for: message,`
`255`	`255`	`isFirst: true,`
`256`		`- availableWidth: 300`
	`256`	`+ availableWidth: 300,`
	`257`	`+ scrolledId: .constant(nil)`
`257`	`258`	`)`
`258`	`259`
`259`	`260`	`// Then`