Do not dismiss selector views after selection

Author: itsmeichigo

WooCommerce/Classes/ViewRelated/Filters/FilterListViewController.swift

@@ -363,7 +363,6 @@ private extension FilterListViewController {
 
                             self?.updateUI(numberOfActiveFilters: self?.viewModel.filterTypeViewModels.numberOfActiveFilters ?? 0)
                             self?.listSelector.reloadData()
-                            self?.listSelector.navigationController?.popViewController(animated: true)
                         }
                     )
                 }()
@@ -381,7 +380,6 @@ private extension FilterListViewController {
                         selected.selectedValue = resource
                         self?.updateUI(numberOfActiveFilters: self?.viewModel.filterTypeViewModels.numberOfActiveFilters ?? 0)
                         self?.listSelector.reloadData()
-                        self?.listSelector.navigationController?.popViewController(animated: true)
                     }
                 )
                 let hostingController = UIHostingController(rootView: memberListSelectorView)
@@ -402,7 +400,6 @@ private extension FilterListViewController {
                         }()
                         self?.updateUI(numberOfActiveFilters: self?.viewModel.filterTypeViewModels.numberOfActiveFilters ?? 0)
                         self?.listSelector.reloadData()
-                        self?.listSelector.navigationController?.popViewController(animated: true)
                     }
                 )
                 let hostingController = UIHostingController(rootView: memberListSelectorView)

WooCommerce/Classes/ViewRelated/Orders/Order Creation/CustomerSection/CustomerSearchUICommand.swift

@@ -65,7 +65,7 @@ final class CustomerSearchUICommand: SearchUICommand {
     private let hideDetailText: Bool
 
     // The currently selected customer ID to show checkmark
-    private let selectedCustomerID: Int64?
+    private var selectedCustomerID: Int64?
 
     init(siteID: Int64,
          loadResultsWhenSearchTermIsEmpty: Bool = false,
@@ -99,6 +99,10 @@ final class CustomerSearchUICommand: SearchUICommand {
         self.onDidFinishSyncingAllCustomersFirstPage = onDidFinishSyncingAllCustomersFirstPage
     }
 
+    func updateSelectedCustomerID(_ customerID: Int64?) {
+        self.selectedCustomerID = customerID
+    }
+
     var hideCancelButton: Bool {
         featureFlagService.isFeatureFlagEnabled(.betterCustomerSelectionInOrder)
     }

WooCommerce/Classes/ViewRelated/Orders/Order Creation/CustomerSection/CustomerSelectorViewController.swift

@@ -8,6 +8,7 @@ import Yosemite
 ///
 final class CustomerSelectorViewController: UIViewController, GhostableViewController {
     private var searchViewController: SearchViewController<UnderlineableTitleAndSubtitleAndDetailTableViewCell, CustomerSearchUICommand>?
+    private var customerSearchCommand: CustomerSearchUICommand?
     private var emptyStateViewController: UIViewController?
     private let siteID: Int64
     private let onCustomerSelected: (Customer) -> Void
@@ -200,31 +201,34 @@ private extension CustomerSelectorViewController {
                                  shouldTrackCustomerAdded: Bool,
                                  disallowCreatingCustomer: Bool,
                                  onAddCustomerDetailsManually: (() -> Void)? = nil) {
+        let command = CustomerSearchUICommand(siteID: siteID,
+                                              loadResultsWhenSearchTermIsEmpty: loadResultsWhenSearchTermIsEmpty,
+                                              showSearchFilters: showSearchFilters,
+                                              showGuestLabel: showGuestLabel,
+                                              shouldTrackCustomerAdded: shouldTrackCustomerAdded,
+                                              disallowCreatingCustomer: disallowCreatingCustomer,
+                                              hideDetailText: configuration.hideDetailText,
+                                              selectedCustomerID: selectedCustomerID,
+                                              onAddCustomerDetailsManually: onAddCustomerDetailsManually,
+                                              onDidSelectSearchResult: onCustomerTapped,
+                                              onDidStartSyncingAllCustomersFirstPage: {
+                                                  Task { @MainActor [weak self] in
+                                                      guard let searchTableView = self?.searchViewController?.tableView else {
+                                                          return
+                                                      }
+                                                      self?.displayGhostContent(over: searchTableView)
+                                                  }
+                                              },
+                                              onDidFinishSyncingAllCustomersFirstPage: {
+                                                  Task { @MainActor [weak self] in
+                                                      self?.removeGhostContent()
+                                                  }
+                                              })
+        self.customerSearchCommand = command
+
         let searchViewController = SearchViewController(
             storeID: siteID,
-            command: CustomerSearchUICommand(siteID: siteID,
-                                             loadResultsWhenSearchTermIsEmpty: loadResultsWhenSearchTermIsEmpty,
-                                             showSearchFilters: showSearchFilters,
-                                             showGuestLabel: showGuestLabel,
-                                             shouldTrackCustomerAdded: shouldTrackCustomerAdded,
-                                             disallowCreatingCustomer: disallowCreatingCustomer,
-                                             hideDetailText: configuration.hideDetailText,
-                                             selectedCustomerID: selectedCustomerID,
-                                             onAddCustomerDetailsManually: onAddCustomerDetailsManually,
-                                             onDidSelectSearchResult: onCustomerTapped,
-                                             onDidStartSyncingAllCustomersFirstPage: {
-                                                 Task { @MainActor [weak self] in
-                                                     guard let searchTableView = self?.searchViewController?.tableView else {
-                                                         return
-                                                     }
-                                                     self?.displayGhostContent(over: searchTableView)
-                                                 }
-                                             },
-                                             onDidFinishSyncingAllCustomersFirstPage: {
-                                                 Task { @MainActor [weak self] in
-                                                     self?.removeGhostContent()
-                                                 }
-                                             }),
+            command: command,
             cellType: UnderlineableTitleAndSubtitleAndDetailTableViewCell.self,
             cellSeparator: .none
         )
@@ -283,6 +287,8 @@ private extension CustomerSelectorViewController {
         viewModel.onCustomerSelected(customer, onCompletion: { [weak self] result in
             guard let self else { return }
             activityIndicator.stopAnimating()
+            customerSearchCommand?.updateSelectedCustomerID(customer.customerID)
+            searchViewController?.tableView.reloadData()
 
             switch result {
             case .success: