From 3154b51d76ad91f29ef44750c9df6f352405cfc4 Mon Sep 17 00:00:00 2001 From: Donkey-Kurt <381890216@qq.com> Date: Wed, 24 Jan 2018 10:47:40 +0800 Subject: [PATCH 1/2] add missing props for android webview adding mixedContentMode?: "never" | "always" | "compatibility"; http://facebook.github.io/react-native/docs/webview.html#mixedcontentmode --- types/react-native/index.d.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts index 78b1d421d4..d269517aa6 100644 --- a/types/react-native/index.d.ts +++ b/types/react-native/index.d.ts @@ -1945,6 +1945,15 @@ export interface WebViewPropertiesAndroid { * Sets the user-agent for the WebView. */ 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. + */ + mixedContentMode?: "never" | "always" | "compatibility"; } export interface WebViewIOSLoadRequestEvent { From f6099e4f9835521a142391711089a5bea7ee3fc2 Mon Sep 17 00:00:00 2001 From: Donkey-Kurt <381890216@qq.com> Date: Wed, 24 Jan 2018 11:05:58 +0800 Subject: [PATCH 2/2] fix trailing whitespace fix trailing whitespace --- types/react-native/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts index d269517aa6..28f26c8ec8 100644 --- a/types/react-native/index.d.ts +++ b/types/react-native/index.d.ts @@ -1945,7 +1945,7 @@ export interface WebViewPropertiesAndroid { * Sets the user-agent for the WebView. */ 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: