mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Hover/focus styles for embedded contacts, default action

Browse source
This commit is contained in:
Scott Nonnenberg 2019-11-14 18:12:31 -08:00
parent bb02fa3a7e
commit 5750412fda
5 changed files with 109 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
ts/components/conversation/Message.tsx
View file

@ -738,6 +738,9 @@ export class Message extends React.PureComponent<Props, State> {
conversationType === 'group' && direction === 'incoming';
const withContentBelow = withCaption || !collapseMetadata;
const otherContent = (contact && contact.signalAccount) || withCaption;
const tabIndex = otherContent ? 0 : -1;
return (
<EmbeddedContact
contact={contact}
@ -748,6 +751,7 @@ export class Message extends React.PureComponent<Props, State> {
}}
withContentAbove={withContentAbove}
withContentBelow={withContentBelow}
tabIndex={tabIndex}
/>
);
}
@ -1250,10 +1254,13 @@ export class Message extends React.PureComponent<Props, State> {
) => {
const {
attachments,
contact,
displayTapToViewMessage,
id,
isTapToView,
isTapToViewExpired,
openConversation,
showContactDetail,
showVisualAttachment,
} = this.props;
const { imageBroken } = this.state;
@ -1321,6 +1328,20 @@ export class Message extends React.PureComponent<Props, State> {
this.audioRef.current.pause();
}
}
if (contact && contact.signalAccount) {
openConversation(contact.signalAccount);
event.preventDefault();
event.stopPropagation();
}
if (contact) {
showContactDetail({ contact, signalAccount: contact.signalAccount });
event.preventDefault();
event.stopPropagation();
}
};
public openGenericAttachment = (event?: React.MouseEvent) => {