Skip to content

Commit 133a749

Browse files
farfromrefugfarfromrefug
committed
fix(ios): allow to dynamically change handler properties
1 parent cb1551f commit 133a749

16 files changed

+228
-36
lines changed

‎packages/gesturehandler/platforms/ios/src/FlingHandler.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#import "GestureHandler.h"
22

33
@interface FlingGestureHandler : GestureHandler
4-
//@property (nonatomic) NSNumber * direction;
5-
//@property (nonatomic) NSNumber * numberOfTouchesRequired;
4+
- (void) setDirection:(NSInteger) value;
5+
- (void) setNumberOfTouchesRequired:(NSInteger) value;
66
@end

‎packages/gesturehandler/platforms/ios/src/FlingHandler.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,17 @@ - (void)unbindFromView
8989
[_bottomrecognizer.view removeGestureRecognizer:_bottomrecognizer];
9090
_bottomrecognizer.delegate = nil;
9191
}
92-
//- (void) setDirection:(NSNumber *) value {
93-
// ((UISwipeGestureRecognizer *)_recognizer).direction = [value integerValue];
94-
//}
92+
- (void) setDirection:(NSInteger) value {
93+
((UISwipeGestureRecognizer *)_recognizer).direction = value;
94+
}
9595
//
9696
//- (NSNumber *) direction {
9797
// return [NSNumber numberWithInteger: ((UISwipeGestureRecognizer *)_recognizer).direction];
9898
//}
9999
//
100-
//- (void) setNumberOfTouchesRequired:(NSNumber *) value {
101-
// ((UISwipeGestureRecognizer *)_recognizer).numberOfTouchesRequired = [value integerValue];
102-
//}
100+
- (void) setNumberOfTouchesRequired:(NSInteger) value {
101+
((UISwipeGestureRecognizer *)_recognizer).numberOfTouchesRequired = value;
102+
}
103103
//
104104
//- (NSNumber *) numberOfTouchesRequired {
105105
// return [NSNumber numberWithInteger: ((UISwipeGestureRecognizer *)_recognizer).numberOfTouchesRequired];

‎packages/gesturehandler/platforms/ios/src/ForceTouchHandler.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#import "GestureHandler.h"
22

33
@interface ForceTouchHandler : GestureHandler
4+
- (void) setMaxForce:(NSInteger) value;
5+
- (void) setMinForce:(NSInteger) value;
6+
- (void) setFeedbackOnActivation:(Boolean) value;
47
@end

‎packages/gesturehandler/platforms/ios/src/ForceTouchHandler.m‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,26 +135,26 @@ - (void)configure:(NSDictionary *)config
135135
}
136136

137137
//
138-
//- (void) setMaxForce:(NSNumber *) value {
139-
// ((ForceTouchGestureRecognizer *)_recognizer).maxForce = [value integerValue];
140-
//}
138+
- (void) setMaxForce:(NSInteger) value {
139+
((ForceTouchGestureRecognizer *)_recognizer).maxForce = value;
140+
}
141141
//
142142
//- (NSNumber *) maxForce {
143143
// return [NSNumber numberWithInteger: ((ForceTouchGestureRecognizer *)_recognizer).maxForce];
144144
//}
145145
//
146-
//- (void) setMinForce:(NSNumber *) value {
147-
// ((ForceTouchGestureRecognizer *)_recognizer).minForce = [value integerValue];
148-
//}
146+
- (void) setMinForce:(NSInteger) value {
147+
((ForceTouchGestureRecognizer *)_recognizer).minForce = value;
148+
}
149149
//
150150
//- (NSNumber *) minForce {
151151
// return [NSNumber numberWithInteger: ((ForceTouchGestureRecognizer *)_recognizer).minForce];
152152
//}
153153
//
154154
//
155-
//- (void) setFeedbackOnActivation:(NSNumber *) value {
156-
// ((ForceTouchGestureRecognizer *)_recognizer).feedbackOnActivation = [value boolValue];
157-
//}
155+
- (void) setFeedbackOnActivation:(Boolean) value {
156+
((ForceTouchGestureRecognizer *)_recognizer).feedbackOnActivation = value;
157+
}
158158
//
159159
//- (NSNumber *) feedbackOnActivation {
160160
// return [NSNumber numberWithBool: ((ForceTouchGestureRecognizer *)_recognizer).feedbackOnActivation];

‎packages/gesturehandler/platforms/ios/src/LongPressHandler.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,7 @@
99
#import "GestureHandler.h"
1010

1111
@interface LongPressGestureHandler : GestureHandler
12+
13+
- (void) setMinDurationMs:(CGFloat) value;
14+
- (void) setMaxDist:(CGFloat) value;
1215
@end

‎packages/gesturehandler/platforms/ios/src/LongPressHandler.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,17 @@ - (void)configure:(NSDictionary *)config
6969
}
7070

7171
//
72-
//- (void) setMinDurationMs:(NSNumber *) value {
73-
// ((UILongPressGestureRecognizer *)_recognizer).minimumPressDuration = [value floatValue] / 1000.0;
74-
//}
72+
- (void) setMinDurationMs:(CGFloat) value {
73+
((UILongPressGestureRecognizer *)_recognizer).minimumPressDuration = value / 1000.0;
74+
}
7575
//
7676
//- (NSNumber *) minDurationMs {
7777
// return [NSNumber numberWithFloat: ((UILongPressGestureRecognizer *)_recognizer).minimumPressDuration * 1000.0];
7878
//}
7979
//
80-
//- (void) setMaxDist:(NSNumber *) value {
81-
// ((UILongPressGestureRecognizer *)_recognizer).allowableMovement = [value floatValue];
82-
//}
80+
- (void) setMaxDist:(CGFloat) value {
81+
((UILongPressGestureRecognizer *)_recognizer).allowableMovement = value;
82+
}
8383
//
8484
//- (NSNumber *) maxDist {
8585
// return [NSNumber numberWithFloat: ((UILongPressGestureRecognizer *)_recognizer).allowableMovement];

‎packages/gesturehandler/platforms/ios/src/NativeViewHandler.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@
1212
@end
1313

1414
@interface NativeViewGestureHandler : GestureHandler
15+
- (void)setShouldActivateOnStart:(Boolean)value;
16+
- (void)setDisallowInterruption:(Boolean)value;
1517
@end

‎packages/gesturehandler/platforms/ios/src/NativeViewHandler.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ - (void)configure:(NSDictionary *)config
5353
}
5454

5555
//
56-
//- (void) setShouldActivateOnStart:(NSNumber *) value {
57-
// _shouldActivateOnStart = [value boolValue];
58-
//}
56+
- (void) setShouldActivateOnStart:(Boolean) value {
57+
_shouldActivateOnStart = value;
58+
}
5959
//
6060
//- (NSNumber *) shouldActivateOnStart {
6161
// return [NSNumber numberWithBool: _shouldActivateOnStart];
6262
//}
63-
//- (void) setDisallowInterruption:(NSNumber *) value {
64-
// _disallowInterruption = [value boolValue];
65-
//}
63+
- (void) setDisallowInterruption:(Boolean) value {
64+
_disallowInterruption = value;
65+
}
6666
//
6767
//- (NSNumber *) disallowInterruption {
6868
// return [NSNumber numberWithBool: _disallowInterruption];

‎packages/gesturehandler/platforms/ios/src/PanHandler.h‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,29 @@
1010

1111
@interface PanGestureHandler : GestureHandler
1212

13+
//@property (nonatomic) CGFloat minDist;
14+
//@property (nonatomic) CGFloat minVelocityX;
15+
//@property (nonatomic) CGFloat minVelocityY;
16+
//@property (nonatomic) CGFloat activeOffsetXStart;
17+
//@property (nonatomic) CGFloat activeOffsetXEnd;
18+
//@property (nonatomic) CGFloat failOffsetXStart;
19+
//@property (nonatomic) CGFloat failOffsetXEnd;
20+
//@property (nonatomic) CGFloat activeOffsetYStart;
21+
//@property (nonatomic) CGFloat activeOffsetYEnd;
22+
//@property (nonatomic) CGFloat failOffsetYStart;
23+
//@property (nonatomic) CGFloat failOffsetYEnd;
24+
25+
- (void)setMinDist:(CGFloat)value;
26+
- (void)setMinVelocityX:(CGFloat)value;
27+
- (void)setMinVelocityY:(CGFloat)value;
28+
- (void)setMinVelocitySq:(CGFloat)value;
29+
- (void)setActiveOffsetXStart:(CGFloat)value;
30+
- (void)setActiveOffsetXEnd:(CGFloat)value;
31+
- (void)setFailOffsetXStart:(CGFloat)value;
32+
- (void)setFailOffsetXEnd:(CGFloat)value;
33+
- (void)setActiveOffsetYStart:(CGFloat)value;
34+
- (void)setActiveOffsetYEnd:(CGFloat)value;
35+
- (void)setFailOffsetYStart:(CGFloat)value;
36+
- (void)setFailOffsetYEnd:(CGFloat)value;
1337

1438
@end

‎packages/gesturehandler/platforms/ios/src/PanHandler.m‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,5 +238,41 @@ - (NSMutableDictionary *)eventExtraData:(UIPanGestureRecognizer *)recognizer
238238
return result;
239239
}
240240

241+
- (void)setMinDist:(CGFloat)value {
242+
((BetterPanGestureRecognizer*)_recognizer).minDistSq = value * value;
243+
}
244+
- (void)setMinVelocityX:(CGFloat)value {
245+
((BetterPanGestureRecognizer*)_recognizer).minVelocityX = value;
246+
}
247+
- (void)setMinVelocityY:(CGFloat)value {
248+
((BetterPanGestureRecognizer*)_recognizer).minVelocityY = value;
249+
}
250+
- (void)setMinVelocitySq:(CGFloat)value {
251+
((BetterPanGestureRecognizer*)_recognizer).minVelocitySq = value;
252+
}
253+
- (void)setActiveOffsetXStart:(CGFloat)value {
254+
((BetterPanGestureRecognizer*)_recognizer).activeOffsetXStart = value;
255+
}
256+
- (void)setActiveOffsetXEnd:(CGFloat)value {
257+
((BetterPanGestureRecognizer*)_recognizer).activeOffsetXEnd = value;
258+
}
259+
- (void)setFailOffsetXStart:(CGFloat)value {
260+
((BetterPanGestureRecognizer*)_recognizer).failOffsetXStart = value;
261+
}
262+
- (void)setFailOffsetXEnd:(CGFloat)value {
263+
((BetterPanGestureRecognizer*)_recognizer).failOffsetXEnd = value;
264+
}
265+
- (void)setActiveOffsetYStart:(CGFloat)value {
266+
((BetterPanGestureRecognizer*)_recognizer).activeOffsetYStart = value;
267+
}
268+
- (void)setActiveOffsetYEnd:(CGFloat)value {
269+
((BetterPanGestureRecognizer*)_recognizer).activeOffsetYEnd = value;
270+
}
271+
- (void)setFailOffsetYStart:(CGFloat)value {
272+
((BetterPanGestureRecognizer*)_recognizer).failOffsetYStart = value;
273+
}
274+
- (void)setFailOffsetYEnd:(CGFloat)value {
275+
((BetterPanGestureRecognizer*)_recognizer).failOffsetYEnd = value;
276+
}
241277
@end
242278

0 commit comments

Comments
 (0)