Re-organize platform-specific types

js/WebView.android.js

@@ -59,46 +59,10 @@ type State = {|
   startInLoadingState: boolean,
 |};
 
-type WebViewPropsAndroid = $ReadOnly<{|
-  ...WebViewSharedProps,
-  onNavigationStateChange?: (event: WebViewNavigation) => mixed,
-  onContentSizeChange?: (event: WebViewEvent) => mixed,
-
-  /**
-   * Sets whether Geolocation is enabled. The default is false.
-   * @platform android
-   */
-  geolocationEnabled?: ?boolean,
-
-  /**
-   * Boolean that sets whether JavaScript running in the context of a file
-   * scheme URL should be allowed to access content from any origin.
-   * Including accessing content from other file scheme URLs
-   * @platform android
-   */
-  allowUniversalAccessFromFileURLs?: ?boolean,
-
-  /**
-   * Used on Android only, controls whether form autocomplete data should be saved
-   * @platform android
-   */
-  saveFormDataDisabled?: ?boolean,
-
-  /*
-   * Used on Android only, controls whether the given list of URL prefixes should
-   * make {@link com.facebook.react.views.webview.ReactWebViewClient} to launch a
-   * default activity intent for those URL instead of loading it within the webview.
-   * Use this to list URLs that WebView cannot handle, e.g. a PDF url.
-   * @platform android
-   */
-  urlPrefixesForDefaultIntent?: $ReadOnlyArray<string>,
-
-|}>;
-
 /**
  * Renders a native WebView.
  */
-class WebView extends React.Component<WebViewPropsAndroid, State> {
+class WebView extends React.Component<WebViewSharedProps, State> {
   static defaultProps = {
     javaScriptEnabled: true,
     thirdPartyCookiesEnabled: true,

js/WebViewTypes.js

@@ -11,6 +11,7 @@
 'use strict';
 
 import type {Node, Element, ComponentType} from 'react';
+
 import type {SyntheticEvent} from 'CoreEventTypes';
 import type {EdgeInsetsProp} from 'EdgeInsetsPropType';
 import type {ViewStyleProp} from 'StyleSheet';
@@ -126,58 +127,13 @@ export type WebViewNativeConfig = $ReadOnly<{|
   viewManager?: ?Object,
 |}>;
 
-export type WebViewSharedProps =  $ReadOnly<{|
-  ...ViewProps,
-  /**
-   * Deprecated. Use `source` instead.
-   */
-  url?: ?string,
-  /**
-   * Deprecated. Use `source` instead.
-   */
-  html?: ?string,
-
-  /**
-   * Loads static html or a uri (with optional headers) in the WebView.
-   */
-  source?: ?WebViewSource,
-
+export type IOSWebViewProps = $ReadOnly<{|
   /**
    * If true, use WKWebView instead of UIWebView.
    * @platform ios
    */
   useWebKit?: ?boolean,
 
-  /**
-   * Function that returns a view to show if there's an error.
-   */
-  renderError: (errorDomain: ?string, errorCode: number, errorDesc: string) => Element<any>, // view to show if there's an error
-
-  /**
-   * Function that returns a loading indicator.
-   */
-  renderLoading: () => Element<any>,
-
-  /**
-   * Function that is invoked when the `WebView` has finished loading.
-   */
-  onLoad: (event: WebViewNavigationEvent) => mixed,
-
-  /**
-   * Function that is invoked when the `WebView` load succeeds or fails.
-   */
-  onLoadEnd: (event: WebViewNavigationEvent | WebViewErrorEvent) => mixed,
-
-  /**
-   * Function that is invoked when the `WebView` starts loading.
-   */
-  onLoadStart: (event: WebViewNavigationEvent) => mixed,
-
-  /**
-   * Function that is invoked when the `WebView` load fails.
-   */
-  onError: (event: WebViewErrorEvent) => mixed,
-
   /**
    * Boolean value that determines whether the web view bounces
    * when it reaches the edge of the content. The default value is `true`.
@@ -205,13 +161,6 @@ export type WebViewSharedProps =  $ReadOnly<{|
    */
   scrollEnabled?: ?boolean,
 
-  /**
-   * Controls whether to adjust the content inset for web views that are
-   * placed behind a navigation bar, tab bar, or toolbar. The default value
-   * is `true`.
-   */
-  automaticallyAdjustContentInsets?: ?boolean,
-
   /**
    * The amount by which the web view content is inset from the edges of
    * the scroll view. Defaults to {top: 0, left: 0, bottom: 0, right: 0}.
@@ -219,28 +168,6 @@ export type WebViewSharedProps =  $ReadOnly<{|
    */
   contentInset?: ?EdgeInsetsProp,
 
-  /**
-   * Function that is invoked when the `WebView` loading starts or ends.
-   */
-  onNavigationStateChange?: (event: WebViewNavigation) => mixed,
-
-  /**
-   * A function that is invoked when the webview calls `window.postMessage`.
-   * Setting this property will inject a `postMessage` global into your
-   * webview, but will still call pre-existing values of `postMessage`.
-   *
-   * `window.postMessage` accepts one argument, `data`, which will be
-   * available on the event object, `event.nativeEvent.data`. `data`
-   * must be a string.
-   */
-  onMessage?: (event: WebViewMessageEvent) => mixed,
-
-  /**
-   * Boolean value that forces the `WebView` to show the loading view
-   * on the first load.
-   */
-  startInLoadingState?: ?boolean,
-
   /**
    * Determines the types of data converted to clickable URLs in the web view's content.
    * By default only phone numbers are detected.
@@ -267,6 +194,59 @@ export type WebViewSharedProps =  $ReadOnly<{|
     | ?DataDetectorTypes
     | $ReadOnlyArray<DataDetectorTypes>,
 
+  /**
+   * Function that allows custom handling of any web view requests. Return
+   * `true` from the function to continue loading the request and `false`
+   * to stop loading.
+   * @platform ios
+   */
+  onShouldStartLoadWithRequest?: (event: WebViewEvent) => mixed,
+
+  /**
+   * Boolean that determines whether HTML5 videos play inline or use the
+   * native full-screen controller. The default value is `false`.
+   *
+   * **NOTE** : In order for video to play inline, not only does this
+   * property need to be set to `true`, but the video element in the HTML
+   * document must also include the `webkit-playsinline` attribute.
+   * @platform ios
+   */
+  allowsInlineMediaPlayback?: ?boolean,
+|}>;
+
+export type AndroidWebViewProps = $ReadOnly<{|
+  onNavigationStateChange?: (event: WebViewNavigation) => mixed,
+  onContentSizeChange?: (event: WebViewEvent) => mixed,
+
+  /**
+   * Sets whether Geolocation is enabled. The default is false.
+   * @platform android
+   */
+  geolocationEnabled?: ?boolean,
+
+  /**
+   * Boolean that sets whether JavaScript running in the context of a file
+   * scheme URL should be allowed to access content from any origin.
+   * Including accessing content from other file scheme URLs
+   * @platform android
+   */
+  allowUniversalAccessFromFileURLs?: ?boolean,
+
+  /**
+   * Used on Android only, controls whether form autocomplete data should be saved
+   * @platform android
+   */
+  saveFormDataDisabled?: ?boolean,
+
+  /*
+   * Used on Android only, controls whether the given list of URL prefixes should
+   * make {@link com.facebook.react.views.webview.ReactWebViewClient} to launch a
+   * default activity intent for those URL instead of loading it within the webview.
+   * Use this to list URLs that WebView cannot handle, e.g. a PDF url.
+   * @platform android
+   */
+  urlPrefixesForDefaultIntent?: $ReadOnlyArray<string>,
+
   /**
    * Boolean value to enable JavaScript in the `WebView`. Used on Android only
    * as JavaScript is enabled by default on iOS. The default value is `true`.
@@ -290,44 +270,115 @@ export type WebViewSharedProps =  $ReadOnly<{|
   domStorageEnabled?: ?boolean,
 
   /**
-   * Set this to provide JavaScript that will be injected into the web page
-   * when the view loads.
+   * Sets the user-agent for the `WebView`.
+   * @platform android
    */
-  injectedJavaScript?: ?string,
+  userAgent?: ?string,
 
   /**
-   * Sets the user-agent for the `WebView`.
+   * Specifies the mixed content mode. i.e WebView will allow a secure origin to load content from any other origin.
+   *
+   * Possible values for `mixedContentMode` are:
+   *
+   * - `'never'` (default) - WebView will not allow a secure origin to load content from an insecure origin.
+   * - `'always'` - WebView will allow a secure origin to load content from any other origin, even if that origin is insecure.
+   * - `'compatibility'` -  WebView will attempt to be compatible with the approach of a modern web browser with regard to mixed content.
    * @platform android
    */
-  userAgent?: ?string,
+  mixedContentMode?: ?('never' | 'always' | 'compatibility'),
+|}>;
 
+export type WebViewSharedProps =  $ReadOnly<{|
+  ...ViewProps,
+  ...IOSWebViewProps,
+  ...AndroidWebViewProps,
   /**
-   * Boolean that controls whether the web content is scaled to fit
-   * the view and enables the user to change the scale. The default value
+   * Deprecated. Use `source` instead.
+   */
+  url?: ?string,
+  /**
+   * Deprecated. Use `source` instead.
+   */
+  html?: ?string,
+
+  /**
+   * Loads static html or a uri (with optional headers) in the WebView.
+   */
+  source?: ?WebViewSource,
+
+  /**
+   * Function that returns a view to show if there's an error.
+   */
+  renderError: (errorDomain: ?string, errorCode: number, errorDesc: string) => Element<any>, // view to show if there's an error
+
+  /**
+   * Function that returns a loading indicator.
+   */
+  renderLoading: () => Element<any>,
+
+  /**
+   * Function that is invoked when the `WebView` has finished loading.
+   */
+  onLoad: (event: WebViewNavigationEvent) => mixed,
+
+  /**
+   * Function that is invoked when the `WebView` load succeeds or fails.
+   */
+  onLoadEnd: (event: WebViewNavigationEvent | WebViewErrorEvent) => mixed,
+
+  /**
+   * Function that is invoked when the `WebView` starts loading.
+   */
+  onLoadStart: (event: WebViewNavigationEvent) => mixed,
+
+  /**
+   * Function that is invoked when the `WebView` load fails.
+   */
+  onError: (event: WebViewErrorEvent) => mixed,
+
+  /**
+   * Controls whether to adjust the content inset for web views that are
+   * placed behind a navigation bar, tab bar, or toolbar. The default value
    * is `true`.
+   */
+  automaticallyAdjustContentInsets?: ?boolean,
+
+  /**
+   * Function that is invoked when the `WebView` loading starts or ends.
+   */
+  onNavigationStateChange?: (event: WebViewNavigation) => mixed,
+
+  /**
+   * A function that is invoked when the webview calls `window.postMessage`.
+   * Setting this property will inject a `postMessage` global into your
+   * webview, but will still call pre-existing values of `postMessage`.
    *
-   * On iOS, when `useWebKit=true`, this prop will not work.
+   * `window.postMessage` accepts one argument, `data`, which will be
+   * available on the event object, `event.nativeEvent.data`. `data`
+   * must be a string.
    */
-  scalesPageToFit?: ?boolean,
+  onMessage?: (event: WebViewMessageEvent) => mixed,
 
   /**
-   * Function that allows custom handling of any web view requests. Return
-   * `true` from the function to continue loading the request and `false`
-   * to stop loading.
-   * @platform ios
+   * Boolean value that forces the `WebView` to show the loading view
+   * on the first load.
    */
-  onShouldStartLoadWithRequest?: (event: WebViewEvent) => mixed,
+  startInLoadingState?: ?boolean,
 
   /**
-   * Boolean that determines whether HTML5 videos play inline or use the
-   * native full-screen controller. The default value is `false`.
+   * Set this to provide JavaScript that will be injected into the web page
+   * when the view loads.
+   */
+  injectedJavaScript?: ?string,
+
+  /**
+   * Boolean that controls whether the web content is scaled to fit
+   * the view and enables the user to change the scale. The default value
+   * is `true`.
    *
-   * **NOTE** : In order for video to play inline, not only does this
-   * property need to be set to `true`, but the video element in the HTML
-   * document must also include the `webkit-playsinline` attribute.
-   * @platform ios
+   * On iOS, when `useWebKit=true`, this prop will not work.
    */
-  allowsInlineMediaPlayback?: ?boolean,
+  scalesPageToFit?: ?boolean,
 
   /**
    * Boolean that determines whether HTML5 audio and video requires the user
@@ -344,18 +395,6 @@ export type WebViewSharedProps =  $ReadOnly<{|
    */
   originWhitelist?: $ReadOnlyArray<string>,
 
-  /**
-   * Specifies the mixed content mode. i.e WebView will allow a secure origin to load content from any other origin.
-   *
-   * Possible values for `mixedContentMode` are:
-   *
-   * - `'never'` (default) - WebView will not allow a secure origin to load content from an insecure origin.
-   * - `'always'` - WebView will allow a secure origin to load content from any other origin, even if that origin is insecure.
-   * - `'compatibility'` -  WebView will attempt to be compatible with the approach of a modern web browser with regard to mixed content.
-   * @platform android
-   */
-  mixedContentMode?: ?('never' | 'always' | 'compatibility'),
-
   /**
    * Override the native component used to render the WebView. Enables a custom native
    * WebView which uses the same JavaScript as the original WebView.