Bläddra i källkod

fix(iOS): resetupScripts now takes a WKWebViewConfiguration

Jamie Birch 5 år sedan
förälder
incheckning
9207312ab6
1 ändrade filer med 5 tillägg och 5 borttagningar
  1. 5
    5
      ios/RNCWebView.m

+ 5
- 5
ios/RNCWebView.m Visa fil

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