Skip to content

Prevent interactive dismiss when cancel button is hidden #788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 8, 2019
Merged

Prevent interactive dismiss when cancel button is hidden #788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Auth/FirebaseAuthUI/FUIAuth.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 4 additions & 0 deletions Auth/FirebaseAuthUI/FUIAuthPickerViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down