Local validation on value changes

Author: itsmeichigo

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Shipping Address Validation/ShippingLabelAddressFormViewController.swift

@@ -142,16 +142,20 @@ private extension ShippingLabelAddressFormViewController {
     }
 
     func registerTableViewCells() {
-            tableView.registerNib(for: TitleAndTextFieldTableViewCell.self)
-            tableView.registerNib(for: BasicTableViewCell.self)
+        tableView.registerNib(for: TitleAndTextFieldTableViewCell.self)
+        tableView.registerNib(for: BasicTableViewCell.self)
     }
 
     func observeViewModel() {
-        viewModel.onChange = { [weak self] in
+        viewModel.onChange = { [weak self] focusedIndex in
             guard let self = self else { return }
             self.configureNavigationBar()
             self.updateTopBannerView()
             self.tableView.reloadData()
+            if let index = focusedIndex,
+               let cell = self.tableView.cellForRow(at: IndexPath(row: index, section: 0)) as? TitleAndTextFieldTableViewCell {
+                cell.textFieldBecomeFirstResponder()
+            }
         }
     }
 
@@ -459,8 +463,7 @@ private extension ShippingLabelAddressFormViewController {
                                                                      placeholder: placeholder,
                                                                      state: .normal,
                                                                      keyboardType: .default,
-                                                                     textFieldAlignment: .leading) { _ in
-        }
+                                                                     textFieldAlignment: .leading) { _ in }
         cell.configure(viewModel: cellViewModel)
         cell.enableTextField(viewModel.statesOfSelectedCountry.isEmpty)
     }
@@ -471,8 +474,7 @@ private extension ShippingLabelAddressFormViewController {
                                                                      placeholder: Localization.countryFieldPlaceholder,
                                                                      state: .normal,
                                                                      keyboardType: .default,
-                                                                     textFieldAlignment: .leading) { _ in
-        }
+                                                                     textFieldAlignment: .leading) { _ in }
         cell.configure(viewModel: cellViewModel)
         cell.enableTextField(false)
     }

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Shipping Address Validation/ShippingLabelAddressFormViewModel.swift

@@ -25,15 +25,16 @@ final class ShippingLabelAddressFormViewModel {
     private let stores: StoresManager
 
     /// Closure to notify the `ViewController` when the view model properties change.
+    /// Accepts optional index for row to be focused after reloading the table view.
     ///
-    var onChange: (() -> (Void))?
+    var onChange: ((_ focusedRowIndex: Int?) -> (Void))?
 
     /// Current `ViewModel` state.
     ///
     private var state: State = State() {
         didSet {
             updateSections()
-            onChange?()
+            onChange?(nil)
         }
     }
 
@@ -106,10 +107,14 @@ final class ShippingLabelAddressFormViewModel {
         case .state:
             address = address?.copy(state: newValue)
         case .country:
-            address = address?.copy(country: newValue)
+            address = address?.copy(country: newValue, state: "")
         default:
             return
         }
+
+        updateSections()
+        let index: Int? = sections.first?.rows.firstIndex(where: { $0 == row })
+        onChange?(index)
     }
 
     func updateSections() {