shorthand replacements for React.Fragment and <span>

This commit is contained in:
or-else
2019-09-22 21:18:31 +03:00
parent 2502460143
commit 12a0660e5b
6 changed files with 9 additions and 9 deletions
+2 -2
View File
@@ -57,7 +57,7 @@ export default class PasswordResetView extends React.PureComponent {
onChange={this.handlePasswordChange} /> onChange={this.handlePasswordChange} />
}</FormattedMessage> }</FormattedMessage>
: :
<React.Fragment> <>
<label htmlFor="inputEmail"> <label htmlFor="inputEmail">
<FormattedMessage id="label_reset_password" <FormattedMessage id="label_reset_password"
defaultMessage="Send a password reset email:" defaultMessage="Send a password reset email:"
@@ -72,7 +72,7 @@ export default class PasswordResetView extends React.PureComponent {
onChange={this.handleEmailChange} onChange={this.handleEmailChange}
required autoFocus /> required autoFocus />
}</FormattedMessage> }</FormattedMessage>
</React.Fragment> </>
} }
<div className="dialog-buttons"> <div className="dialog-buttons">
<button className="blue" type="submit">{reset ? <button className="blue" type="submit">{reset ?
+2 -2
View File
@@ -98,10 +98,10 @@ export default class ChatMessage extends React.Component {
}, this); }, this);
content = React.createElement('span', null, Drafty.format(content, draftyFormatter, this)); content = React.createElement('span', null, Drafty.format(content, draftyFormatter, this));
} else if (typeof content != 'string') { } else if (typeof content != 'string') {
content = <span><i className="material-icons">error_outline</i> <i> content = <><i className="material-icons">error_outline</i> <i>
<FormattedMessage id="invalid_content" <FormattedMessage id="invalid_content"
defaultMessage="invalid content" description="Shown when message is unreadable" /> defaultMessage="invalid content" description="Shown when message is unreadable" />
</i></span> </i></>
} }
return ( return (
+1 -1
View File
@@ -16,7 +16,7 @@ export default class ContactBadges extends React.PureComponent {
badges.push(<span className={style} key={b.key || b.name}>{b.name}</span>); badges.push(<span className={style} key={b.key || b.name}>{b.name}</span>);
} }
}); });
return <React.Fragment>{badges}</React.Fragment>; return <>{badges}</>;
} }
return null; return null;
} }
+1 -1
View File
@@ -70,7 +70,7 @@ export default class Contact extends React.Component {
<UnreadBadge count={this.props.unread} /><ContactBadges badges={icon_badges} /> <UnreadBadge count={this.props.unread} /><ContactBadges badges={icon_badges} />
</div> </div>
{this.props.comment ? <div className="contact-comment">{this.props.comment}</div> : null} {this.props.comment ? <div className="contact-comment">{this.props.comment}</div> : null}
<span><ContactBadges badges={badges} /></span> <><ContactBadges badges={badges} /></>
</div> </div>
{this.props.showContextMenu ? {this.props.showContextMenu ?
<span className="menuTrigger"> <span className="menuTrigger">
+2 -2
View File
@@ -35,14 +35,14 @@ export default class ErrorPanel extends React.PureComponent {
return ( return (
<div className={className}> <div className={className}>
<div className="icon"><i className="material-icons">{level}</i></div> <div className="icon"><i className="material-icons">{level}</i></div>
<span> <>
<span dangerouslySetInnerHTML={{__html: this.props.text}} /> <span dangerouslySetInnerHTML={{__html: this.props.text}} />
{this.props.action ? {this.props.action ?
<a href="#" onClick={(e) => {e.preventDefault(); this.props.action();}}> <a href="#" onClick={(e) => {e.preventDefault(); this.props.action();}}>
{this.props.actionText} {this.props.actionText}
</a> </a>
: null} : null}
</span> </>
<div className="cancel"><MenuCancel onCancel={this.hide} /></div> <div className="cancel"><MenuCancel onCancel={this.hide} /></div>
</div> </div>
); );
+1 -1
View File
@@ -137,7 +137,7 @@ export default class TagManager extends React.Component {
<i className="material-icons">edit</i> &nbsp;<FormattedMessage id="title_manage_tags" defaultMessage="Manage" <i className="material-icons">edit</i> &nbsp;<FormattedMessage id="title_manage_tags" defaultMessage="Manage"
description="Section title for the list of tags" /> description="Section title for the list of tags" />
</a> </a>
<span>{tags}</span> <>{tags}</>
</div> </div>
} }
</div> </div>