-
Notifications
You must be signed in to change notification settings - Fork 3k
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
refactor BaseSidebarScreen to function #21770
Merged
dangrous
merged 7 commits into
Expensify:main
from
namhihi237:refactor-baseSideBarScreen-to-function
Jun 29, 2023
Merged
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
75df5a8
refactor baseSizeBarScreen to function
namhihi237 2851d6b
add displayName for component
namhihi237 77ae25a
fix: conflict from main
namhihi237 bb413be
move function out of component
namhihi237 96be167
add space in comment function
namhihi237 e6fde89
fix lint
namhihi237 d7608ba
fix comment function
namhihi237 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 |
---|---|---|
@@ -1,4 +1,4 @@ | ||
import React, {Component} from 'react'; | ||
import React, {useEffect} from 'react'; | ||
import {View} from 'react-native'; | ||
import styles from '../../../../styles/styles'; | ||
import SidebarLinks from '../SidebarLinks'; | ||
|
@@ -17,60 +17,52 @@ const propTypes = { | |
...windowDimensionsPropTypes, | ||
}; | ||
|
||
class BaseSidebarScreen extends Component { | ||
constructor(props) { | ||
super(props); | ||
/** | ||
* Method called when avatar is clicked | ||
*/ | ||
const navigateToSettings = () => { | ||
Navigation.navigate(ROUTES.SETTINGS); | ||
} | ||
|
||
this.startTimer = this.startTimer.bind(this); | ||
this.navigateToSettings = this.navigateToSettings.bind(this); | ||
} | ||
/** | ||
* Method called when a pinned chat is selected. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same as above |
||
*/ | ||
const startTimer = () => { | ||
Timing.start(CONST.TIMING.SWITCH_REPORT); | ||
Performance.markStart(CONST.TIMING.SWITCH_REPORT); | ||
} | ||
|
||
componentDidMount() { | ||
function BaseSidebarScreen(props) { | ||
useEffect(() => { | ||
Performance.markStart(CONST.TIMING.SIDEBAR_LOADED); | ||
Timing.start(CONST.TIMING.SIDEBAR_LOADED, true); | ||
} | ||
|
||
/** | ||
* Method called when avatar is clicked | ||
*/ | ||
navigateToSettings() { | ||
Navigation.navigate(ROUTES.SETTINGS); | ||
} | ||
|
||
/** | ||
* Method called when a pinned chat is selected. | ||
*/ | ||
startTimer() { | ||
Timing.start(CONST.TIMING.SWITCH_REPORT); | ||
Performance.markStart(CONST.TIMING.SWITCH_REPORT); | ||
} | ||
}, []); | ||
|
||
render() { | ||
return ( | ||
<ScreenWrapper | ||
includeSafeAreaPaddingBottom={false} | ||
shouldEnableKeyboardAvoidingView={false} | ||
style={[styles.sidebar, Browser.isMobile() ? styles.userSelectNone : {}]} | ||
> | ||
{({insets}) => ( | ||
<> | ||
<View style={[styles.flex1]}> | ||
<SidebarLinks | ||
onLinkClick={this.startTimer} | ||
insets={insets} | ||
onAvatarClick={this.navigateToSettings} | ||
isSmallScreenWidth={this.props.isSmallScreenWidth} | ||
onLayout={this.props.onLayout} | ||
/> | ||
</View> | ||
{this.props.children} | ||
</> | ||
)} | ||
</ScreenWrapper> | ||
); | ||
} | ||
return ( | ||
<ScreenWrapper | ||
includeSafeAreaPaddingBottom={false} | ||
shouldEnableKeyboardAvoidingView={false} | ||
style={[styles.sidebar, Browser.isMobile() ? styles.userSelectNone : {}]} | ||
> | ||
{({insets}) => ( | ||
<> | ||
<View style={[styles.flex1]}> | ||
<SidebarLinks | ||
onLinkClick={startTimer} | ||
insets={insets} | ||
onAvatarClick={navigateToSettings} | ||
isSmallScreenWidth={props.isSmallScreenWidth} | ||
onLayout={props.onLayout} | ||
/> | ||
</View> | ||
{props.children} | ||
</> | ||
)} | ||
</ScreenWrapper> | ||
); | ||
} | ||
|
||
BaseSidebarScreen.propTypes = propTypes; | ||
BaseSidebarScreen.displayName = 'BaseSidebarScreen'; | ||
|
||
export default withWindowDimensions(BaseSidebarScreen); |
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.
NAB - Technically this isn't a method anymore, right? Since it's not inside the component? I might be wrong about that.