Skip to content

Commit 152b10b

Browse files
authored
Fix some React warnings (mastodon#26609)
1 parent 44ba785 commit 152b10b

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

app/javascript/mastodon/features/explore/results.jsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ class Results extends PureComponent {
108108
return (
109109
<>
110110
<div className='account__section-headline'>
111-
<button onClick={this.handleSelectAll} className={type === 'all' && 'active'}><FormattedMessage id='search_results.all' defaultMessage='All' /></button>
112-
<button onClick={this.handleSelectAccounts} className={type === 'accounts' && 'active'}><FormattedMessage id='search_results.accounts' defaultMessage='Profiles' /></button>
113-
<button onClick={this.handleSelectHashtags} className={type === 'hashtags' && 'active'}><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></button>
114-
<button onClick={this.handleSelectStatuses} className={type === 'statuses' && 'active'}><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></button>
111+
<button onClick={this.handleSelectAll} className={type === 'all' ? 'active' : undefined}><FormattedMessage id='search_results.all' defaultMessage='All' /></button>
112+
<button onClick={this.handleSelectAccounts} className={type === 'accounts' ? 'active' : undefined}><FormattedMessage id='search_results.accounts' defaultMessage='Profiles' /></button>
113+
<button onClick={this.handleSelectHashtags} className={type === 'hashtags' ? 'active' : undefined}><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></button>
114+
<button onClick={this.handleSelectStatuses} className={type === 'statuses' ? 'active' : undefined}><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></button>
115115
</div>
116116

117117
<div className='explore__search-results'>

app/javascript/mastodon/features/status/index.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ class Status extends ImmutablePureComponent {
568568
onMoveUp={this.handleMoveUp}
569569
onMoveDown={this.handleMoveDown}
570570
contextType='thread'
571-
previousId={i > 0 && list.get(i - 1)}
571+
previousId={i > 0 ? list.get(i - 1) : undefined}
572572
nextId={list.get(i + 1) || (ancestors && statusId)}
573573
rootId={statusId}
574574
/>

app/javascript/mastodon/features/ui/components/modal_root.jsx

+4-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,10 @@ export default class ModalRoot extends PureComponent {
115115
{visible && (
116116
<>
117117
<BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading(type)} error={this.renderError} renderDelay={200}>
118-
{(SpecificComponent) => <SpecificComponent {...props} onChangeBackgroundColor={this.setBackgroundColor} onClose={this.handleClose} ref={this.setModalRef} />}
118+
{(SpecificComponent) => {
119+
const ref = typeof SpecificComponent !== 'function' ? this.setModalRef : undefined;
120+
return <SpecificComponent {...props} onChangeBackgroundColor={this.setBackgroundColor} onClose={this.handleClose} ref={ref} />
121+
}}
119122
</BundleContainer>
120123

121124
<Helmet>

0 commit comments

Comments
 (0)