Skip to content

Commit

Permalink
Merge branch '24i-fork-branch' into fix-yoga
Browse files Browse the repository at this point in the history
# Conflicts:
#	README-24i.md
  • Loading branch information
CHaNGeTe committed Jun 12, 2024
2 parents 85df84b + 60a14a6 commit 52afe56
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 2 deletions.
11 changes: 10 additions & 1 deletion README-24i.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,15 @@ It's important to list all changes we have done in order to keep track of them a

- Changed how snapping to offset is being calculated. Ticket related https://aferian.atlassian.net/browse/PRDSAPPSTV-675. ([link to PR](https://github.com/24i/react-native-tvos/pull/3))

### ./React/Base/RCTTouchHandler.m

- Changed how touch events are bubbling. It affects swipe.
This is needed when used in conjuction with "react-native-screens": "3.13.1"
Remove if updating it.
Ticket related https://aferian.atlassian.net/browse/PRDSAPPSTV-751
Ticket related https://aferian.atlassian.net/browse/PRDSAPPSRN-12649
([link to PR](https://github.com/24i/react-native-tvos/pull/5))

### ./ReactCommon/yoga/yoga/Yoga.cpp

- Use of bitwise '|' with boolean operands ([link to PR](https://github.com/24i/react-native-tvos/pull/6))
- Use of bitwise '|' with boolean operands ([link to PR](https://github.com/24i/react-native-tvos/pull/6))
17 changes: 16 additions & 1 deletion React/Base/RCTTouchHandler.m
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,22 @@ - (BOOL)canBePreventedByGestureRecognizer:(UIGestureRecognizer *)preventingGestu
{
// We fail in favour of other external gesture recognizers.
// iOS will ask `delegate`'s opinion about this gesture recognizer little bit later.
return ![preventingGestureRecognizer.view isDescendantOfView:self.view];

// IMPORTANT
// return ![preventingGestureRecognizer.view isDescendantOfView:self.view];

// Why is this override here
// https://aferian.atlassian.net/browse/PRDSAPPSTV-751
// Somehow on tvOS 17 the focus is lost when we use React-Native-Screens 3.13.1
#if TARGET_OS_TV
if (@available(tvOS 17.0, *)) {
return NO;
} else {
return ![preventingGestureRecognizer.view isDescendantOfView:self.view];
}
#else
return ![preventingGestureRecognizer.view isDescendantOfView:self.view];
#endif
}

- (void)reset
Expand Down

0 comments on commit 52afe56

Please sign in to comment.