Fix: Unable to dismiss keyboard when editing Product Title (#16288)

Author: adborbas

RELEASE-NOTES.txt

@@ -4,6 +4,7 @@
 23.6
 -----
 - [*] Handle sites configured with `http` siteAddress.
+- [*] Fix: Unable to dismiss keyboard when editing Product Title. [https://github.com/woocommerce/woocommerce-ios/pull/16288]
 
 23.5
 -----

WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormTableViewDataSource.swift

@@ -208,6 +208,7 @@ private extension ProductFormTableViewDataSource {
                                                                    productStatus: productStatus,
                                                                    placeholder: placeholder,
                                                                    textViewMinimumHeight: 10.0,
+                                                                   shouldDismissOnReturn: true,
                                                                    isScrollEnabled: false,
                                                                    onNameChange: { [weak self] (newName) in self?.onNameChange?(newName) },
                                                                    style: .headline)

WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormViewController.swift

@@ -645,6 +645,7 @@ private extension ProductFormViewController {
         tableView.delegate = self
         tableView.accessibilityIdentifier = "product-form"
         tableView.cellLayoutMarginsFollowReadableWidth = true
+        tableView.keyboardDismissMode = .onDrag
 
         tableView.backgroundColor = .listForeground(modal: false)
         tableView.removeLastCellSeparator()

WooCommerce/Classes/ViewRelated/ReusableViews/EnhancedTextView.swift

@@ -6,6 +6,7 @@ final class EnhancedTextView: UITextView {
 
     var onTextChange: ((String) -> Void)?
     var onTextDidBeginEditing: (() -> Void)?
+    var shouldDismissOnReturn: Bool = false
 
     var placeholder: String? {
         didSet {
@@ -84,6 +85,18 @@ private extension EnhancedTextView {
 //
 extension EnhancedTextView: UITextViewDelegate {
 
+    func textView(_ textView: UITextView,
+                  shouldChangeTextIn range: NSRange,
+                  replacementText text: String) -> Bool {
+
+        if shouldDismissOnReturn && text == "\n" {
+            textView.resignFirstResponder()
+            return false
+        }
+
+        return true
+    }
+
     func textViewDidBeginEditing(_ textView: UITextView) {
         hidePlaceholder()
         onTextDidBeginEditing?()

WooCommerce/Classes/ViewRelated/ReusableViews/LabeledTextViewTableViewCell.swift

@@ -8,8 +8,8 @@ final class LabeledTextViewTableViewCell: UITableViewCell {
         var productStatus: ProductStatus
         var placeholder: String? = nil
         var textViewMinimumHeight: CGFloat? = nil
+        var shouldDismissOnReturn: Bool = false
         var isScrollEnabled: Bool = true
-        var keyboardType: UIKeyboardType = .default
         var onNameChange: ((_ text: String) -> Void)? = nil
         var onTextDidBeginEditing: (() -> Void)? = nil
         var style: Style = .headline
@@ -33,7 +33,7 @@ final class LabeledTextViewTableViewCell: UITableViewCell {
         productTextField.isScrollEnabled = viewModel.isScrollEnabled
         productTextField.onTextChange = viewModel.onNameChange
         productTextField.onTextDidBeginEditing = viewModel.onTextDidBeginEditing
-        productTextField.keyboardType = viewModel.keyboardType
+        productTextField.shouldDismissOnReturn = viewModel.shouldDismissOnReturn
         configureProductStatusLabel(productStatus: viewModel.productStatus)
         applyStyle(style: viewModel.style)
     }