RN: Consistent API for Image Events

Summary:
Changes the `onLoad` and `onError` events on `Image` to be consistent with each other and with the `ImageSource` type.

Changelog:
[Android][Breaking] - On `Image`, `onLoad` and `onError` event objects will no longer have an extra `uri` property.
[Android][Breaking] - On `Image`, `onLoad` event objects' `source.url` is now renamed to `source.uri`.
[iOS][Breaking] - On `Image`, `onLoad` event objects' `source.url` is now renamed to `source.uri`.

Reviewed By: mdvacca

Differential Revision: D22023565

fbshipit-source-id: 5ea7904c697f87e01118bdb81ed50ab0a5aecdce

Libraries/Image/ImageProps.js

@@ -21,9 +21,8 @@ export type ImageLoadEvent = SyntheticEvent<
     source: $ReadOnly<{|
       width: number,
       height: number,
-      url: string,
+      uri: string,
     |}>,
-    uri?: string, // Only on Android
   |}>,
 >;
 

Libraries/Image/RCTImageView.mm

@@ -41,9 +41,9 @@ static BOOL RCTShouldReloadImageForSizeChange(CGSize currentSize, CGSize idealSi
 static NSDictionary *onLoadParamsForSource(RCTImageSource *source)
 {
   NSDictionary *dict = @{
+    @"uri": source.request.URL.absoluteString,
     @"width": @(source.size.width),
     @"height": @(source.size.height),
-    @"url": source.request.URL.absoluteString,
   };
   return @{ @"source": dict };
 }

RNTester/js/examples/Image/ImageExample.js

@@ -76,7 +76,7 @@ class NetworkImageCallbackExample extends React.Component<
           }
           onLoad={event => {
             if (event.nativeEvent.source) {
-              const url = event.nativeEvent.source.url;
+              const url = event.nativeEvent.source.uri;
               this._loadEventFired(
                 `✔ onLoad (+${new Date() - mountTime}ms) for URL ${url}`,
               );
@@ -127,7 +127,7 @@ class NetworkImageCallbackExample extends React.Component<
             onLoad={event => {
               // Currently this image source feature is only available on iOS.
               if (event.nativeEvent.source) {
-                const url = event.nativeEvent.source.url;
+                const url = event.nativeEvent.source.uri;
                 this._loadEventFired(
                   `✔ (prefetched) onLoad (+${new Date() -
                     mountTime}ms) for URL ${url}`,

ReactAndroid/src/main/java/com/facebook/react/views/image/ImageLoadEvent.java

@@ -107,14 +107,10 @@ public void dispatch(RCTEventEmitter rctEventEmitter) {
     switch (mEventType) {
       case ON_LOAD:
         eventData = Arguments.createMap();
-        // TODO: Remove this (to be less redundant and to be consistent with iOS).
-        eventData.putString("uri", mSourceUri);
         eventData.putMap("source", createEventDataSource());
         break;
       case ON_ERROR:
         eventData = Arguments.createMap();
-        // TODO: Remove this (to be less redundant and to be consistent with iOS).
-        eventData.putString("uri", mSourceUri);
         eventData.putString("error", mErrorMessage);
         break;
     }
@@ -124,9 +120,9 @@ public void dispatch(RCTEventEmitter rctEventEmitter) {
 
   private WritableMap createEventDataSource() {
     WritableMap source = Arguments.createMap();
+    source.putString("uri", mSourceUri);
     source.putDouble("width", mWidth);
     source.putDouble("height", mHeight);
-    source.putString("url", mSourceUri);
     return source;
   }
 }