-
Notifications
You must be signed in to change notification settings - Fork 3.1k
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
[CP Staging] Add freezeScreenWithLazyLoading function #44544
Merged
mountiny
merged 3 commits into
Expensify:main
from
software-mansion-labs:fix/freeze-screen-with-lazy-loading
Jun 27, 2024
Merged
Changes from all commits
Commits
Show all changes
3 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
27 changes: 5 additions & 22 deletions
27
src/components/withPrepareCentralPaneScreen/index.native.tsx
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 |
|---|---|---|
| @@ -1,27 +1,10 @@ | ||
| import type {ComponentType, ForwardedRef, RefAttributes} from 'react'; | ||
| import React from 'react'; | ||
| import getComponentDisplayName from '@libs/getComponentDisplayName'; | ||
| import FreezeWrapper from '@libs/Navigation/FreezeWrapper'; | ||
| import type React from 'react'; | ||
| import freezeScreenWithLazyLoading from '@libs/freezeScreenWithLazyLoading'; | ||
|
|
||
| /** | ||
| * This HOC is dependent on the platform. On native platforms, screens that aren't already displayed in the navigation stack should be frozen to prevent unnecessary rendering. | ||
| * This higher-order function is dependent on the platform. On native platforms, screens that aren't already displayed in the navigation stack should be frozen to prevent unnecessary rendering. | ||
| * It's handled this way only on mobile platforms because on the web, more than one screen is displayed in a wide layout, so these screens shouldn't be frozen. | ||
| */ | ||
| export default function withPrepareCentralPaneScreen<TProps, TRef>( | ||
| WrappedComponent: ComponentType<TProps & RefAttributes<TRef>>, | ||
| ): (props: TProps & React.RefAttributes<TRef>) => React.ReactElement | null { | ||
| function WithPrepareCentralPaneScreen(props: TProps, ref: ForwardedRef<TRef>) { | ||
| return ( | ||
| <FreezeWrapper> | ||
| <WrappedComponent | ||
| // eslint-disable-next-line react/jsx-props-no-spreading | ||
| {...props} | ||
| ref={ref} | ||
| /> | ||
| </FreezeWrapper> | ||
| ); | ||
| } | ||
|
|
||
| WithPrepareCentralPaneScreen.displayName = `WithPrepareCentralPaneScreen(${getComponentDisplayName(WrappedComponent)})`; | ||
| return React.forwardRef(WithPrepareCentralPaneScreen); | ||
| export default function withPrepareCentralPaneScreen(lazyComponent: () => React.ComponentType) { | ||
| return freezeScreenWithLazyLoading(lazyComponent); | ||
| } |
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 |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| import type {ComponentType} from 'react'; | ||
| import type React from 'react'; | ||
|
|
||
| /** | ||
| * This HOC is dependent on the platform. On native platforms, screens that aren't already displayed in the navigation stack should be frozen to prevent unnecessary rendering. | ||
| * This higher-order function is dependent on the platform. On native platforms, screens that aren't already displayed in the navigation stack should be frozen to prevent unnecessary rendering. | ||
| * It's handled this way only on mobile platforms because on the web, more than one screen is displayed in a wide layout, so these screens shouldn't be frozen. | ||
| */ | ||
| export default function withPrepareCentralPaneScreen(WrappedComponent: ComponentType) { | ||
| return WrappedComponent; | ||
| export default function withPrepareCentralPaneScreen(lazyComponent: () => React.ComponentType) { | ||
| return lazyComponent; | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| import React from 'react'; | ||
| import FreezeWrapper from './Navigation/FreezeWrapper'; | ||
|
|
||
| function FrozenScreen<TProps extends React.JSX.IntrinsicAttributes>(WrappedComponent: React.ComponentType<TProps>) { | ||
| return (props: TProps) => ( | ||
| <FreezeWrapper> | ||
| <WrappedComponent | ||
| // eslint-disable-next-line react/jsx-props-no-spreading | ||
| {...props} | ||
| /> | ||
| </FreezeWrapper> | ||
| ); | ||
| } | ||
|
|
||
| export default function freezeScreenWithLazyLoading(lazyComponent: () => React.ComponentType) { | ||
| return () => { | ||
| const Component = lazyComponent(); | ||
| return FrozenScreen(Component); | ||
| }; | ||
| } | ||
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.
This additional loading state caused #45152.
Since this function handles screen-level entities -> we'll re-mount entire screen. keyboard appear -> we re-mount screen -> we destroy composer -> we loose focus -> keyboard hides. When screen is mounted -> we retrieve input focus and we get infinite loop .
(Read the PR description for more details #45335)