feat: make sure that all completion handlers have been called

software-mansion-labs · Apr 22, 2024 · c1491c2 · c1491c2
1 parent 820ec9e
commit c1491c2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/packages/turbo/ios/RNVisitableView.swift b/packages/turbo/ios/RNVisitableView.swift
@@ -220,6 +220,13 @@ extension RNVisitableView: RNVisitableViewControllerDelegate {
   func visitableDidAppear(visitable: Visitable) {
     session.visitableViewDidAppear(view: self)
   }
+
+  func visitableWillDisappear(visitable: Visitable) {
+    // Make sure that all completion handlers have been called.
+    // Otherwise we might end up with a NSInternalInconsistencyException.
+    sendAlertResult()
+    sendConfirmResult(result: "")
+  }
 
   func visitableDidDisappear(visitable: Visitable) {
     // No-op

diff --git a/packages/turbo/ios/RNVisitableViewController.swift b/packages/turbo/ios/RNVisitableViewController.swift
@@ -14,6 +14,8 @@ public protocol RNVisitableViewControllerDelegate {
   func visitableDidAppear(visitable: Visitable)
 
   func visitableDidRender(visitable: Visitable)
+
+  func visitableWillDisappear(visitable: Visitable)
 
   func visitableDidDisappear(visitable: Visitable)
 
@@ -56,6 +58,11 @@ class RNVisitableViewController: UIViewController, Visitable {
     delegate?.visitableDidAppear(visitable: self)
   }
 
+  override func viewWillDisappear(_ animated: Bool) {
+    super.viewWillDisappear(animated)
+    delegate?.visitableWillDisappear(visitable: self)
+  }
+
   override func viewDidDisappear(_ animated: Bool) {
     delegate?.visitableDidDisappear(visitable: self)
   }