Merge branch 'develop' into v5

Author: laevandus

.github/workflows/cron-checks.yml

@@ -21,8 +21,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - ios: 18.3
-            xcode: 16.3
+          - ios: 18.5
+            xcode: 16.4
             os: macos-15
             device: "iPhone 16 Pro"
             setup_runtime: false
@@ -91,14 +91,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - xcode: 16.3
-            os: macos-15
-          - xcode: 16.2
+          - xcode: 16.4
             os: macos-15
           - xcode: 16.1
-            os: macos-15
-          - xcode: 16.0
-            os: macos-15
+            os: macos-14
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/smoke-checks.yml

@@ -20,14 +20,15 @@ concurrency:
 
 env:
   HOMEBREW_NO_INSTALL_CLEANUP: 1 # Disable cleanup for homebrew, we don't need it on CI
-  IOS_SIMULATOR_DEVICE: "iPhone 16 Pro (18.3)"
+  IOS_SIMULATOR_DEVICE: "iPhone 16 Pro (18.5)"
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GITHUB_PR_NUM: ${{ github.event.pull_request.number }}
 
 jobs:
   build-test-app-and-frameworks:
     name: Build Test App and Frameworks
     runs-on: macos-15
+    if: ${{ github.event.inputs.record_snapshots != 'true' }}
     steps:
     - uses: actions/checkout@v4.1.1
     - uses: ./.github/actions/ruby-cache

CHANGELOG.md

@@ -3,6 +3,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 # Upcoming
 
+### 🐞 Fixed
+- Fix inconsistencies in gallery view displaying images and videos [927](https://github.com/GetStream/stream-chat-swiftui/pull/927)
+- Prevent audio messages increasing width in reply mode [#926](https://github.com/GetStream/stream-chat-swiftui/pull/926)
+
+# [4.85.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.85.0)
+_August 13, 2025_
+
+### ✅ Added
+- Add support for customizing AddUsersView [#911)(https://github.com/GetStream/stream-chat-swiftui/pull/911)
+
+# [4.84.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.84.0)
+_August 07, 2025_
+
+### ✅ Added
+- Make `AddUsersView` used by `ChatChannelInfoView` public for creating custom info views through composition [#906](https://github.com/GetStream/stream-chat-swiftui/pull/906)
+- Expose `ChannelAvatarViewOptions.init` [#908](https://github.com/GetStream/stream-chat-swiftui/pull/908)
 ### 🐞 Fixed
 - Fix WebView error handling to enable mp3 attachments loading [#904](https://github.com/GetStream/stream-chat-swiftui/pull/904)
 

Package.swift

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

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/AddUsersView.swift

@@ -6,7 +6,7 @@ import StreamChat
 import SwiftUI
 
 /// View for the add users popup.
-struct AddUsersView<Factory: ViewFactory>: View {
+public struct AddUsersView<Factory: ViewFactory>: View {
     @Injected(\.fonts) private var fonts
     @Injected(\.colors) private var colors
 
@@ -24,7 +24,7 @@ struct AddUsersView<Factory: ViewFactory>: View {
     @StateObject private var viewModel: AddUsersViewModel
     var onUserTap: (ChatUser) -> Void
 
-    init(
+    public init(
         factory: Factory = DefaultViewFactory.shared,
         loadedUserIds: [String],
         onUserTap: @escaping (ChatUser) -> Void
@@ -48,7 +48,7 @@ struct AddUsersView<Factory: ViewFactory>: View {
         self.factory = factory
     }
 
-    var body: some View {
+    public var body: some View {
         VStack {
             SearchBar(text: $viewModel.searchText)
 
@@ -92,3 +92,12 @@ struct AddUsersView<Factory: ViewFactory>: View {
         .padding()
     }
 }
+
+/// Options used in the add users view.
+public struct AddUsersOptions {
+    public let loadedUsers: [ChatUser]
+    
+    public init(loadedUsers: [ChatUser]) {
+        self.loadedUsers = loadedUsers
+    }
+}

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/ChatChannelInfoView.swift

@@ -124,9 +124,9 @@ public struct ChatChannelInfoView<Factory: ViewFactory>: View, KeyboardReadable
                         .accessibilityAction {
                             viewModel.addUsersShown = false
                         }
-                    AddUsersView(
-                        factory: factory,
-                        loadedUserIds: viewModel.participants.map(\.id),
+                    
+                    factory.makeAddUsersView(
+                        options: .init(loadedUsers: viewModel.participants.map(\.chatUser)),
                         onUserTap: viewModel.addUserTapped(_:)
                     )
                 }

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/MediaAttachmentsView.swift

@@ -54,25 +54,17 @@ public struct MediaAttachmentsView<Factory: ViewFactory>: View {
                         ForEach(0..<viewModel.mediaItems.count, id: \.self) { mediaItemIndex in
                             let mediaItem = viewModel.mediaItems[mediaItemIndex]
                             ZStack {
-                                if !mediaItem.isVideo, let imageAttachment = mediaItem.imageAttachment {
-                                    let index = viewModel.allImageAttachments.firstIndex { $0.id == imageAttachment.id } ?? 0
-                                    ImageAttachmentContentView(
+                                if let mediaAttachment = mediaItem.mediaAttachment {
+                                    let index = viewModel.allMediaAttachments.firstIndex { $0.id == mediaAttachment.id
+                                    } ?? 0
+                                    MediaAttachmentContentView(
                                         factory: factory,
                                         mediaItem: mediaItem,
-                                        imageAttachment: imageAttachment,
-                                        allImageAttachments: viewModel.allImageAttachments,
+                                        mediaAttachment: mediaAttachment,
+                                        allMediaAttachments: viewModel.allMediaAttachments,
                                         itemWidth: Self.itemWidth,
                                         index: index
                                     )
-                                } else if let videoAttachment = mediaItem.videoAttachment {
-                                    VideoAttachmentContentView(
-                                        factory: factory,
-                                        attachment: videoAttachment,
-                                        message: mediaItem.message,
-                                        width: Self.itemWidth,
-                                        ratio: 1,
-                                        cornerRadius: 0
-                                    )
                                 }
                             }
                             .overlay(
@@ -110,13 +102,13 @@ public struct MediaAttachmentsView<Factory: ViewFactory>: View {
     }
 }
 
-struct ImageAttachmentContentView<Factory: ViewFactory>: View {
+struct MediaAttachmentContentView<Factory: ViewFactory>: View {
     @State private var galleryShown = false
 
     let factory: Factory
     let mediaItem: MediaItem
-    let imageAttachment: ChatMessageImageAttachment
-    let allImageAttachments: [ChatMessageImageAttachment]
+    let mediaAttachment: MediaAttachment
+    let allMediaAttachments: [MediaAttachment]
     let itemWidth: CGFloat
     let index: Int
 
@@ -125,7 +117,7 @@ struct ImageAttachmentContentView<Factory: ViewFactory>: View {
             galleryShown = true
         } label: {
             LazyLoadingImage(
-                source: MediaAttachment(url: imageAttachment.imageURL, type: .image),
+                source: mediaAttachment,
                 width: itemWidth,
                 height: itemWidth
             )
@@ -137,7 +129,7 @@ struct ImageAttachmentContentView<Factory: ViewFactory>: View {
         }
         .fullScreenCover(isPresented: $galleryShown) {
             factory.makeGalleryView(
-                mediaAttachments: allImageAttachments.map { MediaAttachment(from: $0) },
+                mediaAttachments: allMediaAttachments,
                 message: mediaItem.message,
                 isShown: $galleryShown,
                 options: .init(selectedIndex: index)

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/MediaAttachmentsViewModel.swift

@@ -19,8 +19,8 @@ class MediaAttachmentsViewModel: ObservableObject, ChatMessageSearchControllerDe
 
     private var loadingNextMessages = false
 
-    var allImageAttachments: [ChatMessageImageAttachment] {
-        mediaItems.compactMap(\.imageAttachment)
+    var allMediaAttachments: [MediaAttachment] {
+        mediaItems.compactMap(\.mediaAttachment)
     }
 
     init(channel: ChatChannel) {
@@ -113,4 +113,13 @@ struct MediaItem: Identifiable {
 
     var videoAttachment: ChatMessageVideoAttachment?
     var imageAttachment: ChatMessageImageAttachment?
+    
+    var mediaAttachment: MediaAttachment? {
+        if let videoAttachment {
+            return MediaAttachment(url: videoAttachment.videoURL, type: .video)
+        } else if let imageAttachment {
+            return MediaAttachment(url: imageAttachment.imageURL, type: .image)
+        }
+        return nil
+    }
 }

Sources/StreamChatSwiftUI/ChatChannel/Gallery/GalleryView.swift

@@ -127,8 +127,8 @@ public struct GalleryView<Factory: ViewFactory>: View {
                 .foregroundColor(Color(colors.text))
             }
             .sheet(isPresented: $gridShown) {
-                GridPhotosView(
-                    imageURLs: mediaAttachments.filter { $0.type == .image }.map(\.url),
+                GridMediaView(
+                    attachments: mediaAttachments,
                     isShown: $gridShown
                 )
             }

Sources/StreamChatSwiftUI/ChatChannel/Gallery/GridPhotosView.swift renamed to Sources/StreamChatSwiftUI/ChatChannel/Gallery/GridMediaView.swift

@@ -5,9 +5,9 @@
 import StreamChat
 import SwiftUI
 
-/// View used for displaying photos in a grid.
-struct GridPhotosView: View {
-    var imageURLs: [URL]
+/// View used for displaying media in a grid.
+struct GridMediaView: View {
+    var attachments: [MediaAttachment]
     @Binding var isShown: Bool
 
     private static let spacing: CGFloat = 2
@@ -30,9 +30,9 @@ struct GridPhotosView: View {
             )
             ScrollView {
                 LazyVGrid(columns: columns, spacing: 2) {
-                    ForEach(imageURLs, id: \.self) { url in
+                    ForEach(attachments) { attachment in
                         LazyLoadingImage(
-                            source: MediaAttachment(url: url, type: .image),
+                            source: attachment,
                             width: Self.itemWidth,
                             height: Self.itemWidth
                         )