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

Fix hover/focus bg overriding active bg in ConversationList

Browse source 
Co-authored-by: trevor-signal <131492920+trevor-signal@users.noreply.github.com>
This commit is contained in:
Jamie Kyle 2023-09-18 14:00:26 -07:00 • committed by GitHub
parent d6cc067507
commit 17ea2b58de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ts/components/ListTile.tsx
View file

@ -27,6 +27,7 @@ export type Props = {
// defaults to div
rootElement?: 'div' | 'button';
testId?: string;
'aria-selected'?: boolean;
};
/**
@ -80,6 +81,7 @@ const ListTileImpl = React.forwardRef<HTMLButtonElement, Props>(
variant = 'item',
rootElement = 'div',
testId,
...ariaProps
}: Props,
ref
) {
@ -97,6 +99,7 @@ const ListTileImpl = React.forwardRef<HTMLButtonElement, Props>(
'aria-disabled': disabled ? true : undefined,
onContextMenu,
'data-testid': testId,
...ariaProps,
};
const contents = (

2
ts/components/conversationList/BaseConversationListItem.tsx
View file

@ -257,7 +257,7 @@ export const BaseConversationListItem: FunctionComponent<PropsType> =
className={classNames(
commonClassNames,
`${BASE_CLASS_NAME}--is-checkbox`,
{ [`${BASE_CLASS_NAME}--is-checkbox--disabled`]: disabled }
{ [`${BASE_CLASS_NAME}--disabled`]: disabled }
)}
data-id={identifier}
data-testid={testId}