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

Do not nest buttons in the conversation header

Browse source
This commit is contained in:
Josh Perez 2023-04-24 16:18:00 -04:00 • committed by GitHub
parent 781531d8d7
commit d39ef234e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ts/components/conversation/conversation-details/ConversationDetailsHeader.tsx
View file

@ -54,6 +54,7 @@ export function ConversationDetailsHeader({
let preferredBadge: undefined | BadgeType; let preferredBadge: undefined | BadgeType;
let subtitle: ReactNode; let subtitle: ReactNode;
let hasNestedButton = false;
if (isGroup) { if (isGroup) {
if (conversation.groupDescription) { if (conversation.groupDescription) {
subtitle = ( subtitle = (
@ -63,6 +64,7 @@ export function ConversationDetailsHeader({
title={conversation.title} title={conversation.title}
/> />
); );
hasNestedButton = true;
} else if (canEdit) { } else if (canEdit) {
subtitle = i18n('icu:ConversationDetailsHeader--add-group-description'); subtitle = i18n('icu:ConversationDetailsHeader--add-group-description');
} else { } else {
@ -163,6 +165,9 @@ export function ConversationDetailsHeader({
> >
{contents} {contents}
</button> </button>
{hasNestedButton ? (
<div className={bem('subtitle')}>{subtitle}</div>
) : (
<button <button
type="button" type="button"
onClick={ev => { onClick={ev => {
@ -178,6 +183,7 @@ export function ConversationDetailsHeader({
> >
<div className={bem('subtitle')}>{subtitle}</div> <div className={bem('subtitle')}>{subtitle}</div>
</button> </button>
)}
</div> </div>
); );
} }