Skip to content

fix: Empty array & null checks in handleTabNavigatorChange method fixes #6698 #6700

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
piaskowyk merged 4 commits into from
Dec 4, 2024
Merged

fix: Empty array & null checks in handleTabNavigatorChange method fixes #6698 #6700

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e354c89
fix: Empty array & null checks in handleTabNavigatorChange method, fi…
aymather Nov 13, 2024
68260cf
Formatted for apple to fix linting
aymather Nov 14, 2024
f197660
Merge branch 'main' into fix/tab-navigator-crash
aymather Nov 15, 2024
d7b75b0
Merge branch 'main' into fix/tab-navigator-crash
piaskowyk Dec 4, 2024
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
16 changes: 16 additions & 0 deletions ...t-native-reanimated/apple/reanimated/apple/LayoutReanimation/REASharedTransitionManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,10 +576,26 @@ - (void)handleTabNavigatorChange:(REAUIView *)layoutedScreen
return;
}

// Add safety check for disappearing screens
if ([_disappearingScreens count] == 0) {
return;
}

REAUIView *navTabScreen = _disappearingScreens[0];
REAUIView *sourceScreen = _disappearingScreens[[_disappearingScreens count] - 1];

// Add null checks
if (!navTabScreen || !navTabScreen.reactSuperview) {
return;
}

REAUIView *targetTabScreen = [REAScreensHelper getActiveTabForTabNavigator:navTabScreen.reactSuperview];
REAUIView *targetScreen = [REAScreensHelper findTopScreenInChildren:targetTabScreen];

if (!targetScreen) {
return;
}

if (!layoutedScreen && _isTabNavigator) {
// just wait for the next layout computation for your screen
return;
Expand Down