react-native-webview-bootpay 13.8.42 → 13.13.4-6.alpha.1

package/apple/BPCWebViewImpl.m

@@ -18,14 +18,14 @@
 #import "objc/runtime.h"
 
 static NSTimer *keyboardTimer;
-static NSString *const HistoryShimName = @"ReactNativeHistoryShim";
+static NSString *const HistoryShimName = @"BPReactNativeHistoryShim";
 static NSString *const MessageHandlerName = @"BootpayRNWebView";
 static NSURLCredential* clientAuthenticationCredential;
 static NSDictionary* customCertificatesForHost;
 
 NSString *const BPCUSTOM_SELECTOR = @"_BPCUSTOM_SELECTOR_";
 
-#if !TARGET_OS_OSX
+#if TARGET_OS_IOS
 // runtime trick to remove WKWebView keyboard default toolbar
 // see: http://stackoverflow.com/questions/19033292/ios-7-uiwebview-keyboard-issue/19042279#19042279
 @interface _BPSwizzleHelperWK : UIView
@@ -46,7 +46,7 @@ NSString *const BPCUSTOM_SELECTOR = @"_BPCUSTOM_SELECTOR_";
   return nil;
 }
 @end
-#endif // !TARGET_OS_OSX
+#endif // TARGET_OS_IOS
 
 @interface BPCWKWebView : WKWebView
 #if !TARGET_OS_OSX
@@ -103,9 +103,9 @@ NSString *const BPCUSTOM_SELECTOR = @"_BPCUSTOM_SELECTOR_";
 }
 #else // TARGET_OS_OSX
 - (void)scrollWheel:(NSEvent *)theEvent {
-  BPCWebViewImpl *BPCWebView = (BPCWebViewImpl *)[self superview];
-  RCTAssert([BPCWebView isKindOfClass:[BPCWebView class]], @"superview must be an BPCWebViewImpl");
-  if (![BPCWebView scrollEnabled]) {
+  BPCWebViewImpl *rncWebView = (BPCWebViewImpl *)[self superview];
+  RCTAssert([rncWebView isKindOfClass:[rncWebView class]], @"superview must be an BPCWebViewImpl");
+  if (![rncWebView scrollEnabled]) {
     [[self nextResponder] scrollWheel:theEvent];
     return;
   }
@@ -117,6 +117,7 @@ NSString *const BPCUSTOM_SELECTOR = @"_BPCUSTOM_SELECTOR_";
 @interface BPCWebViewImpl () <WKUIDelegate, WKNavigationDelegate, WKScriptMessageHandler, WKHTTPCookieStoreObserver,
 #if !TARGET_OS_OSX
 UIScrollViewDelegate,
+UIGestureRecognizerDelegate,
 #endif // !TARGET_OS_OSX
 RCTAutoInsetsProtocol>
 
@@ -138,7 +139,7 @@ RCTAutoInsetsProtocol>
   BOOL _savedKeyboardDisplayRequiresUserAction;
 
   // Workaround for StatusBar appearance bug for iOS 12
-  // https://github.com/react-native-webview-bootpay/react-native-webview-bootpay/issues/62
+  // https://github.com/react-native-webview/react-native-webview/issues/62
   BOOL _isFullScreenVideoOpen;
 #if !TARGET_OS_OSX
   UIStatusBarStyle _savedStatusBarStyle;
@@ -164,34 +165,48 @@ RCTAutoInsetsProtocol>
     _bounces = YES;
     _scrollEnabled = YES;
     _showsHorizontalScrollIndicator = YES;
+    _javaScriptEnabled = YES;
+    _allowsLinkPreview = YES;
     _showsVerticalScrollIndicator = YES;
     _directionalLockEnabled = YES;
+    _useSharedProcessPool = YES;
+    _cacheEnabled = YES;
+    _mediaPlaybackRequiresUserAction = YES;
     _automaticallyAdjustContentInsets = YES;
     _autoManageStatusBarEnabled = YES;
     _contentInset = UIEdgeInsetsZero;
     _savedKeyboardDisplayRequiresUserAction = YES;
-#if !TARGET_OS_OSX
-    _savedStatusBarStyle = RCTSharedApplication().statusBarStyle;
-    _savedStatusBarHidden = RCTSharedApplication().statusBarHidden;
-#endif // !TARGET_OS_OSX
     _injectedJavaScript = nil;
     _injectedJavaScriptForMainFrameOnly = YES;
     _injectedJavaScriptBeforeContentLoaded = nil;
     _injectedJavaScriptBeforeContentLoadedForMainFrameOnly = YES;
-
+    _enableApplePay = NO;
+#if TARGET_OS_IOS
+    _savedStatusBarStyle = RCTSharedApplication().statusBarStyle;
+    _savedStatusBarHidden = RCTSharedApplication().statusBarHidden;
+#endif // TARGET_OS_IOS
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
     _savedContentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
 #endif
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 /* __IPHONE_13_0 */
     _savedAutomaticallyAdjustsScrollIndicatorInsets = NO;
+    _fraudulentWebsiteWarningEnabled = YES;
+#endif
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140500 /* __IPHONE_13_0 */
+    _textInteractionEnabled = YES;
 #endif
-    _enableApplePay = NO;
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000 /* iOS 15 */
     _mediaCapturePermissionGrantType = BPCWebViewPermissionGrantType_Prompt;
+#endif
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 160000 /* iOS 15 */
+    if (@available(iOS 16.0, *)) {
+      _editMenuInteraction = [[UIEditMenuInteraction alloc] initWithDelegate:self];
+      [self addInteraction:_editMenuInteraction];
+    }
 #endif
   }
 
-#if !TARGET_OS_OSX
+#if TARGET_OS_IOS
   [[NSNotificationCenter defaultCenter]addObserver:self
                                           selector:@selector(appDidBecomeActive)
                                               name:UIApplicationDidBecomeActiveNotification
@@ -214,7 +229,7 @@ RCTAutoInsetsProtocol>
      name:UIKeyboardWillShowNotification object:nil];
 
     // Workaround for StatusBar appearance bug for iOS 12
-    // https://github.com/react-native-webview-bootpay/react-native-webview-bootpay/issues/62
+    // https://github.com/react-native-webview/react-native-webview/issues/62
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(showFullScreenVideoStatusBars)
                                                  name:UIWindowDidBecomeVisibleNotification
@@ -226,7 +241,7 @@ RCTAutoInsetsProtocol>
                                                object:nil];
 
   }
-#endif // !TARGET_OS_OSX
+#endif // TARGET_OS_IOS
   return self;
 }
 
@@ -246,29 +261,51 @@ RCTAutoInsetsProtocol>
     if (pressSender.state != UIGestureRecognizerStateEnded || !self.menuItems) {
         return;
     }
-    // When a long press ends, bring up our custom UIMenu if defined
-    if (self.menuItems.count == 0) {
+    if (@available(iOS 16.0, *)) {
+      CGPoint location = [pressSender locationInView:self];
+      UIEditMenuConfiguration *config = [UIEditMenuConfiguration configurationWithIdentifier:nil sourcePoint:location];
+      [_editMenuInteraction presentEditMenuWithConfiguration:config];
+    } else {
+      // 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];
+        [menuController showMenuFromView:self rect:self.bounds];
         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];
-      UIMenuItem *item = [[UIMenuItem alloc] initWithTitle: menuItemLabel
-                                                    action: NSSelectorFromString(sel)];
-      [menuControllerItems addObject: item];
-    }
+      }
 
-    menuController.menuItems = menuControllerItems;
-    [menuController setMenuVisible:YES animated:YES];
+      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];
+        UIMenuItem *item = [[UIMenuItem alloc] initWithTitle: menuItemLabel
+                                                      action: NSSelectorFromString(sel)];
+        [menuControllerItems addObject: item];
+      }
+      menuController.menuItems = menuControllerItems;
+      [menuController showMenuFromView:self rect:self.bounds];
+    }
 }
 
+- (UIMenu *)editMenuInteraction:(UIEditMenuInteraction *)interaction menuForConfiguration:(UIEditMenuConfiguration *)configuration suggestedActions:(NSArray<UIMenuElement *> *)suggestedActions API_AVAILABLE(ios(16.0))
+{
+  NSMutableArray<UICommand *> *menuItems = [NSMutableArray new];
+  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];
+    UICommand *command = [UICommand commandWithTitle:menuItemLabel
+                                               image:nil
+                                              action:NSSelectorFromString(sel)
+                                        propertyList:nil];
+    [menuItems addObject:command];
+  }
+  UIMenu *menu = [UIMenu menuWithChildren:menuItems];
+  return menu;
+}
 #endif // !TARGET_OS_OSX
 
 - (void)dealloc
@@ -352,38 +389,40 @@ RCTAutoInsetsProtocol>
  */
 - (WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures
 {
-  if (!navigationAction.targetFrame.isMainFrame) {
-      
-    NSString *url = navigationAction.request.URL.absoluteString;
-//    NSURL *url = navigationAction.request.URL;
-
-     if ([url containsString:@"bootpay.co.kr"]) {
+    if (!navigationAction.targetFrame.isMainFrame) {
+        NSString *url = navigationAction.request.URL.absoluteString;
+        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];
-
             [popupView autoresizingMask];
             popupView.navigationDelegate = self;
             popupView.UIDelegate = self;
-
             [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];
+            if (_onOpenWindow) {
+                NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+                [event addEntriesFromDictionary: @{@"targetUrl": url}];
+                _onOpenWindow(event);
+            } else {
+                [webView loadRequest:navigationAction.request];
+            }
         }
-
-      }
-    
-  }
+    }
+//  if (!navigationAction.targetFrame.isMainFrame) {
+//    NSURL *url = navigationAction.request.URL;
+//
+//    if (_onOpenWindow) {
+//      NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+//      [event addEntriesFromDictionary: @{@"targetUrl": url.absoluteString}];
+//      _onOpenWindow(event);
+//    } else {
+//      [webView loadRequest:navigationAction.request];
+//    }
+//  }
   return nil;
 }
 
-
 - (void)webViewDidClose:(WKWebView *)webView {
     [webView removeFromSuperview];
 }
@@ -483,6 +522,7 @@ RCTAutoInsetsProtocol>
 
 #if !TARGET_OS_OSX
   wkWebViewConfig.allowsInlineMediaPlayback = _allowsInlineMediaPlayback;
+  wkWebViewConfig.allowsPictureInPictureMediaPlayback = _allowsPictureInPictureMediaPlayback;
   wkWebViewConfig.mediaTypesRequiringUserActionForPlayback = _mediaPlaybackRequiresUserAction
   ? WKAudiovisualMediaTypeAll
   : WKAudiovisualMediaTypeNone;
@@ -551,6 +591,7 @@ RCTAutoInsetsProtocol>
     [self setKeyboardDisplayRequiresUserAction: _savedKeyboardDisplayRequiresUserAction];
     [self visitSource];
   }
+
 #if !TARGET_OS_OSX
   // Allow this object to recognize gestures
   if (self.menuItems != nil) {
@@ -592,6 +633,11 @@ RCTAutoInsetsProtocol>
     [_webView.configuration.userContentController removeScriptMessageHandlerForName:MessageHandlerName];
     [_webView removeObserver:self forKeyPath:@"estimatedProgress"];
     [_webView removeFromSuperview];
+    if (@available(iOS 15.0, macOS 12.0, *)) {
+        [_webView pauseAllMediaPlaybackWithCompletionHandler:nil];
+    } else if (@available(iOS 14.5, macOS 11.3, *)) {
+        [_webView suspendAllMediaPlayback:nil];
+    }
 #if !TARGET_OS_OSX
     _webView.scrollView.delegate = nil;
     if (_menuItems) {
@@ -611,7 +657,7 @@ RCTAutoInsetsProtocol>
 #endif
 }
 
-#if !TARGET_OS_OSX
+#if TARGET_OS_IOS
 -(void)showFullScreenVideoStatusBars
 {
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
@@ -667,7 +713,7 @@ RCTAutoInsetsProtocol>
     }];
   }
 }
-#endif // !TARGET_OS_OSX
+#endif // TARGET_OS_IOS
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
   if ([keyPath isEqual:@"estimatedProgress"] && object == self.webView) {
@@ -754,6 +800,7 @@ RCTAutoInsetsProtocol>
     if (_onMessage) {
       NSMutableDictionary<NSString *, id> *event = [self baseEvent];
       [event addEntriesFromDictionary: @{@"data": message.body}];
+      [event addEntriesFromDictionary: @{@"url": message.frameInfo.request.URL.absoluteString}];
       _onMessage(event);
     }
   }
@@ -781,22 +828,25 @@ RCTAutoInsetsProtocol>
   }
 }
 
-#if !TARGET_OS_OSX
 - (void)setContentInset:(UIEdgeInsets)contentInset
 {
+#if !TARGET_OS_OSX
   _contentInset = contentInset;
   [RCTView autoAdjustInsetsForView:self
                     withScrollView:_webView.scrollView
                       updateOffset:NO];
+#endif // !TARGET_OS_OSX
 }
 
 - (void)refreshContentInset
 {
+#if !TARGET_OS_OSX
   [RCTView autoAdjustInsetsForView:self
                     withScrollView:_webView.scrollView
                       updateOffset:YES];
-}
 #endif // !TARGET_OS_OSX
+}
+
 
 - (void)visitSource
 {
@@ -824,6 +874,9 @@ RCTAutoInsetsProtocol>
   NSString *allowingReadAccessToURL = _allowingReadAccessToURL;
 
   [self syncCookiesToWebView:^{
+    // Add observer to sync cookies from webview to sharedHTTPCookieStorage
+    [webView.configuration.websiteDataStore.httpCookieStore addObserver:self];
+    
     // 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
@@ -857,8 +910,10 @@ RCTAutoInsetsProtocol>
     _webView.suppressMenuItems = suppressMenuItems;
 }
 
+#if TARGET_OS_IOS
 -(void)setKeyboardDisplayRequiresUserAction:(BOOL)keyboardDisplayRequiresUserAction
 {
+  _keyboardDisplayRequiresUserAction = keyboardDisplayRequiresUserAction;
   if (_webView == nil) {
     _savedKeyboardDisplayRequiresUserAction = keyboardDisplayRequiresUserAction;
     return;
@@ -891,7 +946,7 @@ RCTAutoInsetsProtocol>
     SEL selector = sel_getUid("_elementDidFocus:userIsInteracting:blurPreviousNode:activityStateChanges:userObject:");
     method = class_getInstanceMethod(class, selector);
     IMP original = method_getImplementation(method);
-    override = imp_implementationWithBlock(^void(id me, void* arg0, BOOL arg1, BOOL arg2, BOOL arg3, id arg4) {
+    override = imp_implementationWithBlock(^void(id me, void* arg0, __unused BOOL arg1, BOOL arg2, BOOL arg3, id arg4) {
       ((void (*)(id, SEL, void*, BOOL, BOOL, BOOL, id))original)(me, selector, arg0, TRUE, arg2, arg3, arg4);
     });
   }
@@ -900,7 +955,7 @@ RCTAutoInsetsProtocol>
     SEL selector = sel_getUid("_elementDidFocus:userIsInteracting:blurPreviousNode:changingActivityState:userObject:");
     method = class_getInstanceMethod(class, selector);
     IMP original = method_getImplementation(method);
-    override = imp_implementationWithBlock(^void(id me, void* arg0, BOOL arg1, BOOL arg2, BOOL arg3, id arg4) {
+    override = imp_implementationWithBlock(^void(id me, void* arg0, __unused BOOL arg1, BOOL arg2, BOOL arg3, id arg4) {
       ((void (*)(id, SEL, void*, BOOL, BOOL, BOOL, id))original)(me, selector, arg0, TRUE, arg2, arg3, arg4);
     });
   }
@@ -909,7 +964,7 @@ RCTAutoInsetsProtocol>
     SEL selector = sel_getUid("_startAssistingNode:userIsInteracting:blurPreviousNode:changingActivityState:userObject:");
     method = class_getInstanceMethod(class, selector);
     IMP original = method_getImplementation(method);
-    override = imp_implementationWithBlock(^void(id me, void* arg0, BOOL arg1, BOOL arg2, BOOL arg3, id arg4) {
+    override = imp_implementationWithBlock(^void(id me, void* arg0, __unused BOOL arg1, BOOL arg2, BOOL arg3, id arg4) {
       ((void (*)(id, SEL, void*, BOOL, BOOL, BOOL, id))original)(me, selector, arg0, TRUE, arg2, arg3, arg4);
     });
   } else {
@@ -917,7 +972,7 @@ RCTAutoInsetsProtocol>
     SEL selector = sel_getUid("_startAssistingNode:userIsInteracting:blurPreviousNode:userObject:");
     method = class_getInstanceMethod(class, selector);
     IMP original = method_getImplementation(method);
-    override = imp_implementationWithBlock(^void(id me, void* arg0, BOOL arg1, BOOL arg2, id arg3) {
+    override = imp_implementationWithBlock(^void(id me, void* arg0, __unused BOOL arg1, BOOL arg2, id arg3) {
       ((void (*)(id, SEL, void*, BOOL, BOOL, id))original)(me, selector, arg0, TRUE, arg2, arg3);
     });
   }
@@ -927,12 +982,15 @@ RCTAutoInsetsProtocol>
 
 -(void)setHideKeyboardAccessoryView:(BOOL)hideKeyboardAccessoryView
 {
+  _hideKeyboardAccessoryView = hideKeyboardAccessoryView;
+  _savedHideKeyboardAccessoryView = hideKeyboardAccessoryView;
+
   if (_webView == nil) {
-    _savedHideKeyboardAccessoryView = hideKeyboardAccessoryView;
     return;
   }
 
   if (_savedHideKeyboardAccessoryView == false) {
+    [self __addInputAccessoryView];
     return;
   }
 
@@ -961,6 +1019,22 @@ RCTAutoInsetsProtocol>
 
   object_setClass(subview, newClass);
 }
+#endif // TARGET_OS_IOS
+
+- (void)__addInputAccessoryView {
+  UIView* subview;
+
+  for (UIView* view in _webView.scrollView.subviews) {
+    if([[view.class description] hasSuffix:@"_BPSwizzleHelperWK"])
+      subview = view;
+  }
+
+  if(subview == nil) return;
+
+  Class newClass = subview.superclass;
+
+  object_setClass(subview, newClass);
+}
 
 // UIScrollViewDelegate method
 - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
@@ -1131,7 +1205,7 @@ RCTAutoInsetsProtocol>
 {
 #if !TARGET_OS_OSX
   UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"" message:message preferredStyle:UIAlertControllerStyleAlert];
-  [alert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+  [alert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:^(__unused UIAlertAction *action) {
     completionHandler();
   }]];
   [[self topViewController] presentViewController:alert animated:YES completion:NULL];
@@ -1150,10 +1224,10 @@ RCTAutoInsetsProtocol>
 - (void)webView:(WKWebView *)webView runJavaScriptConfirmPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(BOOL))completionHandler{
 #if !TARGET_OS_OSX
   UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"" message:message preferredStyle:UIAlertControllerStyleAlert];
-  [alert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+  [alert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:^(__unused UIAlertAction *action) {
     completionHandler(YES);
   }]];
-  [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
+  [alert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(__unused UIAlertAction *action) {
     completionHandler(NO);
   }]];
   [[self topViewController] presentViewController:alert animated:YES completion:NULL];
@@ -1178,11 +1252,11 @@ RCTAutoInsetsProtocol>
   [alert addTextFieldWithConfigurationHandler:^(UITextField *textField) {
     textField.text = defaultText;
   }];
-  UIAlertAction *okAction = [UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+  UIAlertAction *okAction = [UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:^(__unused UIAlertAction *action) {
     completionHandler([[alert.textFields lastObject] text]);
   }];
   [alert addAction:okAction];
-  UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
+  UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(__unused UIAlertAction *action) {
     completionHandler(nil);
   }];
   [alert addAction:cancelAction];
@@ -1257,121 +1331,114 @@ RCTAutoInsetsProtocol>
   decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction
                   decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
 {
-   NSString *url = navigationAction.request.URL.absoluteString;
-
-    //  _beforeUrl = url;
-
- //    [self updateBlindViewIfNaverLogin:url];
-
-     if([self isItunesURL:url]) {
-         [self startAppToApp:[NSURL URLWithString:url]];
-         decisionHandler(WKNavigationActionPolicyCancel);
-     } else if([url hasPrefix:@"about:blank"]) {
+    NSString *url = navigationAction.request.URL.absoluteString;
+       
+    if([self isItunesURL:url]) {
+        [self startAppToApp:[NSURL URLWithString:url]];
+        decisionHandler(WKNavigationActionPolicyCancel);
+    } else if([url hasPrefix:@"about:blank"]) {
         decisionHandler(WKNavigationActionPolicyAllow);
-     } else if(![url hasPrefix:@"http"]) {
-         [self startAppToApp:[NSURL URLWithString:url]];
-         decisionHandler(WKNavigationActionPolicyCancel);
-     } else {
+    } else if(![url hasPrefix:@"http"]) {
+        [self startAppToApp:[NSURL URLWithString:url]];
+        decisionHandler(WKNavigationActionPolicyCancel);
+    } else {
         [self webViewRN:webView decidePolicyForNavigationAction:navigationAction decisionHandler:decisionHandler];
-      //decisionHandler(WKNavigationActionPolicyAllow);
-     }
-    
+    }
 }
 
-
-- (void)                  webViewRN:(WKWebView *)webView
+- (void)                webViewRN:(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];
-  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];
-    [event addEntriesFromDictionary: @{@"targetUrl": request.URL.absoluteString}];
-    decisionHandler(WKNavigationActionPolicyCancel);
-    _onOpenWindow(event);
-    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 (_onShouldStartLoadWithRequest) {
+    WKNavigationType navigationType = navigationAction.navigationType;
+    NSURLRequest *request = navigationAction.request;
+    BOOL isTopFrame = [request.URL isEqual:request.mainDocumentURL];
+    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];
-      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: @{
-          @"url": (request.URL).absoluteString,
-          @"navigationType": navigationTypes[@(navigationType)],
-          @"isTopFrame": @(isTopFrame),
-          @"hasTargetFrame": @(hasTargetFrame),
-          @"lockIdentifier": @(lockIdentifier)
-      }];
-      _onShouldStartLoadWithRequest(event);
-      // decisionHandler(WKNavigationActionPolicyAllow);
+      [event addEntriesFromDictionary: @{@"targetUrl": request.URL.absoluteString}];
+      decisionHandler(WKNavigationActionPolicyCancel);
+      _onOpenWindow(event);
       return;
-  }
+    }
 
-  if (_onLoadingStart) {
-      // We have this check to filter out iframe requests and whatnot
-      if (isTopFrame) {
-          NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+    if (_onShouldStartLoadWithRequest) {
+        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);
+            });
+
+        }];
+        NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+        if (request.mainDocumentURL) {
           [event addEntriesFromDictionary: @{
-              @"url": (request.URL).absoluteString,
-              @"navigationType": navigationTypes[@(navigationType)]
+            @"mainDocumentURL": (request.mainDocumentURL).absoluteString,
           }];
-          _onLoadingStart(event);
-      }
-  }
+        }
+        [event addEntriesFromDictionary: @{
+            @"url": (request.URL).absoluteString,
+            @"navigationType": navigationTypes[@(navigationType)],
+            @"isTopFrame": @(isTopFrame),
+            @"hasTargetFrame": @(hasTargetFrame),
+            @"lockIdentifier": @(lockIdentifier)
+        }];
+        _onShouldStartLoadWithRequest(event);
+        // decisionHandler(WKNavigationActionPolicyAllow);
+        return;
+    }
 
-  // Allow all navigation by default
-  decisionHandler(WKNavigationActionPolicyAllow);
+    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);
 }
 
 /**
@@ -1396,11 +1463,10 @@ RCTAutoInsetsProtocol>
                     decisionHandler:(void (^)(WKNavigationResponsePolicy))decisionHandler
 {
   WKNavigationResponsePolicy policy = WKNavigationResponsePolicyAllow;
-  if (_onHttpError && navigationResponse.forMainFrame) {
-    if ([navigationResponse.response isKindOfClass:[NSHTTPURLResponse class]]) {
-      NSHTTPURLResponse *response = (NSHTTPURLResponse *)navigationResponse.response;
-      NSInteger statusCode = response.statusCode;
-
+  if ([navigationResponse.response isKindOfClass:[NSHTTPURLResponse class]]) {
+    NSHTTPURLResponse *response = (NSHTTPURLResponse *)navigationResponse.response;
+    NSInteger statusCode = response.statusCode;
+    if (_onHttpError && navigationResponse.forMainFrame) {
       if (statusCode >= 400) {
         NSMutableDictionary<NSString *, id> *httpErrorEvent = [self baseEvent];
         [httpErrorEvent addEntriesFromDictionary: @{
@@ -1410,22 +1476,21 @@ RCTAutoInsetsProtocol>
 
         _onHttpError(httpErrorEvent);
       }
-
-      NSString *disposition = nil;
-      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,
-          }];
-          _onFileDownload(downloadEvent);
-        }
+    }
+    NSString *disposition = nil;
+    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,
+        }];
+        _onFileDownload(downloadEvent);
       }
     }
   }
@@ -1582,6 +1647,9 @@ didFinishNavigation:(WKNavigation *)navigation
 {
   UIRefreshControl *refreshControl = [[UIRefreshControl alloc] init];
   _refreshControl = refreshControl;
+  if(_refreshControlLightMode) {
+    [refreshControl setTintColor:[UIColor whiteColor]];
+  }
   [_webView.scrollView addSubview: refreshControl];
   [refreshControl addTarget:self action:@selector(pullToRefresh:) forControlEvents: UIControlEventValueChanged];
 }
@@ -1658,7 +1726,6 @@ didFinishNavigation:(WKNavigation *)navigation
   _webView.scrollView.bounces = _pullToRefreshEnabled || bounces;
 }
 #endif // !TARGET_OS_OSX
- 
 
 - (void)setInjectedJavaScript:(NSString *)source {
   _injectedJavaScript = source;
@@ -1674,15 +1741,16 @@ didFinishNavigation:(WKNavigation *)navigation
 
 - (void)setInjectedJavaScriptObject:(NSString *)source
 {
+  _injectedJavaScriptObject = source;
   self.injectedObjectJsonScript = [
     [WKUserScript alloc]
     initWithSource: [
       NSString
       stringWithFormat:
-       @"window.%@ ??= {};"
+       @"window.%@ = window.%@ || {};"
       "window.%@.injectedObjectJson = function () {"
       "  return `%@`;"
-      "};", MessageHandlerName, MessageHandlerName, source
+      "};", MessageHandlerName, MessageHandlerName, MessageHandlerName, source
     ]
     injectionTime:WKUserScriptInjectionTimeAtDocumentStart
     /* TODO: For a separate (minor) PR: use logic like this (as react-native-wkwebview does) so that messaging can be used in all frames if desired.
@@ -1730,11 +1798,10 @@ didFinishNavigation:(WKNavigation *)navigation
     initWithSource: [
       NSString
       stringWithFormat:
-        @"window.%@ = {"
-      "  postMessage: function (data) {"
-      "    window.webkit.messageHandlers.%@.postMessage(String(data));"
-      "  }"
-      "};", MessageHandlerName, MessageHandlerName
+       @"window.%@ = window.%@ || {};"
+      "window.%@.postMessage = function (data) {"
+      "  window.webkit.messageHandlers.%@.postMessage(String(data));"
+      "};", MessageHandlerName, MessageHandlerName, MessageHandlerName, MessageHandlerName
     ]
     injectionTime:WKUserScriptInjectionTimeAtDocumentStart
     /* TODO: For a separate (minor) PR: use logic like this (as react-native-wkwebview does) so that messaging can be used in all frames if desired.
@@ -1813,8 +1880,8 @@ didFinishNavigation:(WKNavigation *)navigation
                                          "  })\n"
                                          "})(window.history)\n", HistoryShimName
   ];
-  WKUserScript *script = [[WKUserScript alloc] initWithSource:html5HistoryAPIShimSource injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:YES];
-  [wkWebViewConfig.userContentController addUserScript:script];
+  WKUserScript *userScript = [[WKUserScript alloc] initWithSource:html5HistoryAPIShimSource injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:YES];
+  [wkWebViewConfig.userContentController addUserScript:userScript];
 
   if(_sharedCookiesEnabled) {
     // More info to sending cookies with WKWebView
@@ -1826,9 +1893,7 @@ didFinishNavigation:(WKNavigation *)navigation
       if(!_incognito && !_cacheEnabled) {
         wkWebViewConfig.websiteDataStore = [WKWebsiteDataStore nonPersistentDataStore];
       }
-      [self syncCookiesToWebView:^{
-        [wkWebViewConfig.websiteDataStore.httpCookieStore addObserver:self];
-      }];
+      [self syncCookiesToWebView:^{}];
     } else {
       NSMutableString *script = [NSMutableString string];
 
@@ -1917,7 +1982,6 @@ didFinishNavigation:(WKNavigation *)navigation
   return request;
 }
 
-
 #pragma mark - WebView Javascript
 
 -(void) doJavascript:(NSString*) script {
@@ -2066,5 +2130,3 @@ didFinishNavigation:(WKNavigation *)navigation
 }
 
 @end
-
-