Fixed composer bug with selectedRange updates

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannel/Composer/ComposerTextInputView.swift

@@ -37,8 +37,10 @@ struct ComposerTextInputView: UIViewRepresentable {
     func updateUIView(_ uiView: InputTextView, context: Context) {
         DispatchQueue.main.async {
             if uiView.markedTextRange == nil {
+                if uiView.text != text {
+                    uiView.text = text
+                }
                 uiView.selectedRange.location = selectedRangeLocation
-                uiView.text = text
                 uiView.isEditable = editable
                 uiView.placeholderLabel.text = placeholder
                 uiView.handleTextChange()
@@ -65,8 +67,8 @@ struct ComposerTextInputView: UIViewRepresentable {
         }
 
         func textViewDidChange(_ textView: UITextView) {
-            textInput.selectedRangeLocation = textView.selectedRange.location
             textInput.text = textView.text
+            textInput.selectedRangeLocation = textView.selectedRange.location
             var height = textView.sizeThatFits(textView.bounds.size).height
             if height < TextSizeConstants.minThreshold {
                 height = TextSizeConstants.minimumHeight
@@ -77,6 +79,10 @@ struct ComposerTextInputView: UIViewRepresentable {
                 }
             }
         }
+        
+        func textViewDidChangeSelection(_ textView: UITextView) {
+            textInput.selectedRangeLocation = textView.selectedRange.location
+        }
 
         func textView(
             _ textView: UITextView,

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerView.swift

@@ -13,6 +13,7 @@ public struct MessageComposerView<Factory: ViewFactory>: View, KeyboardReadable
     // Initial popup size, before the keyboard is shown.
     @State private var popupSize: CGFloat = 350
     @State private var composerHeight: CGFloat = 0
+    @State private var keyboardShown = false
 
     private var factory: Factory
     private var channelConfig: ChannelConfig?
@@ -134,13 +135,14 @@ public struct MessageComposerView<Factory: ViewFactory>: View, KeyboardReadable
             }
         }
         .onReceive(keyboardWillChangePublisher) { visible in
-            if visible {
+            if visible && !keyboardShown {
                 if viewModel.composerCommand == nil {
                     withAnimation(.easeInOut(duration: 0.02)) {
                         viewModel.pickerTypeState = .expanded(.none)
                     }
                 }
             }
+            keyboardShown = visible
         }
         .onReceive(keyboardHeight) { height in
             if height > 0 && height != popupSize {