Merge pull request #617 from kiyot/fix/ios13-modal-swipe-down-bug

Clean up views after dismissing webview by swiping down

Author: emawby

iOS_SDK/OneSignalSDK/Source/OneSignalWebView.h

@@ -28,7 +28,7 @@
 #import <UIKit/UIKit.h>
 #import <WebKit/WebKit.h>
 
-@interface OneSignalWebView : UIViewController <WKNavigationDelegate>
+@interface OneSignalWebView : UIViewController <WKNavigationDelegate, UIAdaptivePresentationControllerDelegate>
 
 @property(nonatomic, copy)NSURL *url;
 @property(nonatomic)WKWebView *webView;

iOS_SDK/OneSignalSDK/Source/OneSignalWebView.m

@@ -67,10 +67,7 @@ - (void)viewDidAppear:(BOOL)animated {
 
 - (void)dismiss:(id)sender {
     [self.navigationController dismissViewControllerAnimated:true completion:^{
-        // Clear web view
-        [_webView loadHTMLString:@"" baseURL:nil];
-        if (viewControllerForPresentation)
-            [viewControllerForPresentation.view removeFromSuperview];
+        [self clearWebView];
     }];
 }
 
@@ -108,6 +105,7 @@ - (void)showInApp {
     if (!navController) {
         navController = [[UINavigationController alloc] initWithRootViewController:self];
         navController.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
+        navController.presentationController.delegate = self;
     }
     if (!viewControllerForPresentation) {
         viewControllerForPresentation = [[UIViewController alloc] init];
@@ -133,7 +131,15 @@ - (void)showInApp {
     @catch(NSException* exception) { }
 }
 
+- (void)clearWebView {
+    [_webView loadHTMLString:@"" baseURL:nil];
+    if (viewControllerForPresentation)
+        [viewControllerForPresentation.view removeFromSuperview];
+}
 
+- (void)presentationControllerDidDismiss:(UIPresentationController *)presentationController {
+    [self clearWebView];
+}
 
 @end