Updated api to use source property like in react 0.21

Author: joknelid

AQWebView.ios.js

@@ -1,5 +1,8 @@
 var React = require('react-native');
-var { requireNativeComponent } = React;
+var {
+  requireNativeComponent,
+  PropTypes
+} = React;
 
 class WKWebView extends React.Component {
   render() {
@@ -8,20 +11,29 @@ class WKWebView extends React.Component {
 }
 
 WKWebView.propTypes = {
-  url: React.PropTypes.string,
-  baseURL: React.PropTypes.string,
-  html: React.PropTypes.string,
+  source: PropTypes.oneOfType([
+    PropTypes.shape({
+      uri: PropTypes.string,
+      method: PropTypes.string,
+      headers: PropTypes.object,
+      body: PropTypes.string,
+    }),
+    PropTypes.shape({
+      html: PropTypes.string,
+      baseUrl: PropTypes.string,
+    }),
+  ]),
 
-  onLoadingStart: React.PropTypes.func,
-  onLoadingFinish: React.PropTypes.func,
-  onLoadingError: React.PropTypes.func,
+  onLoadingStart: PropTypes.func,
+  onLoadingFinish: PropTypes.func,
+  onLoadingError: PropTypes.func,
 
-  automaticallyAdjustContentInsets: React.PropTypes.bool,
-  contentInset: React.PropTypes.shape({
-    top: React.PropTypes.number,
-    left: React.PropTypes.number,
-    bottom: React.PropTypes.number,
-    right: React.PropTypes.number
+  automaticallyAdjustContentInsets: PropTypes.bool,
+  contentInset: PropTypes.shape({
+    top: PropTypes.number,
+    left: PropTypes.number,
+    bottom: PropTypes.number,
+    right: PropTypes.number
   }),
 };
 

AQWebView/AQWebView.h

@@ -2,11 +2,9 @@
 
 @interface AQWebView : RCTView
 
-@property (nonatomic, strong) NSURL *URL;
 @property (nonatomic, assign) UIEdgeInsets contentInset;
 @property (nonatomic, assign) BOOL automaticallyAdjustContentInsets;
-@property (nonatomic, strong) NSString *html;
-@property (nonatomic, assign) NSString *baseURL;
+@property (nonatomic, copy) NSDictionary *source;
 
 - (void)reload;
 

AQWebView/AQWebView.m

@@ -2,6 +2,7 @@
 #import <UIKit/UIKit.h>
 #import "AQWebView.h"
 #import "RCTAutoInsetsProtocol.h"
+#import "RCTConvert.h"
 
 // lots of code from https://github.com/facebook/react-native/blob/master/React/Views/RCTWebView.m
 
@@ -66,19 +67,34 @@ - (void)reload
   [_webView loadRequest:[NSURLRequest requestWithURL:_webView.URL]];
 }
 
-- (NSURL *)URL
+- (void)setSource:(NSDictionary *)source
 {
-  return _webView.URL;
-}
-
-- (void)setURL:(NSURL *)URL
-{
-  [_webView loadRequest:[NSURLRequest requestWithURL:URL]];
-}
-
-- (void)setHtml:(NSString *)html
-{
-  [_webView loadHTMLString:html baseURL:[NSURL URLWithString:_baseURL]];
+  if (![_source isEqualToDictionary:source]) {
+    _source = [source copy];
+    
+    // Check for a static html source first
+    NSString *html = [RCTConvert NSString:source[@"html"]];
+    if (html) {
+      NSURL *baseURL = [RCTConvert NSURL:source[@"baseUrl"]];
+      [_webView loadHTMLString:html baseURL:baseURL];
+      return;
+    }
+    
+    NSURLRequest *request = [RCTConvert NSURLRequest:source];
+    // Because of the way React works, as pages redirect, we actually end up
+    // passing the redirect urls back here, so we ignore them if trying to load
+    // the same url. We'll expose a call to 'reload' to allow a user to load
+    // the existing page.
+    if ([request.URL isEqual:_webView.URL]) {
+      return;
+    }
+    if (!request.URL) {
+      // Clear the webview
+      [_webView loadHTMLString:@"" baseURL:nil];
+      return;
+    }
+    [_webView loadRequest:request];
+  }
 }
 
 - (void)layoutSubviews

AQWebView/AQWebViewManager.m

@@ -16,14 +16,12 @@ - (UIView *) view
     return [[AQWebView alloc] init];
 }
 
-RCT_REMAP_VIEW_PROPERTY(url, URL, NSURL);
 RCT_EXPORT_VIEW_PROPERTY(contentInset, UIEdgeInsets);
 RCT_EXPORT_VIEW_PROPERTY(automaticallyAdjustContentInsets, BOOL);
-RCT_EXPORT_VIEW_PROPERTY(html, NSString*);
-RCT_EXPORT_VIEW_PROPERTY(baseURL, NSString*);
 RCT_EXPORT_VIEW_PROPERTY(onLoadingStart, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onLoadingFinish, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onLoadingError, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(source, NSDictionary)
 
 RCT_EXPORT_METHOD(reload:(nonnull NSNumber *)reactTag)
 {