Merge branch 'develop' into v5

# Conflicts:
#	StreamChatSwiftUI.xcodeproj/project.pbxproj

Author: laevandus

CHANGELOG.md

@@ -3,7 +3,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 # Upcoming
 
-### 🔄 Changed
+### ✅ Added
+- Add message highlighting on jumping to a quoted message [#1032](https://github.com/GetStream/stream-chat-swiftui/pull/1032)
+- Display double grey checkmark when delivery events are enabled [#1038](https://github.com/GetStream/stream-chat-swiftui/pull/1038)
+
+### 🐞 Fixed
+- Fix composer deleting newly entered text after deleting draft text [#1030](https://github.com/GetStream/stream-chat-swiftui/pull/1030)
 
 # [4.91.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.91.0)
 _October 22, 2025_

README.md

@@ -39,6 +39,17 @@ The SwiftUI SDK offers three types of components:
 - Stateful components - Offer more customization options and possibility to inject custom views. Also fairly simple to integrate, if the extension points are suitable for your chat use-case. These components come with view models.
 - Stateless components - These are the building blocks for the other two types of components. In order to use them, you would have to provide the state and data. Using these components only make sense if you want to implement completely custom chat experience.
 
+## Documentation Generation
+
+To generate the documentation for SwiftUI StreamChat SDK, run the following command:
+
+```bash
+xcodebuild docbuild -skipMacroValidation -skipPackagePluginValidation -derivedDataPath .derivedData -scheme StreamChatSwiftUI -destination generic/platform=iOS | xcpretty
+open .derivedData/Build/Products/Debug-iphoneos/StreamChatSwiftUI.doccarchive
+```
+
+This will build the documentation archive and automatically open it in Xcode.
+
 ## Free for Makers
 
 Stream is free for most side and hobby projects. You can use Stream Chat for free if you have less than five team members and no more than $10,000 in monthly revenue.

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelView.swift

@@ -73,6 +73,7 @@ public struct ChatChannelView<Factory: ViewFactory>: View, KeyboardReadable {
                             },
                             onJumpToMessage: viewModel.jumpToMessage(messageId:)
                         )
+                        .environment(\.highlightedMessageId, viewModel.highlightedMessageId)
                         .dismissKeyboardOnTap(enabled: true) {
                             hideComposerCommandsAndAttachmentsPicker()
                         }

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift

@@ -56,6 +56,7 @@ import SwiftUI
     public var messageController: ChatMessageController?
 
     @Published public var scrolledId: String?
+    @Published public var highlightedMessageId: String?
     @Published public var listId = UUID().uuidString
 
     @Published public var showScrollToLatestButton = false
@@ -172,6 +173,20 @@ import SwiftUI
                 self?.messageCachingUtils.jumpToReplyId = scrollToMessage.messageId
             } else if messageController != nil, let jumpToReplyId = self?.messageCachingUtils.jumpToReplyId {
                 self?.scrolledId = jumpToReplyId
+                // Trigger highlight when jumping to reply in thread
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
+                    self?.highlightedMessageId = jumpToReplyId
+                }
+                // Clear scroll ID after 2 seconds
+                DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) { [weak self] in
+                    self?.scrolledId = nil
+                }
+                // Clear highlight after animation completes
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.7) { [weak self] in
+                    withAnimation {
+                        self?.highlightedMessageId = nil
+                    }
+                }
                 self?.messageCachingUtils.jumpToReplyId = nil
             } else if messageController == nil {
                 self?.scrolledId = scrollToMessage?.messageId
@@ -232,6 +247,12 @@ import SwiftUI
         if let message = notification.userInfo?[MessageRepliesConstants.selectedMessage] as? ChatMessage {
             threadMessage = message
             threadMessageShown = true
+
+            // Only set jumpToReplyId if there's a specific reply message to highlight
+            // (for showReplyInChannel messages). The parent message should never be highlighted.
+            if let replyMessage = notification.userInfo?[MessageRepliesConstants.threadReplyMessage] as? ChatMessage {
+                messageCachingUtils.jumpToReplyId = replyMessage.messageId
+            }
         }
     }
 
@@ -297,9 +318,20 @@ import SwiftUI
                 if scrolledId == nil {
                     scrolledId = messageId
                 }
+                // Trigger highlight after a short delay to allow scroll animation to start
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
+                    self?.highlightedMessageId = messageId
+                }
+                // Clear scroll ID after 2 seconds
                 DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) { [weak self] in
                     self?.scrolledId = nil
                 }
+                // Clear highlight after animation completes
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.7) { [weak self] in
+                    withAnimation {
+                        self?.highlightedMessageId = nil
+                    }
+                }
                 return true
             } else {
                 let message = channelController.dataStore.message(id: baseId)
@@ -325,9 +357,19 @@ import SwiftUI
                     if toJumpId == baseId, let message = channelController.dataStore.message(id: toJumpId) {
                         toJumpId = message.messageId
                     }
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
                         self?.scrolledId = toJumpId
                         self?.loadingMessagesAround = false
+                        // Trigger highlight after scroll starts
+                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                            self?.highlightedMessageId = toJumpId
+                        }
+                        // Clear highlight after animation completes
+                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.7) {
+                            withAnimation {
+                                self?.highlightedMessageId = nil
+                            }
+                        }
                     }
                 }
                 return false

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerViewModel.swift

@@ -912,14 +912,6 @@ extension MessageComposerViewModel: EventsControllerDelegate {
                 fillDraftMessage()
             }
         }
-
-        if let event = event as? DraftDeletedEvent {
-            let isFromSameThread = messageController?.messageId == event.threadId
-            let isFromSameChannel = channelController.cid == event.cid && messageController == nil
-            if isFromSameThread || isFromSameChannel {
-                clearInputData()
-            }
-        }
     }
 }
 

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageContainerView.swift

@@ -9,7 +9,8 @@ import SwiftUI
 public struct MessageContainerView<Factory: ViewFactory>: View {
     @StateObject var messageViewModel: MessageViewModel
     @Environment(\.channelTranslationLanguage) var translationLanguage
-    
+    @Environment(\.highlightedMessageId) var highlightedMessageId
+
     @Injected(\.fonts) private var fonts
     @Injected(\.colors) private var colors
     @Injected(\.images) private var images
@@ -300,7 +301,17 @@ public struct MessageContainerView<Factory: ViewFactory>: View {
         .padding(.horizontal, messageListConfig.messagePaddings.horizontal)
         .padding(.bottom, showsAllInfo || messageViewModel.isPinned ? paddingValue : groupMessageInterItemSpacing)
         .padding(.top, isLast ? paddingValue : 0)
-        .background(messageViewModel.isPinned ? Color(colors.pinnedBackground) : nil)
+        .background(
+            Group {
+                if utils.messageListConfig.highlightMessageWhenJumping,
+                   let highlightedMessageId = highlightedMessageId,
+                   highlightedMessageId == message.messageId {
+                    Color(colors.messageCellHighlightBackground)
+                } else if messageViewModel.isPinned {
+                    Color(colors.pinnedBackground)
+                }
+            }
+        )
         .padding(.bottom, messageViewModel.isPinned ? paddingValue / 2 : 0)
         .transition(
             message.isSentByCurrentUser ?
@@ -414,6 +425,18 @@ public struct MessageContainerView<Factory: ViewFactory>: View {
     }
 }
 
+// Environment plumbing colocated to avoid adding new files to the package list.
+private struct HighlightedMessageIdKey: EnvironmentKey {
+    static let defaultValue: String? = nil
+}
+
+extension EnvironmentValues {
+    var highlightedMessageId: String? {
+        get { self[HighlightedMessageIdKey.self] }
+        set { self[HighlightedMessageIdKey.self] = newValue }
+    }
+}
+
 struct SendFailureIndicator: View {
     @Injected(\.colors) private var colors
     @Injected(\.images) private var images

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListConfig.swift

@@ -26,6 +26,7 @@ public struct MessageListConfig {
         iPadSplitViewEnabled: Bool = true,
         scrollingAnchor: UnitPoint = .center,
         showNewMessagesSeparator: Bool = true,
+        highlightMessageWhenJumping: Bool = true,
         handleTabBarVisibility: Bool = true,
         messageListAlignment: MessageListAlignment = .standard,
         uniqueReactionsEnabled: Bool = false,
@@ -57,6 +58,7 @@ public struct MessageListConfig {
         self.iPadSplitViewEnabled = iPadSplitViewEnabled
         self.scrollingAnchor = scrollingAnchor
         self.showNewMessagesSeparator = showNewMessagesSeparator
+        self.highlightMessageWhenJumping = highlightMessageWhenJumping
         self.handleTabBarVisibility = handleTabBarVisibility
         self.messageListAlignment = messageListAlignment
         self.uniqueReactionsEnabled = uniqueReactionsEnabled
@@ -121,6 +123,11 @@ public struct MessageListConfig {
 
     /// A boolean value that determines if download action is shown for file attachments.
     public let downloadFileAttachmentsEnabled: Bool
+
+    /// Highlights the message background when jumping to a message.
+    ///
+    /// By default it is enabled and it uses the color from `ColorPalette.messageCellHighlightBackground`.
+    public let highlightMessageWhenJumping: Bool
 }
 
 /// Contains information about the message paddings.

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListHelperViews.swift

@@ -100,11 +100,18 @@ public struct MessageReadIndicatorView: View {
 
     var readUsers: [ChatUser]
     var showReadCount: Bool
+    var showDelivered: Bool
     var localState: LocalMessageState?
 
-    public init(readUsers: [ChatUser], showReadCount: Bool, localState: LocalMessageState? = nil) {
+    public init(
+        readUsers: [ChatUser],
+        showReadCount: Bool,
+        showDelivered: Bool = false,
+        localState: LocalMessageState? = nil
+    ) {
         self.readUsers = readUsers
         self.showReadCount = showReadCount
+        self.showDelivered = showDelivered
         self.localState = localState
     }
 
@@ -135,7 +142,7 @@ public struct MessageReadIndicatorView: View {
     }
 
     private var image: UIImage {
-        shouldShowReads ? images.readByAll : (isMessageSending ? images.messageReceiptSending : images.messageSent)
+        shouldShowReads || showDelivered ? images.readByAll : (isMessageSending ? images.messageReceiptSending : images.messageSent)
     }
 
     private var isMessageSending: Bool {

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageRepliesView.swift

@@ -8,6 +8,7 @@ import SwiftUI
 enum MessageRepliesConstants {
     static let selectedMessageThread = "selectedMessageThread"
     static let selectedMessage = "selectedMessage"
+    static let threadReplyMessage = "threadReplyMessage"
 }
 
 /// View shown below a message, when there are replies to it.
@@ -21,21 +22,24 @@ public struct MessageRepliesView<Factory: ViewFactory>: View {
     var replyCount: Int
     var isRightAligned: Bool
     var showReplyCount: Bool
+    var threadReplyMessage: ChatMessage? // The actual reply message (for showReplyInChannel messages)
 
     public init(
         factory: Factory,
         channel: ChatChannel,
         message: ChatMessage,
         replyCount: Int,
         showReplyCount: Bool = true,
-        isRightAligned: Bool? = nil
+        isRightAligned: Bool? = nil,
+        threadReplyMessage: ChatMessage? = nil
     ) {
         self.factory = factory
         self.channel = channel
         self.message = message
         self.replyCount = replyCount
         self.isRightAligned = isRightAligned ?? message.isRightAligned
         self.showReplyCount = showReplyCount
+        self.threadReplyMessage = threadReplyMessage
     }
 
     public var body: some View {
@@ -44,10 +48,14 @@ public struct MessageRepliesView<Factory: ViewFactory>: View {
             resignFirstResponder()
             // NOTE: this is used to avoid breaking changes.
             // Will be updated in a major release.
+            var userInfo: [String: Any] = [MessageRepliesConstants.selectedMessage: message]
+            if let threadReplyMessage = threadReplyMessage {
+                userInfo[MessageRepliesConstants.threadReplyMessage] = threadReplyMessage
+            }
             NotificationCenter.default.post(
                 name: NSNotification.Name(MessageRepliesConstants.selectedMessageThread),
                 object: nil,
-                userInfo: [MessageRepliesConstants.selectedMessage: message]
+                userInfo: userInfo
             )
         } label: {
             HStack {

Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelListItem.swift

@@ -87,9 +87,10 @@ public struct ChatChannelListItem<Factory: ViewFactory>: View {
                                 MessageReadIndicatorView(
                                     readUsers: channel.readUsers(
                                         currentUserId: chatClient.currentUserId,
-                                        message: channel.latestMessages.first
+                                        message: channel.previewMessage
                                     ),
-                                    showReadCount: false
+                                    showReadCount: false,
+                                    showDelivered: channel.previewMessage?.deliveryStatus(for: channel) == .delivered
                                 )
                             }
                             SubtitleText(text: injectedChannelInfo?.timestamp ?? channel.timestampText)
@@ -161,9 +162,8 @@ public struct ChatChannelListItem<Factory: ViewFactory>: View {
     }
 
     private var shouldShowReadEvents: Bool {
-        if let message = channel.latestMessages.first,
-           message.isSentByCurrentUser,
-           !message.isDeleted {
+        if let message = channel.previewMessage,
+           message.isSentByCurrentUser {
             return channel.config.readEventsEnabled
         }