fix: alignment message correctly in detail view

pull/3017/head
William Grant 2 years ago
parent 5b832f9f4f
commit 461a23337f

@ -16,6 +16,7 @@ import { ConversationHeaderTitle } from './ConversationHeaderTitle';
export const ConversationHeaderWithDetails = () => { export const ConversationHeaderWithDetails = () => {
const isSelectionMode = useSelector(isMessageSelectionMode); const isSelectionMode = useSelector(isMessageSelectionMode);
// TODO remove I think?
const isMessageDetailOpened = useSelector(isMessageDetailView); const isMessageDetailOpened = useSelector(isMessageDetailView);
const selectedConvoKey = useSelectedConversationKey(); const selectedConvoKey = useSelectedConversationKey();
const dispatch = useDispatch(); const dispatch = useDispatch();
@ -33,6 +34,7 @@ export const ConversationHeaderWithDetails = () => {
width="100%" width="100%"
flexGrow={1} flexGrow={1}
> >
{/* TODO do we remove */}
<BackButton <BackButton
onGoBack={() => { onGoBack={() => {
dispatch(closeMessageDetailsView()); dispatch(closeMessageDetailsView());

@ -134,6 +134,7 @@ export const MessageContentWithStatuses = (props: Props) => {
messageId={messageId} messageId={messageId}
className={classNames('module-message', `module-message--${direction}`)} className={classNames('module-message', `module-message--${direction}`)}
role={'button'} role={'button'}
isDetailView={isDetailView}
onClick={onClickOnMessageOuterContainer} onClick={onClickOnMessageOuterContainer}
onDoubleClickCapture={onDoubleClickReplyToMessage} onDoubleClickCapture={onDoubleClickReplyToMessage}
dataTestId={dataTestId} dataTestId={dataTestId}

@ -83,6 +83,7 @@ export interface ExpirableReadableMessageProps
extends Omit<ReadableMessageProps, 'receivedAt' | 'isUnread'> { extends Omit<ReadableMessageProps, 'receivedAt' | 'isUnread'> {
messageId: string; messageId: string;
isCentered?: boolean; isCentered?: boolean;
isDetailView?: boolean;
} }
export const ExpirableReadableMessage = (props: ExpirableReadableMessageProps) => { export const ExpirableReadableMessage = (props: ExpirableReadableMessageProps) => {
@ -105,13 +106,15 @@ export const ExpirableReadableMessage = (props: ExpirableReadableMessageProps) =
const { const {
messageId, messageId,
direction, direction: _direction,
receivedAt, receivedAt,
isUnread, isUnread,
expirationDurationMs, expirationDurationMs,
expirationTimestamp, expirationTimestamp,
} = selected; } = selected;
// NOTE we want messages on the left in the message detail view regardless of direction
const direction = props.isDetailView ? 'incoming' : _direction;
const isIncoming = direction === 'incoming'; const isIncoming = direction === 'incoming';
return ( return (

@ -185,7 +185,7 @@ export const OverlayMessageInfo = () => {
)} )}
<MessageInfo /> <MessageInfo />
<SpacerLG /> <SpacerLG />
<PanelButtonGroup> <PanelButtonGroup style={{ margin: '0' }}>
<PanelIconButton <PanelIconButton
text={window.i18n('replyToMessage')} text={window.i18n('replyToMessage')}
iconType="reply" iconType="reply"

Loading…
Cancel
Save