Bläddra i källkod

Merge branch 'master' into ci/detox

Jamon Holmgren 4 år sedan
förälder
incheckning
486a0d92b2
3 ändrade filer med 8 tillägg och 2 borttagningar
  1. 2
    0
      index.d.ts
  2. 1
    1
      ios/RNCWebView.m
  3. 5
    1
      package.json

+ 2
- 0
index.d.ts Visa fil

@@ -2,6 +2,8 @@ import { Component } from 'react';
2 2
 // eslint-disable-next-line
3 3
 import { IOSWebViewProps, AndroidWebViewProps } from './lib/WebViewTypes';
4 4
 
5
+export { WebViewMessageEvent, WebViewNavigation } from "./lib/WebViewTypes";
6
+
5 7
 export type WebViewProps = IOSWebViewProps & AndroidWebViewProps;
6 8
 
7 9
 declare class WebView extends Component<WebViewProps> {

+ 1
- 1
ios/RNCWebView.m Visa fil

@@ -438,7 +438,7 @@ static NSURLCredential* clientAuthenticationCredential;
438 438
         [_webView loadRequest:request];
439 439
     }
440 440
     else {
441
-        NSURL* readAccessUrl = _allowingReadAccessToURL ? [NSURL URLWithString:_allowingReadAccessToURL] : request.URL;
441
+        NSURL* readAccessUrl = _allowingReadAccessToURL ? [RCTConvert NSURL:_allowingReadAccessToURL] : request.URL;
442 442
         [_webView loadFileURL:request.URL allowingReadAccessToURL:readAccessUrl];
443 443
     }
444 444
 }

+ 5
- 1
package.json Visa fil

@@ -8,7 +8,7 @@
8 8
     "Thibault Malbranche <malbranche.thibault@gmail.com>"
9 9
   ],
10 10
   "license": "MIT",
11
-  "version": "7.0.3",
11
+  "version": "7.0.5",
12 12
   "homepage": "https://github.com/react-native-community/react-native-webview#readme",
13 13
   "scripts": {
14 14
     "ci": "CI=true && yarn lint && yarn test",
@@ -21,6 +21,10 @@
21 21
     "prepare": "yarn build",
22 22
     "test": "yarn jest"
23 23
   },
24
+  "rn-docs": {
25
+    "title": "Webview",
26
+    "type": "Component"
27
+  },
24 28
   "peerDependencies": {
25 29
     "react": "^16.0",
26 30
     "react-native": ">=0.60 <0.62"