Skip to content

fix: add usage of older API for older iOS versions #1516

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

Merged
kkafar merged 6 commits into from
Jul 7, 2022
Merged

fix: add usage of older API for older iOS versions #1516

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de6ebd6
fix: add checks for iOS version around
kkafar Jul 6, 2022
d91df07
chore: add API_AVAIABLE macro
kkafar Jul 6, 2022
8facc6b
fix: checks for iOS version
kkafar Jul 6, 2022
5a47fb4
chore: remove #if directive
kkafar Jul 7, 2022
aa41f72
chore: remove unused header
kkafar Jul 7, 2022
df93a75
chore: remove `gestureRecognizer:shouldReceiveEvent: method
kkafar Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions ios/RNSScreenStack.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
return YES;
#else
// RNSPanGestureRecognizer will receive events iff topScreen.fullScreenSwipeEnabled == YES;
// Events are filtered in gestureRecognizer:shouldReceiveEvent: method
// Events are filtered in gestureRecognizer:shouldReceivePressOrTouchEvent: method
if ([gestureRecognizer isKindOfClass:[RNSPanGestureRecognizer class]]) {
if ([self isInGestureResponseDistance:gestureRecognizer topScreen:topScreen]) {
_isFullWidthSwiping = YES;
Expand Down Expand Up @@ -812,10 +812,11 @@ - (BOOL)isScrollViewPanGestureRecognizer:(UIGestureRecognizer *)gestureRecognize
return scrollView.panGestureRecognizer == gestureRecognizer;
}

// Custom method for compatibility with iOS < 13.4
// RNSScreenStackView is a UIGestureRecognizerDelegate for three types of gesture recognizers:
// RNSPanGestureRecognizer, RNSScreenEdgeGestureRecognizer, _UIParallaxTransitionPanGestureRecognizer
// Be careful when adding another type of gesture recognizer.
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveEvent:(UIEvent *)event
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceivePressOrTouchEvent:(NSObject *)event
{
RNSScreenView *topScreen = (RNSScreenView *)_controller.viewControllers.lastObject.view;

Expand All @@ -833,6 +834,16 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceive
return YES;
}

- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceivePress:(UIPress *)press;
{
return [self gestureRecognizer:gestureRecognizer shouldReceivePressOrTouchEvent:press];
}

- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch;
{
return [self gestureRecognizer:gestureRecognizer shouldReceivePressOrTouchEvent:touch];
}

- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
{
Expand Down