diff options
author | kibigo! <marrus-sh@users.noreply.github.com> | 2018-01-05 20:04:13 -0800 |
---|---|---|
committer | kibigo! <marrus-sh@users.noreply.github.com> | 2018-01-05 20:43:16 -0800 |
commit | ad10a80a9925c247ef14837d3a14ff7e7375f001 (patch) | |
tree | 6af7809a0a3c0c043e496274711c912bbf9acf98 /app/javascript/flavours/glitch/components/display_name.js | |
parent | 8bf9d9362a4eeb774d849887c1645b3175d73828 (diff) |
Styling and autosuggest fixes for #293
Diffstat (limited to 'app/javascript/flavours/glitch/components/display_name.js')
-rw-r--r-- | app/javascript/flavours/glitch/components/display_name.js | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/app/javascript/flavours/glitch/components/display_name.js b/app/javascript/flavours/glitch/components/display_name.js index ad1c3a534..4c65aaefa 100644 --- a/app/javascript/flavours/glitch/components/display_name.js +++ b/app/javascript/flavours/glitch/components/display_name.js @@ -1,28 +1,30 @@ +// Package imports. import classNames from 'classnames'; import PropTypes from 'prop-types'; import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; -export default class DisplayName extends React.PureComponent { - - static propTypes = { - account: ImmutablePropTypes.map.isRequired, - className: PropTypes.string, - }; - - render () { - const { - account, - className, - } = this.props; - const computedClass = classNames('display-name', className); - const displayNameHtml = { __html: account.get('display_name_html') }; - - return ( - <span className={computedClass}> - <strong className='display-name__html' dangerouslySetInnerHTML={displayNameHtml} /> <span className='display-name__account'>@{this.props.account.get('acct')}</span> - </span> - ); - } +// The component. +export default function DisplayName ({ + account, + className, + inline, +}) { + const computedClass = classNames('display-name', { inline }, className); + // The result. + return account ? ( + <span className={computedClass}> + <strong className='display-name__html' dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} /> + {inline ? ' ' : null} + <span className='display-name__account'>@{account.get('acct')}</span> + </span> + ) : null; } + +// Props. +DisplayName.propTypes = { + account: ImmutablePropTypes.map, + className: PropTypes.string, + inline: PropTypes.bool, +}; |