Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

* [ios] fix bug that horizontalpan and verticalpan can not trigger si… #2202

Merged
merged 1 commit into from Jan 10, 2017
Merged

* [ios] fix bug that horizontalpan and verticalpan can not trigger si… #2202

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 19 additions & 6 deletions ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
View file
Open in desktop
Expand Up @@ -440,22 +440,35 @@ - (void)onPan:(UIPanGestureRecognizer *)gesture
NSDictionary *resultTouch = [self touchResultWithScreenLocation:screenLocation pageLocation:pageLoacation identifier:gesture.wx_identifier];

if (gesture.state == UIGestureRecognizerStateBegan) {
eventName = @"panstart";
if (_listenPanStart) {
eventName = @"panstart";
}
state = @"start";
} else if (gesture.state == UIGestureRecognizerStateEnded) {
eventName = @"panend";
if (_listenPanEnd) {
eventName = @"panend";
}
state = @"end";
gesture.wx_identifier = nil;
} else if (gesture.state == UIGestureRecognizerStateChanged) {
eventName = @"panmove";
if (_listenPanMove) {
eventName = @"panmove";
}
state = @"move";
}

if (_listenHorizontalPan) {

CGPoint translation = [_panGesture translationInView:self.view];

if (_listenHorizontalPan && fabs(translation.y) <= fabs(translation.x)) {
[self fireEvent:@"horizontalpan" params:@{@"state":state, @"changedTouches":resultTouch ? @[resultTouch] : @[]}];
} else if (_listenVerticalPan) {
}

if (_listenVerticalPan && fabs(translation.y) > fabs(translation.x)) {
[self fireEvent:@"verticalpan" params:@{@"state":state, @"changedTouches":resultTouch ? @[resultTouch] : @[]}];
} else if (eventName) {
}

if (eventName) {
[self fireEvent:eventName params:@{@"changedTouches":resultTouch ? @[resultTouch] : @[]}];
}
}
Expand Down