-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #44544 from software-mansion-labs/fix/freeze-scree…
…n-with-lazy-loading [CP Staging] Add freezeScreenWithLazyLoading function (cherry picked from commit 9d88c63)
- Loading branch information
Showing
4 changed files
with
40 additions
and
37 deletions.
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); | ||
| }; | ||
| } |