Updates to the composer input view

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannel/Composer/ComposerTextInputView.swift

@@ -59,6 +59,13 @@ struct ComposerTextInputView: UIViewRepresentable {
         func textViewDidChange(_ textView: UITextView) {
             textInput.selectedRangeLocation = textView.selectedRange.location
             textInput.text = textView.text
+            var height = textView.sizeThatFits(textView.bounds.size).height
+            if height < TextSizeConstants.minThreshold {
+                height = TextSizeConstants.minimumHeight
+            }
+            if textInput.height != height {
+                textInput.height = height
+            }
         }
 
         func textView(
@@ -70,21 +77,5 @@ struct ComposerTextInputView: UIViewRepresentable {
             let newMessageLength = textView.text.count + (text.count - range.length)
             return newMessageLength <= maxMessageLength
         }
-        
-        func layoutManager(
-            _ layoutManager: NSLayoutManager,
-            didCompleteLayoutFor textContainer: NSTextContainer?,
-            atEnd layoutFinishedFlag: Bool
-        ) {
-            DispatchQueue.main.async { [weak self] in
-                guard let view = self?.textView else {
-                    return
-                }
-                let size = view.sizeThatFits(view.bounds.size)
-                if self?.textInput.height != size.height {
-                    self?.textInput.height = size.height
-                }
-            }
-        }
     }
 }

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerView.swift

@@ -132,15 +132,15 @@ public struct MessageComposerView<Factory: ViewFactory>: View, KeyboardReadable
         }
         .onReceive(keyboardWillChangePublisher) { visible in
             if visible {
-                withAnimation(.easeInOut(duration: 0.02)) {
-                    if viewModel.composerCommand == nil {
+                if viewModel.composerCommand == nil {
+                    withAnimation(.easeInOut(duration: 0.02)) {
                         viewModel.pickerTypeState = .expanded(.none)
                     }
                 }
             }
         }
         .onReceive(keyboardHeight) { height in
-            if height > 0 {
+            if height > 0 && height != popupSize {
                 self.popupSize = height - bottomSafeArea
             }
         }
@@ -189,11 +189,11 @@ public struct ComposerInputView<Factory: ViewFactory>: View {
     var onCustomAttachmentTap: (CustomAttachment) -> Void
     var removeAttachmentWithId: (String) -> Void
 
-    @State var textHeight: CGFloat = 34
+    @State var textHeight: CGFloat = TextSizeConstants.minimumHeight
 
     var textFieldHeight: CGFloat {
-        let minHeight: CGFloat = 34
-        let maxHeight: CGFloat = 76
+        let minHeight: CGFloat = TextSizeConstants.minimumHeight
+        let maxHeight: CGFloat = TextSizeConstants.maximumHeight
 
         if textHeight < minHeight {
             return minHeight

Sources/StreamChatSwiftUI/Utils/Common/InputTextView.swift

@@ -4,6 +4,12 @@
 
 import UIKit
 
+struct TextSizeConstants {
+    static let minimumHeight = 34.0
+    static let maximumHeight = 76.0
+    static let minThreshold = 40.0
+}
+
 class InputTextView: UITextView {
     @Injected(\.colors) private var colors
 
@@ -15,7 +21,7 @@ class InputTextView: UITextView {
     /// When there is no content in the text view OR the height of the content is less than this value,
     /// the text view will be of this height
     open var minimumHeight: CGFloat {
-        34.0
+        TextSizeConstants.minimumHeight
     }
 
     /// The constraint responsible for setting the height of the text view.
@@ -24,7 +30,7 @@ class InputTextView: UITextView {
     /// The maximum height of the text view.
     /// When the content in the text view is greater than this height, scrolling will be enabled and the text view's height will be restricted to this value
     open var maximumHeight: CGFloat {
-        76.0
+        TextSizeConstants.maximumHeight
     }
 
     override open func didMoveToSuperview() {
@@ -99,17 +105,25 @@ class InputTextView: UITextView {
 
     open func setTextViewHeight() {
         var heightToSet = minimumHeight
+        var contentHeight = contentSize.height
+        if contentHeight < TextSizeConstants.minThreshold
+            && contentHeight != minimumHeight {
+            contentSize.height = minimumHeight
+            contentHeight = minimumHeight
+        }
 
-        if contentSize.height <= minimumHeight {
+        if contentHeight <= minimumHeight {
             heightToSet = minimumHeight
-        } else if contentSize.height >= maximumHeight {
+        } else if contentHeight >= maximumHeight {
             heightToSet = maximumHeight
         } else {
-            heightToSet = contentSize.height
+            heightToSet = contentHeight
         }
 
-        heightConstraint?.constant = heightToSet
-        isScrollEnabled = heightToSet > minimumHeight
-        layoutIfNeeded()
+        if heightConstraint?.constant != heightToSet {
+            heightConstraint?.constant = heightToSet
+            isScrollEnabled = heightToSet > minimumHeight
+            layoutIfNeeded()
+        }
     }
 }