djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor DisplayName component to make it closer to upstream

This commit is contained in:
Thibaut Girka 2019-07-23 10:45:35 +02:00
parent cd8763b600
commit 621590b4ab
1 changed files with 54 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
app/javascript/flavours/glitch/components/display_name.js
View File

@ -1,73 +1,69 @@
// Package imports.
import classNames from 'classnames';
import PropTypes from 'prop-types';
import React from 'react'; import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import classNames from 'classnames';
// The component. export default class DisplayName extends React.PureComponent {
export default function DisplayName ({
account,
className,
inline,
localDomain,
others,
onAccountClick,
}) {
const computedClass = classNames('display-name', { inline }, className);
if (!account) return null; static propTypes = {
account: ImmutablePropTypes.map,
className: PropTypes.string,
inline: PropTypes.bool,
localDomain: PropTypes.string,
others: ImmutablePropTypes.list,
handleClick: PropTypes.func,
};
let displayName, suffix; render() {
const { account, className, inline, localDomain, others, onAccountClick } = this.props;
let acct = account.get('acct'); const computedClass = classNames('display-name', { inline }, className);
if (acct.indexOf('@') === -1 && localDomain) { if (!account) return null;
acct = `${acct}@${localDomain}`;
}
if (others && others.size > 0) { let displayName, suffix;
displayName = others.take(2).map(a => (
<a
href={a.get('url')}
target='_blank'
onClick={(e) => onAccountClick(a.get('id'), e)}
title={`@${a.get('acct')}`}
>
<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) { let acct = account.get('acct');
displayName.push(` +${others.size - 2}`);
if (acct.indexOf('@') === -1 && localDomain) {
acct = `${acct}@${localDomain}`;
} }
suffix = ( if (others && others.size > 0) {
<a href={account.get('url')} target='_blank' onClick={(e) => onAccountClick(account.get('id'), e)}> displayName = others.take(2).map(a => (
<span className='display-name__account'>@{acct}</span> <a
</a> href={a.get('url')}
target='_blank'
onClick={(e) => onAccountClick(a.get('id'), e)}
title={`@${a.get('acct')}`}
>
<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('id'), e)}>
<span className='display-name__account'>@{acct}</span>
</a>
);
} else {
displayName = <bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} /></bdi>;
suffix = <span className='display-name__account'>@{acct}</span>;
}
return (
<span className={computedClass}>
{displayName}
{inline ? ' ' : null}
{suffix}
</span>
); );
} else {
displayName = <bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} /></bdi>;
suffix = <span className='display-name__account'>@{acct}</span>;
} }
return (
<span className={computedClass}>
{displayName}
{inline ? ' ' : null}
{suffix}
</span>
);
} }
// Props.
DisplayName.propTypes = {
account: ImmutablePropTypes.map,
className: PropTypes.string,
inline: PropTypes.bool,
localDomain: PropTypes.string,
others: ImmutablePropTypes.list,
handleClick: PropTypes.func,
};