@nativescript-community/gesturehandler 2.0.40 → 2.0.41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +2 -2
  2. package/platforms/ios/src/GestureHandler.m +6 -6
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nativescript-community/gesturehandler",
3
- "version": "2.0.40",
3
+ "version": "2.0.41",
4
4
  "description": "Declarative API exposing platform native touch and gesture system to NativeScript.",
5
5
  "main": "gesturehandler",
6
6
  "sideEffects": false,
@@ -48,5 +48,5 @@
48
48
  "dependencies": {
49
49
  "@nativescript-community/observable": "^2.0.10"
50
50
  },
51
- "gitHead": "52322c9b6c551781c5c1e7a43aca6c92a761a6bd"
51
+ "gitHead": "12c775420bcc35c5485e9ad60b37a2fcd099c431"
52
52
  }
package/platforms/ios/src/GestureHandler.m CHANGED
@@ -292,18 +292,18 @@ shouldRequireFailureOfGestureRecognizer:(UIGestureRecognizer *)otherGestureRecog
292
292
  - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
293
293
  shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
294
294
  {
295
- if (gestureRecognizer.view == otherGestureRecognizer.view && gestureRecognizer.allowSameViewGestures) {
296
- return YES;
297
- }
298
295
  if (gestureRecognizer.view == otherGestureRecognizer.view && [gestureRecognizer isKindOfClass:[UISwipeGestureRecognizer class]] && [otherGestureRecognizer isKindOfClass:[UISwipeGestureRecognizer class]]) {
299
296
  return YES;
300
297
  }
301
298
  if (_recognizer.state == UIGestureRecognizerStateBegan && _recognizer.state == UIGestureRecognizerStatePossible) {
302
299
  return YES;
303
300
  }
304
- if ([_simultaneousHandlers count]) {
305
- GestureHandler *handler = [GestureHandler findGestureHandlerByRecognizer:otherGestureRecognizer];
306
- if (handler != nil) {
301
+ GestureHandler *handler = [GestureHandler findGestureHandlerByRecognizer:otherGestureRecognizer];
302
+ if (handler != nil) {
303
+ if (gestureRecognizer.view == otherGestureRecognizer.view && (_allowSameViewGestures || handler.allowSameViewGestures)) {
304
+ return YES;
305
+ }
306
+ if ([_simultaneousHandlers count]) {
307
307
  for (NSNumber *handlerTag in _simultaneousHandlers) {
308
308
  if ([handler.tag isEqual:handlerTag]) {
309
309
  return YES;