Fix LockViewController dismissal when presented as a popup (#647)

auth0 · Apr 13, 2021 · 5a7499e · 5a7499e
1 parent aa6287a
commit 5a7499e
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/Lock/LockViewController.swift b/Lock/LockViewController.swift
@@ -49,6 +49,9 @@ public class LockViewController: UIViewController {
             self.modalPresentationStyle = .fullScreen
         }
         self.router = lock.classicMode ? ClassicRouter(lock: lock, controller: self) : PasswordlessRouter(lock: lock, controller: self)
+        if #available(iOS 13.0, *) {
+            self.isModalInPresentation = !lock.options.closable
+        }
     }
 
     public required init?(coder aDecoder: NSCoder) {
@@ -134,6 +137,7 @@ public class LockViewController: UIViewController {
         center.addObserver(self, selector: #selector(keyboardWasShown), name: UIResponder.responderKeyboardWillShowNotification, object: nil)
         center.addObserver(self, selector: #selector(keyboardWasHidden), name: UIResponder.responderKeyboardWillHideNotification, object: nil)
 
+        self.presentationController?.delegate = self
         self.present(self.router.root, title: Route.root.title(withStyle: self.lock.style))
     }
 
@@ -212,3 +216,11 @@ public class LockViewController: UIViewController {
     }
 
 }
+
+// MARK: - UIAdaptivePresentationControllerDelegate
+
+extension LockViewController: UIAdaptivePresentationControllerDelegate {
+    public func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
+        self.lock.observerStore.dispatch(result: .cancel)
+    }
+}