Merge remote-tracking branch 'origin/master'

farfromrefug · farfromrefug · commit 5ec9e5f0f068 · 2024-02-23T21:36:54.000+01:00
# Conflicts:
#	yarn.lock
diff --git a/.gitignore b/.gitignore
@@ -43,8 +43,10 @@ packages/**/*.d.ts
 bin
 build
 Pods
-!packages/platforms
+!packages/*/platforms
 /packages/**/*.aar
+/packages/**/*.framework
+/packages/**/*.xcframework
 /demo-snippets/**/*.aar
 *.xcuserdatad
 /packages/README.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.26](https://github.com/nativescript-community/gesturehandler/compare/v2.0.25...v2.0.26) (2024-02-23)
+
+### Bug Fixes
+
+* **ios:** fling gesture fix ([f58dd24](https://github.com/nativescript-community/gesturehandler/commit/f58dd246e7158b1173f4c79ddb08340cf4583812))
+* **ios:** test for gesture activation on first touch like Android ([780700b](https://github.com/nativescript-community/gesturehandler/commit/780700bafca703653d1c44c49bdc66c74e7df471))
+
+## [2.0.25](https://github.com/nativescript-community/gesturehandler/compare/v2.0.24...v2.0.25) (2024-02-02)
+
+### Bug Fixes
+
+* **ios:** trigger the longPress gesture on begin ([b2b9ffa](https://github.com/nativescript-community/gesturehandler/commit/b2b9ffaedfd7aab5abd31a01d0803460c9f1aaf0))
+
 ## [2.0.24](https://github.com/nativescript-community/gesturehandler/compare/v2.0.23...v2.0.24) (2024-01-18)
 
 ### Bug Fixes
diff --git a/demo-vue b/demo-vue
@@ -1 +1 @@
-Subproject commit 9fef6c12ff6215d6a10890fa36bcbbebdd95da24
+Subproject commit 00fab65ca6187ff4dc096a875c71c60dae0587f0
diff --git a/docs/assets/navigation.js b/docs/assets/navigation.js
diff --git a/docs/assets/search.js b/docs/assets/search.js
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-    "version": "2.0.24",
+    "version": "2.0.26",
     "$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json",
     "packages": [
         "packages/*"
diff --git a/packages/gesturehandler/CHANGELOG.md b/packages/gesturehandler/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.26](https://github.com/nativescript-community/gesturehandler/compare/v2.0.25...v2.0.26) (2024-02-23)
+
+### Bug Fixes
+
+* **ios:** fling gesture fix ([f58dd24](https://github.com/nativescript-community/gesturehandler/commit/f58dd246e7158b1173f4c79ddb08340cf4583812))
+* **ios:** test for gesture activation on first touch like Android ([780700b](https://github.com/nativescript-community/gesturehandler/commit/780700bafca703653d1c44c49bdc66c74e7df471))
+
+## [2.0.25](https://github.com/nativescript-community/gesturehandler/compare/v2.0.24...v2.0.25) (2024-02-02)
+
+**Note:** Version bump only for package @nativescript-community/gesturehandler
+
 ## [2.0.24](https://github.com/nativescript-community/gesturehandler/compare/v2.0.23...v2.0.24) (2024-01-18)
 
 ### Bug Fixes
diff --git a/packages/gesturehandler/package.json b/packages/gesturehandler/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/gesturehandler",
-    "version": "2.0.24",
+    "version": "2.0.26",
     "description": "Declarative API exposing platform native touch and gesture system to NativeScript.",
     "main": "gesturehandler",
     "sideEffects": false,
diff --git a/packages/gesturehandler/platforms/ios/src/FlingHandler.m b/packages/gesturehandler/platforms/ios/src/FlingHandler.m
@@ -14,7 +14,7 @@ @implementation FlingGestureHandler
 - (instancetype)initWithTag:(NSNumber *)tag
 {
     if ((self = [super initWithTag:tag])) {
-        self.direction = UISwipeGestureRecognizerDirectionLeft | UISwipeGestureRecognizerDirectionRight |   UISwipeGestureRecognizerDirectionUp | UISwipeGestureRecognizerDirectionDown;
+      _direction = UISwipeGestureRecognizerDirectionLeft | UISwipeGestureRecognizerDirectionRight |   UISwipeGestureRecognizerDirectionUp | UISwipeGestureRecognizerDirectionDown;
         _recognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(handleGesture:)];
         [(UISwipeGestureRecognizer*)_recognizer setDirection:UISwipeGestureRecognizerDirectionLeft];
         _rightrecognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(handleGesture:)];
@@ -34,17 +34,17 @@ - (void)configure:(NSDictionary *)config
   
   id prop = config[@"direction"];
   if (prop != nil) {
-    self.direction = [prop integerValue];
-    if ((self.direction & UISwipeGestureRecognizerDirectionLeft) == 0)  {
+    _direction = [prop integerValue];
+    if ((_direction & UISwipeGestureRecognizerDirectionLeft) == 0)  {
       _recognizer.enabled = NO;
     }
-    if ((self.direction & UISwipeGestureRecognizerDirectionRight) == 0)  {
+    if ((_direction & UISwipeGestureRecognizerDirectionRight) == 0)  {
       _rightrecognizer.enabled = NO;
     }
-    if ((self.direction & UISwipeGestureRecognizerDirectionUp) == 0)  {
+    if ((_direction & UISwipeGestureRecognizerDirectionUp) == 0)  {
       _toprecognizer.enabled = NO;
     }
-    if ((self.direction & UISwipeGestureRecognizerDirectionDown) == 0)  {
+    if ((_direction & UISwipeGestureRecognizerDirectionDown) == 0)  {
       _bottomrecognizer.enabled = NO;
     }
   }
@@ -90,7 +90,11 @@ - (void)unbindFromView
     _bottomrecognizer.delegate = nil;
 }
 - (void) setDirection:(NSInteger) value {
-  ((UISwipeGestureRecognizer *)_recognizer).direction = value;
+  _direction = value;
+  _recognizer.enabled = (_direction & UISwipeGestureRecognizerDirectionLeft) != 0;
+  _rightrecognizer.enabled = (_direction & UISwipeGestureRecognizerDirectionRight) != 0;
+  _toprecognizer.enabled = (_direction & UISwipeGestureRecognizerDirectionUp) != 0;
+  _bottomrecognizer.enabled = (_direction & UISwipeGestureRecognizerDirectionDown) != 0;
 }
 //
 //- (NSNumber *) direction {
@@ -128,4 +132,3 @@ - (NSMutableDictionary *)eventExtraData:(UISwipeGestureRecognizer *)recognizer
   return result;
 }
 @end
-
diff --git a/packages/gesturehandler/platforms/ios/src/GestureHandler.h b/packages/gesturehandler/platforms/ios/src/GestureHandler.h
@@ -78,6 +78,7 @@ if (value != nil) recognizer.prop = [value type]; \
 //@property (nonatomic, weak, nullable) id<GestureHandlerEventEmitter> emitter;
 @property (nonatomic, readonly, nullable) UIGestureRecognizer *recognizer;
 @property (nonatomic) BOOL enabled;
+@property (nonatomic) BOOL activateOnBegin;
 @property(nonatomic) BOOL shouldCancelWhenOutside;
 @property (nullable, nonatomic, weak) id<GestureHandlerDelegate> delegate;
 
diff --git a/packages/gesturehandler/platforms/ios/src/GestureHandler.m b/packages/gesturehandler/platforms/ios/src/GestureHandler.m
@@ -70,6 +70,7 @@ - (instancetype)initWithTag:(NSNumber *)tag
         _tag = tag;
         _lastState = GestureHandlerStateUndetermined;
         _hitSlop = RNGHHitSlopEmpty;
+        _activateOnBegin = YES;
     }
     return self;
 }
@@ -323,7 +324,7 @@ - (BOOL)containsPointInView
 - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
 {
     [self reset];
-    if (self.delegate && [self.delegate respondsToSelector:@selector(gestureHandler:shouldActivateForEvent:)]) {
+    if (self.activateOnBegin && self.delegate && [self.delegate respondsToSelector:@selector(gestureHandler:shouldActivateForEvent:)]) {
         if (![self.delegate gestureHandler:self shouldActivateForEvent:[self eventExtraData:gestureRecognizer]]) {
           return FALSE;
         }
diff --git a/packages/gesturehandler/platforms/ios/src/PanHandler.m b/packages/gesturehandler/platforms/ios/src/PanHandler.m
@@ -79,6 +79,12 @@ - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
   }
 #endif
   [super touchesBegan:touches withEvent:event];
+
+  // we check for active before UIGestureRecognizerStateBegan because otherwise
+  // we dont behave as Android and activate on first touch
+  if (![_gestureHandler.delegate gestureHandler:_gestureHandler shouldActivateForEvent:[_gestureHandler eventExtraData:self]]) {
+    self.state = UIGestureRecognizerStateFailed;
+  }
 }
 
 - (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
@@ -187,6 +193,7 @@ - (instancetype)initWithTag:(NSNumber *)tag
 {
   if ((self = [super initWithTag:tag])) {
     _recognizer = [[BetterPanGestureRecognizer alloc] initWithGestureHandler:self];
+    self.activateOnBegin = NO;
   }
   return self;
 }
@@ -275,4 +282,3 @@ - (void)setFailOffsetYEnd:(CGFloat)value {
   ((BetterPanGestureRecognizer*)_recognizer).failOffsetYEnd = value;
 }
 @end
-
diff --git a/src/gesturehandler/gestures_override.ts b/src/gesturehandler/gestures_override.ts
@@ -209,7 +209,7 @@ export class GesturesObserver {
                 gestureHandler = manager.createGestureHandler(HandlerType.LONG_PRESS, target['LONGPRESS_HANDLER_TAG'], {
                     simultaneousHandlers: [ROOT_GESTURE_HANDLER_TAG]
                 });
-                gestureHandler.on(GestureHandlerStateEvent, this.onGestureStateChange(GestureTypes.longPress, GestureState.ACTIVE), this);
+                gestureHandler.on(GestureHandlerStateEvent, this.onGestureStateChange(GestureTypes.longPress, __IOS__  ? GestureState.BEGAN : GestureState.ACTIVE), this);
             }
             if (type & GestureTypes.doubleTap) {
                 gestureHandler = manager.createGestureHandler(HandlerType.TAP, target['DOUBLE_TAP_HANDLER_TAG'], {
diff --git a/tools b/tools
@@ -1 +1 @@
-Subproject commit 5657f0482d4c70bdf096abe65eb1140552743cd4
+Subproject commit c1d26efda95941e2568f5e6ffa6cfd6fb3c2dc66
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "2.0.24",`
	`2`	`+ "version": "2.0.26",`
`3`	`3`	`"$schema": "node_modules/@lerna-lite/cli/schemas/lerna-schema.json",`
`4`	`4`	`"packages": [`
`5`	`5`	`"packages/*"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@nativescript-community/gesturehandler",`
`3`		`- "version": "2.0.24",`
	`3`	`+ "version": "2.0.26",`
`4`	`4`	`"description": "Declarative API exposing platform native touch and gesture system to NativeScript.",`
`5`	`5`	`"main": "gesturehandler",`
`6`	`6`	`"sideEffects": false,`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ @implementation FlingGestureHandler`
`14`	`14`	`- (instancetype)initWithTag:(NSNumber *)tag`
`15`	`15`	`{`
`16`	`16`	`if ((self = [super initWithTag:tag])) {`
`17`		`- self.direction = UISwipeGestureRecognizerDirectionLeft \| UISwipeGestureRecognizerDirectionRight \| UISwipeGestureRecognizerDirectionUp \| UISwipeGestureRecognizerDirectionDown;`
	`17`	`+ _direction = UISwipeGestureRecognizerDirectionLeft \| UISwipeGestureRecognizerDirectionRight \| UISwipeGestureRecognizerDirectionUp \| UISwipeGestureRecognizerDirectionDown;`
`18`	`18`	`_recognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(handleGesture:)];`
`19`	`19`	`[(UISwipeGestureRecognizer*)_recognizer setDirection:UISwipeGestureRecognizerDirectionLeft];`
`20`	`20`	`_rightrecognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(handleGesture:)];`
`@@ -34,17 +34,17 @@ - (void)configure:(NSDictionary *)config`
`34`	`34`
`35`	`35`	`id prop = config[@"direction"];`
`36`	`36`	`if (prop != nil) {`
`37`		`- self.direction = [prop integerValue];`
`38`		`- if ((self.direction & UISwipeGestureRecognizerDirectionLeft) == 0) {`
	`37`	`+ _direction = [prop integerValue];`
	`38`	`+ if ((_direction & UISwipeGestureRecognizerDirectionLeft) == 0) {`
`39`	`39`	`_recognizer.enabled = NO;`
`40`	`40`	`}`
`41`		`- if ((self.direction & UISwipeGestureRecognizerDirectionRight) == 0) {`
	`41`	`+ if ((_direction & UISwipeGestureRecognizerDirectionRight) == 0) {`
`42`	`42`	`_rightrecognizer.enabled = NO;`
`43`	`43`	`}`
`44`		`- if ((self.direction & UISwipeGestureRecognizerDirectionUp) == 0) {`
	`44`	`+ if ((_direction & UISwipeGestureRecognizerDirectionUp) == 0) {`
`45`	`45`	`_toprecognizer.enabled = NO;`
`46`	`46`	`}`
`47`		`- if ((self.direction & UISwipeGestureRecognizerDirectionDown) == 0) {`
	`47`	`+ if ((_direction & UISwipeGestureRecognizerDirectionDown) == 0) {`
`48`	`48`	`_bottomrecognizer.enabled = NO;`
`49`	`49`	`}`
`50`	`50`	`}`
`@@ -90,7 +90,11 @@ - (void)unbindFromView`
`90`	`90`	`_bottomrecognizer.delegate = nil;`
`91`	`91`	`}`
`92`	`92`	`- (void) setDirection:(NSInteger) value {`
`93`		`- ((UISwipeGestureRecognizer *)_recognizer).direction = value;`
	`93`	`+ _direction = value;`
	`94`	`+ _recognizer.enabled = (_direction & UISwipeGestureRecognizerDirectionLeft) != 0;`
	`95`	`+ _rightrecognizer.enabled = (_direction & UISwipeGestureRecognizerDirectionRight) != 0;`
	`96`	`+ _toprecognizer.enabled = (_direction & UISwipeGestureRecognizerDirectionUp) != 0;`
	`97`	`+ _bottomrecognizer.enabled = (_direction & UISwipeGestureRecognizerDirectionDown) != 0;`
`94`	`98`	`}`
`95`	`99`	`//`
`96`	`100`	`//- (NSNumber *) direction {`
`@@ -128,4 +132,3 @@ - (NSMutableDictionary )eventExtraData:(UISwipeGestureRecognizer )recognizer`
`128`	`132`	`return result;`
`129`	`133`	`}`
`130`	`134`	`@end`
`131`		`-`