fix: confirmed no issue with the isVisible check

pull/3020/head
William Grant 1 year ago
parent 3512e60726
commit 91c76e98b8

@ -17,10 +17,7 @@ import {
getQuotedMessageToAnimate, getQuotedMessageToAnimate,
getShouldHighlightMessage, getShouldHighlightMessage,
} from '../../../../state/selectors/conversations'; } from '../../../../state/selectors/conversations';
import { import { useSelectedIsPrivate } from '../../../../state/selectors/selectedConversation';
useSelectedIsGroup,
useSelectedIsPrivate,
} from '../../../../state/selectors/selectedConversation';
import { canDisplayImage } from '../../../../types/Attachment'; import { canDisplayImage } from '../../../../types/Attachment';
import { ScrollToLoadedMessageContext } from '../../SessionMessagesListContainer'; import { ScrollToLoadedMessageContext } from '../../SessionMessagesListContainer';
import { MessageAttachment } from './MessageAttachment'; import { MessageAttachment } from './MessageAttachment';
@ -59,7 +56,6 @@ function onClickOnMessageInnerContainer(event: React.MouseEvent<HTMLDivElement>)
const StyledMessageContent = styled.div<{ msgDirection: MessageModelType }>` const StyledMessageContent = styled.div<{ msgDirection: MessageModelType }>`
display: flex; display: flex;
align-self: ${props => (props.msgDirection === 'incoming' ? 'flex-start' : 'flex-end')}; align-self: ${props => (props.msgDirection === 'incoming' ? 'flex-start' : 'flex-end')};
`; `;
@ -82,9 +78,7 @@ const StyledMessageOpaqueContent = styled(MessageHighlighter)<{
export const IsMessageVisibleContext = createContext(false); export const IsMessageVisibleContext = createContext(false);
// NOTE aligns group member avatars with the ExpireTimer const StyledAvatarContainer = styled.div`
const StyledAvatarContainer = styled.div<{ hideAvatar: boolean; isGroup: boolean }>`
/* margin-inline-start: ${props => (!props.hideAvatar && props.isGroup ? '-11px' : '')}; */
align-self: flex-end; align-self: flex-end;
`; `;
@ -99,13 +93,11 @@ export const MessageContent = (props: Props) => {
const scrollToLoadedMessage = useContext(ScrollToLoadedMessageContext); const scrollToLoadedMessage = useContext(ScrollToLoadedMessageContext);
const selectedIsPrivate = useSelectedIsPrivate(); const selectedIsPrivate = useSelectedIsPrivate();
const isGroup = useSelectedIsGroup();
const hideAvatar = useHideAvatarInMsgList(props.messageId); const hideAvatar = useHideAvatarInMsgList(props.messageId);
const [imageBroken, setImageBroken] = useState(false); const [imageBroken, setImageBroken] = useState(false);
const onVisible = (inView: boolean, _: IntersectionObserverEntry) => { const onVisible = (inView: boolean, _: IntersectionObserverEntry) => {
// TODO[epic=ses-1409] check if there is no issue with focus after simplifiying the check
if (inView) { if (inView) {
if (isMessageVisible !== true) { if (isMessageVisible !== true) {
setMessageIsVisible(true); setMessageIsVisible(true);
@ -179,7 +171,7 @@ export const MessageContent = (props: Props) => {
title={toolTipTitle} title={toolTipTitle}
msgDirection={direction} msgDirection={direction}
> >
<StyledAvatarContainer hideAvatar={hideAvatar} isGroup={isGroup}> <StyledAvatarContainer>
<MessageAvatar <MessageAvatar
messageId={props.messageId} messageId={props.messageId}
hideAvatar={hideAvatar} hideAvatar={hideAvatar}

Loading…
Cancel
Save