Rather handle in didDisappear

Author: adborbas

WooCommerce/Classes/Authentication/AuthenticatedWebViewController.swift

@@ -123,6 +123,11 @@ final class AuthenticatedWebViewController: UIViewController {
             viewModel.handleDismissal()
         }
     }
+
+    override func viewDidDisappear(_ animated: Bool) {
+        viewModel.handleDisappear()
+        super.viewDidDisappear(animated)
+    }
 }
 
 private extension AuthenticatedWebViewController {

WooCommerce/Classes/Authentication/AuthenticatedWebViewModel.swift

@@ -22,6 +22,9 @@ protocol AuthenticatedWebViewModel {
     /// Triggered when the web view is dismissed
     func handleDismissal()
 
+    /// Triggered when the web view is disappeared
+    func handleDisappear()
+
     /// Triggered when the web view redirects to a new URL
     func handleRedirect(for url: URL?)
 
@@ -53,6 +56,10 @@ extension AuthenticatedWebViewModel {
     func didFailProvisionalNavigation(with error: Error) {
         // NO-OP
     }
+
+    func handleDisappear () {
+        // NO-OP
+    }
 }
 
 // MARK: - Helper methods

WooCommerce/Classes/Authentication/WPAdminWebViewModel.swift

@@ -20,6 +20,10 @@ class WPAdminWebViewModel: AuthenticatedWebViewModel, WebviewReloadable {
         // no-op
     }
 
+    func handleDisappear() {
+        // no-op
+    }
+
     func handleRedirect(for url: URL?) {
         guard let url else {
             return

WooCommerce/Classes/Extensions/UIViewController+Navigation.swift

@@ -8,8 +8,7 @@ extension UIViewController {
     var isBeingDismissedInAnyWay: Bool {
         isMovingFromParent ||
         isBeingDismissed ||
-        navigationController?.isBeingDismissed == true ||
-        navigationController?.isMovingFromParent == true
+        navigationController?.isBeingDismissed == true
     }
 
     /// Async/await version of the UIKit `dismiss(animated:)`.

WooCommerce/Classes/Routing/ProductDetail/Coordinator/ProductDetailWebCoordinator.swift

@@ -18,7 +18,6 @@ class ProductDetailWebCoordinator: NSObject {
             onDismiss()
         }
         let webViewController = AuthenticatedWebViewController(viewModel: viewModel)
-
         return webViewController
     }
 }
@@ -31,8 +30,8 @@ fileprivate class AdminWebViewModel: WPAdminWebViewModel {
         super.init(title: title, initialURL: initialURL)
     }
 
-    override func handleDismissal() {
+    override func handleDisappear() {
         onDismiss()
-        super.handleDismissal()
+        super.handleDisappear()
     }
 }