-
-
Notifications
You must be signed in to change notification settings - Fork 514
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
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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?There was a problem hiding this comment.
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.