-
Notifications
You must be signed in to change notification settings - Fork 292
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Group messages in the chat by user and timestamp (#16496)
* feat: Group messages in the chat by user and timestamp * feat: Prepare new version * improve message asset read indicator * revert opacity to 0 for not hovered message * revert expectsReadConfirmation * clear unecessary styles
- Loading branch information
Showing
9 changed files
with
259 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
src/script/components/MessagesList/Message/ReadIndicator/ReadIndicator.styles.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2024 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| * | ||
| */ | ||
|
|
||
| import {CSSObject} from '@emotion/react'; | ||
|
|
||
| export const ReadReceiptText: CSSObject = { | ||
| display: 'inline-flex', | ||
| alignItems: 'center', | ||
| verticalAlign: 'bottom', | ||
| }; | ||
|
|
||
| export const ReadIndicatorStyles = (showIconOnly = false): CSSObject => ({ | ||
| color: 'var(--gray-70)', | ||
| fontSize: 'var(--font-size-small)', | ||
| fontWeight: 'var(--font-weight-medium)', | ||
| lineHeight: 'var(--line-height-sm)', | ||
|
|
||
| svg: { | ||
| width: '10px', | ||
| minHeight: '10px', | ||
| marginRight: '4px', | ||
| fill: 'currentColor', | ||
| }, | ||
|
|
||
| ...(showIconOnly && { | ||
| display: 'flex', | ||
| alignItems: 'center', | ||
| marginLeft: '8px', | ||
| }), | ||
|
|
||
| '.message-asset &': { | ||
| marginTop: '8px', | ||
| marginLeft: '12px', | ||
| }, | ||
|
|
||
| ...(!showIconOnly && { | ||
| opacity: 0, | ||
| '.message:hover &': { | ||
| opacity: '1', | ||
| }, | ||
| }), | ||
| }); |
92 changes: 92 additions & 0 deletions
92
src/script/components/MessagesList/Message/ReadIndicator/ReadIndicator.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2024 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| * | ||
| */ | ||
|
|
||
| import {Icon} from 'Components/Icon'; | ||
| import {useKoSubscribableChildren} from 'Util/ComponentUtil'; | ||
| import {t} from 'Util/LocalizerUtil'; | ||
| import {formatTimeShort} from 'Util/TimeUtil'; | ||
|
|
||
| import {ReadIndicatorStyles, ReadReceiptText} from './ReadIndicator.styles'; | ||
|
|
||
| import {Message} from '../../../../entity/message/Message'; | ||
|
|
||
| interface ReadIndicatorProps { | ||
| message: Message; | ||
| is1to1Conversation?: boolean; | ||
| isLastDeliveredMessage?: boolean; | ||
| showIconOnly?: boolean; | ||
| onClick: (message: Message) => void; | ||
| } | ||
|
|
||
| export const ReadIndicator = ({ | ||
| message, | ||
| is1to1Conversation = false, | ||
| isLastDeliveredMessage = false, | ||
| showIconOnly = false, | ||
| onClick, | ||
| }: ReadIndicatorProps) => { | ||
| const {readReceipts} = useKoSubscribableChildren(message, ['readReceipts']); | ||
|
|
||
| if (!message.expectsReadConfirmation) { | ||
| return null; | ||
| } | ||
|
|
||
| if (is1to1Conversation) { | ||
| const readReceiptText = readReceipts.length ? formatTimeShort(readReceipts[0].time) : ''; | ||
| const showDeliveredMessage = isLastDeliveredMessage && readReceiptText === ''; | ||
|
|
||
| return ( | ||
| <span css={ReadIndicatorStyles(showIconOnly)} data-uie-name="status-message-read-receipts"> | ||
| {showDeliveredMessage && ( | ||
| <span data-uie-name="status-message-read-receipt-delivered">{t('conversationMessageDelivered')}</span> | ||
| )} | ||
|
|
||
| {showIconOnly && readReceiptText && <Icon.Read />} | ||
|
|
||
| {!showIconOnly && !!readReceiptText && ( | ||
| <div css={ReadReceiptText} data-uie-name="status-message-read-receipt-text"> | ||
| <Icon.Read /> {readReceiptText} | ||
| </div> | ||
| )} | ||
| </span> | ||
| ); | ||
| } | ||
|
|
||
| const readReceiptCount = readReceipts.length; | ||
| const showEyeIndicatorOnly = showIconOnly && readReceiptCount > 0; | ||
|
|
||
| return ( | ||
| <button | ||
| css={ReadIndicatorStyles(showIconOnly)} | ||
| onClick={() => onClick(message)} | ||
| className="button-reset-default" | ||
| data-uie-name="status-message-read-receipts" | ||
| > | ||
| {showEyeIndicatorOnly ? ( | ||
| <Icon.Read /> | ||
| ) : ( | ||
| !!readReceiptCount && ( | ||
| <div css={ReadReceiptText} data-uie-name="status-message-read-receipt-count"> | ||
| <Icon.Read /> {readReceiptCount} | ||
| </div> | ||
| ) | ||
| )} | ||
| </button> | ||
| ); | ||
| }; |
Oops, something went wrong.