bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

State condition isLight unnecessary

Browse source
This commit is contained in:
Sean King 2020-07-11 14:22:39 -06:00
parent 697291e6f5
commit 8b376b81cf
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/soapbox/features/ui/components/tabs_bar.js
View file

@ -37,7 +37,6 @@ class TabsBar extends React.PureComponent {
state = { state = {
collapsed: false, collapsed: false,
isLight: this.props.settings.get('themeMode') === 'light' ? true : false,
} }
static contextTypes = { static contextTypes = {
@ -116,8 +115,6 @@ class TabsBar extends React.PureComponent {
handleToggleTheme = () => { handleToggleTheme = () => {
this.props.toggleTheme(this.getNewThemeValue()); this.props.toggleTheme(this.getNewThemeValue());
this.setState({ isLight: !this.state.isLight });
} }
handleScroll = throttle(() => { handleScroll = throttle(() => {
@ -142,8 +139,8 @@ class TabsBar extends React.PureComponent {
}); });
render() { render() {
const { account, onOpenCompose, onOpenSidebar, intl } = this.props; const { account, onOpenCompose, onOpenSidebar, intl, settings } = this.props;
const { collapsed, isLight } = this.state; const { collapsed } = this.state;
const classes = classNames('tabs-bar', { const classes = classNames('tabs-bar', {
'tabs-bar--collapsed': collapsed, 'tabs-bar--collapsed': collapsed,
@ -161,8 +158,8 @@ class TabsBar extends React.PureComponent {
</div> </div>
{ account && { account &&
<div className='flex'> <div className='flex'>
<button className='tabs-bar__button-theme-toggle button' onClick={this.handleToggleTheme} aria-label={isLight ? intl.formatMessage(messages.switchToDark) : intl.formatMessage(messages.switchToLight)}> <button className='tabs-bar__button-theme-toggle button' onClick={this.handleToggleTheme} aria-label={settings.get('themeMode') === 'light' ? intl.formatMessage(messages.switchToDark) : intl.formatMessage(messages.switchToLight)}>
<Icon id={isLight ? 'moon' : 'sun'} /> <Icon id={settings.get('themeMode') === 'light' ? 'sun' : 'moon'} />
</button> </button>
<div className='tabs-bar__profile'> <div className='tabs-bar__profile'>
<Avatar account={account} /> <Avatar account={account} />