Browse Source

fix(iOS): resetupScripts now takes a WKWebViewConfiguration

Jamie Birch 5 years ago
parent
commit
9207312ab6
1 changed files with 5 additions and 5 deletions
  1. 5
    5
      ios/RNCWebView.m

+ 5
- 5
ios/RNCWebView.m View File

@@ -171,7 +171,7 @@ static NSDictionary* customCertificatesForHost;
171 171
   [wkWebViewConfig.userContentController addScriptMessageHandler:[[RNCWeakScriptMessageDelegate alloc] initWithDelegate:self]
172 172
                                                             name:HistoryShimName];
173 173
 
174
-  [self resetupScripts];
174
+  [self resetupScripts:wkWebViewConfig];
175 175
 
176 176
   wkWebViewConfig.allowsInlineMediaPlayback = _allowsInlineMediaPlayback;
177 177
 #if WEBKIT_IOS_10_APIS_AVAILABLE
@@ -966,7 +966,7 @@ static NSDictionary* customCertificatesForHost;
966 966
       injectionTime:WKUserScriptInjectionTimeAtDocumentEnd
967 967
     forMainFrameOnly:_injectedJavaScriptForMainFrameOnly];
968 968
   
969
-  [self resetupScripts];
969
+  [self resetupScripts:_webView.configuration];
970 970
 }
971 971
 
972 972
 - (void)setInjectedJavaScriptBeforeContentLoaded:(NSString *)script {
@@ -976,7 +976,7 @@ static NSDictionary* customCertificatesForHost;
976 976
        injectionTime:WKUserScriptInjectionTimeAtDocumentStart
977 977
     forMainFrameOnly:_injectedJavaScriptBeforeContentLoadedForMainFrameOnly];
978 978
   
979
-  [self resetupScripts];
979
+  [self resetupScripts:_webView.configuration];
980 980
 }
981 981
 
982 982
 - (void)setInjectedJavaScriptForMainFrameOnly:(BOOL)inject {
@@ -1011,10 +1011,10 @@ static NSDictionary* customCertificatesForHost;
1011 1011
    ] :
1012 1012
   nil;
1013 1013
   
1014
-  [self resetupScripts];
1014
+  [self resetupScripts:_webView.configuration];
1015 1015
 }
1016 1016
 
1017
-- (void)resetupScripts {
1017
+- (void)resetupScripts:(WKWebViewConfiguration *)wkWebViewConfig {
1018 1018
   [_webView.configuration.userContentController removeAllUserScripts];
1019 1019
   [_webView.configuration.userContentController removeScriptMessageHandlerForName:MessageHandlerName];
1020 1020