Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Add title on conversation with a status on the conversation list (ACC-444) #14559

Merged
merged 1 commit into from
Jan 30, 2023
Merged

feat: Add title on conversation with a status on the conversation list (ACC-444) #14559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/i18n/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
"accessibility.conversationDetailsCloseLabel": "Close image details view",
"accessibility.conversationOptionsMenu": "Open conversation options",
"accessibility.conversationOptionsMenuAccessKey": "Use right arrow key to focus on the conversation options menu",
"accessibility.conversationTitle": "{{username}} status {{status}}",
"accessibility.conversationStatusMuted": "Muted conversation",
"accessibility.conversationStatusPending": "Pending connection request",
"accessibility.conversationStatusUnread": "Unread message",
Expand Down
4 changes: 3 additions & 1 deletion src/script/components/AvailabilityState.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export interface AvailabilityStateProps {
className?: string;
dataUieName: string;
label: string;
title?: string;
onClick?: (event: React.MouseEvent | React.KeyboardEvent) => void;
showArrow?: boolean;
theme?: boolean;
Expand All @@ -58,6 +59,7 @@ const AvailabilityState: React.FC<AvailabilityStateProps> = ({
className,
dataUieName,
label,
title,
showArrow = false,
theme = false,
onClick,
Expand Down Expand Up @@ -117,7 +119,7 @@ const AvailabilityState: React.FC<AvailabilityStateProps> = ({
className={cx('availability-state-label', {'availability-state-label--active': theme})}
css={{userSelect: 'none'}}
data-uie-name="status-label"
title={label}
title={title || label}
>
{label}
</span>
Expand Down
16 changes: 16 additions & 0 deletions src/script/components/list/ConversationListCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ import React, {

import cx from 'classnames';

import {Availability} from '@wireapp/protocol-messaging';

import {AvailabilityState} from 'Components/AvailabilityState';
import {Avatar, AVATAR_SIZE} from 'Components/Avatar';
import {GroupAvatar} from 'Components/avatar/GroupAvatar';
Expand Down Expand Up @@ -174,6 +176,19 @@ const ConversationListCell: React.FC<ConversationListCellProps> = ({

const mainButtonTabIndex = useMessageFocusedTabIndex(focusConversation);
const contextMenuButtonTabIndex = useMessageFocusedTabIndex(focusContextMenu && focusConversation);
const availabilityStrings: Record<string, string> = {
[Availability.Type.AVAILABLE]: t('userAvailabilityAvailable'),
[Availability.Type.AWAY]: t('userAvailabilityAway'),
[Availability.Type.BUSY]: t('userAvailabilityBusy'),
};
const availabilityTitle = [Availability.Type.AWAY, Availability.Type.BUSY, Availability.Type.AVAILABLE].includes(
availabilityOfUser,
)
? t('accessibility.conversationTitle', {
username: displayName,
status: availabilityStrings[availabilityOfUser],
})
: displayName;

return (
<li onContextMenu={openContextMenu}>
Expand Down Expand Up @@ -216,6 +231,7 @@ const ConversationListCell: React.FC<ConversationListCellProps> = ({
label={displayName}
theme={isActive}
dataUieName="status-availability-item"
title={availabilityTitle}
/>
) : (
<span className={cx('conversation-list-cell-name', {'conversation-list-cell-name--active': isActive})}>
Expand Down