Fix AvatarComposite and DisplayName referencing undefined props (#2222)
parent
054df2d67e
commit
058898802a
|
@ -9,7 +9,6 @@ export default class AvatarComposite extends React.PureComponent {
|
||||||
accounts: ImmutablePropTypes.list.isRequired,
|
accounts: ImmutablePropTypes.list.isRequired,
|
||||||
animate: PropTypes.bool,
|
animate: PropTypes.bool,
|
||||||
size: PropTypes.number.isRequired,
|
size: PropTypes.number.isRequired,
|
||||||
onAccountClick: PropTypes.func.isRequired,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static defaultProps = {
|
static defaultProps = {
|
||||||
|
@ -80,15 +79,7 @@ export default class AvatarComposite extends React.PureComponent {
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<a
|
<div key={account.get('id')} style={style} data-avatar-of={`@${account.get('acct')}`} />
|
||||||
href={account.get('url')}
|
|
||||||
target='_blank'
|
|
||||||
onClick={(e) => this.props.onAccountClick(account.get('acct'), e)}
|
|
||||||
title={`@${account.get('acct')}`}
|
|
||||||
key={account.get('id')}
|
|
||||||
>
|
|
||||||
<div style={style} data-avatar-of={`@${account.get('acct')}`} />
|
|
||||||
</a>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,12 +9,9 @@ export default class DisplayName extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
account: ImmutablePropTypes.map,
|
account: ImmutablePropTypes.map,
|
||||||
className: PropTypes.string,
|
|
||||||
inline: PropTypes.bool,
|
|
||||||
localDomain: PropTypes.string,
|
|
||||||
others: ImmutablePropTypes.list,
|
others: ImmutablePropTypes.list,
|
||||||
handleClick: PropTypes.func,
|
localDomain: PropTypes.string,
|
||||||
onAccountClick: PropTypes.func,
|
inline: PropTypes.bool,
|
||||||
};
|
};
|
||||||
|
|
||||||
handleMouseEnter = ({ currentTarget }) => {
|
handleMouseEnter = ({ currentTarget }) => {
|
||||||
|
@ -43,48 +40,30 @@ export default class DisplayName extends React.PureComponent {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
render() {
|
render () {
|
||||||
const { account, className, inline, localDomain, others, onAccountClick } = this.props;
|
const { others, localDomain, inline } = this.props;
|
||||||
|
|
||||||
const computedClass = classNames('display-name', { inline }, className);
|
let displayName, suffix, account;
|
||||||
|
|
||||||
let displayName, suffix;
|
if (others && others.size > 1) {
|
||||||
let acct;
|
displayName = others.take(2).map(a => <bdi key={a.get('id')}><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }} /></bdi>).reduce((prev, cur) => [prev, ', ', cur]);
|
||||||
|
|
||||||
if (account) {
|
if (others.size - 2 > 0) {
|
||||||
acct = account.get('acct');
|
suffix = `+${others.size - 2}`;
|
||||||
|
}
|
||||||
|
} else if ((others && others.size > 0) || this.props.account) {
|
||||||
|
if (others && others.size > 0) {
|
||||||
|
account = others.first();
|
||||||
|
} else {
|
||||||
|
account = this.props.account;
|
||||||
|
}
|
||||||
|
|
||||||
|
let acct = account.get('acct');
|
||||||
|
|
||||||
if (acct.indexOf('@') === -1 && localDomain) {
|
if (acct.indexOf('@') === -1 && localDomain) {
|
||||||
acct = `${acct}@${localDomain}`;
|
acct = `${acct}@${localDomain}`;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (others && others.size > 0) {
|
|
||||||
displayName = others.take(2).map(a => (
|
|
||||||
<a
|
|
||||||
key={a.get('id')}
|
|
||||||
href={a.get('url')}
|
|
||||||
target='_blank'
|
|
||||||
onClick={(e) => onAccountClick(a.get('acct'), e)}
|
|
||||||
title={`@${a.get('acct')}`}
|
|
||||||
rel='noopener noreferrer'
|
|
||||||
>
|
|
||||||
<bdi key={a.get('id')}>
|
|
||||||
<strong className='display-name__html' dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }} />
|
|
||||||
</bdi>
|
|
||||||
</a>
|
|
||||||
)).reduce((prev, cur) => [prev, ', ', cur]);
|
|
||||||
|
|
||||||
if (others.size - 2 > 0) {
|
|
||||||
displayName.push(` +${others.size - 2}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
suffix = (
|
|
||||||
<a href={account.get('url')} target='_blank' onClick={(e) => onAccountClick(account.get('acct'), e)} rel='noopener noreferrer'>
|
|
||||||
<span className='display-name__account'>@{acct}</span>
|
|
||||||
</a>
|
|
||||||
);
|
|
||||||
} else if (account) {
|
|
||||||
displayName = <bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} /></bdi>;
|
displayName = <bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} /></bdi>;
|
||||||
suffix = <span className='display-name__account'>@{acct}</span>;
|
suffix = <span className='display-name__account'>@{acct}</span>;
|
||||||
} else {
|
} else {
|
||||||
|
@ -93,7 +72,7 @@ export default class DisplayName extends React.PureComponent {
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<span className={computedClass} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
|
<span className={classNames('display-name', { inline })} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
|
||||||
{displayName}
|
{displayName}
|
||||||
{inline ? ' ' : null}
|
{inline ? ' ' : null}
|
||||||
{suffix}
|
{suffix}
|
||||||
|
|
Loading…
Reference in New Issue