iOS fixes

Author: erezrokah

ios/FirebaseUIImageView.m

@@ -12,18 +12,22 @@
 #import "UIImageView+FirebaseStorage.h"
 
 @implementation FirebaseImageView
+{
+    BOOL _needsReload;
+}
 
 - (void)setPath:(NSString *)path
 {
     _path = path;
 
-    [self reloadImage];
+    _needsReload = YES;
 }
 
 -(void)setTimestamp:(NSNumber*)timestamp
 {
     _timestamp = timestamp;
-    [self reloadImage];
+
+    _needsReload = YES;
 }
 
 - (void)setResizeMode:(RCTResizeMode)resizeMode
@@ -43,8 +47,16 @@ - (void)setResizeMode:(RCTResizeMode)resizeMode
     }
 }
 
+- (void)didSetProps:(NSArray<NSString *> *)changedProps
+{
+    if (_needsReload) {
+        [self reloadImage];
+    }
+}
+
 -(void)reloadImage
 {
+    _needsReload = NO;
     // Reference to an image file in Firebase Storage
     FIRStorageReference *reference = [[FIRStorage storage] referenceWithPath:_path];
 

ios/UIImageView+FirebaseStorage.h

@@ -15,7 +15,7 @@
 //
 
 @import UIKit;
-
+#import <UIKit/UIKit.h>
 #import <FirebaseStorage/FirebaseStorage.h>
 #import <SDWebImage/UIImageView+WebCache.h>
 #import <SDWebImage/UIImage+MultiFormat.h>

ios/UIImageView+FirebaseStorage.m

@@ -117,7 +117,12 @@ - (FIRStorageDownloadTask *)sd_setImageWithStorageReference:(FIRStorageReference
   self.image = placeholder;
 
   // Query cache for image before trying to download
-  NSString *key = [storageRef.fullPath stringByAppendingString:customKey];
+  NSString *key = nil;
+  if (customKey != nil) {
+    key = [storageRef.fullPath stringByAppendingString:customKey];
+  } else {
+    key = storageRef.fullPath;
+  }
   UIImage *cached = nil;
 
   cached = [cache imageFromMemoryCacheForKey:key];
@@ -148,7 +153,7 @@ - (FIRStorageDownloadTask *)sd_setImageWithStorageReference:(FIRStorageReference
         self.image = image;
 
         // Cache downloaded image
-        [cache storeImage:image forKey:storageRef.fullPath completion:nil];
+        [cache storeImage:image forKey:key completion:nil];
 
         if (completion != nil) {
           completion(image, nil, SDImageCacheTypeNone, storageRef);