Sfoglia il codice sorgente

feat(iOS): new prop injectedJavaScriptBeforeContentLoaded (#1038)

* Run the injectedJavaScript on DocumentStart for iOS

* Add new prop injectedJavaScriptBeforeContentLoaded
Update types
Update docs

* Self review
Salvatore Randazzo 5 anni fa
parent
commit
604495e399
6 ha cambiato i file con 91 aggiunte e 13 eliminazioni
  1. 33
    0
      docs/Guide.md
  2. 30
    0
      docs/Reference.md
  3. 1
    0
      ios/RNCWebView.h
  4. 17
    11
      ios/RNCWebView.m
  5. 1
    0
      ios/RNCWebViewManager.m
  6. 9
    2
      src/WebViewTypes.ts

+ 33
- 0
docs/Guide.md Vedi File

@@ -336,6 +336,39 @@ _Under the hood_
336 336
 > On iOS, `injectedJavaScript` runs a method on WebView called `evaluateJavaScript:completionHandler:`
337 337
 > On Android, `injectedJavaScript` runs a method on the Android WebView called `evaluateJavascriptWithFallback`
338 338
 
339
+
340
+#### The `injectedJavaScriptBeforeContentLoaded` prop
341
+
342
+This is a script that runs **before** the web page loads for the first time. It only runs once, even if the page is reloaded or navigated away. This is useful if you want to inject anything into the window, localstorage, or document prior to the web code executing. 
343
+
344
+```jsx
345
+import React, { Component } from 'react';
346
+import { View } from 'react-native';
347
+import { WebView } from 'react-native-webview';
348
+
349
+export default class App extends Component {
350
+  render() {
351
+    const runFirst = `
352
+      window.isNativeApp = true;
353
+      true; // note: this is required, or you'll sometimes get silent failures
354
+    `;
355
+    return (
356
+      <View style={{ flex: 1 }}>
357
+        <WebView
358
+          source={{
359
+            uri:
360
+              'https://github.com/react-native-community/react-native-webview',
361
+          }}
362
+          injectedJavaScriptBeforeContentLoaded={runFirst}
363
+        />
364
+      </View>
365
+    );
366
+  }
367
+}
368
+```
369
+
370
+This runs the JavaScript in the `runFirst` string before the page is loaded. In this case, the value of `window.isNativeApp` will be set to true before the web code executes. 
371
+
339 372
 #### The `injectJavaScript` method
340 373
 
341 374
 While convenient, the downside to the previously mentioned `injectedJavaScript` prop is that it only runs once. That's why we also expose a method on the webview ref called `injectJavaScript` (note the slightly different name!).

+ 30
- 0
docs/Reference.md Vedi File

@@ -7,6 +7,7 @@ This document lays out the current public properties and methods for the React N
7 7
 - [`source`](Reference.md#source)
8 8
 - [`automaticallyAdjustContentInsets`](Reference.md#automaticallyadjustcontentinsets)
9 9
 - [`injectedJavaScript`](Reference.md#injectedjavascript)
10
+- [`injectedJavaScriptBeforeContentLoaded`](Reference.md#injectedJavaScriptBeforeContentLoaded)
10 11
 - [`mediaPlaybackRequiresUserAction`](Reference.md#mediaplaybackrequiresuseraction)
11 12
 - [`nativeConfig`](Reference.md#nativeconfig)
12 13
 - [`onError`](Reference.md#onerror)
@@ -144,6 +145,35 @@ const INJECTED_JAVASCRIPT = `(function() {
144 145
 
145 146
 ---
146 147
 
148
+### `injectedJavaScriptBeforeContentLoaded`
149
+
150
+Set this to provide JavaScript that will be injected into the web page after the document element is created, but before any other content is loaded. Make sure the string evaluates to a valid type (`true` works) and doesn't otherwise throw an exception.
151
+On iOS, see [WKUserScriptInjectionTimeAtDocumentStart](https://developer.apple.com/documentation/webkit/wkuserscriptinjectiontime/wkuserscriptinjectiontimeatdocumentstart?language=objc)
152
+
153
+| Type   | Required |
154
+| ------ | -------- |
155
+| string | No       |
156
+
157
+To learn more, read the [Communicating between JS and Native](Guide.md#communicating-between-js-and-native) guide.
158
+
159
+Example:
160
+
161
+Post message a JSON object of `window.location` to be handled by [`onMessage`](Reference.md#onmessage)
162
+
163
+```jsx
164
+const INJECTED_JAVASCRIPT = `(function() {
165
+    window.ReactNativeWebView.postMessage(JSON.stringify(window.location));
166
+})();`;
167
+
168
+<WebView
169
+  source={{ uri: 'https://facebook.github.io/react-native' }}
170
+  injectedJavaScriptBeforeContentLoaded={INJECTED_JAVASCRIPT}
171
+  onMessage={this.onMessage}
172
+/>;
173
+```
174
+
175
+---
176
+
147 177
 ### `mediaPlaybackRequiresUserAction`
148 178
 
149 179
 Boolean that determines whether HTML5 audio and video requires the user to tap them before they start playing. The default value is `true`. (Android API minimum version 17).

+ 1
- 0
ios/RNCWebView.h Vedi File

@@ -25,6 +25,7 @@
25 25
 @property (nonatomic, copy) NSDictionary * _Nullable source;
26 26
 @property (nonatomic, assign) BOOL messagingEnabled;
27 27
 @property (nonatomic, copy) NSString * _Nullable injectedJavaScript;
28
+@property (nonatomic, copy) NSString * _Nullable injectedJavaScriptBeforeContentLoaded;
28 29
 @property (nonatomic, assign) BOOL scrollEnabled;
29 30
 @property (nonatomic, assign) BOOL sharedCookiesEnabled;
30 31
 @property (nonatomic, assign) BOOL pagingEnabled;

+ 17
- 11
ios/RNCWebView.m Vedi File

@@ -165,6 +165,12 @@ static NSDictionary* customCertificatesForHost;
165 165
 
166 166
       WKUserScript *script = [[WKUserScript alloc] initWithSource:source injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:YES];
167 167
       [wkWebViewConfig.userContentController addUserScript:script];
168
+        
169
+      if (_injectedJavaScriptBeforeContentLoaded) {
170
+        // If user has provided an injectedJavascript prop, execute it at the start of the document
171
+        WKUserScript *injectedScript = [[WKUserScript alloc] initWithSource:_injectedJavaScriptBeforeContentLoaded injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:YES];
172
+        [wkWebViewConfig.userContentController addUserScript:injectedScript];
173
+      }
168 174
     }
169 175
 
170 176
     wkWebViewConfig.allowsInlineMediaPlayback = _allowsInlineMediaPlayback;
@@ -949,19 +955,19 @@ static NSDictionary* customCertificatesForHost;
949 955
  * Called when the navigation is complete.
950 956
  * @see https://fburl.com/rtys6jlb
951 957
  */
952
-- (void)      webView:(WKWebView *)webView
958
+- (void)webView:(WKWebView *)webView
953 959
   didFinishNavigation:(WKNavigation *)navigation
954 960
 {
955
-  if (_injectedJavaScript) {
956
-    [self evaluateJS: _injectedJavaScript thenCall: ^(NSString *jsEvaluationValue) {
957
-      NSMutableDictionary *event = [self baseEvent];
958
-      event[@"jsEvaluationValue"] = jsEvaluationValue;
959
-
960
-      if (self.onLoadingFinish) {
961
-        self.onLoadingFinish(event);
962
-      }
963
-    }];
964
-  } else if (_onLoadingFinish) {
961
+   if (_injectedJavaScript) {
962
+     [self evaluateJS: _injectedJavaScript thenCall: ^(NSString *jsEvaluationValue) {
963
+       NSMutableDictionary *event = [self baseEvent];
964
+       event[@"jsEvaluationValue"] = jsEvaluationValue;
965
+
966
+       if (self.onLoadingFinish) {
967
+         self.onLoadingFinish(event);
968
+       }
969
+     }];
970
+   } else if (_onLoadingFinish) {
965 971
     _onLoadingFinish([self baseEvent]);
966 972
   }
967 973
 }

+ 1
- 0
ios/RNCWebViewManager.m Vedi File

@@ -51,6 +51,7 @@ RCT_EXPORT_VIEW_PROPERTY(onHttpError, RCTDirectEventBlock)
51 51
 RCT_EXPORT_VIEW_PROPERTY(onShouldStartLoadWithRequest, RCTDirectEventBlock)
52 52
 RCT_EXPORT_VIEW_PROPERTY(onContentProcessDidTerminate, RCTDirectEventBlock)
53 53
 RCT_EXPORT_VIEW_PROPERTY(injectedJavaScript, NSString)
54
+RCT_EXPORT_VIEW_PROPERTY(injectedJavaScriptBeforeContentLoaded, NSString)
54 55
 RCT_EXPORT_VIEW_PROPERTY(javaScriptEnabled, BOOL)
55 56
 RCT_EXPORT_VIEW_PROPERTY(allowsInlineMediaPlayback, BOOL)
56 57
 RCT_EXPORT_VIEW_PROPERTY(mediaPlaybackRequiresUserAction, BOOL)

+ 9
- 2
src/WebViewTypes.ts Vedi File

@@ -20,7 +20,7 @@ type AndroidWebViewCommands = 'clearHistory' | 'clearCache' | 'clearFormData';
20 20
 
21 21
 interface RNCWebViewUIManager<Commands extends string> extends UIManagerStatic {
22 22
   getViewManagerConfig: (
23
-      name: string,
23
+    name: string,
24 24
   ) => {
25 25
     Commands: {[key in Commands]: number};
26 26
   };
@@ -216,6 +216,7 @@ export interface CommonNativeWebViewProps extends ViewProps {
216 216
   cacheEnabled?: boolean;
217 217
   incognito?: boolean;
218 218
   injectedJavaScript?: string;
219
+  injectedJavaScriptBeforeContentLoaded?: string;
219 220
   mediaPlaybackRequiresUserAction?: boolean;
220 221
   messagingEnabled: boolean;
221 222
   onScroll?: (event: NativeScrollEvent) => void;
@@ -501,7 +502,7 @@ export interface AndroidWebViewProps extends WebViewSharedProps {
501 502
    */
502 503
   geolocationEnabled?: boolean;
503 504
 
504
-
505
+  
505 506
   /**
506 507
    * Boolean that sets whether JavaScript running in the context of a file
507 508
    * scheme URL should be allowed to access content from other file scheme URLs.
@@ -685,6 +686,12 @@ export interface WebViewSharedProps extends ViewProps {
685 686
    */
686 687
   injectedJavaScript?: string;
687 688
 
689
+  /**
690
+   * Set this to provide JavaScript that will be injected into the web page
691
+   * once the webview is initialized but before the view loads any content.
692
+   */
693
+  injectedJavaScriptBeforeContentLoaded?: string;
694
+
688 695
   /**
689 696
    * Boolean value that determines whether a horizontal scroll indicator is
690 697
    * shown in the `WebView`. The default value is `true`.