react-native-webview-bootpay 11.26.20 → 13.6.0

package/apple/{BPCWebView.m → BPCWebViewImpl.m}

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "BPCWebView.h"
+#import "BPCWebViewImpl.h"
 #import <React/RCTConvert.h>
 #import <React/RCTAutoInsetsProtocol.h>
 #import "BPCWKProcessPoolManager.h"
@@ -23,7 +23,7 @@ static NSString *const MessageHandlerName = @"BootpayRNWebView";
 static NSURLCredential* clientAuthenticationCredential;
 static NSDictionary* customCertificatesForHost;
 
-NSString *const BPCUSTOM_SELECTOR = @"_BPCUSTOM_SELECTOR_";
+NSString *const CUSTOM_SELECTOR = @"_BPCUSTOM_SELECTOR_";
 
 #if !TARGET_OS_OSX
 // runtime trick to remove WKWebView keyboard default toolbar
@@ -37,7 +37,7 @@ NSString *const BPCUSTOM_SELECTOR = @"_BPCUSTOM_SELECTOR_";
   if (_webView == nil) {
     return nil;
   }
-  
+
   if ([_webView respondsToSelector:@selector(inputAssistantItem)]) {
     UITextInputAssistantItem *inputAssistantItem = [_webView inputAssistantItem];
     inputAssistantItem.leadingBarButtonGroups = @[];
@@ -48,49 +48,85 @@ NSString *const BPCUSTOM_SELECTOR = @"_BPCUSTOM_SELECTOR_";
 @end
 #endif // !TARGET_OS_OSX
 
-#if TARGET_OS_OSX
 @interface BPCWKWebView : WKWebView
+#if !TARGET_OS_OSX
+@property (nonatomic, copy) NSArray<NSDictionary *> * _Nullable menuItems;
+@property (nonatomic, copy) NSArray<NSString *> * _Nullable suppressMenuItems;
+#endif // !TARGET_OS_OSX
 @end
 @implementation BPCWKWebView
+#if !TARGET_OS_OSX
+- (NSString *)stringFromAction:(SEL) action {
+  NSString *sel = NSStringFromSelector(action);
+
+  NSDictionary *map = @{
+      @"cut:":               @"cut",
+      @"copy:":              @"copy",
+      @"paste:":             @"paste",
+      @"delete:":            @"delete",
+      @"select:":             @"select",
+      @"selectAll:":         @"selectAll",
+      @"_promptForReplace:": @"replace",
+      @"_define:":           @"lookup",
+      @"_translate:":        @"translate",
+      @"toggleBoldface:":    @"bold",
+      @"toggleItalics:":     @"italic",
+      @"toggleUnderline:":   @"underline",
+      @"_share:":            @"share",
+  };
+    
+  return map[sel] ?: sel;
+}
+
+- (BOOL)canPerformAction:(SEL)action
+              withSender:(id)sender{
+  if(self.suppressMenuItems) {
+      NSString * sel = [self stringFromAction:action];
+      if ([self.suppressMenuItems containsObject: sel]) {
+          return NO;
+      }
+  }
+  
+  if (!self.menuItems) {
+      return [super canPerformAction:action withSender:sender];
+  }
+
+  return NO;
+}
+- (void)buildMenuWithBuilder:(id<UIMenuBuilder>)builder API_AVAILABLE(ios(13.0))  {
+    if (@available(iOS 16.0, *)) {
+      if(self.menuItems){
+        [builder removeMenuForIdentifier:UIMenuLookup];
+      }
+    }
+    [super buildMenuWithBuilder:builder];
+}
+#else // TARGET_OS_OSX
 - (void)scrollWheel:(NSEvent *)theEvent {
-  BPCWebView *bpcWebView = (BPCWebView *)[self superview];
-  RCTAssert([bpcWebView isKindOfClass:[bpcWebView class]], @"superview must be an BPCWebView");
-  if (![bpcWebView scrollEnabled]) {
+  BPCWebViewImpl *BPCWebView = (BPCWebViewImpl *)[self superview];
+  RCTAssert([BPCWebView isKindOfClass:[BPCWebView class]], @"superview must be an BPCWebViewImpl");
+  if (![BPCWebView scrollEnabled]) {
     [[self nextResponder] scrollWheel:theEvent];
     return;
   }
   [super scrollWheel:theEvent];
 }
-@end
 #endif // TARGET_OS_OSX
+@end
 
-@interface BPCWebView () <WKUIDelegate, WKNavigationDelegate, WKScriptMessageHandler, WKHTTPCookieStoreObserver,
+@interface BPCWebViewImpl () <WKUIDelegate, WKNavigationDelegate, WKScriptMessageHandler, WKHTTPCookieStoreObserver,
 #if !TARGET_OS_OSX
 UIScrollViewDelegate,
 #endif // !TARGET_OS_OSX
 RCTAutoInsetsProtocol>
 
-@property (nonatomic, copy) RCTDirectEventBlock onFileDownload;
-@property (nonatomic, copy) RCTDirectEventBlock onLoadingStart;
-@property (nonatomic, copy) RCTDirectEventBlock onLoadingFinish;
-@property (nonatomic, copy) RCTDirectEventBlock onLoadingError;
-@property (nonatomic, copy) RCTDirectEventBlock onLoadingProgress;
-@property (nonatomic, copy) RCTDirectEventBlock onShouldStartLoadWithRequest;
-@property (nonatomic, copy) RCTDirectEventBlock onHttpError;
-@property (nonatomic, copy) RCTDirectEventBlock onMessage;
-@property (nonatomic, copy) RCTDirectEventBlock onScroll;
-@property (nonatomic, copy) RCTDirectEventBlock onContentProcessDidTerminate;
-#if !TARGET_OS_OSX
-@property (nonatomic, copy) WKWebView *webView;
-#else
 @property (nonatomic, copy) BPCWKWebView *webView;
-#endif // !TARGET_OS_OSX
 @property (nonatomic, strong) WKUserScript *postMessageScript;
 @property (nonatomic, strong) WKUserScript *atStartScript;
 @property (nonatomic, strong) WKUserScript *atEndScript;
 @end
 
-@implementation BPCWebView
+@implementation BPCWebViewImpl
 {
 #if !TARGET_OS_OSX
   UIColor * _savedBackgroundColor;
@@ -99,15 +135,15 @@ RCTAutoInsetsProtocol>
 #endif // !TARGET_OS_OSX
   BOOL _savedHideKeyboardAccessoryView;
   BOOL _savedKeyboardDisplayRequiresUserAction;
-  
+
   // Workaround for StatusBar appearance bug for iOS 12
-  // https://github.com/react-native-webview/react-native-webview/issues/62
+  // https://github.com/react-native-webview-bootpay/react-native-webview-bootpay/issues/62
   BOOL _isFullScreenVideoOpen;
 #if !TARGET_OS_OSX
   UIStatusBarStyle _savedStatusBarStyle;
 #endif // !TARGET_OS_OSX
   BOOL _savedStatusBarHidden;
-  
+
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
   UIScrollViewContentInsetAdjustmentBehavior _savedContentInsetAdjustmentBehavior;
 #endif
@@ -141,7 +177,7 @@ RCTAutoInsetsProtocol>
     _injectedJavaScriptForMainFrameOnly = YES;
     _injectedJavaScriptBeforeContentLoaded = nil;
     _injectedJavaScriptBeforeContentLoadedForMainFrameOnly = YES;
-    
+
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
     _savedContentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
 #endif
@@ -153,13 +189,13 @@ RCTAutoInsetsProtocol>
     _mediaCapturePermissionGrantType = BPCWebViewPermissionGrantType_Prompt;
 #endif
   }
-  
+
 #if !TARGET_OS_OSX
   [[NSNotificationCenter defaultCenter]addObserver:self
                                           selector:@selector(appDidBecomeActive)
                                               name:UIApplicationDidBecomeActiveNotification
                                             object:nil];
-  
+
   [[NSNotificationCenter defaultCenter]addObserver:self
                                           selector:@selector(appWillResignActive)
                                               name:UIApplicationWillResignActiveNotification
@@ -175,19 +211,19 @@ RCTAutoInsetsProtocol>
      addObserver:self
      selector:@selector(keyboardWillShow)
      name:UIKeyboardWillShowNotification object:nil];
-    
+
     // Workaround for StatusBar appearance bug for iOS 12
-    // https://github.com/react-native-webview/react-native-webview/issues/62
+    // https://github.com/react-native-webview-bootpay/react-native-webview-bootpay/issues/62
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(showFullScreenVideoStatusBars)
                                                  name:UIWindowDidBecomeVisibleNotification
                                                object:nil];
-    
+
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(hideFullScreenVideoStatusBars)
                                                  name:UIWindowDidBecomeHiddenNotification
                                                object:nil];
-    
+
   }
 #endif // !TARGET_OS_OSX
   return self;
@@ -206,27 +242,30 @@ RCTAutoInsetsProtocol>
 // 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;
+    if (pressSender.state != UIGestureRecognizerStateEnded || !self.menuItems) {
+        return;
+    }
+    // When a long press ends, bring up our custom UIMenu if defined
+    if (self.menuItems.count == 0) {
+        UIMenuController *menuController = [UIMenuController sharedMenuController];
+        menuController.menuItems = nil;
+        [menuController setMenuVisible:NO animated:YES];
+        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:@"%@%@", BPCUSTOM_SELECTOR, menuItemKey];
+      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
@@ -280,7 +319,7 @@ RCTAutoInsetsProtocol>
 - (void)forwardInvocation:(NSInvocation *)invocation
 {
   NSString *sel = NSStringFromSelector([invocation selector]);
-  NSRange match = [sel rangeOfString:BPCUSTOM_SELECTOR];
+  NSRange match = [sel rangeOfString:CUSTOM_SELECTOR];
   if (match.location == 0) {
     [self tappedMenuItem:[sel substringFromIndex:17]];
   } else {
@@ -299,8 +338,8 @@ RCTAutoInsetsProtocol>
 {
   NSString *sel = NSStringFromSelector(action);
   // Do any of them have our custom keys?
-  NSRange match = [sel rangeOfString:BPCUSTOM_SELECTOR];
-  
+  NSRange match = [sel rangeOfString:CUSTOM_SELECTOR];
+
   if (match.location == 0) {
     return YES;
   }
@@ -312,17 +351,12 @@ RCTAutoInsetsProtocol>
  */
 - (WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures
 {
-    /*
   if (!navigationAction.targetFrame.isMainFrame) {
-    [webView loadRequest:navigationAction.request];
-  }
-  return nil;
-  */ 
-  NSString *url = navigationAction.request.URL.absoluteString;
+      
+    NSString *url = navigationAction.request.URL.absoluteString;
+//    NSURL *url = navigationAction.request.URL;
 
-  if (!navigationAction.targetFrame.isMainFrame) {
-    
-        if ([url containsString:@"bootpay.co.kr"]) {
+     if ([url containsString:@"bootpay.co.kr"]) {
             // 팝업(새 창) 뜨는 경우 호출됨 (window.open 또는 target="_blank")
             WKWebView *popupView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, self.bounds.size.width, self.bounds.size.height) configuration:configuration];
 
@@ -333,11 +367,18 @@ RCTAutoInsetsProtocol>
             [self addSubview:popupView];
 
             return popupView;
+      } else {
+        if (_onOpenWindow) {
+          NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+          [event addEntriesFromDictionary: @{@"targetUrl": url}];
+          _onOpenWindow(event);
         } else {
-            [webView loadRequest:navigationAction.request];
-            return nil;
+          [webView loadRequest:navigationAction.request];
         }
-    }
+
+      }
+    
+  }
   return nil;
 }
 
@@ -372,6 +413,14 @@ RCTAutoInsetsProtocol>
     prefs.javaScriptEnabled = NO;
     _prefsUsed = YES;
   }
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 /* iOS 13 */
+  if (@available(iOS 13.0, *)) {
+    if (!_fraudulentWebsiteWarningEnabled) {
+        prefs.fraudulentWebsiteWarningEnabled = NO;
+        _prefsUsed = YES;
+    }
+  }
+#endif
   if (_allowUniversalAccessFromFileURLs) {
     [wkWebViewConfig setValue:@TRUE forKey:@"allowUniversalAccessFromFileURLs"];
   }
@@ -403,7 +452,7 @@ RCTAutoInsetsProtocol>
     wkWebViewConfig.processPool = [[BPCWKProcessPoolManager sharedManager] sharedProcessPool];
   }
   wkWebViewConfig.userContentController = [WKUserContentController new];
-  
+
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 /* iOS 13 */
   if (@available(iOS 13.0, *)) {
     WKWebpagePreferences *pagePrefs = [[WKWebpagePreferences alloc]init];
@@ -411,7 +460,7 @@ RCTAutoInsetsProtocol>
     wkWebViewConfig.defaultWebpagePreferences = pagePrefs;
   }
 #endif
-  
+
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000 /* iOS 14 */
   if (@available(iOS 14.0, *)) {
     if ([wkWebViewConfig respondsToSelector:@selector(limitsNavigationsToAppBoundDomains)]) {
@@ -421,32 +470,28 @@ RCTAutoInsetsProtocol>
     }
   }
 #endif
-  
+
   // Shim the HTML5 history API:
   [wkWebViewConfig.userContentController addScriptMessageHandler:[[BPCWeakScriptMessageDelegate alloc] initWithDelegate:self]
                                                             name:HistoryShimName];
   [self resetupScripts:wkWebViewConfig];
-  
+
   if(@available(macos 10.11, ios 9.0, *)) {
     wkWebViewConfig.allowsAirPlayForMediaPlayback = _allowsAirPlayForMediaPlayback;
   }
-  
+
 #if !TARGET_OS_OSX
   wkWebViewConfig.allowsInlineMediaPlayback = _allowsInlineMediaPlayback;
-#if WEBKIT_IOS_10_APIS_AVAILABLE
   wkWebViewConfig.mediaTypesRequiringUserActionForPlayback = _mediaPlaybackRequiresUserAction
   ? WKAudiovisualMediaTypeAll
   : WKAudiovisualMediaTypeNone;
   wkWebViewConfig.dataDetectorTypes = _dataDetectorTypes;
-#else
-  wkWebViewConfig.mediaPlaybackRequiresUserAction = _mediaPlaybackRequiresUserAction;
-#endif
 #endif // !TARGET_OS_OSX
-  
+
   if (_applicationNameForUserAgent) {
     wkWebViewConfig.applicationNameForUserAgent = [NSString stringWithFormat:@"%@ %@", wkWebViewConfig.applicationNameForUserAgent, _applicationNameForUserAgent];
   }
-  
+
   return wkWebViewConfig;
 }
 
@@ -454,14 +499,11 @@ RCTAutoInsetsProtocol>
 {
   if (self.window != nil && _webView == nil) {
     WKWebViewConfiguration *wkWebViewConfig = [self setUpWkWebViewConfig];
-#if !TARGET_OS_OSX
-    _webView = [[WKWebView alloc] initWithFrame:self.bounds configuration: wkWebViewConfig];
-#else
     _webView = [[BPCWKWebView alloc] initWithFrame:self.bounds configuration: wkWebViewConfig];
-#endif // !TARGET_OS_OSX
-    
     [self setBackgroundColor: _savedBackgroundColor];
 #if !TARGET_OS_OSX
+    _webView.menuItems = _menuItems;
+    _webView.suppressMenuItems = _suppressMenuItems;
     _webView.scrollView.delegate = self;
 #endif // !TARGET_OS_OSX
     _webView.UIDelegate = self;
@@ -481,19 +523,28 @@ RCTAutoInsetsProtocol>
     _webView.allowsLinkPreview = _allowsLinkPreview;
     [_webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew context:nil];
     _webView.allowsBackForwardNavigationGestures = _allowsBackForwardNavigationGestures;
-    
+
     _webView.customUserAgent = _userAgent;
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
+
+#if !TARGET_OS_OSX
     if ([_webView.scrollView respondsToSelector:@selector(setContentInsetAdjustmentBehavior:)]) {
       _webView.scrollView.contentInsetAdjustmentBehavior = _savedContentInsetAdjustmentBehavior;
     }
-#endif
+#endif  // !TARGET_OS_OSX
+
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 /* __IPHONE_13_0 */
     if (@available(iOS 13.0, *)) {
       _webView.scrollView.automaticallyAdjustsScrollIndicatorInsets = _savedAutomaticallyAdjustsScrollIndicatorInsets;
     }
 #endif
-    
+
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130300 || \
+    __IPHONE_OS_VERSION_MAX_ALLOWED >= 160400 || \
+    __TV_OS_VERSION_MAX_ALLOWED >= 160400
+    if (@available(macOS 13.3, iOS 16.4, tvOS 16.4, *))
+      _webView.inspectable = _webviewDebuggingEnabled;
+#endif
+
     [self addSubview:_webView];
     [self setHideKeyboardAccessoryView: _savedHideKeyboardAccessoryView];
     [self setKeyboardDisplayRequiresUserAction: _savedKeyboardDisplayRequiresUserAction];
@@ -504,7 +555,7 @@ RCTAutoInsetsProtocol>
   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;
@@ -519,7 +570,21 @@ RCTAutoInsetsProtocol>
   _webView.allowsBackForwardNavigationGestures = _allowsBackForwardNavigationGestures;
 }
 
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130300 || \
+    __IPHONE_OS_VERSION_MAX_ALLOWED >= 160400 || \
+    __TV_OS_VERSION_MAX_ALLOWED >= 160400
+- (void)setWebviewDebuggingEnabled:(BOOL)webviewDebuggingEnabled {
+  _webviewDebuggingEnabled = webviewDebuggingEnabled;
+  if (@available(macOS 13.3, iOS 16.4, tvOS 16.4, *))
+      _webView.inspectable = _webviewDebuggingEnabled;
+}
+#endif
+
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)destroyWebView
+#else
 - (void)removeFromSuperview
+#endif
 {
   if (_webView) {
     [_webView.configuration.userContentController removeScriptMessageHandlerForName:HistoryShimName];
@@ -528,6 +593,10 @@ RCTAutoInsetsProtocol>
     [_webView removeFromSuperview];
 #if !TARGET_OS_OSX
     _webView.scrollView.delegate = nil;
+    if (_menuItems) {
+      UIMenuController *menuController = [UIMenuController sharedMenuController];
+      menuController.menuItems = nil;
+    }
 #endif // !TARGET_OS_OSX
     _webView = nil;
     if (_onContentProcessDidTerminate) {
@@ -535,8 +604,10 @@ RCTAutoInsetsProtocol>
       _onContentProcessDidTerminate(event);
     }
   }
-  
+
+#ifndef RCT_NEW_ARCH_ENABLED
   [super removeFromSuperview];
+#endif
 }
 
 #if !TARGET_OS_OSX
@@ -546,7 +617,7 @@ RCTAutoInsetsProtocol>
   if (!_autoManageStatusBarEnabled) {
     return;
   }
-  
+
   _isFullScreenVideoOpen = YES;
   RCTUnsafeExecuteOnMainQueueSync(^{
     [RCTSharedApplication() setStatusBarStyle:self->_savedStatusBarStyle animated:YES];
@@ -560,7 +631,7 @@ RCTAutoInsetsProtocol>
   if (!_autoManageStatusBarEnabled) {
     return;
   }
-  
+
   _isFullScreenVideoOpen = NO;
   RCTUnsafeExecuteOnMainQueueSync(^{
     [RCTSharedApplication() setStatusBarHidden:self->_savedStatusBarHidden animated:YES];
@@ -619,7 +690,7 @@ RCTAutoInsetsProtocol>
   if (_webView == nil) {
     return;
   }
-  
+
   CGFloat alpha = CGColorGetAlpha(backgroundColor.CGColor);
   BOOL opaque = (alpha == 1.0);
 #if !TARGET_OS_OSX
@@ -637,21 +708,22 @@ RCTAutoInsetsProtocol>
 #endif // !TARGET_OS_OSX
 }
 
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
+#if !TARGET_OS_OSX
 - (void)setContentInsetAdjustmentBehavior:(UIScrollViewContentInsetAdjustmentBehavior)behavior
 {
   _savedContentInsetAdjustmentBehavior = behavior;
   if (_webView == nil) {
     return;
   }
-  
+
   if ([_webView.scrollView respondsToSelector:@selector(setContentInsetAdjustmentBehavior:)]) {
     CGPoint contentOffset = _webView.scrollView.contentOffset;
     _webView.scrollView.contentInsetAdjustmentBehavior = behavior;
     _webView.scrollView.contentOffset = contentOffset;
   }
 }
-#endif
+#endif // !TARGET_OS_OSX
+
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 /* __IPHONE_13_0 */
 - (void)setAutomaticallyAdjustsScrollIndicatorInsets:(BOOL)automaticallyAdjustsScrollIndicatorInsets{
   _savedAutomaticallyAdjustsScrollIndicatorInsets = automaticallyAdjustsScrollIndicatorInsets;
@@ -663,6 +735,7 @@ RCTAutoInsetsProtocol>
   }
 }
 #endif
+
 /**
  * This method is called whenever JavaScript running within the web view calls:
  *   - window.webkit.messageHandlers[MessageHandlerName].postMessage
@@ -689,7 +762,7 @@ RCTAutoInsetsProtocol>
 {
   if (![_source isEqualToDictionary:source]) {
     _source = [source copy];
-    
+
     if (_webView != nil) {
       [self visitSource];
     }
@@ -700,7 +773,7 @@ RCTAutoInsetsProtocol>
 {
   if (![_allowingReadAccessToURL isEqualToString:allowingReadAccessToURL]) {
     _allowingReadAccessToURL = [allowingReadAccessToURL copy];
-    
+
     if (_webView != nil) {
       [self visitSource];
     }
@@ -744,62 +817,74 @@ RCTAutoInsetsProtocol>
     NSArray *httpCookies = [NSHTTPCookie cookiesWithResponseHeaderFields:headers forURL:urlString];
     [self writeCookiesToWebView:httpCookies completion:nil];
   }
-  
+
   NSURLRequest *request = [self requestForSource:_source];
-  
+  __weak WKWebView *webView = _webView;
+  NSString *allowingReadAccessToURL = _allowingReadAccessToURL;
+
   [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]) {
+    if ([request.URL isEqual:webView.URL]) {
       return;
     }
     if (!request.URL) {
       // Clear the webview
-      [_webView loadHTMLString:@"" baseURL:nil];
+      [webView loadHTMLString:@"" baseURL:nil];
       return;
     }
     if (request.URL.host) {
-      [_webView loadRequest:request];
+      [webView loadRequest:request];
     }
     else {
-      NSURL* readAccessUrl = _allowingReadAccessToURL ? [RCTConvert NSURL:_allowingReadAccessToURL] : request.URL;
-      [_webView loadFileURL:request.URL allowingReadAccessToURL:readAccessUrl];
+      NSURL* readAccessUrl = allowingReadAccessToURL ? [RCTConvert NSURL:allowingReadAccessToURL] : request.URL;
+      [webView loadFileURL:request.URL allowingReadAccessToURL:readAccessUrl];
     }
   }];
 }
 
 #if !TARGET_OS_OSX
+-(void)setMenuItems:(NSArray<NSDictionary *> *)menuItems {
+    _menuItems = menuItems;
+    _webView.menuItems = menuItems;
+}
+
+-(void)setSuppressMenuItems:(NSArray<NSString *> *)suppressMenuItems {
+    _suppressMenuItems = suppressMenuItems;
+    _webView.suppressMenuItems = suppressMenuItems;
+}
+
 -(void)setKeyboardDisplayRequiresUserAction:(BOOL)keyboardDisplayRequiresUserAction
 {
   if (_webView == nil) {
     _savedKeyboardDisplayRequiresUserAction = keyboardDisplayRequiresUserAction;
     return;
   }
-  
+
   if (_savedKeyboardDisplayRequiresUserAction == true) {
     return;
   }
-  
+
   UIView* subview;
-  
+
   for (UIView* view in _webView.scrollView.subviews) {
     if([[view.class description] hasPrefix:@"WK"])
       subview = view;
   }
-  
+
   if(subview == nil) return;
-  
+
   Class class = subview.class;
-  
+
   NSOperatingSystemVersion iOS_11_3_0 = (NSOperatingSystemVersion){11, 3, 0};
   NSOperatingSystemVersion iOS_12_2_0 = (NSOperatingSystemVersion){12, 2, 0};
   NSOperatingSystemVersion iOS_13_0_0 = (NSOperatingSystemVersion){13, 0, 0};
-  
+
   Method method;
   IMP override;
-  
+
   if ([[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion: iOS_13_0_0]) {
     // iOS 13.0.0 - Future
     SEL selector = sel_getUid("_elementDidFocus:userIsInteracting:blurPreviousNode:activityStateChanges:userObject:");
@@ -835,7 +920,7 @@ RCTAutoInsetsProtocol>
       ((void (*)(id, SEL, void*, BOOL, BOOL, id))original)(me, selector, arg0, TRUE, arg2, arg3);
     });
   }
-  
+
   method_setImplementation(method, override);
 }
 
@@ -845,34 +930,34 @@ RCTAutoInsetsProtocol>
     _savedHideKeyboardAccessoryView = hideKeyboardAccessoryView;
     return;
   }
-  
+
   if (_savedHideKeyboardAccessoryView == false) {
     return;
   }
-  
+
   UIView* subview;
-  
+
   for (UIView* view in _webView.scrollView.subviews) {
     if([[view.class description] hasPrefix:@"WK"])
       subview = view;
   }
-  
+
   if(subview == nil) return;
-  
+
   NSString* name = [NSString stringWithFormat:@"%@_BPSwizzleHelperWK", subview.class.superclass];
   Class newClass = NSClassFromString(name);
-  
+
   if(newClass == nil)
   {
     newClass = objc_allocateClassPair(subview.class, [name cStringUsingEncoding:NSASCIIStringEncoding], 0);
     if(!newClass) return;
-    
+
     Method method = class_getInstanceMethod([_BPSwizzleHelperWK class], @selector(inputAccessoryView));
     class_addMethod(newClass, @selector(inputAccessoryView), method_getImplementation(method), method_getTypeEncoding(method));
-    
+
     objc_registerClassPair(newClass);
   }
-  
+
   object_setClass(subview, newClass);
 }
 
@@ -963,8 +1048,8 @@ RCTAutoInsetsProtocol>
 - (void)layoutSubviews
 {
   [super layoutSubviews];
-  
-  // Ensure webview takes the position and dimensions of BPCWebView
+
+  // Ensure webview takes the position and dimensions of BPCWebViewImpl
   _webView.frame = self.bounds;
 #if !TARGET_OS_OSX
   _webView.scrollView.contentInset = _contentInset;
@@ -1105,7 +1190,7 @@ RCTAutoInsetsProtocol>
 #else
   NSAlert *alert = [[NSAlert alloc] init];
   [alert setMessageText:prompt];
-  
+
   const NSRect RCTSingleTextFieldFrame = NSMakeRect(0.0, 0.0, 275.0, 22.0);
   NSTextField *textField = [[NSTextField alloc] initWithFrame:RCTSingleTextFieldFrame];
   textField.cell.scrollable = YES;
@@ -1114,7 +1199,7 @@ RCTAutoInsetsProtocol>
   }
   textField.stringValue = defaultText;
   [alert setAccessoryView:textField];
-  
+
   [alert addButtonWithTitle:NSLocalizedString(@"OK", @"OK button")];
   [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Cancel button")];
   [alert beginSheetModalForWindow:[NSApp keyWindow] completionHandler:^(NSModalResponse response) {
@@ -1167,14 +1252,13 @@ RCTAutoInsetsProtocol>
  * Decides whether to allow or cancel a navigation.
  * @see https://fburl.com/42r9fxob
  */
-
- - (void)                  webView:(WKWebView *)webView
+- (void)                  webView:(WKWebView *)webView
   decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction
                   decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
- {
-     NSString *url = navigationAction.request.URL.absoluteString;
+{
+   NSString *url = navigationAction.request.URL.absoluteString;
 
-     _beforeUrl = url;
+    //  _beforeUrl = url;
 
  //    [self updateBlindViewIfNaverLogin:url];
 
@@ -1190,7 +1274,8 @@ RCTAutoInsetsProtocol>
         [self webViewRN:webView decidePolicyForNavigationAction:navigationAction decisionHandler:decisionHandler];
       //decisionHandler(WKNavigationActionPolicyAllow);
      }
- }
+    
+}
 
 
 - (void)                  webViewRN:(WKWebView *)webView
@@ -1199,54 +1284,91 @@ RCTAutoInsetsProtocol>
 {
   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",
-    };
+      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) {
+  BOOL hasTargetFrame = navigationAction.targetFrame != nil;
+
+  if (_onOpenWindow && !hasTargetFrame) {
+    // When OnOpenWindow should be called, we want to prevent the navigation
+    // If not prevented, the `decisionHandler` is called first and after that `createWebViewWithConfiguration` is called
+    // In that order the WebView's ref would be updated with the target URL even if `createWebViewWithConfiguration` does not call `loadRequest`
+    // So the WebView's document stays on the current URL, but the WebView's ref is replaced by the target URL
+    // By preventing the navigation here, we also prevent the WebView's ref mutation
+    // The counterpart is that we have to manually call `_onOpenWindow` here, because no navigation means no call to `createWebViewWithConfiguration`
     NSMutableDictionary<NSString *, id> *event = [self baseEvent];
-    if (request.mainDocumentURL) {
+    [event addEntriesFromDictionary: @{@"targetUrl": request.URL.absoluteString}];
+    decisionHandler(WKNavigationActionPolicyCancel);
+    _onOpenWindow(event);
+    return;
+  }
+
+  if (_onShouldStartLoadWithRequest) {
+      NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+      int lockIdentifier = [[BPCWebViewDecisionManager getInstance] setDecisionHandler: ^(BOOL shouldStart){
+          dispatch_async(dispatch_get_main_queue(), ^{
+              if (!shouldStart) {
+                  decisionHandler(WKNavigationActionPolicyCancel);
+                  return;
+              }
+              if (self->_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)]
+                      }];
+                      self->_onLoadingStart(event);
+                  }
+              }
+
+              // Allow all navigation by default
+              decisionHandler(WKNavigationActionPolicyAllow);
+          });
+
+      }];
+      if (request.mainDocumentURL) {
+        [event addEntriesFromDictionary: @{
+          @"mainDocumentURL": (request.mainDocumentURL).absoluteString,
+        }];
+      }
       [event addEntriesFromDictionary: @{
-        @"mainDocumentURL": (request.mainDocumentURL).absoluteString,
+          @"url": (request.URL).absoluteString,
+          @"navigationType": navigationTypes[@(navigationType)],
+          @"isTopFrame": @(isTopFrame),
+          @"hasTargetFrame": @(hasTargetFrame),
+          @"lockIdentifier": @(lockIdentifier)
       }];
-    }
-    [event addEntriesFromDictionary: @{
-      @"url": (request.URL).absoluteString,
-      @"navigationType": navigationTypes[@(navigationType)],
-      @"isTopFrame": @(isTopFrame)
-    }];
-    if (![self.delegate webView:self
-      shouldStartLoadForRequest:event
-                   withCallback:_onShouldStartLoadWithRequest]) {
-      decisionHandler(WKNavigationActionPolicyCancel);
+      _onShouldStartLoadWithRequest(event);
+      // decisionHandler(WKNavigationActionPolicyAllow);
       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);
-    }
+      // 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);
 }
@@ -1277,26 +1399,26 @@ RCTAutoInsetsProtocol>
     if ([navigationResponse.response isKindOfClass:[NSHTTPURLResponse class]]) {
       NSHTTPURLResponse *response = (NSHTTPURLResponse *)navigationResponse.response;
       NSInteger statusCode = response.statusCode;
-      
+
       if (statusCode >= 400) {
         NSMutableDictionary<NSString *, id> *httpErrorEvent = [self baseEvent];
         [httpErrorEvent addEntriesFromDictionary: @{
           @"url": response.URL.absoluteString,
           @"statusCode": @(statusCode)
         }];
-        
+
         _onHttpError(httpErrorEvent);
       }
-      
+
       NSString *disposition = nil;
-      if (@available(iOS 13, *)) {
+      if (@available(iOS 13, macOS 10.15, *)) {
         disposition = [response valueForHTTPHeaderField:@"Content-Disposition"];
       }
       BOOL isAttachment = disposition != nil && [disposition hasPrefix:@"attachment"];
       if (isAttachment || !navigationResponse.canShowMIMEType) {
         if (_onFileDownload) {
           policy = WKNavigationResponsePolicyCancel;
-          
+
           NSMutableDictionary<NSString *, id> *downloadEvent = [self baseEvent];
           [downloadEvent addEntriesFromDictionary: @{
             @"downloadUrl": (response.URL).absoluteString,
@@ -1306,7 +1428,7 @@ RCTAutoInsetsProtocol>
       }
     }
   }
-  
+
   decisionHandler(policy);
 }
 
@@ -1326,7 +1448,7 @@ RCTAutoInsetsProtocol>
       // http://stackoverflow.com/questions/1024748/how-do-i-fix-nsurlerrordomain-error-999-in-iphone-3-0-os
       return;
     }
-    
+
     if ([error.domain isEqualToString:@"WebKitErrorDomain"] &&
         (error.code == 102 || error.code == 101)) {
       // Error code 102 "Frame load interrupted" is raised by the WKWebView
@@ -1334,7 +1456,7 @@ RCTAutoInsetsProtocol>
       // implementing OAuth with a WebView.
       return;
     }
-    
+
     NSMutableDictionary<NSString *, id> *event = [self baseEvent];
     [event addEntriesFromDictionary:@{
       @"didFailProvisionalNavigation": @YES,
@@ -1412,13 +1534,15 @@ didFinishNavigation:(WKNavigation *)navigation
 
 - (void)cookiesDidChangeInCookieStore:(WKHTTPCookieStore *)cookieStore
 {
-  if(_sharedCookiesEnabled && @available(iOS 11.0, *)) {
-    // Write all cookies from WKWebView back to sharedHTTPCookieStorage
-    [cookieStore getAllCookies:^(NSArray* cookies) {
-      for (NSHTTPCookie *cookie in cookies) {
-        [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookie:cookie];
-      }
-    }];
+  if (@available(iOS 11.0, *)) {
+    if(_sharedCookiesEnabled) {
+      // Write all cookies from WKWebView back to sharedHTTPCookieStorage
+      [cookieStore getAllCookies:^(NSArray* cookies) {
+        for (NSHTTPCookie *cookie in cookies) {
+          [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookie:cookie];
+        }
+      }];
+    }
   }
 }
 
@@ -1445,7 +1569,7 @@ didFinishNavigation:(WKNavigation *)navigation
    * manually call [_webView loadRequest:request].
    */
   NSURLRequest *request = [self requestForSource:self.source];
-  
+
   if (request.URL && !_webView.URL.absoluteString.length) {
     [_webView loadRequest:request];
   } else {
@@ -1471,13 +1595,13 @@ didFinishNavigation:(WKNavigation *)navigation
 - (void)setPullToRefreshEnabled:(BOOL)pullToRefreshEnabled
 {
   _pullToRefreshEnabled = pullToRefreshEnabled;
-  
+
   if (pullToRefreshEnabled) {
     [self addPullToRefreshControl];
   } else {
     [_refreshControl removeFromSuperview];
   }
-  
+
   [self setBounces:_bounces];
 }
 #endif // !TARGET_OS_OSX
@@ -1494,6 +1618,37 @@ didFinishNavigation:(WKNavigation *)navigation
 #endif // !TARGET_OS_OSX
 }
 
+- (void)clearCache:(BOOL)includeDiskFiles
+{
+  NSMutableSet *dataTypes = [NSMutableSet setWithArray:@[
+    WKWebsiteDataTypeMemoryCache,
+    WKWebsiteDataTypeOfflineWebApplicationCache,
+  ]];
+  if (@available(iOS 11.3, *)) {
+    [dataTypes addObject:WKWebsiteDataTypeFetchCache];
+  }
+  if (includeDiskFiles) {
+    [dataTypes addObjectsFromArray:@[
+      WKWebsiteDataTypeDiskCache,
+      WKWebsiteDataTypeSessionStorage,
+      WKWebsiteDataTypeLocalStorage,
+      WKWebsiteDataTypeWebSQLDatabases,
+      WKWebsiteDataTypeIndexedDBDatabases
+    ]];
+  }
+  [self removeData:dataTypes];
+}
+
+- (void)removeData:(NSSet *)dataTypes
+{
+  if (_webView == nil) {
+      return;
+  }
+  NSDate *dateFrom = [NSDate dateWithTimeIntervalSince1970:0];
+
+  [_webView.configuration.websiteDataStore removeDataOfTypes:dataTypes modifiedSince:dateFrom completionHandler:^{}];
+}
+
 #if !TARGET_OS_OSX
 - (void)setBounces:(BOOL)bounces
 {
@@ -1505,23 +1660,30 @@ didFinishNavigation:(WKNavigation *)navigation
 
 - (void)setInjectedJavaScript:(NSString *)source {
   _injectedJavaScript = source;
-  
+
   self.atEndScript = source == nil ? nil : [[WKUserScript alloc] initWithSource:source
                                                                   injectionTime:WKUserScriptInjectionTimeAtDocumentEnd
                                                                forMainFrameOnly:_injectedJavaScriptForMainFrameOnly];
-  
+
   if(_webView != nil){
     [self resetupScripts:_webView.configuration];
   }
 }
 
+- (void)setEnableApplePay:(BOOL)enableApplePay {
+    _enableApplePay = enableApplePay;
+    if(_webView != nil){
+      [self resetupScripts:_webView.configuration];
+    }
+}
+
 - (void)setInjectedJavaScriptBeforeContentLoaded:(NSString *)source {
   _injectedJavaScriptBeforeContentLoaded = source;
-  
+
   self.atStartScript = source == nil ? nil : [[WKUserScript alloc] initWithSource:source
                                                                     injectionTime:WKUserScriptInjectionTimeAtDocumentStart
                                                                  forMainFrameOnly:_injectedJavaScriptBeforeContentLoadedForMainFrameOnly];
-  
+
   if(_webView != nil){
     [self resetupScripts:_webView.configuration];
   }
@@ -1539,7 +1701,7 @@ didFinishNavigation:(WKNavigation *)navigation
 
 - (void)setMessagingEnabled:(BOOL)messagingEnabled {
   _messagingEnabled = messagingEnabled;
-  
+
   self.postMessageScript = _messagingEnabled ?
   [
     [WKUserScript alloc]
@@ -1559,7 +1721,7 @@ didFinishNavigation:(WKNavigation *)navigation
     forMainFrameOnly:YES
   ] :
   nil;
-  
+
   if(_webView != nil){
     [self resetupScripts:_webView.configuration];
   }
@@ -1567,22 +1729,28 @@ didFinishNavigation:(WKNavigation *)navigation
 
 - (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();
+  if (@available(iOS 11.0, *)) {
+    if (_sharedCookiesEnabled) {
+      __weak WKWebView *webView = _webView;
+      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) {
+      return;
+    }
+  }
+
+  if (completion) {
     completion();
   }
 }
@@ -1602,7 +1770,7 @@ didFinishNavigation:(WKNavigation *)navigation
     }
     return;
   }
-  
+
   NSString *html5HistoryAPIShimSource = [NSString stringWithFormat:
                                            @"(function(history) {\n"
                                          "  function notify(type) {\n"
@@ -1625,7 +1793,7 @@ didFinishNavigation:(WKNavigation *)navigation
   ];
   WKUserScript *script = [[WKUserScript alloc] initWithSource:html5HistoryAPIShimSource injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:YES];
   [wkWebViewConfig.userContentController addUserScript:script];
-  
+
   if(_sharedCookiesEnabled) {
     // More info to sending cookies with WKWebView
     // https://stackoverflow.com/questions/26573137/can-i-set-the-cookies-to-be-used-by-a-wkwebview/26577303#26577303
@@ -1641,7 +1809,7 @@ didFinishNavigation:(WKNavigation *)navigation
       }];
     } else {
       NSMutableString *script = [NSMutableString string];
-      
+
       // Clear all existing cookies in a direct called function. This ensures that no
       // javascript error will break the web content javascript.
       // We keep this code here, if someone requires that Cookies are also removed within the
@@ -1659,7 +1827,7 @@ didFinishNavigation:(WKNavigation *)navigation
        [script appendString:@"  }\n"];
        [script appendString:@"})();\n\n"];
        */
-      
+
       // Set cookies in a direct called function. This ensures that no
       // javascript error will break the web content javascript.
       // Generates JS: document.cookie = "key=value; Path=/; Expires=Thu, 01 Jan 20xx 00:00:01 GMT;"
@@ -1680,14 +1848,14 @@ didFinishNavigation:(WKNavigation *)navigation
         [script appendString:@";\n"];
       }
       [script appendString:@"})();\n"];
-      
+
       WKUserScript* cookieInScript = [[WKUserScript alloc] initWithSource:script
                                                             injectionTime:WKUserScriptInjectionTimeAtDocumentStart
                                                          forMainFrameOnly:YES];
       [wkWebViewConfig.userContentController addUserScript:cookieInScript];
     }
   }
-  
+
   if(_messagingEnabled){
     if (self.postMessageScript){
       [wkWebViewConfig.userContentController addScriptMessageHandler:[[BPCWeakScriptMessageDelegate alloc] initWithDelegate:self]
@@ -1706,7 +1874,7 @@ didFinishNavigation:(WKNavigation *)navigation
 
 - (NSURLRequest *)requestForSource:(id)json {
   NSURLRequest *request = [RCTConvert NSURLRequest:self.source];
-  
+
   // If sharedCookiesEnabled we automatically add all application cookies to the
   // http request. This is automatically done on iOS 11+ in the WebView constructor.
   // Se we need to manually add these shared cookies here only for iOS versions < 11.
@@ -1738,14 +1906,14 @@ didFinishNavigation:(WKNavigation *)navigation
 }
 
 - (void) naverLoginBugFix {
-    if([_beforeUrl hasPrefix:@"naversearchthirdlogin://"]) {
-        NSString* value = [self getQueryStringParameter:_beforeUrl :@"session"];
-        if(value != nil && [value length] > 0) {
-            NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"https://nid.naver.com/login/scheme.redirect?session=%@", value]];
-            NSURLRequest *request = [[NSURLRequest alloc] initWithURL:url];
-            [_webView loadRequest:request];
-        }
-    }
+    // if([_beforeUrl hasPrefix:@"naversearchthirdlogin://"]) {
+    //     NSString* value = [self getQueryStringParameter:_beforeUrl :@"session"];
+    //     if(value != nil && [value length] > 0) {
+    //         NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"https://nid.naver.com/login/scheme.redirect?session=%@", value]];
+    //         NSURLRequest *request = [[NSURLRequest alloc] initWithURL:url];
+    //         [_webView loadRequest:request];
+    //     }
+    // }
 }
 
 - (NSString*) getQueryStringParameter:(NSString*)url :(NSString*)param {
@@ -1872,7 +2040,6 @@ didFinishNavigation:(WKNavigation *)navigation
   [self.scriptDelegate userContentController:userContentController didReceiveScriptMessage:message];
 }
 
-
-
 @end
 
+