fix WebView types

src/WebView.android.tsx

@@ -50,7 +50,9 @@ enum WebViewState {
   ERROR = 'ERROR',
 }
 
-const isWebViewUriSource = (source: any): source is WebViewSourceUri =>
+const isWebViewUriSource = (
+  source: WebViewSource,
+): source is WebViewSourceUri =>
   typeof source !== 'number' && !('html' in source);
 
 const defaultRenderLoading = (): React.ReactNode => (

src/WebView.ios.tsx

@@ -123,6 +123,9 @@ const defaultRenderError = (
   </View>
 );
 
+const RNCUIWebView = requireNativeComponent('RNCUIWebView');
+const RNCWKWebView = requireNativeComponent('RNCWKWebView');
+
 /**
  * `WebView` renders web content in a native view.
  *
@@ -475,13 +478,9 @@ export default class WebView extends React.Component<
 
     const messagingEnabled = typeof this.props.onMessage === 'function';
 
-    let NativeWebView = nativeConfig.component;
-
-    if (this.props.useWebKit) {
-      NativeWebView = NativeWebView || RNCWKWebView;
-    } else {
-      NativeWebView = NativeWebView || RNCUIWebView;
-    }
+    const NativeWebView
+      = nativeConfig.component
+      || (this.props.useWebKit ? RNCWKWebView : RNCUIWebView);
 
     const webView = (
       <NativeWebView
@@ -529,6 +528,3 @@ export default class WebView extends React.Component<
     );
   }
 }
-
-const RNCUIWebView = requireNativeComponent('RNCUIWebView');
-const RNCWKWebView = requireNativeComponent('RNCWKWebView');

types/index.d.ts

@@ -476,7 +476,12 @@ declare module "src/WebView.ios" {
         state: State;
         webViewRef: React.RefObject<React.ComponentClass<{}, any>>;
         UNSAFE_componentWillMount(): void;
-        _getCommands(): {
+        componentDidUpdate(prevProps: WebViewSharedProps): void;
+        /**
+         * Go forward one page in the web view's history.
+         */
+        goForward: () => void;
+        getCommands(): {
             goForward: () => void;
             goBack: () => void;
             reload: () => void;
@@ -484,10 +489,6 @@ declare module "src/WebView.ios" {
             postMessage: () => void;
             injectJavaScript: () => void;
         };
-        /**
-         * Go forward one page in the web view's history.
-         */
-        goForward: () => void;
         /**
          * Go back one page in the web view's history.
          */
@@ -522,18 +523,17 @@ declare module "src/WebView.ios" {
          * We return an event with a bunch of fields including:
          *  url, title, loading, canGoBack, canGoForward
          */
-        _updateNavigationState: (event: NativeSyntheticEvent<import("src/types/WebViewTypes").WebViewNavigation>) => void;
+        updateNavigationState: (event: NativeSyntheticEvent<import("src/types/WebViewTypes").WebViewNavigation>) => void;
         /**
          * Returns the native `WebView` node.
          */
         getWebViewHandle: () => number | null;
-        _onLoadingStart: (event: NativeSyntheticEvent<import("src/types/WebViewTypes").WebViewNavigation>) => void;
-        _onLoadingError: (event: NativeSyntheticEvent<WebViewError>) => void;
-        _onLoadingFinish: (event: NativeSyntheticEvent<import("src/types/WebViewTypes").WebViewNavigation>) => void;
-        _onMessage: (event: NativeSyntheticEvent<import("src/types/WebViewTypes").WebViewMessage>) => void;
-        _onLoadingProgress: (event: NativeSyntheticEvent<WebViewProgressEvent>) => void;
-        componentDidUpdate(prevProps: WebViewSharedProps): void;
-        _showRedboxOnPropChanges(prevProps: WebViewSharedProps, propName: 'allowsInlineMediaPlayback' | 'mediaPlaybackRequiresUserAction' | 'dataDetectorTypes'): void;
+        onLoadingStart: (event: NativeSyntheticEvent<import("src/types/WebViewTypes").WebViewNavigation>) => void;
+        onLoadingError: (event: NativeSyntheticEvent<WebViewError>) => void;
+        onLoadingFinish: (event: NativeSyntheticEvent<import("src/types/WebViewTypes").WebViewNavigation>) => void;
+        onMessage: (event: NativeSyntheticEvent<import("src/types/WebViewTypes").WebViewMessage>) => void;
+        onLoadingProgress: (event: NativeSyntheticEvent<WebViewProgressEvent>) => void;
+        showRedboxOnPropChanges(prevProps: WebViewSharedProps, propName: 'allowsInlineMediaPlayback' | 'mediaPlaybackRequiresUserAction' | 'dataDetectorTypes'): void;
         render(): React.ReactNode;
     }
 }