render @ mention correctly with long title on ConversationListItem

pull/1361/head
Audric Ackermann 5 years ago
parent f3a2c5ca64
commit 4578c635a6
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -100,9 +100,8 @@
padding-inline-start: 3px; padding-inline-start: 3px;
padding-inline-end: 3px; padding-inline-end: 3px;
position: absolute; position: static;
left: 50%; margin-inline-start: 5px;
margin-inline-start: 30px;
top: 2px; top: 2px;
font-weight: 300; font-weight: 300;

@ -108,28 +108,21 @@ class ConversationListItem extends React.PureComponent<Props> {
); );
} }
public renderUnread() { public renderHeader() {
const { unreadCount, mentionedUs } = this.props; const { unreadCount, mentionedUs, i18n, isMe, lastUpdated } = this.props;
const {} = this.props;
let atSymbol = null;
let unreadCountDiv = null;
if (unreadCount > 0) { if (unreadCount > 0) {
const atSymbol = mentionedUs ? <p className="at-symbol">@</p> : null; atSymbol = mentionedUs ? <p className="at-symbol">@</p> : null;
unreadCountDiv = (
return ( <p className="module-conversation-list-item__unread-count">
<div> {unreadCount}
<p className="module-conversation-list-item__unread-count"> </p>
{unreadCount}
</p>
{atSymbol}
</div>
); );
} }
return null;
}
public renderHeader() {
const { unreadCount, i18n, isMe, lastUpdated } = this.props;
return ( return (
<div className="module-conversation-list-item__header"> <div className="module-conversation-list-item__header">
<div <div
@ -142,7 +135,8 @@ class ConversationListItem extends React.PureComponent<Props> {
> >
{this.renderUser()} {this.renderUser()}
</div> </div>
{this.renderUnread()} {unreadCountDiv}
{atSymbol}
{ {
<div <div
className={classNames( className={classNames(

Loading…
Cancel
Save