-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Fix Help Panel freezing the app when opened from a modal #67052
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
Merged
mountiny
merged 9 commits into
Expensify:main
from
software-mansion-labs:fix/nested-modals
Jul 28, 2025
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
f201fdc
fix: ensure correct modal presentation by updating UIView+React.m to …
blazejkustra 8835ae9
chore: update details.md to include new patch for fixing nested modal…
blazejkustra a21d5ea
chore: update E/App issue link in details.md for nested modals patch
blazejkustra 6c03ae5
Merge branch 'main' into fix/nested-modals
blazejkustra 8a3d341
Rename patch
blazejkustra 1dc37f1
Remove patch
blazejkustra 5875741
Display side panel modal in HelpButton component on native platforms
blazejkustra 24af296
Add comments to clarify SidePanel rendering behavior in RootNavigator…
blazejkustra 62e191a
Create files for platform specific code for HelpButton
blazejkustra 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
11 changes: 11 additions & 0 deletions
11
src/components/Navigation/RootNavigatorExtraContent/index.native.tsx
This file contains hidden or 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,11 @@ | ||
| import React from 'react'; | ||
| import TopLevelNavigationTabBar from '@components/Navigation/TopLevelNavigationTabBar'; | ||
| import type RootNavigatorExtraContentProps from './types'; | ||
|
|
||
| function RootNavigatorExtraContent({state}: RootNavigatorExtraContentProps) { | ||
| return <TopLevelNavigationTabBar state={state} />; | ||
| } | ||
|
|
||
| RootNavigatorExtraContent.displayName = 'RootNavigatorExtraContent'; | ||
|
|
||
| export default RootNavigatorExtraContent; | ||
10 changes: 3 additions & 7 deletions
10
.../Navigation/RootNavigatorExtraContent.tsx → ...ation/RootNavigatorExtraContent/index.tsx
This file contains hidden or 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 hidden or 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,8 @@ | ||
| import type {ParamListBase} from '@react-navigation/native'; | ||
| import type {PlatformStackNavigationState} from '@libs/Navigation/PlatformStackNavigation/types'; | ||
|
|
||
| type RootNavigatorExtraContentProps = { | ||
| state: PlatformStackNavigationState<ParamListBase>; | ||
| }; | ||
|
|
||
| export default RootNavigatorExtraContentProps; |
This file contains hidden or 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
18 changes: 18 additions & 0 deletions
18
src/components/SidePanel/HelpComponents/HelpButton/index.native.tsx
This file contains hidden or 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,18 @@ | ||
| import React from 'react'; | ||
| import SidePanel from '@components/SidePanel/index'; | ||
| import HelpButtonBase from './HelpButtonBase'; | ||
| import type HelpButtonProps from './types'; | ||
|
|
||
| function HelpButton({style}: HelpButtonProps) { | ||
| return ( | ||
| <> | ||
| {/* Render SidePanel here on native platforms, since it's not included in RootNavigatorExtraContent like on web */} | ||
| <SidePanel /> | ||
| <HelpButtonBase style={style} /> | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
| HelpButton.displayName = 'HelpButton'; | ||
|
|
||
| export default HelpButton; |
11 changes: 11 additions & 0 deletions
11
src/components/SidePanel/HelpComponents/HelpButton/index.tsx
This file contains hidden or 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,11 @@ | ||
| import React from 'react'; | ||
| import HelpButtonBase from './HelpButtonBase'; | ||
| import type HelpButtonProps from './types'; | ||
|
|
||
| function HelpButton({style}: HelpButtonProps) { | ||
| return <HelpButtonBase style={style} />; | ||
| } | ||
|
|
||
| HelpButton.displayName = 'HelpButton'; | ||
|
|
||
| export default HelpButton; |
This file contains hidden or 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,7 @@ | ||
| import type {StyleProp, ViewStyle} from 'react-native'; | ||
|
|
||
| type HelpButtonProps = { | ||
| style?: StyleProp<ViewStyle>; | ||
| }; | ||
|
|
||
| export default HelpButtonProps; |
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.
Uh oh!
There was an error while loading. Please reload this page.