fixed issue with jumping keyboard

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerView.swift

@@ -31,7 +31,7 @@ public struct MessageComposerView<Factory: ViewFactory>: View, KeyboardReadable
     var onMessageSent: () -> Void
 
     public var body: some View {
-        VStack {
+        VStack(spacing: 0) {
             HStack(alignment: .bottom) {
                 factory.makeLeadingComposerView(state: $viewModel.pickerTypeState)
 
@@ -98,7 +98,7 @@ public struct ComposerInputView<Factory: ViewFactory>: View {
     var addedAssets: [AddedAsset]
     var addedFileURLs: [URL]
     var addedCustomAttachments: [CustomAttachment]
-    var onCustomAttachmentTap: (CustomAttachment) -> ()
+    var onCustomAttachmentTap: (CustomAttachment) -> Void
 
     var removeAttachmentWithId: (String) -> Void
 
@@ -145,7 +145,8 @@ public struct ComposerInputView<Factory: ViewFactory>: View {
             if !addedCustomAttachments.isEmpty {
                 factory.makeCustomAttachmentPreviewView(
                     addedCustomAttachments: addedCustomAttachments,
-                    onCustomAttachmentTap: onCustomAttachmentTap)
+                    onCustomAttachmentTap: onCustomAttachmentTap
+                )
             }
 
             ComposerTextInputView(

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListView.swift

@@ -25,6 +25,7 @@ struct MessageListView<Factory: ViewFactory>: View, KeyboardReadable {
     @State private var width: CGFloat?
     @State private var height: CGFloat?
     @State private var keyboardShown = false
+    @State private var pendingKeyboardUpdate: Bool?
 
     private var dateFormatter: DateFormatter {
         utils.dateFormatter
@@ -101,7 +102,13 @@ struct MessageListView<Factory: ViewFactory>: View, KeyboardReadable {
                     }
                 }
                 .onPreferenceChange(ScrollViewOffsetPreferenceKey.self) { value in
-                    showScrollToLatestButton = value ?? 0 < -20
+                    DispatchQueue.main.async {
+                        let offsetValue = value ?? 0
+                        showScrollToLatestButton = offsetValue < -20
+                        if keyboardShown {
+                            resignFirstResponder()
+                        }
+                    }
                 }
                 .onPreferenceChange(HeightPreferenceKey.self) { value in
                     if let value = value, value != height {
@@ -132,8 +139,18 @@ struct MessageListView<Factory: ViewFactory>: View, KeyboardReadable {
             }
         }
         .onReceive(keyboardPublisher) { visible in
-            keyboardShown = visible
+            if currentDateString != nil {
+                pendingKeyboardUpdate = visible
+            } else {
+                keyboardShown = visible
+            }
         }
+        .onChange(of: currentDateString, perform: { dateString in
+            if dateString == nil, let keyboardUpdate = pendingKeyboardUpdate {
+                keyboardShown = keyboardUpdate
+                pendingKeyboardUpdate = nil
+            }
+        })
         .modifier(HideKeyboardOnTapGesture(shouldAdd: keyboardShown))
     }