Merge branch 'master' into docs/nav-state-changes

docs/Reference.md

@@ -332,11 +332,11 @@ Boolean value to enable third party cookies in the `WebView`. Used on Android Lo
 
 ### `userAgent`
 
-Sets the user-agent for the `WebView`.
+Sets the user-agent for the `WebView`. This will only work for iOS if you are using WKWebView, not UIWebView (see https://developer.apple.com/documentation/webkit/wkwebview/1414950-customuseragent).
 
 | Type   | Required | Platform |
 | ------ | -------- | -------- |
-| string | No       | Android  |
+| string | No       | Android, iOS WKWebView  |
 
 ---
 

ios/RNCWKWebView.h

@@ -37,6 +37,7 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
 @property (nonatomic, assign) BOOL automaticallyAdjustContentInsets;
 @property (nonatomic, assign) BOOL hideKeyboardAccessoryView;
 @property (nonatomic, assign) BOOL allowsBackForwardNavigationGestures;
+@property (nonatomic, copy) NSString *userAgent;
 
 - (void)postMessage:(NSString *)message;
 - (void)injectJavaScript:(NSString *)script;

ios/RNCWKWebView.m

@@ -103,7 +103,9 @@ static NSString *const MessageHanderName = @"ReactNative";
     _webView.scrollView.bounces = _bounces;
     [_webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew context:nil];
     _webView.allowsBackForwardNavigationGestures = _allowsBackForwardNavigationGestures;
-
+    if (_userAgent) {
+      _webView.customUserAgent = _userAgent;
+    }
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
     if ([_webView.scrollView respondsToSelector:@selector(setContentInsetAdjustmentBehavior:)]) {
       _webView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;

ios/RNCWKWebViewManager.m

@@ -45,6 +45,7 @@ RCT_EXPORT_VIEW_PROPERTY(contentInset, UIEdgeInsets)
 RCT_EXPORT_VIEW_PROPERTY(automaticallyAdjustContentInsets, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(hideKeyboardAccessoryView, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(allowsBackForwardNavigationGestures, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(userAgent, NSString)
 
 /**
  * Expose methods to enable messaging the webview.

js/WebView.ios.js

@@ -271,6 +271,7 @@ class WebView extends React.Component<WebViewSharedProps, State> {
         }
         hideKeyboardAccessoryView={this.props.hideKeyboardAccessoryView}
         allowsBackForwardNavigationGestures={this.props.allowsBackForwardNavigationGestures}
+        userAgent={this.props.userAgent}
         onLoadingStart={this._onLoadingStart}
         onLoadingFinish={this._onLoadingFinish}
         onLoadingError={this._onLoadingError}

js/WebViewTypes.js

@@ -229,6 +229,10 @@ export type IOSWebViewProps = $ReadOnly<{|
    * back-forward list navigations.
    */
   allowsBackForwardNavigationGestures?: ?boolean,
+  /**
+   * The custom user agent string.
+   */
+  userAgent?: ?string,
 |}>;
 
 export type AndroidWebViewProps = $ReadOnly<{|

package.json

@@ -2,12 +2,13 @@
   "name": "react-native-webview",
   "description": "React Native WebView component for iOS, Android, and Windows 10 (coming soon)",
   "main": "index.js",
+  "typings": "typings/index.d.ts",
   "author": "Jamon Holmgren <jamon@infinite.red>",
   "contributors": [
     "Thibault Malbranche <malbranche.thibault@gmail.com>"
   ],
   "license": "MIT",
-  "version": "2.5.0",
+  "version": "2.7.0",
   "homepage": "https://github.com/react-native-community/react-native-webview#readme",
   "scripts": {
     "test:ios:flow": "flow check",
@@ -27,6 +28,8 @@
   },
   "devDependencies": {
     "@semantic-release/git": "7.0.5",
+    "@types/react": "^16.4.18",
+    "@types/react-native": "^0.57.6",
     "flow-bin": "^0.80.0",
     "react-native": "^0.57",
     "semantic-release": "15.10.3"

typings/index.d.ts

@@ -0,0 +1,420 @@
+import { ComponentType, ReactElement, ReactNode, Component } from 'react';
+import { Insets, NativeSyntheticEvent, StyleProp, ViewProps, ViewStyle } from 'react-native';
+
+export interface WebViewNativeEvent {
+  readonly url: string;
+  readonly loading: boolean;
+  readonly title: string;
+  readonly canGoBack: boolean;
+  readonly canGoForward: boolean;
+}
+
+export interface WebViewProgressEvent extends WebViewNativeEvent {
+  readonly progress: number;
+}
+
+export interface WebViewNavigation extends WebViewNativeEvent {
+  readonly navigationType:
+    | 'click'
+    | 'formsubmit'
+    | 'backforward'
+    | 'reload'
+    | 'formresubmit'
+    | 'other';
+}
+
+export interface WebViewMessage extends WebViewNativeEvent {
+  readonly data: string;
+}
+
+export interface WebViewError extends WebViewNativeEvent {
+  readonly domain?: string;
+  readonly code: number;
+  readonly description: string;
+}
+
+export type WebViewEvent = NativeSyntheticEvent<WebViewNativeEvent>;
+
+export type WebViewNavigationEvent = NativeSyntheticEvent<WebViewNavigation>;
+
+export type WebViewMessageEvent = NativeSyntheticEvent<WebViewMessage>;
+
+export type WebViewErrorEvent = NativeSyntheticEvent<WebViewError>;
+
+export type DataDetectorTypes =
+  | 'phoneNumber'
+  | 'link'
+  | 'address'
+  | 'calendarEvent'
+  | 'trackingNumber'
+  | 'flightNumber'
+  | 'lookupSuggestion'
+  | 'none'
+  | 'all';
+
+export type OverScrollModeType = 'always' | 'content' | 'never';
+
+export interface WebViewSourceUri {
+  /**
+   * The URI to load in the `WebView`. Can be a local or remote file.
+   */
+  uri?: string;
+
+  /**
+   * The HTTP Method to use. Defaults to GET if not specified.
+   * NOTE: On Android, only GET and POST are supported.
+   */
+  method?: string;
+
+  /**
+   * Additional HTTP headers to send with the request.
+   * NOTE: On Android, this can only be used with GET requests.
+   */
+  headers?: {[key: string]: string};
+
+  /**
+   * The HTTP body to send with the request. This must be a valid
+   * UTF-8 string, and will be sent exactly as specified, with no
+   * additional encoding (e.g. URL-escaping or base64) applied.
+   * NOTE: On Android, this can only be used with POST requests.
+   */
+  body?: string;
+}
+
+export interface WebViewSourceHtml {
+  /**
+   * A static HTML page to display in the WebView.
+   */
+  html?: string;
+  /**
+   * The base URL to be used for any relative links in the HTML.
+   */
+  baseUrl?: string;
+}
+
+export type WebViewSource = WebViewSourceUri | WebViewSourceHtml;
+
+export interface WebViewNativeConfig {
+  /*
+    * The native component used to render the WebView.
+    */
+  component?: ComponentType<WebViewSharedProps>;
+  /*
+    * Set props directly on the native component WebView. Enables custom props which the
+    * original WebView doesn't pass through.
+    */
+  props?: any;
+  /*
+    * Set the ViewManager to use for communication with the native side.
+    * @platform ios
+    */
+  viewManager?: any;
+}
+
+export interface IOSWebViewProps {
+  /**
+   * If true, use WKWebView instead of UIWebView.
+   * @platform ios
+   */
+  useWebKit?: boolean;
+
+  /**
+   * Boolean value that determines whether the web view bounces
+   * when it reaches the edge of the content. The default value is `true`.
+   * @platform ios
+   */
+  bounces?: boolean;
+
+  /**
+   * A floating-point number that determines how quickly the scroll view
+   * decelerates after the user lifts their finger. You may also use the
+   * string shortcuts `"normal"` and `"fast"` which match the underlying iOS
+   * settings for `UIScrollViewDecelerationRateNormal` and
+   * `UIScrollViewDecelerationRateFast` respectively:
+   *
+   *   - normal: 0.998
+   *   - fast: 0.99 (the default for iOS web view)
+   * @platform ios
+   */
+  decelerationRate?: 'fast' | 'normal' | number;
+
+  /**
+   * Boolean value that determines whether scrolling is enabled in the
+   * `WebView`. The default value is `true`.
+   * @platform ios
+   */
+  scrollEnabled?: 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}.
+   * @platform ios
+   */
+  contentInset?: Insets;
+
+  /**
+   * Determines the types of data converted to clickable URLs in the web view's content.
+   * By default only phone numbers are detected.
+   *
+   * You can provide one type or an array of many types.
+   *
+   * Possible values for `dataDetectorTypes` are:
+   *
+   * - `'phoneNumber'`
+   * - `'link'`
+   * - `'address'`
+   * - `'calendarEvent'`
+   * - `'none'`
+   * - `'all'`
+   *
+   * With the new WebKit implementation, we have three new values:
+   * - `'trackingNumber'`,
+   * - `'flightNumber'`,
+   * - `'lookupSuggestion'`,
+   *
+   * @platform ios
+   */
+  dataDetectorTypes?: DataDetectorTypes | 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: WebViewNativeEvent) => any;
+
+  /**
+   * 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;
+  /**
+   * Hide the accessory view when the keyboard is open. Default is false to be
+   * backward compatible.
+   */
+  hideKeyboardAccessoryView?: boolean;
+}
+
+export interface AndroidWebViewProps {
+  onNavigationStateChange?: (event: WebViewNavigation) => any;
+  onContentSizeChange?: (event: WebViewEvent) => any;
+
+  /**
+   * https://developer.android.com/reference/android/view/View#OVER_SCROLL_NEVER
+   * Sets the overScrollMode. Possible values are:
+   *
+   * - `'always'` (default)
+   * - `'content'`
+   * - `'never'`
+   *
+   * @platform android
+   */
+  overScrollMode?: OverScrollModeType;
+
+  /**
+   * 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;
+
+  /**
+   * Sets whether the webview allow access to file system.
+   * @platform android
+   */
+  allowFileAccess?: 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?: 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`.
+   * @platform android
+   */
+  javaScriptEnabled?: boolean;
+
+  /**
+   * Boolean value to enable third party cookies in the `WebView`. Used on
+   * Android Lollipop and above only as third party cookies are enabled by
+   * default on Android Kitkat and below and on iOS. The default value is `true`.
+   * @platform android
+   */
+  thirdPartyCookiesEnabled?: boolean;
+
+  /**
+   * Boolean value to control whether DOM Storage is enabled. Used only in
+   * Android.
+   * @platform android
+   */
+  domStorageEnabled?: boolean;
+
+  /**
+   * Sets the user-agent for the `WebView`.
+   * @platform android
+   */
+  userAgent?: 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';
+}
+
+export interface WebViewSharedProps extends ViewProps, IOSWebViewProps, AndroidWebViewProps {
+  /**
+   * @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 | undefined, errorCode: number, errorDesc: string) => ReactElement<any>; // view to show if there's an error
+
+  /**
+   * Function that returns a loading indicator.
+   */
+  renderLoading?: () => ReactElement<any>;
+
+  /**
+   * Function that is invoked when the `WebView` has finished loading.
+   */
+  onLoad?: (event: WebViewNavigationEvent) => any;
+
+  /**
+   * Function that is invoked when the `WebView` load succeeds or fails.
+   */
+  onLoadEnd?: (event: WebViewNavigationEvent | WebViewErrorEvent) => any;
+
+  /**
+   * Function that is invoked when the `WebView` starts loading.
+   */
+  onLoadStart?: (event: WebViewNavigationEvent) => any;
+
+  /**
+   * Function that is invoked when the `WebView` load fails.
+   */
+  onError?: (event: WebViewErrorEvent) => any;
+
+  /**
+   * 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) => any;
+
+  /**
+   * 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) => any;
+
+  /**
+   * Function that is invoked when the `WebView` is loading.
+   */
+  onLoadProgress?: (event: NativeSyntheticEvent<WebViewProgressEvent>) => any;
+
+  /**
+   * Boolean value that forces the `WebView` to show the loading view
+   * on the first load.
+   */
+  startInLoadingState?: string;
+
+  /**
+   * 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`.
+   *
+   * On iOS, when `useWebKit=true`, this prop will not work.
+   */
+  scalesPageToFit?: boolean;
+
+  /**
+   * Boolean that determines whether HTML5 audio and video requires the user
+   * to tap them before they start playing. The default value is `true`.
+   */
+  mediaPlaybackRequiresUserAction?: boolean;
+
+  /**
+   * List of origin strings to allow being navigated to. The strings allow
+   * wildcards and get matched against *just* the origin (not the full URL).
+   * If the user taps to navigate to a new page but the new page is not in
+   * this whitelist, we will open the URL in Safari.
+   * The default whitelisted origins are "http://*" and "https://*".
+   */
+  originWhitelist?: string[];
+
+  /**
+   * Override the native component used to render the WebView. Enables a custom native
+   * WebView which uses the same JavaScript as the original WebView.
+   */
+  nativeConfig?: WebViewNativeConfig;
+
+  style?: StyleProp<ViewStyle>;
+  children?: ReactNode;
+}
+
+export class WebView extends Component<WebViewSharedProps> {
+  public goForward: () => void;
+  public goBack: () => void;
+  public reload: () => void;
+  public stopLoading: () => void;
+}

yarn.lock

@@ -739,6 +739,24 @@
     into-stream "^4.0.0"
     lodash "^4.17.4"
 
+"@types/prop-types@*":
+  version "15.5.6"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.6.tgz#9c03d3fed70a8d517c191b7734da2879b50ca26c"
+
+"@types/react-native@^0.57.6":
+  version "0.57.6"
+  resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.57.6.tgz#b53afeebcb19f7ba353f0937b6778d39c2cf10d0"
+  dependencies:
+    "@types/prop-types" "*"
+    "@types/react" "*"
+
+"@types/react@*", "@types/react@^16.4.18":
+  version "16.4.18"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.4.18.tgz#2e28a2e7f92d3fa7d6a65f2b73275c3e3138a13d"
+  dependencies:
+    "@types/prop-types" "*"
+    csstype "^2.2.0"
+
 JSONStream@^1.0.4, JSONStream@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
@@ -2082,6 +2100,10 @@ crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
 
+csstype@^2.2.0:
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.5.7.tgz#bf9235d5872141eccfb2d16d82993c6b149179ff"
+
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"