Merge pull request #788 from morganchen12/dismiss

Prevent interactive dismiss when cancel button is hidden
firebase · Oct 8, 2019 · f686b60 · f686b60
2 parents f029d98 + c81ce1f
commit f686b60
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Auth/FirebaseAuthUI/FUIAuth.h b/Auth/FirebaseAuthUI/FUIAuth.h
@@ -188,7 +188,8 @@ __attribute__((deprecated("Instead use authUI:didSignInWithAuthDataResult:error:
 @property(nonatomic, copy) NSArray<id<FUIAuthProvider>> *providers;
 
 /** @property shouldHideCancelButton
- @brief Whether to hide the canel button, defaults to NO.
+ @brief Whether to hide the cancel button, defaults to NO. On iOS 13, this also disables
+     the swipe-to-dismiss gesture.
  */
 @property(nonatomic, assign) BOOL shouldHideCancelButton;
 

diff --git a/Auth/FirebaseAuthUI/FUIAuthPickerViewController.m b/Auth/FirebaseAuthUI/FUIAuthPickerViewController.m
@@ -102,6 +102,10 @@ - (void)viewDidLoad {
                                                       target:self
                                                       action:@selector(cancelAuthorization)];
     self.navigationItem.leftBarButtonItem = cancelBarButton;
+  } else {
+    if (@available(iOS 13, *)) {
+      self.modalInPresentation = YES;
+    }
   }
   self.navigationItem.backBarButtonItem =
       [[UIBarButtonItem alloc] initWithTitle:FUILocalizedString(kStr_Back)