github/apache-cordova-plugin-inappbrowser
github/apache-cordova-plugin-inappbrowser
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ios): exit event not fired on swipe down (#737)

Browse Source
This commit is contained in:
jcesarmobile 2020-06-22 11:44:39 +02:00 committed by GitHub
parent d5fba787d4
commit bdbb1df44c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ios/CDVWKInAppBrowser.h
View File

@ -49,7 +49,7 @@
@end @end
@interface CDVWKInAppBrowserViewController : UIViewController <CDVScreenOrientationDelegate,WKNavigationDelegate,WKUIDelegate,WKScriptMessageHandler>{ @interface CDVWKInAppBrowserViewController : UIViewController <CDVScreenOrientationDelegate,WKNavigationDelegate,WKUIDelegate,WKScriptMessageHandler,UIAdaptivePresentationControllerDelegate>{
@private @private
CDVInAppBrowserOptions *_browserOptions; CDVInAppBrowserOptions *_browserOptions;
NSDictionary *_settings; NSDictionary *_settings;

7
src/ios/CDVWKInAppBrowser.m
View File

@ -290,6 +290,7 @@ static CDVWKInAppBrowser* instance = nil;
nav.orientationDelegate = self.inAppBrowserViewController; nav.orientationDelegate = self.inAppBrowserViewController;
nav.navigationBarHidden = YES; nav.navigationBarHidden = YES;
nav.modalPresentationStyle = self.inAppBrowserViewController.modalPresentationStyle; nav.modalPresentationStyle = self.inAppBrowserViewController.modalPresentationStyle;
nav.presentationController.delegate = self.inAppBrowserViewController;
__weak CDVWKInAppBrowser* weakSelf = self; __weak CDVWKInAppBrowser* weakSelf = self;
@ -306,7 +307,6 @@ static CDVWKInAppBrowser* instance = nil;
strongSelf->tmpWindow = [[UIWindow alloc] initWithFrame:frame]; strongSelf->tmpWindow = [[UIWindow alloc] initWithFrame:frame];
} }
UIViewController *tmpController = [[UIViewController alloc] init]; UIViewController *tmpController = [[UIViewController alloc] init];
[strongSelf->tmpWindow setRootViewController:tmpController]; [strongSelf->tmpWindow setRootViewController:tmpController];
[strongSelf->tmpWindow setWindowLevel:UIWindowLevelNormal]; [strongSelf->tmpWindow setWindowLevel:UIWindowLevelNormal];
@ -1257,5 +1257,10 @@ BOOL isExiting = FALSE;
[super viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
} }
#pragma mark UIAdaptivePresentationControllerDelegate
- (void)presentationControllerWillDismiss:(UIPresentationController *)presentationController {
isExiting = TRUE;
}
@end //CDVWKInAppBrowserViewController @end //CDVWKInAppBrowserViewController