Merge pull request #806 from GetStream/add/edit-message-attachments

Author: nuno-vieira

CHANGELOG.md

@@ -3,7 +3,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 # Upcoming
 
+### ✅ Added
+- Add support for editing message attachments [#806](https://github.com/GetStream/stream-chat-swiftui/pull/806)
+### 🐞 Fixed
+- Fix scrolling to the bottom when editing a message [#806](https://github.com/GetStream/stream-chat-swiftui/pull/806)
+- Fix having message edit action on Giphy messages [#806](https://github.com/GetStream/stream-chat-swiftui/pull/806)
+- Fix being able to long press an unsent Giphy message [#806](https://github.com/GetStream/stream-chat-swiftui/pull/806)
+- Fix being able to swipe to reply an unsent Giphy message [#806](https://github.com/GetStream/stream-chat-swiftui/pull/806)
 ### 🔄 Changed
+- Deprecated `ComposerConfig.attachmentPayloadConverter` in favour of `MessageComposerViewModel.convertAddedAssetsToPayloads()` [#806](https://github.com/GetStream/stream-chat-swiftui/pull/806)
 
 # [4.77.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.77.0)
 _April 10, 2025_

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelView.swift

@@ -115,7 +115,9 @@ public struct ChatChannelView<Factory: ViewFactory>: View, KeyboardReadable {
                         messageController: viewModel.messageController,
                         quotedMessage: $viewModel.quotedMessage,
                         editedMessage: $viewModel.editedMessage,
-                        onMessageSent: viewModel.scrollToLastMessage
+                        onMessageSent: {
+                            viewModel.messageSentTapped()
+                        }
                     )
                     .opacity((
                         utils.messageListConfig.messagePopoverEnabled && messageDisplayInfo != nil && !viewModel

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift

@@ -264,7 +264,15 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
             }
         }
     }
-        
+
+    /// The user tapped on the message sent button.
+    public func messageSentTapped() {
+        // only scroll if the message is not being edited
+        if editedMessage == nil {
+            scrollToLastMessage()
+        }
+    }
+
     public func jumpToMessage(messageId: String) -> Bool {
         if messageId == .unknownMessageId {
             if firstUnreadMessageId == nil, let lastReadMessageId {

Sources/StreamChatSwiftUI/ChatChannel/Composer/ComposerConfig.swift

@@ -17,6 +17,14 @@ public struct ComposerConfig {
     public var inputPaddingsConfig: PaddingsConfig
     public var adjustMessageOnSend: (String) -> (String)
     public var adjustMessageOnRead: (String) -> (String)
+
+    @available(
+        *,
+        deprecated,
+        message: """
+        Override the MessageComposerViewModel.inputAttachmentsAsPayloads() in order to convert the message attachments to payloads.
+        """
+    )
     public var attachmentPayloadConverter: (ChatMessage) -> [AnyAttachmentPayload]
 
     public init(
@@ -44,8 +52,9 @@ public struct ComposerConfig {
         self.isVoiceRecordingEnabled = isVoiceRecordingEnabled
     }
 
-    public static var defaultAttachmentPayloadConverter: (ChatMessage) -> [AnyAttachmentPayload] = { message in
-        message.allAttachments.toAnyAttachmentPayload()
+    public static var defaultAttachmentPayloadConverter: (ChatMessage) -> [AnyAttachmentPayload] = { _ in
+        /// This now returns empty array by default since attachmentPayloadConverter has been deprecated.
+        []
     }
 }
 

Sources/StreamChatSwiftUI/ChatChannel/Composer/ComposerModels.swift

@@ -27,25 +27,34 @@ public struct AddedAsset: Identifiable, Equatable {
     public let url: URL
     public let type: AssetType
     public var extraData: [String: RawJSON] = [:]
-    
+
+    /// The payload of the attachment, in case the attachment has been uploaded to server already.
+    /// This is mostly used when editing an existing message that contains attachments.
+    public var payload: AttachmentPayload?
+
     public init(
         image: UIImage,
         id: String,
         url: URL,
         type: AssetType,
-        extraData: [String: RawJSON] = [:]
+        extraData: [String: RawJSON] = [:],
+        payload: AttachmentPayload? = nil
     ) {
         self.image = image
         self.id = id
         self.url = url
         self.type = type
         self.extraData = extraData
+        self.payload = payload
     }
 }
 
 extension AddedAsset {
     func toAttachmentPayload() throws -> AnyAttachmentPayload {
-        try AnyAttachmentPayload(
+        if let payload = self.payload {
+            return AnyAttachmentPayload(payload: payload)
+        }
+        return try AnyAttachmentPayload(
             localFileURL: url,
             attachmentType: type == .video ? .video : .image,
             extraData: extraData
@@ -63,7 +72,8 @@ extension AnyChatMessageAttachment {
                 id: imageAttachment.id.rawValue,
                 url: imageAttachment.imageURL,
                 type: .image,
-                extraData: imageAttachment.extraData ?? [:]
+                extraData: imageAttachment.extraData ?? [:],
+                payload: imageAttachment.payload
             )
         } else if let videoAttachment = attachment(payloadType: VideoAttachmentPayload.self),
                   let thumbnail = imageThumbnail(for: videoAttachment.payload) {
@@ -72,7 +82,8 @@ extension AnyChatMessageAttachment {
                 id: videoAttachment.id.rawValue,
                 url: videoAttachment.videoURL,
                 type: .video,
-                extraData: videoAttachment.extraData ?? [:]
+                extraData: videoAttachment.extraData ?? [:],
+                payload: videoAttachment.payload
             )
         }
         return nil

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerView.swift

@@ -102,9 +102,11 @@ public struct MessageComposerView<Factory: ViewFactory>: View, KeyboardReadable
                         quotedMessage: quotedMessage,
                         editedMessage: editedMessage
                     ) {
+                        // Calling onMessageSent() before erasing the edited and quoted message
+                        // so that onMessageSent can use them for state handling.
+                        onMessageSent()
                         quotedMessage = nil
                         editedMessage = nil
-                        onMessageSent()
                     }
                 }
                 .environmentObject(viewModel)
@@ -208,11 +210,10 @@ public struct MessageComposerView<Factory: ViewFactory>: View, KeyboardReadable
         )
         .modifier(factory.makeComposerViewModifier())
         .onChange(of: editedMessage) { _ in
-            viewModel.text = editedMessage?.text ?? ""
+            viewModel.fillEditedMessage(editedMessage)
             if editedMessage != nil {
                 becomeFirstResponder()
                 editedMessageWillShow = true
-                viewModel.selectedRangeLocation = editedMessage?.text.count ?? 0
             }
         }
         .onAppear(perform: {