react-native-webview-bootpay 11.18.16 → 11.22.7

package/apple/BPCWebView.m

@@ -18,30 +18,32 @@
 #import "objc/runtime.h"
 
 static NSTimer *keyboardTimer;
-static NSString *const HistoryShimName = @"ReactNativeHistoryShimBootpay";
-static NSString *const MessageHandlerName = @"BootpayRNWebView";
+static NSString *const HistoryShimName = @"ReactNativeHistoryShim";
+static NSString *const MessageHandlerName = @"ReactNativeWebView";
 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
-@interface _BPSwizzleHelperWK : UIView
+@interface _SwizzleHelperWK : UIView
 @property (nonatomic, copy) WKWebView *webView;
 @end
-@implementation _BPSwizzleHelperWK
+@implementation _SwizzleHelperWK
 -(id)inputAccessoryView
 {
-    if (_webView == nil) {
-        return nil;
-    }
-
-    if ([_webView respondsToSelector:@selector(inputAssistantItem)]) {
-        UITextInputAssistantItem *inputAssistantItem = [_webView inputAssistantItem];
-        inputAssistantItem.leadingBarButtonGroups = @[];
-        inputAssistantItem.trailingBarButtonGroups = @[];
-    }
+  if (_webView == nil) {
     return nil;
+  }
+  
+  if ([_webView respondsToSelector:@selector(inputAssistantItem)]) {
+    UITextInputAssistantItem *inputAssistantItem = [_webView inputAssistantItem];
+    inputAssistantItem.leadingBarButtonGroups = @[];
+    inputAssistantItem.trailingBarButtonGroups = @[];
+  }
+  return nil;
 }
 @end
 #endif // !TARGET_OS_OSX
@@ -51,9 +53,9 @@ static NSDictionary* customCertificatesForHost;
 @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([rncWebView isKindOfClass:[rncWebView class]], @"superview must be an BPCWebView");
+  if (![rncWebView scrollEnabled]) {
     [[self nextResponder] scrollWheel:theEvent];
     return;
   }
@@ -64,9 +66,9 @@ static NSDictionary* customCertificatesForHost;
 
 @interface BPCWebView () <WKUIDelegate, WKNavigationDelegate, WKScriptMessageHandler,
 #if !TARGET_OS_OSX
-    UIScrollViewDelegate,
+UIScrollViewDelegate,
 #endif // !TARGET_OS_OSX
-    RCTAutoInsetsProtocol>
+RCTAutoInsetsProtocol>
 
 @property (nonatomic, copy) RCTDirectEventBlock onFileDownload;
 @property (nonatomic, copy) RCTDirectEventBlock onLoadingStart;
@@ -97,7 +99,7 @@ static NSDictionary* customCertificatesForHost;
 #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
   BOOL _isFullScreenVideoOpen;
@@ -105,7 +107,7 @@ static NSDictionary* customCertificatesForHost;
   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
@@ -117,11 +119,11 @@ static NSDictionary* customCertificatesForHost;
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if ((self = [super initWithFrame:frame])) {
-    #if !TARGET_OS_OSX
+#if !TARGET_OS_OSX
     super.backgroundColor = [UIColor clearColor];
-    #else
+#else
     super.backgroundColor = [RCTUIColor clearColor];
-    #endif // !TARGET_OS_OSX
+#endif // !TARGET_OS_OSX
     _bounces = YES;
     _scrollEnabled = YES;
     _showsHorizontalScrollIndicator = YES;
@@ -131,15 +133,15 @@ static NSDictionary* customCertificatesForHost;
     _autoManageStatusBarEnabled = YES;
     _contentInset = UIEdgeInsetsZero;
     _savedKeyboardDisplayRequiresUserAction = YES;
-    #if !TARGET_OS_OSX
+#if !TARGET_OS_OSX
     _savedStatusBarStyle = RCTSharedApplication().statusBarStyle;
     _savedStatusBarHidden = RCTSharedApplication().statusBarHidden;
-    #endif // !TARGET_OS_OSX
+#endif // !TARGET_OS_OSX
     _injectedJavaScript = nil;
     _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
@@ -147,86 +149,170 @@ static NSDictionary* customCertificatesForHost;
     _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
-    [[NSNotificationCenter defaultCenter]addObserver:self
-    selector:@selector(appDidBecomeActive)
-        name:UIApplicationDidBecomeActiveNotification
-      object:nil];
-
-    [[NSNotificationCenter defaultCenter]addObserver:self
-    selector:@selector(appWillResignActive)
-        name:UIApplicationWillResignActiveNotification
-      object:nil];
+  [[NSNotificationCenter defaultCenter]addObserver:self
+                                          selector:@selector(appDidBecomeActive)
+                                              name:UIApplicationDidBecomeActiveNotification
+                                            object:nil];
+  
+  [[NSNotificationCenter defaultCenter]addObserver:self
+                                          selector:@selector(appWillResignActive)
+                                              name:UIApplicationWillResignActiveNotification
+                                            object:nil];
   if (@available(iOS 12.0, *)) {
     // Workaround for a keyboard dismissal bug present in iOS 12
     // https://openradar.appspot.com/radar?id=5018321736957952
     [[NSNotificationCenter defaultCenter]
-      addObserver:self
-      selector:@selector(keyboardWillHide)
-      name:UIKeyboardWillHideNotification object:nil];
+     addObserver:self
+     selector:@selector(keyboardWillHide)
+     name:UIKeyboardWillHideNotification object:nil];
     [[NSNotificationCenter defaultCenter]
-      addObserver:self
-      selector:@selector(keyboardWillShow)
-      name:UIKeyboardWillShowNotification object:nil];
-
+     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
-      [[NSNotificationCenter defaultCenter] addObserver:self
-                                               selector:@selector(showFullScreenVideoStatusBars)
-                                                   name:UIWindowDidBecomeVisibleNotification
-                                                 object:nil];
-
-      [[NSNotificationCenter defaultCenter] addObserver:self
-                                               selector:@selector(hideFullScreenVideoStatusBars)
-                                                   name:UIWindowDidBecomeHiddenNotification
-                                                 object:nil];
-
+    [[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;
 }
 
+#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];
 }
 
-/**
- * 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
+- (void)tappedMenuItem:(NSString *)eventType
 {
-    //팝업관련 
-    NSLog(@"------ popup url: %@", navigationAction.request.URL.absoluteString);
-
-    if([navigationAction.request.URL.absoluteString rangeOfString:@"bootpay.co.kr"].location == NSNotFound) {
-      NSLog(@"111");
-
-      //원래 로직 
-      if (!navigationAction.targetFrame.isMainFrame) {
-        [webView loadRequest:navigationAction.request];
-      }
-      return nil;
+  // 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(@"222");
+// 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:)];
+}
 
-      WKWebView *popupView = [[WKWebView alloc] initWithFrame:webView.bounds configuration:configuration];
+// 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]];
+  } else {
+    [super forwardInvocation:invocation];
+  }
+}
 
-      popupView.autoresizingMask = (UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight);
-      popupView.navigationDelegate = self;
-      popupView.UIDelegate = self;
-      [webView addSubview:popupView];
-  
-      return popupView;
-    } 
+// Allows the instance to respond to UIMenuController Actions
+- (BOOL)canBecomeFirstResponder
+{
+  return YES;
 }
 
+// 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];
+  
+  if (match.location == 0) {
+    return YES;
+  }
+  return NO;
+}
 
-- (void)webViewDidClose:(WKWebView *)webView { 
-    [webView removeFromSuperview];
+/**
+ * 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;
 }
 
 - (WKWebViewConfiguration *)setUpWkWebViewConfig
@@ -249,6 +335,14 @@ static NSDictionary* customCertificatesForHost;
     [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;
   }
@@ -261,7 +355,7 @@ static NSDictionary* customCertificatesForHost;
     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];
@@ -269,7 +363,7 @@ static NSDictionary* customCertificatesForHost;
     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)]) {
@@ -279,28 +373,32 @@ static NSDictionary* customCertificatesForHost;
     }
   }
 #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;
+  ? WKAudiovisualMediaTypeAll
+  : WKAudiovisualMediaTypeNone;
   wkWebViewConfig.dataDetectorTypes = _dataDetectorTypes;
 #else
   wkWebViewConfig.mediaPlaybackRequiresUserAction = _mediaPlaybackRequiresUserAction;
 #endif
 #endif // !TARGET_OS_OSX
-
+  
   if (_applicationNameForUserAgent) {
-      wkWebViewConfig.applicationNameForUserAgent = [NSString stringWithFormat:@"%@ %@", wkWebViewConfig.applicationNameForUserAgent, _applicationNameForUserAgent];
+    wkWebViewConfig.applicationNameForUserAgent = [NSString stringWithFormat:@"%@ %@", wkWebViewConfig.applicationNameForUserAgent, _applicationNameForUserAgent];
   }
-
+  
   return wkWebViewConfig;
 }
 
@@ -313,7 +411,7 @@ static NSDictionary* customCertificatesForHost;
 #else
     _webView = [[BPCWKWebView alloc] initWithFrame:self.bounds configuration: wkWebViewConfig];
 #endif // !TARGET_OS_OSX
-
+    
     [self setBackgroundColor: _savedBackgroundColor];
 #if !TARGET_OS_OSX
     _webView.scrollView.delegate = self;
@@ -322,11 +420,11 @@ static NSDictionary* customCertificatesForHost;
     _webView.navigationDelegate = self;
 #if !TARGET_OS_OSX
     if (_pullToRefreshEnabled) {
-        [self addPullToRefreshControl];
+      [self addPullToRefreshControl];
     }
     _webView.scrollView.scrollEnabled = _scrollEnabled;
     _webView.scrollView.pagingEnabled = _pagingEnabled;
-      //For UIRefreshControl to work correctly, the bounces should always be true
+    //For UIRefreshControl to work correctly, the bounces should always be true
     _webView.scrollView.bounces = _pullToRefreshEnabled || _bounces;
     _webView.scrollView.showsHorizontalScrollIndicator = _showsHorizontalScrollIndicator;
     _webView.scrollView.showsVerticalScrollIndicator = _showsVerticalScrollIndicator;
@@ -335,10 +433,8 @@ static NSDictionary* customCertificatesForHost;
     _webView.allowsLinkPreview = _allowsLinkPreview;
     [_webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew context:nil];
     _webView.allowsBackForwardNavigationGestures = _allowsBackForwardNavigationGestures;
-
-    if (_userAgent) {
-      _webView.customUserAgent = _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;
@@ -349,12 +445,24 @@ static NSDictionary* customCertificatesForHost;
       _webView.scrollView.automaticallyAdjustsScrollIndicatorInsets = _savedAutomaticallyAdjustsScrollIndicatorInsets;
     }
 #endif
-
+    
     [self addSubview:_webView];
     [self setHideKeyboardAccessoryView: _savedHideKeyboardAccessoryView];
     [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.
@@ -365,92 +473,92 @@ static NSDictionary* customCertificatesForHost;
 
 - (void)removeFromSuperview
 {
-    if (_webView) {
-        [_webView.configuration.userContentController removeScriptMessageHandlerForName:HistoryShimName];
-        [_webView.configuration.userContentController removeScriptMessageHandlerForName:MessageHandlerName];
-        [_webView removeObserver:self forKeyPath:@"estimatedProgress"];
-        [_webView removeFromSuperview];
+  if (_webView) {
+    [_webView.configuration.userContentController removeScriptMessageHandlerForName:HistoryShimName];
+    [_webView.configuration.userContentController removeScriptMessageHandlerForName:MessageHandlerName];
+    [_webView removeObserver:self forKeyPath:@"estimatedProgress"];
+    [_webView removeFromSuperview];
 #if !TARGET_OS_OSX
-        _webView.scrollView.delegate = nil;
+    _webView.scrollView.delegate = nil;
 #endif // !TARGET_OS_OSX
-        _webView = nil;
-        if (_onContentProcessDidTerminate) {
-          NSMutableDictionary<NSString *, id> *event = [self baseEvent];
-          _onContentProcessDidTerminate(event);
-        }
+    _webView = nil;
+    if (_onContentProcessDidTerminate) {
+      NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+      _onContentProcessDidTerminate(event);
     }
-
-    [super removeFromSuperview];
+  }
+  
+  [super removeFromSuperview];
 }
 
 #if !TARGET_OS_OSX
 -(void)showFullScreenVideoStatusBars
 {
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    if (!_autoManageStatusBarEnabled) {
-      return;
-    }
-
-    _isFullScreenVideoOpen = YES;
-    RCTUnsafeExecuteOnMainQueueSync(^{
-      [RCTSharedApplication() setStatusBarStyle:self->_savedStatusBarStyle animated:YES];
-    });
+  if (!_autoManageStatusBarEnabled) {
+    return;
+  }
+  
+  _isFullScreenVideoOpen = YES;
+  RCTUnsafeExecuteOnMainQueueSync(^{
+    [RCTSharedApplication() setStatusBarStyle:self->_savedStatusBarStyle animated:YES];
+  });
 #pragma clang diagnostic pop
 }
 
 -(void)hideFullScreenVideoStatusBars
 {
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    if (!_autoManageStatusBarEnabled) {
-      return;
-    }
-
-    _isFullScreenVideoOpen = NO;
-    RCTUnsafeExecuteOnMainQueueSync(^{
-      [RCTSharedApplication() setStatusBarHidden:self->_savedStatusBarHidden animated:YES];
-      [RCTSharedApplication() setStatusBarStyle:self->_savedStatusBarStyle animated:YES];
-    });
+  if (!_autoManageStatusBarEnabled) {
+    return;
+  }
+  
+  _isFullScreenVideoOpen = NO;
+  RCTUnsafeExecuteOnMainQueueSync(^{
+    [RCTSharedApplication() setStatusBarHidden:self->_savedStatusBarHidden animated:YES];
+    [RCTSharedApplication() setStatusBarStyle:self->_savedStatusBarStyle animated:YES];
+  });
 #pragma clang diagnostic pop
 }
 
 -(void)keyboardWillHide
 {
-    keyboardTimer = [NSTimer scheduledTimerWithTimeInterval:0 target:self selector:@selector(keyboardDisplacementFix) userInfo:nil repeats:false];
-    [[NSRunLoop mainRunLoop] addTimer:keyboardTimer forMode:NSRunLoopCommonModes];
+  keyboardTimer = [NSTimer scheduledTimerWithTimeInterval:0 target:self selector:@selector(keyboardDisplacementFix) userInfo:nil repeats:false];
+  [[NSRunLoop mainRunLoop] addTimer:keyboardTimer forMode:NSRunLoopCommonModes];
 }
 -(void)keyboardWillShow
 {
-    if (keyboardTimer != nil) {
-        [keyboardTimer invalidate];
-    }
+  if (keyboardTimer != nil) {
+    [keyboardTimer invalidate];
+  }
 }
 -(void)keyboardDisplacementFix
 {
-    // Additional viewport checks to prevent unintentional scrolls
-    UIScrollView *scrollView = self.webView.scrollView;
-    double maxContentOffset = scrollView.contentSize.height - scrollView.frame.size.height;
-    if (maxContentOffset < 0) {
-        maxContentOffset = 0;
-    }
-    if (scrollView.contentOffset.y > maxContentOffset) {
-      // https://stackoverflow.com/a/9637807/824966
-      [UIView animateWithDuration:.25 animations:^{
-          scrollView.contentOffset = CGPointMake(0, maxContentOffset);
-      }];
-    }
+  // Additional viewport checks to prevent unintentional scrolls
+  UIScrollView *scrollView = self.webView.scrollView;
+  double maxContentOffset = scrollView.contentSize.height - scrollView.frame.size.height;
+  if (maxContentOffset < 0) {
+    maxContentOffset = 0;
+  }
+  if (scrollView.contentOffset.y > maxContentOffset) {
+    // https://stackoverflow.com/a/9637807/824966
+    [UIView animateWithDuration:.25 animations:^{
+      scrollView.contentOffset = CGPointMake(0, maxContentOffset);
+    }];
+  }
 }
 #endif // !TARGET_OS_OSX
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
-    if ([keyPath isEqual:@"estimatedProgress"] && object == self.webView) {
-        if(_onLoadingProgress){
-             NSMutableDictionary<NSString *, id> *event = [self baseEvent];
-            [event addEntriesFromDictionary:@{@"progress":[NSNumber numberWithDouble:self.webView.estimatedProgress]}];
-            _onLoadingProgress(event);
-        }
-    }else{
-        [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+  if ([keyPath isEqual:@"estimatedProgress"] && object == self.webView) {
+    if(_onLoadingProgress){
+      NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+      [event addEntriesFromDictionary:@{@"progress":[NSNumber numberWithDouble:self.webView.estimatedProgress]}];
+      _onLoadingProgress(event);
     }
+  }else{
+    [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+  }
 }
 
 #if !TARGET_OS_OSX
@@ -463,7 +571,7 @@ static NSDictionary* customCertificatesForHost;
   if (_webView == nil) {
     return;
   }
-
+  
   CGFloat alpha = CGColorGetAlpha(backgroundColor.CGColor);
   BOOL opaque = (alpha == 1.0);
 #if !TARGET_OS_OSX
@@ -484,27 +592,27 @@ static NSDictionary* customCertificatesForHost;
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
 - (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;
-    }
+  _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
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 /* __IPHONE_13_0 */
 - (void)setAutomaticallyAdjustsScrollIndicatorInsets:(BOOL)automaticallyAdjustsScrollIndicatorInsets{
-    _savedAutomaticallyAdjustsScrollIndicatorInsets = automaticallyAdjustsScrollIndicatorInsets;
-    if (_webView == nil) {
-           return;
-       }
-       if ([_webView.scrollView respondsToSelector:@selector(setAutomaticallyAdjustsScrollIndicatorInsets:)]) {
-           _webView.scrollView.automaticallyAdjustsScrollIndicatorInsets = automaticallyAdjustsScrollIndicatorInsets;
-       }
+  _savedAutomaticallyAdjustsScrollIndicatorInsets = automaticallyAdjustsScrollIndicatorInsets;
+  if (_webView == nil) {
+    return;
+  }
+  if ([_webView.scrollView respondsToSelector:@selector(setAutomaticallyAdjustsScrollIndicatorInsets:)]) {
+    _webView.scrollView.automaticallyAdjustsScrollIndicatorInsets = automaticallyAdjustsScrollIndicatorInsets;
+  }
 }
 #endif
 /**
@@ -512,7 +620,7 @@ static NSDictionary* customCertificatesForHost;
  *   - window.webkit.messageHandlers[MessageHandlerName].postMessage
  */
 - (void)userContentController:(WKUserContentController *)userContentController
-       didReceiveScriptMessage:(WKScriptMessage *)message
+      didReceiveScriptMessage:(WKScriptMessage *)message
 {
   if ([message.name isEqualToString:HistoryShimName]) {
     if (_onLoadingFinish) {
@@ -533,7 +641,7 @@ static NSDictionary* customCertificatesForHost;
 {
   if (![_source isEqualToDictionary:source]) {
     _source = [source copy];
-
+    
     if (_webView != nil) {
       [self visitSource];
     }
@@ -544,7 +652,7 @@ static NSDictionary* customCertificatesForHost;
 {
   if (![_allowingReadAccessToURL isEqualToString:allowingReadAccessToURL]) {
     _allowingReadAccessToURL = [allowingReadAccessToURL copy];
-
+    
     if (_webView != nil) {
       [self visitSource];
     }
@@ -570,153 +678,154 @@ static NSDictionary* customCertificatesForHost;
 
 - (void)visitSource
 {
-    // Check for a static html source first
-    NSString *html = [RCTConvert NSString:_source[@"html"]];
-    if (html) {
-        NSURL *baseURL = [RCTConvert NSURL:_source[@"baseUrl"]];
-        if (!baseURL) {
-            baseURL = [NSURL URLWithString:@"about:blank"];
-        }
-        [_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"]]; 
-    if(headerCookie) {
-      NSDictionary *headers = [NSDictionary dictionaryWithObjectsAndKeys:headerCookie,@"Set-Cookie",nil];
-      NSURL *urlString = [NSURL URLWithString:_source[@"uri"]];
-      NSArray *httpCookies = [NSHTTPCookie cookiesWithResponseHeaderFields:headers forURL:urlString];
-      for (NSHTTPCookie *httpCookie in httpCookies) {
-          [_webView.configuration.websiteDataStore.httpCookieStore setCookie:httpCookie completionHandler:nil];
-      }
+  // Check for a static html source first
+  NSString *html = [RCTConvert NSString:_source[@"html"]];
+  if (html) {
+    NSURL *baseURL = [RCTConvert NSURL:_source[@"baseUrl"]];
+    if (!baseURL) {
+      baseURL = [NSURL URLWithString:@"about:blank"];
     }
-
-    NSURLRequest *request = [self requestForSource:_source];
+    [_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"]];
+  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];
+  }
+  
+  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;
+      return;
     }
     if (!request.URL) {
-        // Clear the webview
-        [_webView loadHTMLString:@"" baseURL:nil];
-        return;
+      // Clear the webview
+      [_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)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:");
-        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) {
-            ((void (*)(id, SEL, void*, BOOL, BOOL, BOOL, id))original)(me, selector, arg0, TRUE, arg2, arg3, arg4);
-        });
-    }
-    else if ([[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion: iOS_12_2_0]) {
-        // iOS 12.2.0 - iOS 13.0.0
-        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) {
-            ((void (*)(id, SEL, void*, BOOL, BOOL, BOOL, id))original)(me, selector, arg0, TRUE, arg2, arg3, arg4);
-        });
-    }
-    else if ([[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion: iOS_11_3_0]) {
-        // iOS 11.3.0 - 12.2.0
-        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) {
-            ((void (*)(id, SEL, void*, BOOL, BOOL, BOOL, id))original)(me, selector, arg0, TRUE, arg2, arg3, arg4);
-        });
-    } else {
-        // iOS 9.0 - 11.3.0
-        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) {
-            ((void (*)(id, SEL, void*, BOOL, BOOL, id))original)(me, selector, arg0, TRUE, arg2, arg3);
-        });
-    }
-
-    method_setImplementation(method, override);
+  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:");
+    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) {
+      ((void (*)(id, SEL, void*, BOOL, BOOL, BOOL, id))original)(me, selector, arg0, TRUE, arg2, arg3, arg4);
+    });
+  }
+  else if ([[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion: iOS_12_2_0]) {
+    // iOS 12.2.0 - iOS 13.0.0
+    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) {
+      ((void (*)(id, SEL, void*, BOOL, BOOL, BOOL, id))original)(me, selector, arg0, TRUE, arg2, arg3, arg4);
+    });
+  }
+  else if ([[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion: iOS_11_3_0]) {
+    // iOS 11.3.0 - 12.2.0
+    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) {
+      ((void (*)(id, SEL, void*, BOOL, BOOL, BOOL, id))original)(me, selector, arg0, TRUE, arg2, arg3, arg4);
+    });
+  } else {
+    // iOS 9.0 - 11.3.0
+    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) {
+      ((void (*)(id, SEL, void*, BOOL, BOOL, id))original)(me, selector, arg0, TRUE, arg2, arg3);
+    });
+  }
+  
+  method_setImplementation(method, override);
 }
 
 -(void)setHideKeyboardAccessoryView:(BOOL)hideKeyboardAccessoryView
 {
-    if (_webView == nil) {
-        _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);
+  if (_webView == nil) {
+    _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:@"%@_SwizzleHelperWK", 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([_SwizzleHelperWK class], @selector(inputAccessoryView));
+    class_addMethod(newClass, @selector(inputAccessoryView), method_getImplementation(method), method_getTypeEncoding(method));
+    
+    objc_registerClassPair(newClass);
+  }
+  
+  object_setClass(subview, newClass);
 }
 
 // UIScrollViewDelegate method
@@ -726,6 +835,12 @@ static NSDictionary* customCertificatesForHost;
 }
 #endif // !TARGET_OS_OSX
 
+- (void)setUserAgent:(NSString*)userAgent
+{
+  _userAgent = userAgent;
+  _webView.customUserAgent = userAgent;
+}
+
 - (void)setScrollEnabled:(BOOL)scrollEnabled
 {
   _scrollEnabled = scrollEnabled;
@@ -745,45 +860,45 @@ static NSDictionary* customCertificatesForHost;
   else if (_onScroll != nil) {
     NSDictionary *event = @{
       @"contentOffset": @{
-          @"x": @(scrollView.contentOffset.x),
-          @"y": @(scrollView.contentOffset.y)
-          },
+        @"x": @(scrollView.contentOffset.x),
+        @"y": @(scrollView.contentOffset.y)
+      },
       @"contentInset": @{
-          @"top": @(scrollView.contentInset.top),
-          @"left": @(scrollView.contentInset.left),
-          @"bottom": @(scrollView.contentInset.bottom),
-          @"right": @(scrollView.contentInset.right)
-          },
+        @"top": @(scrollView.contentInset.top),
+        @"left": @(scrollView.contentInset.left),
+        @"bottom": @(scrollView.contentInset.bottom),
+        @"right": @(scrollView.contentInset.right)
+      },
       @"contentSize": @{
-          @"width": @(scrollView.contentSize.width),
-          @"height": @(scrollView.contentSize.height)
-          },
+        @"width": @(scrollView.contentSize.width),
+        @"height": @(scrollView.contentSize.height)
+      },
       @"layoutMeasurement": @{
-          @"width": @(scrollView.frame.size.width),
-          @"height": @(scrollView.frame.size.height)
-          },
+        @"width": @(scrollView.frame.size.width),
+        @"height": @(scrollView.frame.size.height)
+      },
       @"zoomScale": @(scrollView.zoomScale ?: 1),
-      };
+    };
     _onScroll(event);
   }
 }
 
 - (void)setDirectionalLockEnabled:(BOOL)directionalLockEnabled
 {
-    _directionalLockEnabled = directionalLockEnabled;
-    _webView.scrollView.directionalLockEnabled = directionalLockEnabled;
+  _directionalLockEnabled = directionalLockEnabled;
+  _webView.scrollView.directionalLockEnabled = directionalLockEnabled;
 }
 
 - (void)setShowsHorizontalScrollIndicator:(BOOL)showsHorizontalScrollIndicator
 {
-    _showsHorizontalScrollIndicator = showsHorizontalScrollIndicator;
-    _webView.scrollView.showsHorizontalScrollIndicator = showsHorizontalScrollIndicator;
+  _showsHorizontalScrollIndicator = showsHorizontalScrollIndicator;
+  _webView.scrollView.showsHorizontalScrollIndicator = showsHorizontalScrollIndicator;
 }
 
 - (void)setShowsVerticalScrollIndicator:(BOOL)showsVerticalScrollIndicator
 {
-    _showsVerticalScrollIndicator = showsVerticalScrollIndicator;
-    _webView.scrollView.showsVerticalScrollIndicator = showsVerticalScrollIndicator;
+  _showsVerticalScrollIndicator = showsVerticalScrollIndicator;
+  _webView.scrollView.showsVerticalScrollIndicator = showsVerticalScrollIndicator;
 }
 #endif // !TARGET_OS_OSX
 
@@ -791,8 +906,8 @@ static NSDictionary* customCertificatesForHost;
 {
   NSDictionary *eventInitDict = @{@"data": message};
   NSString *source = [NSString
-    stringWithFormat:@"window.dispatchEvent(new MessageEvent('message', %@));",
-    RCTJSONStringify(eventInitDict, NULL)
+                      stringWithFormat:@"window.dispatchEvent(new MessageEvent('message', %@));",
+                      RCTJSONStringify(eventInitDict, NULL)
   ];
   [self injectJavaScript: source];
 }
@@ -800,7 +915,7 @@ static NSDictionary* customCertificatesForHost;
 - (void)layoutSubviews
 {
   [super layoutSubviews];
-
+  
   // Ensure webview takes the position and dimensions of BPCWebView
   _webView.frame = self.bounds;
 #if !TARGET_OS_OSX
@@ -825,43 +940,52 @@ static NSDictionary* customCertificatesForHost;
 }
 
 + (void)setCustomCertificatesForHost:(nullable NSDictionary*)certificates {
-    customCertificatesForHost = certificates;
+  customCertificatesForHost = certificates;
 }
 
 - (void)                    webView:(WKWebView *)webView
   didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
                   completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential * _Nullable))completionHandler
 {
-    NSString* host = nil;
-    if (webView.URL != nil) {
-        host = webView.URL.host;
-    }
-    if ([[challenge protectionSpace] authenticationMethod] == NSURLAuthenticationMethodClientCertificate) {
-        completionHandler(NSURLSessionAuthChallengeUseCredential, clientAuthenticationCredential);
-        return;
-    }
-    if ([[challenge protectionSpace] serverTrust] != nil && customCertificatesForHost != nil && host != nil) {
-        SecCertificateRef localCertificate = (__bridge SecCertificateRef)([customCertificatesForHost objectForKey:host]);
-        if (localCertificate != nil) {
-            NSData *localCertificateData = (NSData*) CFBridgingRelease(SecCertificateCopyData(localCertificate));
-            SecTrustRef trust = [[challenge protectionSpace] serverTrust];
-            long count = SecTrustGetCertificateCount(trust);
-            for (long i = 0; i < count; i++) {
-                SecCertificateRef serverCertificate = SecTrustGetCertificateAtIndex(trust, i);
-                if (serverCertificate == nil) { continue; }
-                NSData *serverCertificateData = (NSData *) CFBridgingRelease(SecCertificateCopyData(serverCertificate));
-                if ([serverCertificateData isEqualToData:localCertificateData]) {
-                    NSURLCredential *useCredential = [NSURLCredential credentialForTrust:trust];
-                    if (challenge.sender != nil) {
-                        [challenge.sender useCredential:useCredential forAuthenticationChallenge:challenge];
-                    }
-                    completionHandler(NSURLSessionAuthChallengeUseCredential, useCredential);
-                    return;
-                }
-            }
+  NSString* host = nil;
+  if (webView.URL != nil) {
+    host = webView.URL.host;
+  }
+  if ([[challenge protectionSpace] authenticationMethod] == NSURLAuthenticationMethodClientCertificate) {
+    completionHandler(NSURLSessionAuthChallengeUseCredential, clientAuthenticationCredential);
+    return;
+  }
+  if ([[challenge protectionSpace] serverTrust] != nil && customCertificatesForHost != nil && host != nil) {
+    SecCertificateRef localCertificate = (__bridge SecCertificateRef)([customCertificatesForHost objectForKey:host]);
+    if (localCertificate != nil) {
+      NSData *localCertificateData = (NSData*) CFBridgingRelease(SecCertificateCopyData(localCertificate));
+      SecTrustRef trust = [[challenge protectionSpace] serverTrust];
+      long count = SecTrustGetCertificateCount(trust);
+      for (long i = 0; i < count; i++) {
+        SecCertificateRef serverCertificate = SecTrustGetCertificateAtIndex(trust, i);
+        if (serverCertificate == nil) { continue; }
+        NSData *serverCertificateData = (NSData *) CFBridgingRelease(SecCertificateCopyData(serverCertificate));
+        if ([serverCertificateData isEqualToData:localCertificateData]) {
+          NSURLCredential *useCredential = [NSURLCredential credentialForTrust:trust];
+          if (challenge.sender != nil) {
+            [challenge.sender useCredential:useCredential forAuthenticationChallenge:challenge];
+          }
+          completionHandler(NSURLSessionAuthChallengeUseCredential, useCredential);
+          return;
         }
+      }
     }
-    completionHandler(NSURLSessionAuthChallengePerformDefaultHandling, nil);
+  }
+  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);
 }
 
 #pragma mark - WKNavigationDelegate methods
@@ -933,7 +1057,7 @@ static NSDictionary* customCertificatesForHost;
 #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;
@@ -942,7 +1066,7 @@ static NSDictionary* customCertificatesForHost;
   }
   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) {
@@ -955,12 +1079,38 @@ static NSDictionary* customCertificatesForHost;
 #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
  */
 -(UIViewController *)topViewController{
-    return RCTPresentedViewController();
+  return RCTPresentedViewController();
 }
 
 #endif // !TARGET_OS_OSX
@@ -972,191 +1122,55 @@ static NSDictionary* customCertificatesForHost;
 - (void)                  webView:(WKWebView *)webView
   decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction
                   decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
-{    
-    [self updateBlindViewIfNaverLogin:webView :navigationAction.request.URL.absoluteString];
-
-    if([self isItunesURL:navigationAction.request.URL.absoluteString]) { 
-        [self startAppToApp:navigationAction.request.URL];
-        decisionHandler(WKNavigationActionPolicyCancel);
-    } 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 {      
-        [self navigationOriginRN:webView decidePolicyForNavigationAction:navigationAction decisionHandler:decisionHandler];
-    }
-}
-
-
-- (void) updateBlindViewIfNaverLogin:(WKWebView*)webView :(NSString*)url {
-    if([url hasPrefix: @"https://nid.naver.com"]) {
-        [webView evaluateJavaScript: @"document.getElementById('back').remove();" completionHandler: ^(id result, NSError *error) { 
-        
-        }]; 
-    }  
-}
-
-
-- (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];
-    
-//    if (@available(iOS 10.0, *)) {
-//        [application openURL:url options:@{} completionHandler:nil];
-//    } else {
-//        [application openURL:url];
-//    }
-    
-    if (@available(iOS 10.0, *)) {
-        [application openURL:url options:@{} completionHandler: ^(BOOL success) {
-            if(success == false) {
-                [self startItunesToInstall:url];
-            }
-        }];
-    } else {
-        [application openURL:url];
-    }
-}
-
-
-- (void) startItunesToInstall:(NSURL*) url {
-    NSString *sUrl = url.absoluteString;
-    NSString *itunesUrl = @"";
-    
-    if([sUrl hasPrefix: @"kfc-bankpay"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/%EB%B1%85%ED%81%AC%ED%8E%98%EC%9D%B4-%EA%B8%88%EC%9C%B5%EA%B8%B0%EA%B4%80-%EA%B3%B5%EB%8F%99-%EA%B3%84%EC%A2%8C%EC%9D%B4%EC%B2%B4-%EA%B2%B0%EC%A0%9C-%EC%A0%9C%EB%A1%9C%ED%8E%98%EC%9D%B4/id398456030";
-    } else if([sUrl hasPrefix: @"ispmobile"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/isp/id369125087";
-    } else if([sUrl hasPrefix: @"hdcardappcardansimclick"] || [sUrl hasPrefix: @"smhyundaiansimclick"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/%ED%98%84%EB%8C%80%EC%B9%B4%EB%93%9C/id702653088";
-    } else if([sUrl hasPrefix: @"shinhan-sr-ansimclick"] || [sUrl hasPrefix: @"smshinhanansimclick"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/%EC%8B%A0%ED%95%9C%ED%8E%98%EC%9D%B4%ED%8C%90/id572462317";
-    } else if([sUrl hasPrefix: @"kb-acp"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/kb-pay/id695436326";
-    } else if([sUrl hasPrefix: @"liivbank"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/%EB%A6%AC%EB%B8%8C/id1126232922";
-    } else if([sUrl hasPrefix: @"mpocket.online.ansimclick"] || [sUrl hasPrefix: @"ansimclickscard"] || [sUrl hasPrefix: @"ansimclickipcollect"] || [sUrl hasPrefix: @"samsungpay"] || [sUrl hasPrefix: @"scardcertiapp"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/%EC%82%BC%EC%84%B1%EC%B9%B4%EB%93%9C/id535125356";
-    } else if([sUrl hasPrefix: @"lottesmartpay"]) {
-        itunesUrl = @"https://apps.apple.com/us/app/%EB%A1%AF%EB%8D%B0%EC%B9%B4%EB%93%9C-%EC%95%B1%EC%B9%B4%EB%93%9C/id688047200";
-    } else if([sUrl hasPrefix: @"lotteappcard"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/%EB%94%94%EC%A7%80%EB%A1%9C%EC%B9%B4-%EB%A1%AF%EB%8D%B0%EC%B9%B4%EB%93%9C/id688047200";
-    } else if([sUrl hasPrefix: @"newsmartpib"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/%EC%9A%B0%EB%A6%AC-won-%EB%B1%85%ED%82%B9/id1470181651";
-    } else if([sUrl hasPrefix: @"com.wooricard.wcard"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/%EC%9A%B0%EB%A6%ACwon%EC%B9%B4%EB%93%9C/id1499598869";
-    } else if([sUrl hasPrefix: @"citispay"] || [sUrl hasPrefix: @"citicardappkr"] || [sUrl hasPrefix: @"citimobileapp"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/%EC%94%A8%ED%8B%B0%EB%AA%A8%EB%B0%94%EC%9D%BC/id1179759666";
-    } else if([sUrl hasPrefix: @"shinsegaeeasypayment"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/ssgpay/id666237916";
-    } else if([sUrl hasPrefix: @"cloudpay"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/%ED%95%98%EB%82%98%EC%B9%B4%EB%93%9C-%EC%9B%90%ED%81%90%ED%8E%98%EC%9D%B4/id847268987";
-    } else if([sUrl hasPrefix: @"hanawalletmembers"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/n-wallet/id492190784";
-    } else if([sUrl hasPrefix: @"nhappvardansimclick"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/%EC%98%AC%EC%9B%90%ED%8E%98%EC%9D%B4-nh%EC%95%B1%EC%B9%B4%EB%93%9C/id1177889176";
-    } else if([sUrl hasPrefix: @"nhallonepayansimclick"] || [sUrl hasPrefix: @"nhappcardansimclick"] || [sUrl hasPrefix: @"nhallonepayansimclick"] || [sUrl hasPrefix: @"nonghyupcardansimclick"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/%EC%98%AC%EC%9B%90%ED%8E%98%EC%9D%B4-nh%EC%95%B1%EC%B9%B4%EB%93%9C/id1177889176";
-    } else if([sUrl hasPrefix: @"payco"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/payco/id924292102";
-    } else if([sUrl hasPrefix: @"lpayapp"] || [sUrl hasPrefix: @"lmslpay"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/l-point-with-l-pay/id473250588";
-    } else if([sUrl hasPrefix: @"naversearchapp"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/%EB%84%A4%EC%9D%B4%EB%B2%84-naver/id393499958";
-    } else if([sUrl hasPrefix: @"tauthlink"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/pass-by-skt/id1141258007";
-    } else if([sUrl hasPrefix: @"uplusauth"] || [sUrl hasPrefix: @"upluscorporation"] ) {
-        itunesUrl = @"https://apps.apple.com/kr/app/pass-by-u/id1147394645";
-    } else if([sUrl hasPrefix: @"ktauthexternalcall"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/pass-by-kt/id1134371550";
-    } else if([sUrl hasPrefix: @"supertoss"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/%ED%86%A0%EC%8A%A4/id839333328";
-    } else if([sUrl hasPrefix: @"kakaotalk"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/kakaotalk/id362057947";
-    } else if([sUrl hasPrefix: @"chaipayment"]) {
-        itunesUrl = @"https://apps.apple.com/kr/app/%EC%B0%A8%EC%9D%B4/id1459979272";
-    }
-    
-    if(itunesUrl.length > 0) {
-        NSURL *appstore = [NSURL URLWithString: itunesUrl];
-        [self startAppToApp: appstore];
-    }
-}
-
-- (BOOL) isItunesURL:(NSString*) urlString {
-    NSRange match = [urlString rangeOfString: @"itunes.apple.com"];
-    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) {
+  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;
+    }
+  }
+  
+  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,
-        @"mainDocumentURL": (request.mainDocumentURL).absoluteString,
-        @"navigationType": navigationTypes[@(navigationType)],
-        @"isTopFrame": @(isTopFrame)
+        @"navigationType": navigationTypes[@(navigationType)]
       }];
-      if (![self.delegate webView:self
-        shouldStartLoadForRequest:event
-                     withCallback:_onShouldStartLoadWithRequest]) {
-        decisionHandler(WKNavigationActionPolicyCancel);
-        return;
-      }
+      _onLoadingStart(event);
     }
-
-    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);
 }
 
 /**
@@ -1185,17 +1199,17 @@ static NSDictionary* customCertificatesForHost;
     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, *)) {
         disposition = [response valueForHTTPHeaderField:@"Content-Disposition"];
@@ -1204,7 +1218,7 @@ static NSDictionary* customCertificatesForHost;
       if (isAttachment || !navigationResponse.canShowMIMEType) {
         if (_onFileDownload) {
           policy = WKNavigationResponsePolicyCancel;
-
+          
           NSMutableDictionary<NSString *, id> *downloadEvent = [self baseEvent];
           [downloadEvent addEntriesFromDictionary: @{
             @"downloadUrl": (response.URL).absoluteString,
@@ -1214,7 +1228,7 @@ static NSDictionary* customCertificatesForHost;
       }
     }
   }
-
+  
   decisionHandler(policy);
 }
 
@@ -1234,7 +1248,7 @@ static NSDictionary* customCertificatesForHost;
       // 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
@@ -1242,7 +1256,7 @@ static NSDictionary* customCertificatesForHost;
       // implementing OAuth with a WebView.
       return;
     }
-
+    
     NSMutableDictionary<NSString *, id> *event = [self baseEvent];
     [event addEntriesFromDictionary:@{
       @"didFailProvisionalNavigation": @YES,
@@ -1273,26 +1287,26 @@ static NSDictionary* customCertificatesForHost;
 
 -(void)forceIgnoreSilentHardwareSwitch:(BOOL)initialSetup
 {
-    NSString *mp3Str = @"data:audio/mp3;base64,//tAxAAAAAAAAAAAAAAAAAAAAAAASW5mbwAAAA8AAAAFAAAESAAzMzMzMzMzMzMzMzMzMzMzMzMzZmZmZmZmZmZmZmZmZmZmZmZmZmaZmZmZmZmZmZmZmZmZmZmZmZmZmczMzMzMzMzMzMzMzMzMzMzMzMzM//////////////////////////8AAAA5TEFNRTMuMTAwAZYAAAAAAAAAABQ4JAMGQgAAOAAABEhNIZS0AAAAAAD/+0DEAAPH3Yz0AAR8CPqyIEABp6AxjG/4x/XiInE4lfQDFwIIRE+uBgZoW4RL0OLMDFn6E5v+/u5ehf76bu7/6bu5+gAiIQGAABQIUJ0QolFghEn/9PhZQpcUTpXMjo0OGzRCZXyKxoIQzB2KhCtGobpT9TRVj/3Pmfp+f8X7Pu1B04sTnc3s0XhOlXoGVCMNo9X//9/r6a10TZEY5DsxqvO7mO5qFvpFCmKIjhpSItGsUYcRO//7QsQRgEiljQIAgLFJAbIhNBCa+JmorCbOi5q9nVd2dKnusTMQg4MFUlD6DQ4OFijwGAijRMfLbHG4nLVTjydyPlJTj8pfPflf9/5GD950A5e+jsrmNZSjSirjs1R7hnkia8vr//l/7Nb+crvr9Ok5ZJOylUKRxf/P9Zn0j2P4pJYXyKkeuy5wUYtdmOu6uobEtFqhIJViLEKIjGxchGev/L3Y0O3bwrIOszTBAZ7Ih28EUaSOZf/7QsQfg8fpjQIADN0JHbGgQBAZ8T//y//t/7d/2+f5m7MdCeo/9tdkMtGLbt1tqnabRroO1Qfvh20yEbei8nfDXP7btW7f9/uO9tbe5IvHQbLlxpf3DkAk0ojYcv///5/u3/7PTfGjPEPUvt5D6f+/3Lea4lz4tc4TnM/mFPrmalWbboeNiNyeyr+vufttZuvrVrt/WYv3T74JFo8qEDiJqJrmDTs///v99xDku2xG02jjunrICP/7QsQtA8kpkQAAgNMA/7FgQAGnobgfghgqA+uXwWQ3XFmGimSbe2X3ksY//KzK1a2k6cnNWOPJnPWUsYbKqkh8RJzrVf///P///////4vyhLKHLrCb5nIrYIUss4cthigL1lQ1wwNAc6C1pf1TIKRSkt+a//z+yLVcwlXKSqeSuCVQFLng2h4AFAFgTkH+Z/8jTX/zr//zsJV/5f//5UX/0ZNCNCCaf5lTCTRkaEdhNP//n/KUjf/7QsQ5AEhdiwAAjN7I6jGddBCO+WGTQ1mXrYatSAgaykxBTUUzLjEwMKqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqg==";
-    NSString *scr;
-    if (initialSetup) {
-        scr = [NSString stringWithFormat:@"var s=new Audio('%@');s.id='wkwebviewAudio';s.controls=false;s.loop=true;s.play();document.body.appendChild(s);true", mp3Str];
-    } else {
-        scr = [NSString stringWithFormat:@"var s=document.getElementById('wkwebviewAudio');s.src=null;s.parentNode.removeChild(s);s=null;s=new Audio('%@');s.id='wkwebviewAudio';s.controls=false;s.loop=true;s.play();document.body.appendChild(s);true", mp3Str];
-    }
-    [self evaluateJS: scr thenCall: nil];
+  NSString *mp3Str = @"data:audio/mp3;base64,//tAxAAAAAAAAAAAAAAAAAAAAAAASW5mbwAAAA8AAAAFAAAESAAzMzMzMzMzMzMzMzMzMzMzMzMzZmZmZmZmZmZmZmZmZmZmZmZmZmaZmZmZmZmZmZmZmZmZmZmZmZmZmczMzMzMzMzMzMzMzMzMzMzMzMzM//////////////////////////8AAAA5TEFNRTMuMTAwAZYAAAAAAAAAABQ4JAMGQgAAOAAABEhNIZS0AAAAAAD/+0DEAAPH3Yz0AAR8CPqyIEABp6AxjG/4x/XiInE4lfQDFwIIRE+uBgZoW4RL0OLMDFn6E5v+/u5ehf76bu7/6bu5+gAiIQGAABQIUJ0QolFghEn/9PhZQpcUTpXMjo0OGzRCZXyKxoIQzB2KhCtGobpT9TRVj/3Pmfp+f8X7Pu1B04sTnc3s0XhOlXoGVCMNo9X//9/r6a10TZEY5DsxqvO7mO5qFvpFCmKIjhpSItGsUYcRO//7QsQRgEiljQIAgLFJAbIhNBCa+JmorCbOi5q9nVd2dKnusTMQg4MFUlD6DQ4OFijwGAijRMfLbHG4nLVTjydyPlJTj8pfPflf9/5GD950A5e+jsrmNZSjSirjs1R7hnkia8vr//l/7Nb+crvr9Ok5ZJOylUKRxf/P9Zn0j2P4pJYXyKkeuy5wUYtdmOu6uobEtFqhIJViLEKIjGxchGev/L3Y0O3bwrIOszTBAZ7Ih28EUaSOZf/7QsQfg8fpjQIADN0JHbGgQBAZ8T//y//t/7d/2+f5m7MdCeo/9tdkMtGLbt1tqnabRroO1Qfvh20yEbei8nfDXP7btW7f9/uO9tbe5IvHQbLlxpf3DkAk0ojYcv///5/u3/7PTfGjPEPUvt5D6f+/3Lea4lz4tc4TnM/mFPrmalWbboeNiNyeyr+vufttZuvrVrt/WYv3T74JFo8qEDiJqJrmDTs///v99xDku2xG02jjunrICP/7QsQtA8kpkQAAgNMA/7FgQAGnobgfghgqA+uXwWQ3XFmGimSbe2X3ksY//KzK1a2k6cnNWOPJnPWUsYbKqkh8RJzrVf///P///////4vyhLKHLrCb5nIrYIUss4cthigL1lQ1wwNAc6C1pf1TIKRSkt+a//z+yLVcwlXKSqeSuCVQFLng2h4AFAFgTkH+Z/8jTX/zr//zsJV/5f//5UX/0ZNCNCCaf5lTCTRkaEdhNP//n/KUjf/7QsQ5AEhdiwAAjN7I6jGddBCO+WGTQ1mXrYatSAgaykxBTUUzLjEwMKqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqg==";
+  NSString *scr;
+  if (initialSetup) {
+    scr = [NSString stringWithFormat:@"var s=new Audio('%@');s.id='wkwebviewAudio';s.controls=false;s.loop=true;s.play();document.body.appendChild(s);true", mp3Str];
+  } else {
+    scr = [NSString stringWithFormat:@"var s=document.getElementById('wkwebviewAudio');s.src=null;s.parentNode.removeChild(s);s=null;s=new Audio('%@');s.id='wkwebviewAudio';s.controls=false;s.loop=true;s.play();document.body.appendChild(s);true", mp3Str];
+  }
+  [self evaluateJS: scr thenCall: nil];
 }
 
 -(void)disableIgnoreSilentSwitch
 {
-    [self evaluateJS: @"document.getElementById('wkwebviewAudio').src=null;true" thenCall: nil];
+  [self evaluateJS: @"document.getElementById('wkwebviewAudio').src=null;true" thenCall: nil];
 }
 
 -(void)appDidBecomeActive
 {
-    if (_ignoreSilentHardwareSwitch) {
-      [self forceIgnoreSilentHardwareSwitch:false];
-    }
+  if (_ignoreSilentHardwareSwitch) {
+    [self forceIgnoreSilentHardwareSwitch:false];
+  }
 }
 
 -(void)appWillResignActive
@@ -1307,12 +1321,21 @@ static NSDictionary* customCertificatesForHost;
  * @see https://fburl.com/rtys6jlb
  */
 - (void)webView:(WKWebView *)webView
-  didFinishNavigation:(WKNavigation *)navigation
+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];
   }
-
+  
   if (_onLoadingFinish) {
     _onLoadingFinish([self baseEvent]);
   }
@@ -1341,8 +1364,7 @@ static NSDictionary* customCertificatesForHost;
    * manually call [_webView loadRequest:request].
    */
   NSURLRequest *request = [self requestForSource:self.source];
-
-
+  
   if (request.URL && !_webView.URL.absoluteString.length) {
     [_webView loadRequest:request];
   } else {
@@ -1352,30 +1374,30 @@ static NSDictionary* customCertificatesForHost;
 #if !TARGET_OS_OSX
 - (void)addPullToRefreshControl
 {
-    UIRefreshControl *refreshControl = [[UIRefreshControl alloc] init];
-    _refreshControl = refreshControl;
-    [_webView.scrollView addSubview: refreshControl];
-    [refreshControl addTarget:self action:@selector(pullToRefresh:) forControlEvents: UIControlEventValueChanged];
+  UIRefreshControl *refreshControl = [[UIRefreshControl alloc] init];
+  _refreshControl = refreshControl;
+  [_webView.scrollView addSubview: refreshControl];
+  [refreshControl addTarget:self action:@selector(pullToRefresh:) forControlEvents: UIControlEventValueChanged];
 }
 
 - (void)pullToRefresh:(UIRefreshControl *)refreshControl
 {
-    [self reload];
-    [refreshControl endRefreshing];
+  [self reload];
+  [refreshControl endRefreshing];
 }
 
 
 - (void)setPullToRefreshEnabled:(BOOL)pullToRefreshEnabled
 {
-    _pullToRefreshEnabled = pullToRefreshEnabled;
-
-    if (pullToRefreshEnabled) {
-        [self addPullToRefreshControl];
-    } else {
-        [_refreshControl removeFromSuperview];
-    }
-
-    [self setBounces:_bounces];
+  _pullToRefreshEnabled = pullToRefreshEnabled;
+  
+  if (pullToRefreshEnabled) {
+    [self addPullToRefreshControl];
+  } else {
+    [_refreshControl removeFromSuperview];
+  }
+  
+  [self setBounces:_bounces];
 }
 #endif // !TARGET_OS_OSX
 
@@ -1384,22 +1406,29 @@ static NSDictionary* customCertificatesForHost;
   [_webView stopLoading];
 }
 
+- (void)requestFocus
+{
+#if !TARGET_OS_OSX
+  [_webView becomeFirstResponder];
+#endif // !TARGET_OS_OSX
+}
+
 #if !TARGET_OS_OSX
 - (void)setBounces:(BOOL)bounces
 {
   _bounces = bounces;
-    //For UIRefreshControl to work correctly, the bounces should always be true
+  //For UIRefreshControl to work correctly, the bounces should always be true
   _webView.scrollView.bounces = _pullToRefreshEnabled || bounces;
 }
 #endif // !TARGET_OS_OSX
 
 - (void)setInjectedJavaScript:(NSString *)source {
   _injectedJavaScript = source;
-
+  
   self.atEndScript = source == nil ? nil : [[WKUserScript alloc] initWithSource:source
-      injectionTime:WKUserScriptInjectionTimeAtDocumentEnd
-    forMainFrameOnly:_injectedJavaScriptForMainFrameOnly];
-
+                                                                  injectionTime:WKUserScriptInjectionTimeAtDocumentEnd
+                                                               forMainFrameOnly:_injectedJavaScriptForMainFrameOnly];
+  
   if(_webView != nil){
     [self resetupScripts:_webView.configuration];
   }
@@ -1407,11 +1436,11 @@ static NSDictionary* customCertificatesForHost;
 
 - (void)setInjectedJavaScriptBeforeContentLoaded:(NSString *)source {
   _injectedJavaScriptBeforeContentLoaded = source;
-
+  
   self.atStartScript = source == nil ? nil : [[WKUserScript alloc] initWithSource:source
-       injectionTime:WKUserScriptInjectionTimeAtDocumentStart
-    forMainFrameOnly:_injectedJavaScriptBeforeContentLoadedForMainFrameOnly];
-
+                                                                    injectionTime:WKUserScriptInjectionTimeAtDocumentStart
+                                                                 forMainFrameOnly:_injectedJavaScriptBeforeContentLoadedForMainFrameOnly];
+  
   if(_webView != nil){
     [self resetupScripts:_webView.configuration];
   }
@@ -1429,66 +1458,93 @@ static NSDictionary* customCertificatesForHost;
 
 - (void)setMessagingEnabled:(BOOL)messagingEnabled {
   _messagingEnabled = messagingEnabled;
-
+  
   self.postMessageScript = _messagingEnabled ?
   [
-   [WKUserScript alloc]
-   initWithSource: [
-                    NSString
-                    stringWithFormat:
-                    @"window.%@ = {"
-                    "  postMessage: function (data) {"
-                    "    window.webkit.messageHandlers.%@.postMessage(String(data));"
-                    "  }"
-                    "};", 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.
-    *       I am keeping it as YES for consistency with previous behaviour. */
-   // forMainFrameOnly:_messagingEnabledForMainFrameOnly
-   forMainFrameOnly:YES
-   ] :
+    [WKUserScript alloc]
+    initWithSource: [
+      NSString
+      stringWithFormat:
+        @"window.%@ = {"
+      "  postMessage: function (data) {"
+      "    window.webkit.messageHandlers.%@.postMessage(String(data));"
+      "  }"
+      "};", 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.
+     *       I am keeping it as YES for consistency with previous behaviour. */
+    // forMainFrameOnly:_messagingEnabledForMainFrameOnly
+    forMainFrameOnly:YES
+  ] :
   nil;
-
+  
   if(_webView != nil){
     [self resetupScripts:_webView.configuration];
   }
 }
 
+- (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];
   if(self.enableApplePay){
     if (self.postMessageScript){
       [wkWebViewConfig.userContentController addScriptMessageHandler:[[BPCWeakScriptMessageDelegate alloc] initWithDelegate:self]
-                                                                       name:MessageHandlerName];
+                                                                name:MessageHandlerName];
     }
     return;
   }
-
+  
   NSString *html5HistoryAPIShimSource = [NSString stringWithFormat:
-    @"(function(history) {\n"
-    "  function notify(type) {\n"
-    "    setTimeout(function() {\n"
-    "      window.webkit.messageHandlers.%@.postMessage(type)\n"
-    "    }, 0)\n"
-    "  }\n"
-    "  function shim(f) {\n"
-    "    return function pushState() {\n"
-    "      notify('other')\n"
-    "      return f.apply(history, arguments)\n"
-    "    }\n"
-    "  }\n"
-    "  history.pushState = shim(history.pushState)\n"
-    "  history.replaceState = shim(history.replaceState)\n"
-    "  window.addEventListener('popstate', function() {\n"
-    "    notify('backforward')\n"
-    "  })\n"
-    "})(window.history)\n", HistoryShimName
+                                           @"(function(history) {\n"
+                                         "  function notify(type) {\n"
+                                         "    setTimeout(function() {\n"
+                                         "      window.webkit.messageHandlers.%@.postMessage(type)\n"
+                                         "    }, 0)\n"
+                                         "  }\n"
+                                         "  function shim(f) {\n"
+                                         "    return function pushState() {\n"
+                                         "      notify('other')\n"
+                                         "      return f.apply(history, arguments)\n"
+                                         "    }\n"
+                                         "  }\n"
+                                         "  history.pushState = shim(history.pushState)\n"
+                                         "  history.replaceState = shim(history.replaceState)\n"
+                                         "  window.addEventListener('popstate', function() {\n"
+                                         "    notify('backforward')\n"
+                                         "  })\n"
+                                         "})(window.history)\n", HistoryShimName
   ];
   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
@@ -1499,12 +1555,10 @@ static NSDictionary* customCertificatesForHost;
       if(!_incognito && !_cacheEnabled) {
         wkWebViewConfig.websiteDataStore = [WKWebsiteDataStore nonPersistentDataStore];
       }
-      for (NSHTTPCookie *cookie in [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookies]) {
-        [wkWebViewConfig.websiteDataStore.httpCookieStore setCookie:cookie completionHandler:nil];
-      }
+      [self syncCookiesToWebView:nil];
     } 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
@@ -1513,48 +1567,48 @@ static NSDictionary* customCertificatesForHost;
       // Generates JS: document.cookie = "key=; Expires=Thu, 01 Jan 1970 00:00:01 GMT;"
       // for each cookie which is already available in the WebView context.
       /*
-      [script appendString:@"(function () {\n"];
-      [script appendString:@"  var cookies = document.cookie.split('; ');\n"];
-      [script appendString:@"  for (var i = 0; i < cookies.length; i++) {\n"];
-      [script appendString:@"    if (cookies[i].indexOf('=') !== -1) {\n"];
-      [script appendString:@"      document.cookie = cookies[i].split('=')[0] + '=; Expires=Thu, 01 Jan 1970 00:00:01 GMT';\n"];
-      [script appendString:@"    }\n"];
-      [script appendString:@"  }\n"];
-      [script appendString:@"})();\n\n"];
-      */
-
+       [script appendString:@"(function () {\n"];
+       [script appendString:@"  var cookies = document.cookie.split('; ');\n"];
+       [script appendString:@"  for (var i = 0; i < cookies.length; i++) {\n"];
+       [script appendString:@"    if (cookies[i].indexOf('=') !== -1) {\n"];
+       [script appendString:@"      document.cookie = cookies[i].split('=')[0] + '=; Expires=Thu, 01 Jan 1970 00:00:01 GMT';\n"];
+       [script appendString:@"    }\n"];
+       [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;"
+      // Generates JS: document.cookie = "key=value; Path=/; Expires=Thu, 01 Jan 20xx 00:00:01 GMT;"
       // for each cookie which is available in the application context.
       [script appendString:@"(function () {\n"];
       for (NSHTTPCookie *cookie in [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookies]) {
         [script appendFormat:@"document.cookie = %@ + '=' + %@",
-          RCTJSONStringify(cookie.name, NULL),
-          RCTJSONStringify(cookie.value, NULL)];
+         RCTJSONStringify(cookie.name, NULL),
+         RCTJSONStringify(cookie.value, NULL)];
         if (cookie.path) {
           [script appendFormat:@" + '; Path=' + %@", RCTJSONStringify(cookie.path, NULL)];
         }
         if (cookie.expiresDate) {
           [script appendFormat:@" + '; Expires=' + new Date(%f).toUTCString()",
-            cookie.expiresDate.timeIntervalSince1970 * 1000
+           cookie.expiresDate.timeIntervalSince1970 * 1000
           ];
         }
         [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]
-                                                                       name:MessageHandlerName];
+                                                                name:MessageHandlerName];
       [wkWebViewConfig.userContentController addUserScript:self.postMessageScript];
     }
     if (self.atEndScript) {
@@ -1569,7 +1623,7 @@ static NSDictionary* customCertificatesForHost;
 
 - (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.
@@ -1592,15 +1646,15 @@ static NSDictionary* customCertificatesForHost;
 @implementation BPCWeakScriptMessageDelegate
 
 - (instancetype)initWithDelegate:(id<WKScriptMessageHandler>)scriptDelegate {
-    self = [super init];
-    if (self) {
-        _scriptDelegate = scriptDelegate;
-    }
-    return self;
+  self = [super init];
+  if (self) {
+    _scriptDelegate = scriptDelegate;
+  }
+  return self;
 }
 
 - (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message {
-    [self.scriptDelegate userContentController:userContentController didReceiveScriptMessage:message];
+  [self.scriptDelegate userContentController:userContentController didReceiveScriptMessage:message];
 }
 
 @end