Skip to content

Refactor/16140 migrate deeplinkwrapper to function #24090

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.

Sign up for GitHub

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
robertjchen merged 3 commits into from
Aug 7, 2023
Merged

Refactor/16140 migrate deeplinkwrapper to function #24090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4487268
refactor: migrate deeplinkwrapper website to function component
koko57 Aug 2, 2023
1464bc2
refactor: migrate deeplinkwrapper native to function component
koko57 Aug 2, 2023
6e950c8
fix: minor fix
koko57 Aug 3, 2023
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
8 changes: 3 additions & 5 deletions src/components/DeeplinkWrapper/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
import PropTypes from 'prop-types';
import {PureComponent} from 'react';

const propTypes = {
/** Children to render. */
children: PropTypes.node.isRequired,
};

class DeeplinkWrapper extends PureComponent {
render() {
return this.props.children;
}
function DeeplinkWrapper({children}) {
return children;
}

DeeplinkWrapper.propTypes = propTypes;

export default DeeplinkWrapper;
23 changes: 11 additions & 12 deletions src/components/DeeplinkWrapper/index.website.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from 'prop-types';
import {PureComponent} from 'react';
import {useEffect} from 'react';
import Str from 'expensify-common/lib/str';
import * as Browser from '../../libs/Browser';
import ROUTES from '../../ROUTES';
Expand All @@ -12,9 +12,13 @@ const propTypes = {
children: PropTypes.node.isRequired,
};

class DeeplinkWrapper extends PureComponent {

@situchan situchan Aug 7, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We can use memo equivalent to PureComponent

@koko57 koko57 Aug 7, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

we don't need memo here

@situchan situchan Aug 7, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I thought no need at first. But this actually includes entire app views as children.
So still you persist no performance optimization here?

@situchan situchan Aug 7, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I am also fine no memo usage but let's just guarantee that this won't cause any performance regressions.

@koko57 koko57 Aug 7, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

No, it shouldn't. I've checked both implementations but I noticed no difference. And memo uses shallow comparison so it won't work for props.children and will always cause a rerender.

componentDidMount() {
if (!this.isMacOSWeb() || CONFIG.ENVIRONMENT === CONST.ENVIRONMENT.DEV) {
function isMacOSWeb() {
return !Browser.isMobile() && typeof navigator === 'object' && typeof navigator.userAgent === 'string' && /Mac/i.test(navigator.userAgent) && !/Electron/i.test(navigator.userAgent);
}

function DeeplinkWrapper({children}) {
useEffect(() => {
if (!isMacOSWeb() || CONFIG.ENVIRONMENT === CONST.ENVIRONMENT.DEV) {
return;
}

Expand All @@ -26,16 +30,11 @@ class DeeplinkWrapper extends PureComponent {
App.beginDeepLinkRedirectAfterTransition();
return;
}
App.beginDeepLinkRedirect();
}

isMacOSWeb() {
return !Browser.isMobile() && typeof navigator === 'object' && typeof navigator.userAgent === 'string' && /Mac/i.test(navigator.userAgent) && !/Electron/i.test(navigator.userAgent);
}
App.beginDeepLinkRedirect();
}, []);

render() {
return this.props.children;
}
return children;
}

DeeplinkWrapper.propTypes = propTypes;
Expand Down