|
@@ -8,11 +8,7 @@
|
8
|
8
|
* @flow
|
9
|
9
|
*/
|
10
|
10
|
|
11
|
|
-'use strict';
|
12
|
|
-
|
13
|
11
|
import React from 'react';
|
14
|
|
-
|
15
|
|
-import ReactNative from 'react-native'
|
16
|
12
|
import {
|
17
|
13
|
ActivityIndicator,
|
18
|
14
|
Linking,
|
|
@@ -22,7 +18,8 @@ import {
|
22
|
18
|
View,
|
23
|
19
|
requireNativeComponent,
|
24
|
20
|
NativeModules,
|
25
|
|
- Image
|
|
21
|
+ Image,
|
|
22
|
+ findNodeHandle,
|
26
|
23
|
} from 'react-native';
|
27
|
24
|
|
28
|
25
|
import invariant from 'fbjs/lib/invariant';
|
|
@@ -136,7 +133,9 @@ class WebView extends React.Component<WebViewSharedProps, State> {
|
136
|
133
|
};
|
137
|
134
|
|
138
|
135
|
state = {
|
139
|
|
- viewState: this.props.startInLoadingState ? WebViewState.LOADING : WebViewState.IDLE,
|
|
136
|
+ viewState: this.props.startInLoadingState
|
|
137
|
+ ? WebViewState.LOADING
|
|
138
|
+ : WebViewState.IDLE,
|
140
|
139
|
lastErrorEvent: null,
|
141
|
140
|
};
|
142
|
141
|
|
|
@@ -203,7 +202,7 @@ class WebView extends React.Component<WebViewSharedProps, State> {
|
203
|
202
|
'about:blank',
|
204
|
203
|
...(this.props.originWhitelist || []),
|
205
|
204
|
].map(WebViewShared.originWhitelistToRegex);
|
206
|
|
- const onShouldStartLoadWithRequest = (event) => {
|
|
205
|
+ const onShouldStartLoadWithRequest = event => {
|
207
|
206
|
let shouldStart = true;
|
208
|
207
|
const { url } = event.nativeEvent;
|
209
|
208
|
const origin = WebViewShared.extractOrigin(url);
|
|
@@ -384,7 +383,7 @@ class WebView extends React.Component<WebViewSharedProps, State> {
|
384
|
383
|
* Returns the native `WebView` node.
|
385
|
384
|
*/
|
386
|
385
|
getWebViewHandle = () => {
|
387
|
|
- return ReactNative.findNodeHandle(this.webViewRef.current);
|
|
386
|
+ return findNodeHandle(this.webViewRef.current);
|
388
|
387
|
};
|
389
|
388
|
|
390
|
389
|
_onLoadingStart = (event: WebViewNavigationEvent) => {
|