Added support for local image to RCTImageLoader

Libraries/Image/RCTImageLoader.h

@@ -15,6 +15,7 @@
 @interface RCTImageLoader : NSObject
 
 + (ALAssetsLibrary *)assetsLibrary;
-+ (void)loadImageWithTag:(NSString *)tag callback:(void (^)(NSError *error, UIImage *image))callback;
++ (void)loadImageWithTag:(NSString *)tag
+                callback:(void (^)(NSError *error, id /* UIImage or CAAnimation */ image))callback;
 
 @end

Libraries/Image/RCTImageLoader.m

@@ -16,6 +16,7 @@
 #import <UIKit/UIKit.h>
 
 #import "RCTConvert.h"
+#import "RCTGIFImage.h"
 #import "RCTImageDownloader.h"
 #import "RCTLog.h"
 
@@ -51,7 +52,7 @@ NSError *errorWithMessage(NSString *message)
   return assetsLibrary;
 }
 
-+ (void)loadImageWithTag:(NSString *)imageTag callback:(void (^)(NSError *error, UIImage *image))callback
++ (void)loadImageWithTag:(NSString *)imageTag callback:(void (^)(NSError *error, id image))callback
 {
   if ([imageTag hasPrefix:@"assets-library"]) {
     [[RCTImageLoader assetsLibrary] assetForURL:[NSURL URLWithString:imageTag] resultBlock:^(ALAsset *asset) {
@@ -119,10 +120,24 @@ NSError *errorWithMessage(NSString *message)
         callback(nil, [UIImage imageWithData:data]);
       }
     }];
+  } else if ([[imageTag pathExtension] caseInsensitiveCompare:@"gif"] == NSOrderedSame) {
+    id image = RCTGIFImageWithFileURL([RCTConvert NSURL:imageTag]);
+    if (image) {
+      callback(nil, image);
+    } else {
+      NSString *errorMessage = [NSString stringWithFormat:@"Unable to load GIF image: %@", imageTag];
+      NSError *error = errorWithMessage(errorMessage);
+      callback(error, nil);
+    }
   } else {
-    NSString *errorMessage = [NSString stringWithFormat:@"Unrecognized tag protocol: %@", imageTag];
-    NSError *error = errorWithMessage(errorMessage);
-    callback(error, nil);
+    UIImage *image = [RCTConvert UIImage:imageTag];
+    if (image) {
+      callback(nil, image);
+    } else {
+      NSString *errorMessage = [NSString stringWithFormat:@"Unrecognized tag protocol: %@", imageTag];
+      NSError *error = errorWithMessage(errorMessage);
+      callback(error, nil);
+    }
   }
 }
 

Libraries/Image/RCTStaticImageManager.m

@@ -33,9 +33,11 @@ RCT_CUSTOM_VIEW_PROPERTY(src, NSURL, RCTStaticImage)
     if ([[[json description] pathExtension] caseInsensitiveCompare:@"gif"] == NSOrderedSame) {
       [view.layer addAnimation:RCTGIFImageWithFileURL([RCTConvert NSURL:json]) forKey:@"contents"];
     } else {
+      [view.layer removeAnimationForKey:@"contents"];
       view.image = [RCTConvert UIImage:json];
     }
   } else {
+    [view.layer removeAnimationForKey:@"contents"];
     view.image = defaultView.image;
   }
 }
@@ -52,13 +54,19 @@ RCT_CUSTOM_VIEW_PROPERTY(tintColor, UIColor, RCTStaticImage)
 RCT_CUSTOM_VIEW_PROPERTY(imageTag, NSString, RCTStaticImage)
 {
   if (json) {
-    [RCTImageLoader loadImageWithTag:[RCTConvert NSString:json] callback:^(NSError *error, UIImage *image) {
+    [RCTImageLoader loadImageWithTag:[RCTConvert NSString:json] callback:^(NSError *error, id image) {
       if (error) {
         RCTLogWarn(@"%@", error.localizedDescription);
       }
-      view.image = image;
+      if ([image isKindOfClass:[CAAnimation class]]) {
+        [view.layer addAnimation:image forKey:@"contents"];
+      } else {
+        [view.layer removeAnimationForKey:@"contents"];
+        view.image = image;
+      }
     }];
   } else {
+    [view.layer removeAnimationForKey:@"contents"];
     view.image = defaultView.image;
   }
 }