Finish iOS

moonjava2005 · May 23, 2019 · b8a2d9f · b8a2d9f
1 parent 756252d
commit b8a2d9f
Show file tree

Hide file tree

Showing 9 changed files with 97 additions and 185 deletions.
diff --git a/PhotoView.ios.js b/PhotoView.ios.js
@@ -45,10 +45,6 @@ export default class PhotoView extends Component {
             console.warn('source.uri should not be an empty string');
         }
 
-        if (this.props.src) {
-            console.warn('The <PhotoView> component requires a `source` property rather than `src`.');
-        }
-
         if (source && source.uri) {
             var {onLoadStart, onLoad, onLoadEnd, onProgress, onTap, onViewTap, onScale, ...props} = this.props;
 
@@ -61,7 +57,7 @@ export default class PhotoView extends Component {
                 onPhotoViewerViewTap: onViewTap,
                 onPhotoViewerScale: onScale,
                 ...props,
-                src: source,
+                source,
                 loadingIndicatorSrc: loadingIndicatorSource ? loadingIndicatorSource.uri : null,
             };
 
@@ -80,9 +76,9 @@ var cfg = {
         onPhotoViewerTap: true,
         onPhotoViewerViewTap: true,
         onPhotoViewerScale: true,
-        src: true,
+        source: true,
         loadingIndicatorSrc: true
     }
 };
 
-const RNPhotoView = requireNativeComponent('RNPhotoView', PhotoView, cfg);
+const RNPhotoView = requireNativeComponent('RNPinchZoomImage', PhotoView, cfg);
diff --git a/ios/MWTapDetectingFastImageView.h b/ios/MWTapDetectingFastImageView.h
diff --git a/ios/MWTapDetectingFastImageView.m b/ios/MWTapDetectingFastImageView.m
diff --git a/ios/MWTapDetectingImageView.h b/ios/MWTapDetectingImageView.h
@@ -8,10 +8,11 @@
 
 #import <UIKit/UIKit.h>
 #import <Foundation/Foundation.h>
+#import <react-native-fast-image/FFFastImageView.h>
 
 @protocol MWTapDetectingImageViewDelegate;
 
-@interface MWTapDetectingImageView : UIImageView {}
+@interface MWTapDetectingImageView : FFFastImageView {}
 
 @property (nonatomic, weak) id <MWTapDetectingImageViewDelegate> tapDelegate;
 

diff --git a/ios/MWTapDetectingImageView.m b/ios/MWTapDetectingImageView.m
@@ -10,6 +10,13 @@
 
 @implementation MWTapDetectingImageView
 
+- (id)init {
+    if ((self = [super init])) {
+        self.userInteractionEnabled = YES;
+    }
+    return self;
+}
+
 - (id)initWithFrame:(CGRect)frame {
 	if ((self = [super initWithFrame:frame])) {
 		self.userInteractionEnabled = YES;

diff --git a/ios/RNPhotoView.h b/ios/RNPhotoView.h
@@ -2,21 +2,20 @@
 #import <React/RCTComponent.h>
 #import "MWTapDetectingImageView.h"
 #import "MWTapDetectingView.h"
+#import <react-native-fast-image/FFFastImageSource.h>
 
 @class RCTBridge;
 
 @interface RNPhotoView : UIScrollView <UIScrollViewDelegate, MWTapDetectingImageViewDelegate, MWTapDetectingViewDelegate>
 
 #pragma mark - Data
 
-@property (nonatomic, strong) NSDictionary *source;
-@property (nonatomic, strong) NSDictionary *src;
+@property (nonatomic, strong) FFFastImageSource *source;
 @property (nonatomic, strong) NSString *loadingIndicatorSrc;
 @property (nonatomic, assign) NSInteger scale;
 @property (nonatomic, assign) CGFloat minZoomScale;
 @property (nonatomic, assign) CGFloat maxZoomScale;
 @property (nonatomic, assign) BOOL autoAdjustContentInset;
-
 #pragma mark - Block
 
 @property (nonatomic, copy) RCTDirectEventBlock onPhotoViewerScale;