react-native-webview-bootpay 11.18.1 → 11.18.13

package/apple/BPCWebView.h

@@ -9,14 +9,6 @@
 #import <React/RCTDefines.h>
 #import <WebKit/WebKit.h>
 
-typedef enum BPCWebViewPermissionGrantType : NSUInteger {
-    BPCWebViewPermissionGrantType_GrantIfSameHost_ElsePrompt,
-    BPCWebViewPermissionGrantType_GrantIfSameHost_ElseDeny,
-    BPCWebViewPermissionGrantType_Deny,
-    BPCWebViewPermissionGrantType_Grant,
-    BPCWebViewPermissionGrantType_Prompt
-} BPCWebViewPermissionGrantType;
-
 @class BPCWebView;
 
 @protocol BPCWebViewDelegate <NSObject>
@@ -75,11 +67,8 @@ typedef enum BPCWebViewPermissionGrantType : NSUInteger {
 @property (nonatomic, assign) BOOL directionalLockEnabled;
 @property (nonatomic, assign) BOOL ignoreSilentHardwareSwitch;
 @property (nonatomic, copy) NSString * _Nullable allowingReadAccessToURL;
-@property (nonatomic, copy) NSDictionary * _Nullable basicAuthCredential;
 @property (nonatomic, assign) BOOL pullToRefreshEnabled;
 @property (nonatomic, assign) BOOL enableApplePay;
-@property (nonatomic, copy) NSArray<NSDictionary *> * _Nullable menuItems;
-@property (nonatomic, copy) RCTDirectEventBlock onCustomMenuSelection;
 #if !TARGET_OS_OSX
 @property (nonatomic, weak) UIRefreshControl * _Nullable refreshControl;
 #endif
@@ -92,14 +81,6 @@ typedef enum BPCWebViewPermissionGrantType : NSUInteger {
 @property (nonatomic, assign) BOOL limitsNavigationsToAppBoundDomains;
 #endif
 
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140500 /* iOS 14.5 */
-@property (nonatomic, assign) BOOL textInteractionEnabled;
-#endif
-
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000 /* iOS 15 */
-@property (nonatomic, assign) BPCWebViewPermissionGrantType mediaCapturePermissionGrantType;
-#endif
-
 + (void)setClientAuthenticationCredential:(nullable NSURLCredential*)credential;
 + (void)setCustomCertificatesForHost:(nullable NSDictionary *)certificates;
 - (void)postMessage:(NSString *_Nullable)message;

package/apple/BPCWebView.m

@@ -23,8 +23,6 @@ static NSString *const MessageHandlerName = @"BootpayRNWebView";
 static NSURLCredential* clientAuthenticationCredential;
 static NSDictionary* customCertificatesForHost;
 
-NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
-
 #if !TARGET_OS_OSX
 // runtime trick to remove WKWebView keyboard default toolbar
 // see: http://stackoverflow.com/questions/19033292/ios-7-uiwebview-keyboard-issue/19042279#19042279
@@ -53,9 +51,9 @@ NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
 @end
 @implementation BPCWKWebView
 - (void)scrollWheel:(NSEvent *)theEvent {
-  BPCWebView *BPCWebView = (BPCWebView *)[self superview];
-  RCTAssert([BPCWebView isKindOfClass:[BPCWebView class]], @"superview must be an BPCWebView");
-  if (![BPCWebView scrollEnabled]) {
+  BPCWebView *bpcWebView = (BPCWebView *)[self superview];
+  RCTAssert([bpcWebView isKindOfClass:[bpcWebView class]], @"superview must be an BPCWebView");
+  if (![bpcWebView scrollEnabled]) {
     [[self nextResponder] scrollWheel:theEvent];
     return;
   }
@@ -149,9 +147,6 @@ NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
     _savedAutomaticallyAdjustsScrollIndicatorInsets = NO;
 #endif
     _enableApplePay = NO;
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000 /* iOS 15 */
-    _mediaCapturePermissionGrantType = BPCWebViewPermissionGrantType_Prompt;
-#endif
   }
 
 #if !TARGET_OS_OSX
@@ -193,126 +188,45 @@ NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
   return self;
 }
 
-#if !TARGET_OS_OSX
-- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer {
-    // Only allow long press gesture
-    if ([otherGestureRecognizer isKindOfClass:[UILongPressGestureRecognizer class]]) {
-        return YES;
-    }else{
-        return NO;
-    }
-}
-
-// Listener for long presses
-- (void)startLongPress:(UILongPressGestureRecognizer *)pressSender
-{
-    // When a long press ends, bring up our custom UIMenu
-    if(pressSender.state == UIGestureRecognizerStateEnded) {
-      if (!self.menuItems || self.menuItems.count == 0) {
-        return;
-      }
-        UIMenuController *menuController = [UIMenuController sharedMenuController];
-        NSMutableArray *menuControllerItems = [NSMutableArray arrayWithCapacity:self.menuItems.count];
-        
-        for(NSDictionary *menuItem in self.menuItems) {
-            NSString *menuItemLabel = [RCTConvert NSString:menuItem[@"label"]];
-            NSString *menuItemKey = [RCTConvert NSString:menuItem[@"key"]];
-            NSString *sel = [NSString stringWithFormat:@"%@%@", CUSTOM_SELECTOR, menuItemKey];
-            UIMenuItem *item = [[UIMenuItem alloc] initWithTitle: menuItemLabel
-                                                          action: NSSelectorFromString(sel)];
-            
-            [menuControllerItems addObject: item];
-        }
-  
-        menuController.menuItems = menuControllerItems;
-        [menuController setMenuVisible:YES animated:YES];
-    }
-}
-
-#endif // !TARGET_OS_OSX
-
 - (void)dealloc
 {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
-- (void)tappedMenuItem:(NSString *)eventType
+/**
+ * See https://stackoverflow.com/questions/25713069/why-is-wkwebview-not-opening-links-with-target-blank/25853806#25853806 for details.
+ */
+- (WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures
 {
-    // Get the selected text
-    // NOTE: selecting text in an iframe or shadow DOM will not work
-    [self.webView evaluateJavaScript: @"window.getSelection().toString()" completionHandler: ^(id result, NSError *error) {
-    if (error != nil) {
-      RCTLogWarn(@"%@", [NSString stringWithFormat:@"Error evaluating injectedJavaScript: This is possibly due to an unsupported return type. Try adding true to the end of your injectedJavaScript string. %@", error]);
-    } else {
-      if (self.onCustomMenuSelection) {
-        NSPredicate *filter = [NSPredicate predicateWithFormat:@"key contains[c] %@ ",eventType];
-        NSArray *filteredMenuItems = [self.menuItems filteredArrayUsingPredicate:filter];
-        NSDictionary *selectedMenuItem = filteredMenuItems[0];
-        NSString *label = [RCTConvert NSString:selectedMenuItem[@"label"]];
-        self.onCustomMenuSelection(@{
-            @"key": eventType,
-            @"label": label,
-            @"selectedText": result
-        });
-      } else {
-        RCTLogWarn(@"Error evaluating onCustomMenuSelection: You must implement an `onCustomMenuSelection` callback when using custom menu items");
-      }
-    }
-  }];
-}
+    //팝업관련 
+    NSLog(@"------ popup url: %@", navigationAction.request.URL.absoluteString);
 
-// Overwrite method that interprets which action to call upon UIMenu Selection
-// https://developer.apple.com/documentation/objectivec/nsobject/1571960-methodsignatureforselector
-- (NSMethodSignature *)methodSignatureForSelector:(SEL)sel
-{
-    NSMethodSignature *existingSelector = [super methodSignatureForSelector:sel];
-    if (existingSelector) {
-        return existingSelector;
-    }
-    return [super methodSignatureForSelector:@selector(tappedMenuItem:)];
-}
+    if([navigationAction.request.URL.absoluteString rangeOfString:@"bootpay.co.kr"].location == NSNotFound) {
+      NSLog(@"111");
 
-// Needed to forward messages to other objects
-// https://developer.apple.com/documentation/objectivec/nsobject/1571955-forwardinvocation
-- (void)forwardInvocation:(NSInvocation *)invocation
-{
-    NSString *sel = NSStringFromSelector([invocation selector]);
-    NSRange match = [sel rangeOfString:CUSTOM_SELECTOR];
-    if (match.location == 0) {
-        [self tappedMenuItem:[sel substringFromIndex:17]];
+      //원래 로직 
+      if (!navigationAction.targetFrame.isMainFrame) {
+        [webView loadRequest:navigationAction.request];
+      }
+      return nil;
     } else {
-        [super forwardInvocation:invocation];
-    }
-}
 
-// Allows the instance to respond to UIMenuController Actions
-- (BOOL)canBecomeFirstResponder
-{
-    return YES;
-}
+      NSLog(@"222");
 
-// Control which items show up on the UIMenuController
-- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
-{
-    NSString *sel = NSStringFromSelector(action);
-    // Do any of them have our custom keys?
-    NSRange match = [sel rangeOfString:CUSTOM_SELECTOR];
+      WKWebView *popupView = [[WKWebView alloc] initWithFrame:webView.bounds configuration:configuration];
 
-    if (match.location == 0) {
-        return YES;
-    }
-    return NO;
+      popupView.autoresizingMask = (UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight);
+      popupView.navigationDelegate = self;
+      popupView.UIDelegate = self;
+      [webView addSubview:popupView];
+  
+      return popupView;
+    } 
 }
 
-/**
- * See https://stackoverflow.com/questions/25713069/why-is-wkwebview-not-opening-links-with-target-blank/25853806#25853806 for details.
- */
-- (WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures
-{
-  if (!navigationAction.targetFrame.isMainFrame) {
-    [webView loadRequest:navigationAction.request];
-  }
-  return nil;
+
+- (void)webViewDidClose:(WKWebView *)webView { 
+    [webView removeFromSuperview];
 }
 
 - (WKWebViewConfiguration *)setUpWkWebViewConfig
@@ -335,14 +249,6 @@ NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
     [prefs setValue:@TRUE forKey:@"javaScriptCanOpenWindowsAutomatically"];
     _prefsUsed = YES;
   }
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140500 /* iOS 14.5 */
-  if (@available(iOS 14.5, *)) {
-    if (!_textInteractionEnabled) {
-      [prefs setValue:@FALSE forKey:@"textInteractionEnabled"];
-      _prefsUsed = YES;
-    }
-  }
-#endif
   if (_prefsUsed) {
     wkWebViewConfig.preferences = prefs;
   }
@@ -430,7 +336,9 @@ NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
     [_webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew context:nil];
     _webView.allowsBackForwardNavigationGestures = _allowsBackForwardNavigationGestures;
 
-    _webView.customUserAgent = _userAgent;
+    if (_userAgent) {
+      _webView.customUserAgent = _userAgent;
+    }
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
     if ([_webView.scrollView respondsToSelector:@selector(setContentInsetAdjustmentBehavior:)]) {
       _webView.scrollView.contentInsetAdjustmentBehavior = _savedContentInsetAdjustmentBehavior;
@@ -447,18 +355,6 @@ NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
     [self setKeyboardDisplayRequiresUserAction: _savedKeyboardDisplayRequiresUserAction];
     [self visitSource];
   }
-#if !TARGET_OS_OSX
-  // Allow this object to recognize gestures
-  if (self.menuItems != nil) {
-    UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(startLongPress:)];
-    longPress.delegate = self;
-
-    longPress.minimumPressDuration = 0.4f;
-    longPress.numberOfTouchesRequired = 1;
-    longPress.cancelsTouchesInView = YES;
-    [self addGestureRecognizer:longPress];
-  }
-#endif // !TARGET_OS_OSX
 }
 
 // Update webview property when the component prop changes.
@@ -683,39 +579,38 @@ NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
         }
         [_webView loadHTMLString:html baseURL:baseURL];
         return;
-    }
-    // Add cookie for subsequent resource requests sent by page itself, if cookie was set in headers on WebView
-    NSString *headerCookie = [RCTConvert NSString:_source[@"headers"][@"cookie"]];
+    } 
+    //Add cookie for subsequent resource requests sent by page itself, if cookie was set in headers on WebView
+    NSString *headerCookie = [RCTConvert NSString:_source[@"headers"][@"cookie"]]; 
     if(headerCookie) {
       NSDictionary *headers = [NSDictionary dictionaryWithObjectsAndKeys:headerCookie,@"Set-Cookie",nil];
       NSURL *urlString = [NSURL URLWithString:_source[@"uri"]];
       NSArray *httpCookies = [NSHTTPCookie cookiesWithResponseHeaderFields:headers forURL:urlString];
-      [self writeCookiesToWebView:httpCookies completion:nil];
+      for (NSHTTPCookie *httpCookie in httpCookies) {
+          [_webView.configuration.websiteDataStore.httpCookieStore setCookie:httpCookie completionHandler:nil];
+      }
     }
 
     NSURLRequest *request = [self requestForSource:_source];
-
-    [self syncCookiesToWebView:^{
-      // Because of the way React works, as pages redirect, we actually end up
-      // passing the redirect urls back here, so we ignore them if trying to load
-      // the same url. We'll expose a call to 'reload' to allow a user to load
-      // the existing page.
-      if ([request.URL isEqual:_webView.URL]) {
-          return;
-      }
-      if (!request.URL) {
-          // Clear the webview
-          [_webView loadHTMLString:@"" baseURL:nil];
-          return;
-      }
-      if (request.URL.host) {
-          [_webView loadRequest:request];
-      }
-      else {
-          NSURL* readAccessUrl = _allowingReadAccessToURL ? [RCTConvert NSURL:_allowingReadAccessToURL] : request.URL;
-          [_webView loadFileURL:request.URL allowingReadAccessToURL:readAccessUrl];
-      }
-    }];
+    // Because of the way React works, as pages redirect, we actually end up
+    // passing the redirect urls back here, so we ignore them if trying to load
+    // the same url. We'll expose a call to 'reload' to allow a user to load
+    // the existing page.
+    if ([request.URL isEqual:_webView.URL]) {
+        return;
+    }
+    if (!request.URL) {
+        // Clear the webview
+        [_webView loadHTMLString:@"" baseURL:nil];
+        return;
+    }
+    if (request.URL.host) {
+        [_webView loadRequest:request];
+    }
+    else {
+        NSURL* readAccessUrl = _allowingReadAccessToURL ? [RCTConvert NSURL:_allowingReadAccessToURL] : request.URL;
+        [_webView loadFileURL:request.URL allowingReadAccessToURL:readAccessUrl];
+    }
 }
 
 #if !TARGET_OS_OSX
@@ -807,7 +702,7 @@ NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
 
     if(subview == nil) return;
 
-    NSString* name = [NSString stringWithFormat:@"%@_SwizzleHelperWK", subview.class.superclass];
+    NSString* name = [NSString stringWithFormat:@"%@_BPSwizzleHelperWK", subview.class.superclass];
     Class newClass = NSClassFromString(name);
 
     if(newClass == nil)
@@ -831,12 +726,6 @@ NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
 }
 #endif // !TARGET_OS_OSX
 
-- (void)setUserAgent:(NSString*)userAgent
-{
-  _userAgent = userAgent;
-  _webView.customUserAgent = userAgent;
-}
-
 - (void)setScrollEnabled:(BOOL)scrollEnabled
 {
   _scrollEnabled = scrollEnabled;
@@ -972,15 +861,6 @@ NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
             }
         }
     }
-    if ([[challenge protectionSpace] authenticationMethod] == NSURLAuthenticationMethodHTTPBasic) {
-        NSString *username = [_basicAuthCredential valueForKey:@"username"];
-        NSString *password = [_basicAuthCredential valueForKey:@"password"];
-        if (username && password) {
-            NSURLCredential *credential = [NSURLCredential credentialWithUser:username password:password persistence:NSURLCredentialPersistenceNone];
-            completionHandler(NSURLSessionAuthChallengeUseCredential, credential);
-            return;
-        }
-    }
     completionHandler(NSURLSessionAuthChallengePerformDefaultHandling, nil);
 }
 
@@ -1075,32 +955,6 @@ NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
 #endif // !TARGET_OS_OSX
 }
 
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000 /* iOS 15 */
-/**
- * Media capture permissions (prevent multiple prompts)
- */
-- (void)                         webView:(WKWebView *)webView
-  requestMediaCapturePermissionForOrigin:(WKSecurityOrigin *)origin
-                        initiatedByFrame:(WKFrameInfo *)frame
-                                    type:(WKMediaCaptureType)type
-                         decisionHandler:(void (^)(WKPermissionDecision decision))decisionHandler {
-    if (_mediaCapturePermissionGrantType == BPCWebViewPermissionGrantType_GrantIfSameHost_ElsePrompt || _mediaCapturePermissionGrantType == BPCWebViewPermissionGrantType_GrantIfSameHost_ElseDeny) {
-        if ([origin.host isEqualToString:webView.URL.host]) {
-            decisionHandler(WKPermissionDecisionGrant);
-        } else {
-            WKPermissionDecision decision = _mediaCapturePermissionGrantType == BPCWebViewPermissionGrantType_GrantIfSameHost_ElsePrompt ? WKPermissionDecisionPrompt : WKPermissionDecisionDeny;
-            decisionHandler(decision);
-        }
-    } else if (_mediaCapturePermissionGrantType == BPCWebViewPermissionGrantType_Deny) {
-        decisionHandler(WKPermissionDecisionDeny);
-    } else if (_mediaCapturePermissionGrantType == BPCWebViewPermissionGrantType_Grant) {
-        decisionHandler(WKPermissionDecisionGrant);
-    } else {
-        decisionHandler(WKPermissionDecisionPrompt);
-    }
-}
-#endif
-
 #if !TARGET_OS_OSX
 /**
  * topViewController
@@ -1118,22 +972,37 @@ NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
 - (void)                  webView:(WKWebView *)webView
   decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction
                   decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
-{
-    
-    NSString *url = navigationAction.request.URL.absoluteString;
-        
-    if([self isItunesURL:url]) {
-        [self startAppToApp:[NSURL URLWithString:url]];
+{    
+    if([self isItunesURL:navigationAction.request.URL.absoluteString]) { 
+        [self startAppToApp:navigationAction.request.URL];
         decisionHandler(WKNavigationActionPolicyCancel);
-    } else if(![url hasPrefix:@"http"]) {
-        [self startAppToApp:[NSURL URLWithString:url]];
+    } else if(![navigationAction.request.URL.scheme isEqualToString:@"http"] && ![navigationAction.request.URL.scheme isEqualToString:@"https"] && ![navigationAction.request.URL.absoluteString isEqualToString:@"about:blank"]) {
+        [self startAppToApp:navigationAction.request.URL];
         decisionHandler(WKNavigationActionPolicyCancel);
-    } else {
+    } else {      
         [self navigationOriginRN:webView decidePolicyForNavigationAction:navigationAction decisionHandler:decisionHandler];
     }
 }
 
 
+- (NSString*) getQueryStringParameter:(NSString*)url :(NSString*)param {
+    NSMutableDictionary *queryStringDictionary = [[NSMutableDictionary alloc] init];
+    NSArray *urlComponents = [url componentsSeparatedByString:@"&"];
+    
+    for (NSString *keyValuePair in urlComponents)
+    {
+        NSArray *pairComponents = [keyValuePair componentsSeparatedByString:@"="];
+        NSString *key = [[pairComponents firstObject] stringByRemovingPercentEncoding];
+        NSString *value = [[pairComponents lastObject] stringByRemovingPercentEncoding];
+
+        if([param isEqualToString:key]) {
+            return value;
+        }
+    }
+    
+    return @"";
+}
+
 - (void) startAppToApp:(NSURL*) url {
     UIApplication *application = [UIApplication sharedApplication];
     
@@ -1224,58 +1093,59 @@ NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
     return match.location != NSNotFound;
 }
 
+
 - (void)                  navigationOriginRN:(WKWebView *)webView
   decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction
                   decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
 {
-  static NSDictionary<NSNumber *, NSString *> *navigationTypes;
-  static dispatch_once_t onceToken;
-
-  dispatch_once(&onceToken, ^{
-    navigationTypes = @{
-      @(WKNavigationTypeLinkActivated): @"click",
-      @(WKNavigationTypeFormSubmitted): @"formsubmit",
-      @(WKNavigationTypeBackForward): @"backforward",
-      @(WKNavigationTypeReload): @"reload",
-      @(WKNavigationTypeFormResubmitted): @"formresubmit",
-      @(WKNavigationTypeOther): @"other",
-    };
-  });
-
-  WKNavigationType navigationType = navigationAction.navigationType;
-  NSURLRequest *request = navigationAction.request;
-  BOOL isTopFrame = [request.URL isEqual:request.mainDocumentURL];
-
-  if (_onShouldStartLoadWithRequest) {
-    NSMutableDictionary<NSString *, id> *event = [self baseEvent];
-    [event addEntriesFromDictionary: @{
-      @"url": (request.URL).absoluteString,
-      @"mainDocumentURL": (request.mainDocumentURL).absoluteString,
-      @"navigationType": navigationTypes[@(navigationType)],
-      @"isTopFrame": @(isTopFrame)
-    }];
-    if (![self.delegate webView:self
-      shouldStartLoadForRequest:event
-                   withCallback:_onShouldStartLoadWithRequest]) {
-      decisionHandler(WKNavigationActionPolicyCancel);
-      return;
-    }
-  }
+    static NSDictionary<NSNumber *, NSString *> *navigationTypes;
+    static dispatch_once_t onceToken;
+
+    dispatch_once(&onceToken, ^{
+      navigationTypes = @{
+        @(WKNavigationTypeLinkActivated): @"click",
+        @(WKNavigationTypeFormSubmitted): @"formsubmit",
+        @(WKNavigationTypeBackForward): @"backforward",
+        @(WKNavigationTypeReload): @"reload",
+        @(WKNavigationTypeFormResubmitted): @"formresubmit",
+        @(WKNavigationTypeOther): @"other",
+      };
+    });
 
-  if (_onLoadingStart) {
-    // We have this check to filter out iframe requests and whatnot
-    if (isTopFrame) {
+    WKNavigationType navigationType = navigationAction.navigationType;
+    NSURLRequest *request = navigationAction.request;
+    BOOL isTopFrame = [request.URL isEqual:request.mainDocumentURL];
+
+    if (_onShouldStartLoadWithRequest) {
       NSMutableDictionary<NSString *, id> *event = [self baseEvent];
       [event addEntriesFromDictionary: @{
         @"url": (request.URL).absoluteString,
-        @"navigationType": navigationTypes[@(navigationType)]
+        @"mainDocumentURL": (request.mainDocumentURL).absoluteString,
+        @"navigationType": navigationTypes[@(navigationType)],
+        @"isTopFrame": @(isTopFrame)
       }];
-      _onLoadingStart(event);
+      if (![self.delegate webView:self
+        shouldStartLoadForRequest:event
+                     withCallback:_onShouldStartLoadWithRequest]) {
+        decisionHandler(WKNavigationActionPolicyCancel);
+        return;
+      }
+    }
+
+    if (_onLoadingStart) {
+      // We have this check to filter out iframe requests and whatnot
+      if (isTopFrame) {
+        NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+        [event addEntriesFromDictionary: @{
+          @"url": (request.URL).absoluteString,
+          @"navigationType": navigationTypes[@(navigationType)]
+        }];
+        _onLoadingStart(event);
+      }
     }
-  }
 
-  // Allow all navigation by default
-  decisionHandler(WKNavigationActionPolicyAllow);
+    // Allow all navigation by default
+    decisionHandler(WKNavigationActionPolicyAllow);
 }
 
 /**
@@ -1428,15 +1298,6 @@ NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
 - (void)webView:(WKWebView *)webView
   didFinishNavigation:(WKNavigation *)navigation
 {
-  if(_sharedCookiesEnabled && @available(iOS 11.0, *)) {
-    // Write all cookies from WKWebView back to sharedHTTPCookieStorage
-    [webView.configuration.websiteDataStore.httpCookieStore getAllCookies:^(NSArray* cookies) {
-      for (NSHTTPCookie *cookie in cookies) {
-        [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookie:cookie];
-      }
-    }];
-  }
-
   if (_ignoreSilentHardwareSwitch) {
     [self forceIgnoreSilentHardwareSwitch:true];
   }
@@ -1470,6 +1331,7 @@ NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
    */
   NSURLRequest *request = [self requestForSource:self.source];
 
+
   if (request.URL && !_webView.URL.absoluteString.length) {
     [_webView loadRequest:request];
   } else {
@@ -1582,33 +1444,6 @@ NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
   }
 }
 
-- (void)writeCookiesToWebView:(NSArray<NSHTTPCookie *>*)cookies completion:(void (^)(void))completion {
-  // The required cookie APIs only became available on iOS 11
-  if(_sharedCookiesEnabled && @available(iOS 11.0, *)) {
-    dispatch_async(dispatch_get_main_queue(), ^{
-      dispatch_group_t group = dispatch_group_create();
-      for (NSHTTPCookie *cookie in cookies) {
-        dispatch_group_enter(group);
-        [_webView.configuration.websiteDataStore.httpCookieStore setCookie:cookie completionHandler:^{
-          dispatch_group_leave(group);
-        }];
-      }
-      dispatch_group_notify(group, dispatch_get_main_queue(), ^{
-        if (completion) {
-          completion();
-        }
-      });
-    });
-  } else if (completion) {
-    completion();
-  }
-}
-
-- (void)syncCookiesToWebView:(void (^)(void))completion {
-  NSArray<NSHTTPCookie *> *cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookies];
-  [self writeCookiesToWebView:cookies completion:completion];
-}
-
 - (void)resetupScripts:(WKWebViewConfiguration *)wkWebViewConfig {
   [wkWebViewConfig.userContentController removeAllUserScripts];
   [wkWebViewConfig.userContentController removeScriptMessageHandlerForName:MessageHandlerName];
@@ -1653,7 +1488,9 @@ NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
       if(!_incognito && !_cacheEnabled) {
         wkWebViewConfig.websiteDataStore = [WKWebsiteDataStore nonPersistentDataStore];
       }
-      [self syncCookiesToWebView:nil];
+      for (NSHTTPCookie *cookie in [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookies]) {
+        [wkWebViewConfig.websiteDataStore.httpCookieStore setCookie:cookie completionHandler:nil];
+      }
     } else {
       NSMutableString *script = [NSMutableString string];
 

package/apple/BPCWebViewManager.h

@@ -8,6 +8,4 @@
 #import <React/RCTViewManager.h>
 
 @interface BPCWebViewManager : RCTViewManager
-  @property (nonatomic, copy) NSArray<NSDictionary *> * _Nullable menuItems;
-  @property (nonatomic, copy) RCTDirectEventBlock onCustomMenuSelection;
 @end