Fix onLoad and onError on iOS.

dream-sports-labs · Apr 18, 2017 · e98bacc · e98bacc
1 parent a891bcf
commit e98bacc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/FastImage.js b/FastImage.js
@@ -44,6 +44,8 @@ const FastImageSourcePropType = PropTypes.shape({
 FastImage.propTypes = {
   ...View.propTypes,
   source: FastImageSourcePropType,
+  onFastImageError: PropTypes.func,
+  onFastImageLoad: PropTypes.func,
 }
 
 FastImage.defaultProps = {
@@ -53,7 +55,7 @@ FastImage.defaultProps = {
 }
 
 const FastImageView = requireNativeComponent('FastImageView', FastImage, {
-  nativeOnly: { onError: true, onLoad: true },
+  nativeOnly: { onFastImageError: true, onFastImageLoad: true },
 })
 
 export default FastImage
diff --git a/ios/FastImage/FFFastImageView.h b/ios/FastImage/FFFastImageView.h
@@ -9,8 +9,8 @@
 
 @interface FFFastImageView : UIImageView
 
-@property(nonatomic, copy) RCTDirectEventBlock onError;
-@property(nonatomic, copy) RCTDirectEventBlock onLoad;
+@property(nonatomic, copy) RCTDirectEventBlock onFastImageError;
+@property(nonatomic, copy) RCTDirectEventBlock onFastImageLoad;
 @property(nonatomic, assign) RCTResizeMode resizeMode;
 @property(nonatomic, strong) FFFastImageSource *source;
 

diff --git a/ios/FastImage/FFFastImageView.m b/ios/FastImage/FFFastImageView.m
@@ -42,12 +42,12 @@ - (void)setSource:(FFFastImageSource *)source {
                                    SDImageCacheType cacheType,
                                    NSURL *imageURL) {
                            if (error) {
-                             if (_onError) {
-                               _onError(@{});
+                             if (_onFastImageError) {
+                               _onFastImageError(@{});
                              }
                            } else {
-                             if (_onLoad) {
-                               _onLoad(@{});
+                             if (_onFastImageLoad) {
+                               _onFastImageLoad(@{});
                              }
                            }
                        }];

diff --git a/ios/FastImage/FFFastImageViewManager.m b/ios/FastImage/FFFastImageViewManager.m
@@ -14,7 +14,7 @@ - (FFFastImageView*)view {
 
 RCT_EXPORT_VIEW_PROPERTY(source, FFFastImageSource);
 RCT_EXPORT_VIEW_PROPERTY(resizeMode, RCTResizeMode);
-RCT_EXPORT_VIEW_PROPERTY(onError, RCTDirectEventBlock);
-RCT_EXPORT_VIEW_PROPERTY(onLoad, RCTDirectEventBlock);
+RCT_EXPORT_VIEW_PROPERTY(onFastImageError, RCTDirectEventBlock);
+RCT_EXPORT_VIEW_PROPERTY(onFastImageLoad, RCTDirectEventBlock);
 
 @end