Improvements to the composer view

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannel/Composer/AddedImageAttachmentsView.swift

@@ -23,34 +23,45 @@ public struct AddedImageAttachmentsView: View {
     }
 
     public var body: some View {
-        ScrollView(.horizontal) {
-            HStack {
-                ForEach(images) { attachment in
-                    Image(uiImage: attachment.image)
-                        .resizable()
-                        .aspectRatio(contentMode: .fill)
-                        .frame(width: imageSize, height: imageSize)
-                        .clipped()
-                        .cornerRadius(12)
-                        .overlay(
-                            ZStack {
-                                DiscardAttachmentButton(
-                                    attachmentIdentifier: attachment.id,
-                                    onDiscard: onDiscardAttachment
-                                )
-                                
-                                if attachment.type == .video {
-                                    VideoIndicatorView()
+        ScrollViewReader { reader in
+            ScrollView(.horizontal) {
+                HStack {
+                    ForEach(images) { attachment in
+                        Image(uiImage: attachment.image)
+                            .resizable()
+                            .aspectRatio(contentMode: .fill)
+                            .frame(width: imageSize, height: imageSize)
+                            .clipped()
+                            .cornerRadius(12)
+                            .id(attachment.id)
+                            .overlay(
+                                ZStack {
+                                    DiscardAttachmentButton(
+                                        attachmentIdentifier: attachment.id,
+                                        onDiscard: onDiscardAttachment
+                                    )
 
-                                    if let duration = attachment.extraData["duration"] as? String {
-                                        VideoDurationIndicatorView(duration: duration)
+                                    if attachment.type == .video {
+                                        VideoIndicatorView()
+                                        
+                                        if let duration = attachment.extraData["duration"] as? String {
+                                            VideoDurationIndicatorView(duration: duration)
+                                        }
                                     }
                                 }
-                            }
-                        )
+                            )
+                    }
+                }
+            }
+            .frame(height: imageSize)
+            .onChange(of: images) { [images] newValue in
+                if newValue.count > images.count {
+                    let last = newValue.last
+                    withAnimation {
+                        reader.scrollTo(last?.id, anchor: .trailing)
+                    }
                 }
             }
         }
-        .frame(height: imageSize)
     }
 }

Sources/StreamChatSwiftUI/ChatChannel/Composer/AttachmentPickerView.swift

@@ -44,6 +44,7 @@ public struct AttachmentPickerView<Factory: ViewFactory>: View {
                             onAssetTap: onAssetTap,
                             isAssetSelected: isAssetSelected
                         )
+                        .edgesIgnoringSafeArea(.bottom)
                     } else {
                         viewFactory.makeAssetsAccessPermissionView()
                     }

Sources/StreamChatSwiftUI/ChatChannel/Composer/ComposerHelperViews.swift

@@ -97,12 +97,15 @@ struct CameraPickerDisplayView: View {
 
     var body: some View {
         Spacer()
-            .sheet(isPresented: $cameraPickerShown, onDismiss: {
+            .fullScreenCover(isPresented: $cameraPickerShown, onDismiss: {
                 selectedPickerState = .photos
             }) {
                 ImagePickerView(sourceType: .camera) { addedImage in
                     cameraImageAdded(addedImage)
                 }
+                .background(
+                    Color.black.edgesIgnoringSafeArea(.all)
+                )
             }
     }
 }

Sources/StreamChatSwiftUI/ChatChannel/Composer/ComposerModels.swift

@@ -14,7 +14,12 @@ public enum AttachmentPickerState {
 }
 
 /// Struct representing an asset added to the composer.
-public struct AddedAsset: Identifiable {
+public struct AddedAsset: Identifiable, Equatable {
+    
+    public static func == (lhs: AddedAsset, rhs: AddedAsset) -> Bool {
+        lhs.id == rhs.id
+    }
+    
     public let image: UIImage
     public let id: String
     public let url: URL