Merge branch 'develop' into v5

Author: laevandus

CHANGELOG.md

@@ -3,12 +3,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 # Upcoming
 
+### 🔄 Changed
+
+# [4.92.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.92.0)
+_November 07, 2025_
+
 ### ✅ 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)
+- Fix mark unread action not shown for messages that are root of a thread in the channel view [#1041](https://github.com/GetStream/stream-chat-swiftui/pull/1041)
 
 # [4.91.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.91.0)
 _October 22, 2025_

Package.swift

@@ -16,7 +16,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/GetStream/stream-chat-swift.git", from: "4.91.0")
+        .package(url: "https://github.com/GetStream/stream-chat-swift.git", from: "4.92.0")
     ],
     targets: [
         .target(

README.md

@@ -5,7 +5,7 @@
 <p align="center">
   <a href="https://sonarcloud.io/summary/new_code?id=GetStream_stream-chat-swiftui"><img src="https://sonarcloud.io/api/project_badges/measure?project=GetStream_stream-chat-swiftui&metric=coverage" /></a>
 
-  <img id="stream-chat-swiftui-label" alt="StreamChatSwiftUI" src="https://img.shields.io/badge/StreamChatSwiftUI-9.58%20MB-blue"/>
+  <img id="stream-chat-swiftui-label" alt="StreamChatSwiftUI" src="https://img.shields.io/badge/StreamChatSwiftUI-9.63%20MB-blue"/>
 </p>
 
 ## SwiftUI StreamChat SDK

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift

@@ -58,6 +58,9 @@ import SwiftUI
     @Published public var scrolledId: String?
     @Published public var highlightedMessageId: String?
     @Published public var listId = UUID().uuidString
+    // A boolean to skip highlighting of a message when scrolling to it.
+    // This is used for scenarios when scrolling to message Id should not highlight it.
+    var skipHighlightMessageId: String?
 
     @Published public var showScrollToLatestButton = false
     @Published var showAlertBanner = false
@@ -173,20 +176,11 @@ 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?.highlightMessage(withId: jumpToReplyId)
                 self?.messageCachingUtils.jumpToReplyId = nil
             } else if messageController == nil {
                 self?.scrolledId = scrollToMessage?.messageId
@@ -318,20 +312,11 @@ 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
-                    }
-                }
+                highlightMessage(withId: messageId)
                 return true
             } else {
                 let message = channelController.dataStore.message(id: baseId)
@@ -360,23 +345,33 @@ import SwiftUI
                     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
-                            }
-                        }
+                        self?.highlightMessage(withId: toJumpId)
                     }
                 }
                 return false
             }
         }
     }
-    
+
+    /// Highlights the message background.
+    ///
+    /// - Parameter messageId: The ID of the message to highlight.
+    public func highlightMessage(withId messageId: MessageId) {
+        if skipHighlightMessageId == messageId {
+            skipHighlightMessageId = nil
+            return
+        }
+
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
+            self?.highlightedMessageId = messageId
+        }
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.7) { [weak self] in
+            withAnimation {
+                self?.highlightedMessageId = nil
+            }
+        }
+    }
+
     open func handleMessageAppear(index: Int, scrollDirection: ScrollDirection) {
         if index >= channelDataSource.messages.count || loadingMessagesAround {
             return
@@ -561,7 +556,7 @@ import SwiftUI
     }
 
     // MARK: - private
-    
+
     private func checkForOlderMessages(index: Int) {
         guard index >= channelDataSource.messages.count - 25 else { return }
         guard !loadingPreviousMessages else { return }

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

@@ -121,16 +121,14 @@ public extension MessageAction {
             messageActions.append(copyAction)
         }
 
-        if message.isRootOfThread {
-            if isInsideThreadView {
-                let markThreadUnreadAction = markThreadAsUnreadAction(
-                    messageController: messageController,
-                    message: message,
-                    onFinish: onFinish,
-                    onError: onError
-                )
-                messageActions.append(markThreadUnreadAction)
-            }
+        if message.isRootOfThread && isInsideThreadView {
+            let markThreadUnreadAction = markThreadAsUnreadAction(
+                messageController: messageController,
+                message: message,
+                onFinish: onFinish,
+                onError: onError
+            )
+            messageActions.append(markThreadUnreadAction)
         } else if !message.isSentByCurrentUser && channel.canReceiveReadEvents {
             if !message.isPartOfThread || message.showReplyInChannel {
                 let markUnreadAction = markAsUnreadAction(

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

@@ -40,6 +40,7 @@ public class MessageActionsResolver: MessageActionsResolving {
         } else if info.identifier == MessageActionId.markUnread {
             viewModel.firstUnreadMessageId = info.message.messageId
             viewModel.currentUserMarkedMessageUnread = true
+            viewModel.skipHighlightMessageId = info.message.messageId
             viewModel.scrolledId = info.message.messageId
         }
 

Sources/StreamChatSwiftUI/Generated/SystemEnvironment+Version.swift

@@ -7,5 +7,5 @@ import Foundation
 
 enum SystemEnvironment {
   /// A Stream Chat version.
-  public static let version: String = "4.92.0-SNAPSHOT"
+  public static let version: String = "4.93.0-SNAPSHOT"
 }

Sources/StreamChatSwiftUI/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.91.0</string>
+	<string>4.92.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPhotoLibraryUsageDescription</key>

StreamChatSwiftUI-XCFramework.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name = 'StreamChatSwiftUI-XCFramework'
-  spec.version = '4.91.0'
+  spec.version = '4.92.0'
   spec.summary = 'StreamChat SwiftUI Chat Components'
   spec.description = 'StreamChatSwiftUI SDK offers flexible SwiftUI components able to display data provided by StreamChat SDK.'
 
@@ -19,7 +19,7 @@ Pod::Spec.new do |spec|
 
   spec.framework = 'Foundation', 'UIKit', 'SwiftUI'
 
-  spec.dependency 'StreamChat-XCFramework', '~> 4.91.0'
+  spec.dependency 'StreamChat-XCFramework', '~> 4.92.0'
 
   spec.cocoapods_version = '>= 1.11.0'
 end

StreamChatSwiftUI.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name = 'StreamChatSwiftUI'
-  spec.version = '4.91.0'
+  spec.version = '4.92.0'
   spec.summary = 'StreamChat SwiftUI Chat Components'
   spec.description = 'StreamChatSwiftUI SDK offers flexible SwiftUI components able to display data provided by StreamChat SDK.'
 
@@ -19,5 +19,5 @@ Pod::Spec.new do |spec|
 
   spec.framework = 'Foundation', 'UIKit', 'SwiftUI'
 
-  spec.dependency 'StreamChat', '~> 4.91.0'
+  spec.dependency 'StreamChat', '~> 4.92.0'
 end