[WEEX-598][iOS] slider component can not request gesture stoppropagat…

…ion (#1478)
apache · Aug 27, 2018 · bd0789a · bd0789a
1 parent a797740
commit bd0789a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.h b/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.h
@@ -27,3 +27,6 @@
 - (void)setIndicatorView:(WXIndicatorView *)indicatorView;
 
 @end
+@interface WXRecycleSliderScrollView: UIScrollView
+@end
+
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.mm b/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.mm
@@ -24,6 +24,7 @@
 #import "WXSDKManager.h"
 #import "WXUtility.h"
 #import "WXComponent+Layout.h"
+#import "WXComponent+Events.h"
 
 typedef NS_ENUM(NSInteger, Direction) {
     DirectionNone = 1 << 0,
@@ -40,15 +41,16 @@ - (void)recycleSliderView:(WXRecycleSliderView *)recycleSliderView didScroll:(UI
 - (void)recycleSliderView:(WXRecycleSliderView *)recycleSliderView didScrollToItemAtIndex:(NSInteger)index;
 - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView;
 - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate;
+- (BOOL)requestGestureShouldStopPropagation:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch;
 
 @end
 
+
 @interface WXRecycleSliderView : UIView <UIScrollViewDelegate>
 
 @property (nonatomic, strong) WXIndicatorView *indicator;
 @property (nonatomic, weak) id<WXRecycleSliderViewDelegate> delegate;
-
-@property (nonatomic, strong) UIScrollView *scrollView;
+@property (nonatomic, strong) WXRecycleSliderScrollView *scrollView;
 @property (nonatomic, strong) NSMutableArray *itemViews;
 @property (nonatomic, assign) Direction direction;
 @property (nonatomic, assign) NSInteger currentIndex;
@@ -70,7 +72,7 @@ - (id)initWithFrame:(CGRect)frame
     if (self) {
         _currentIndex = 0;
         _itemViews = [[NSMutableArray alloc] init];
-        _scrollView = [[UIScrollView alloc] init];
+        _scrollView = [[WXRecycleSliderScrollView alloc] init];
         _scrollView.backgroundColor = [UIColor clearColor];
         _scrollView.delegate = self;
         _scrollView.showsHorizontalScrollIndicator = NO;
@@ -256,7 +258,6 @@ - (void)nextPage {
 
 - (void)lastPage
 {
-
     NSInteger lastIndex = [self currentIndex]-1;
     if (_itemViews.count > 1) {
         if (_infinite) {
@@ -589,6 +590,11 @@ - (void)removeEvent:(NSString *)eventName
     }
 }
 
+- (BOOL)requestGestureShouldStopPropagation:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch
+{
+    return [self gestureShouldStopPropagation:gestureRecognizer shouldReceiveTouch:touch];
+}
+
 #pragma mark WXIndicatorComponentDelegate Methods
 
 -(void)setIndicatorView:(WXIndicatorView *)indicatorView
@@ -680,3 +686,17 @@ - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL
 }
 
 @end
+
+@implementation WXRecycleSliderScrollView
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch
+{
+    WXRecycleSliderView *view = (WXRecycleSliderView *)self.delegate;
+    if ([(id <WXRecycleSliderViewDelegate>) view.wx_component respondsToSelector:@selector(requestGestureShouldStopPropagation:shouldReceiveTouch:)]) {
+        return [(id <WXRecycleSliderViewDelegate>) view.wx_component requestGestureShouldStopPropagation:gestureRecognizer shouldReceiveTouch:touch];
+    }
+    else{
+        return YES;
+    }
+}
+@end
+
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.mm b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.mm
@@ -191,7 +191,7 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     [self setContentSize:_contentSize];
-    WXScrollerComponentView* scrollView = (WXScrollerComponentView *)self.view;
+    WXScrollerComponentView *scrollView = (WXScrollerComponentView *)self.view;
     scrollView.delegate = self;
     scrollView.exclusiveTouch = YES;
     scrollView.autoresizesSubviews = NO;