fixed a bug with jumping keyboard

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannel/Composer/ComposerTextInputView.swift

@@ -10,7 +10,6 @@ struct ComposerTextInputView: UIViewRepresentable {
     @Binding var text: String
     @Binding var height: CGFloat
     @Binding var selectedRangeLocation: Int
-    @Binding var isFirstResponder: Bool
 
     var placeholder: String
 
@@ -30,30 +29,21 @@ struct ComposerTextInputView: UIViewRepresentable {
                 uiView.selectedRange.location = selectedRangeLocation
                 uiView.text = text
                 uiView.handleTextChange()
-                switch isFirstResponder {
-                case true: uiView.becomeFirstResponder()
-                case false: uiView.resignFirstResponder()
-                }
             }
         }
     }
 
     func makeCoordinator() -> Coordinator {
-        Coordinator(textInput: self, isFirstResponder: $isFirstResponder)
+        Coordinator(textInput: self)
     }
 
     class Coordinator: NSObject, UITextViewDelegate, NSLayoutManagerDelegate {
         weak var textView: InputTextView?
 
         var textInput: ComposerTextInputView
-        var isFirstResponder: Binding<Bool>
 
-        init(
-            textInput: ComposerTextInputView,
-            isFirstResponder: Binding<Bool>
-        ) {
+        init(textInput: ComposerTextInputView) {
             self.textInput = textInput
-            self.isFirstResponder = isFirstResponder
         }
 
         func textViewDidChange(_ textView: UITextView) {
@@ -69,14 +59,6 @@ struct ComposerTextInputView: UIViewRepresentable {
             true
         }
 
-        func textViewDidBeginEditing(_ textView: UITextView) {
-            isFirstResponder.wrappedValue = true
-        }
-        
-        func textViewDidEndEditing(_ textView: UITextView) {
-            isFirstResponder.wrappedValue = false
-        }
-
         func layoutManager(
             _ layoutManager: NSLayoutManager,
             didCompleteLayoutFor textContainer: NSTextContainer?,

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerView.swift

@@ -60,7 +60,6 @@ public struct MessageComposerView<Factory: ViewFactory>: View, KeyboardReadable
                 factory.makeComposerInputView(
                     text: $viewModel.text,
                     selectedRangeLocation: $viewModel.selectedRangeLocation,
-                    isFirstResponder: $viewModel.isFirstResponder,
                     command: $viewModel.composerCommand,
                     addedAssets: viewModel.addedAssets,
                     addedFileURLs: viewModel.addedFileURLs,
@@ -170,7 +169,6 @@ public struct ComposerInputView<Factory: ViewFactory>: View {
     var factory: Factory
     @Binding var text: String
     @Binding var selectedRangeLocation: Int
-    @Binding var isFirstResponder: Bool
     @Binding var command: ComposerCommand?
     var addedAssets: [AddedAsset]
     var addedFileURLs: [URL]
@@ -232,10 +230,10 @@ public struct ComposerInputView<Factory: ViewFactory>: View {
                 )
             }
 
-            if let command = command,
-               let displayInfo = command.displayInfo,
-               displayInfo.isInstant == true {
-                HStack {
+            HStack {
+                if let command = command,
+                   let displayInfo = command.displayInfo,
+                   displayInfo.isInstant == true {
                     HStack(spacing: 0) {
                         Image(uiImage: images.smallBolt)
                         Text(displayInfo.displayName.uppercased())
@@ -246,16 +244,17 @@ public struct ComposerInputView<Factory: ViewFactory>: View {
                     .background(Color.blue)
                     .foregroundColor(.white)
                     .cornerRadius(16)
-                    
-                    ComposerTextInputView(
-                        text: $text,
-                        height: $textHeight,
-                        selectedRangeLocation: $selectedRangeLocation,
-                        isFirstResponder: $isFirstResponder,
-                        placeholder: L10n.Composer.Placeholder.message
-                    )
-                    .frame(height: textFieldHeight)
-                    .overlay(
+                }
+                
+                ComposerTextInputView(
+                    text: $text,
+                    height: $textHeight,
+                    selectedRangeLocation: $selectedRangeLocation,
+                    placeholder: L10n.Composer.Placeholder.message
+                )
+                .frame(height: textFieldHeight)
+                .overlay(
+                    command?.displayInfo?.isInstant == true ?
                         HStack {
                             Spacer()
                             Button {
@@ -266,18 +265,10 @@ public struct ComposerInputView<Factory: ViewFactory>: View {
                                 )
                             }
                         }
-                    )
-                }
-            } else {
-                ComposerTextInputView(
-                    text: $text,
-                    height: $textHeight,
-                    selectedRangeLocation: $selectedRangeLocation,
-                    isFirstResponder: $isFirstResponder,
-                    placeholder: L10n.Composer.Placeholder.message
+                        : nil
                 )
-                .frame(height: textFieldHeight)
             }
+            .frame(height: textFieldHeight)
         }
         .padding(.vertical, shouldAddVerticalPadding ? 8 : 0)
         .padding(.leading, 8)

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerViewModel.swift

@@ -50,7 +50,6 @@ public class MessageComposerViewModel: ObservableObject {
     }
 
     @Published var selectedRangeLocation: Int = 0
-    @Published var isFirstResponder = false
 
     @Published var addedFileURLs = [URL]() {
         didSet {
@@ -98,9 +97,6 @@ public class MessageComposerViewModel: ObservableObject {
             if oldValue?.id != composerCommand?.id &&
                 composerCommand?.displayInfo?.isInstant == true {
                 text = ""
-                if isFirstResponder == false {
-                    isFirstResponder = true
-                }
             }
             if oldValue != nil && composerCommand == nil {
                 pickerTypeState = .expanded(.none)

Sources/StreamChatSwiftUI/DefaultViewFactory.swift

@@ -270,7 +270,6 @@ extension ViewFactory {
     public func makeComposerInputView(
         text: Binding<String>,
         selectedRangeLocation: Binding<Int>,
-        isFirstResponder: Binding<Bool>,
         command: Binding<ComposerCommand?>,
         addedAssets: [AddedAsset],
         addedFileURLs: [URL],
@@ -286,7 +285,6 @@ extension ViewFactory {
                     factory: self,
                     text: text,
                     selectedRangeLocation: selectedRangeLocation,
-                    isFirstResponder: isFirstResponder,
                     command: command,
                     addedAssets: addedAssets,
                     addedFileURLs: addedFileURLs,
@@ -302,7 +300,6 @@ extension ViewFactory {
                 factory: self,
                 text: text,
                 selectedRangeLocation: selectedRangeLocation,
-                isFirstResponder: isFirstResponder,
                 command: command,
                 addedAssets: addedAssets,
                 addedFileURLs: addedFileURLs,

Sources/StreamChatSwiftUI/ViewFactory.swift

@@ -263,7 +263,6 @@ public protocol ViewFactory: AnyObject {
     func makeComposerInputView(
         text: Binding<String>,
         selectedRangeLocation: Binding<Int>,
-        isFirstResponder: Binding<Bool>,
         command: Binding<ComposerCommand?>,
         addedAssets: [AddedAsset],
         addedFileURLs: [URL],