Skip to content
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.

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

fix(iOS): modal not presenting when deep in stack #2335

Merged
merged 2 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
116 changes: 116 additions & 0 deletions apps/src/tests/TestModalNavigation.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
import * as React from 'react';
import { View, Text, Button } from 'react-native';
import { NavigationContainer } from '@react-navigation/native';
import { NativeStackScreenProps, createNativeStackNavigator } from '@react-navigation/native-stack';

type StackParamList = {
Home: undefined;
NestedStack: undefined;
MainStackScreen: undefined;
Screen1: undefined;
Screen2: undefined;
Screen3: undefined;
};

function HomeScreen({
navigation,
}: NativeStackScreenProps<StackParamList, 'Home'>) {
return (
<View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
<Text>Home Screen</Text>
<Button
title="Navigate to Screen 1"
onPress={() => navigation.navigate('NestedStack')}
/>
</View>
);
}

function MainStackScreen() {
return (
<View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
<Text>Main stack screen</Text>
</View>
);
}

function Screen1({
navigation,
}: NativeStackScreenProps<StackParamList, 'Screen1'>) {
return (
<View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
<Text>Screen 1</Text>
<Button
title="Navigate to Screen 2"
onPress={() => navigation.navigate('Screen2')}
/>
</View>
);
};

function Screen2({
navigation,
}: NativeStackScreenProps<StackParamList, 'Screen2'>) {
return (
<View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
<Text>Screen 2</Text>
<Button
title="Navigate to MainStackScreen - WORKS fine"
onPress={() => navigation.navigate('MainStackScreen')}
/>
<Button
title="Navigate to Screen 3"
onPress={() => navigation.navigate('Screen3')}
/>
</View>
);
};

function Screen3({
navigation,
}: NativeStackScreenProps<StackParamList, 'Screen3'>) {
return (
<View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
<Text>Screen 3</Text>
<Button
title="Navigate to MainStackScreen - NOT working"
onPress={() => navigation.navigate('MainStackScreen')}
/>
<Button
title="Navigate to Screen 2"
onPress={() => navigation.navigate('Screen2')}
/>
</View>
);
};

const Stack = createNativeStackNavigator<StackParamList>();
const NestedStack = createNativeStackNavigator<StackParamList>();

function RootStack() {
return (
<Stack.Navigator>
<Stack.Screen name="Home" component={HomeScreen} />
<Stack.Screen name="NestedStack" component={NestedStackScreen} options={{ headerShown: true, presentation: 'modal' }} />
<Stack.Screen name="MainStackScreen" component={MainStackScreen} options={{ headerShown: true, presentation: 'modal' }} />
</Stack.Navigator>
);
}

function NestedStackScreen() {
return (
<NestedStack.Navigator screenOptions={{ presentation: 'modal' }}>
<NestedStack.Screen name="Screen1" component={Screen1} />
<NestedStack.Screen name="Screen2" component={Screen2} />
<NestedStack.Screen name="Screen3" component={Screen3} />
</NestedStack.Navigator>
);
}

export default function App() {
return (
<NavigationContainer>
<RootStack />
</NavigationContainer>
);
}
1 change: 1 addition & 0 deletions apps/src/tests/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,4 @@ export { default as Test2282 } from './Test2282';
export { default as Test2232 } from './Test2332';
export { default as TestScreenAnimation } from './TestScreenAnimation';
export { default as TestHeader } from './TestHeader';
export { default as TestModalNavigation } from './TestModalNavigation';
7 changes: 0 additions & 7 deletions ios/RNSScreenStack.mm
Original file line number Diff line number Diff line change
Expand Up @@ -513,13 +513,6 @@ - (void)setModalViewControllers:(NSArray<UIViewController *> *)controllers
[changeRootController dismissViewControllerAnimated:shouldAnimate completion:finish];
return;
}

UIViewController *lastModalVc = [self lastFromPresentedViewControllerChainStartingFrom:firstModalToBeDismissed];

if (lastModalVc != firstModalToBeDismissed) {
[lastModalVc dismissViewControllerAnimated:shouldAnimate completion:finish];
return;
}
Comment on lines -516 to -522
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you checked if this doesn't break anything else? According to blame, this check has been here added in purpose. See: 471127e
Could you check if Test1829.tsx works properly with changes from this PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we had a call with @kkafar trying to figure out the proper fix prior to making this PR and we checked a few scenarios including Test1829.
Unless there is some hidden scenario which breaks by this, there shouldn't be any issues with the removal of those lines.

}

// changeRootController does not have presentedViewController but it does not mean that no modals are in presentation;
Expand Down
Loading