fix: typing bubble relates to current conversation, not selected one

pull/2840/head
Audric Ackermann 2 years ago
parent 63228a97ee
commit a23f53286e

@ -1,16 +1,15 @@
import React from 'react'; import React from 'react';
import styled from 'styled-components'; import styled from 'styled-components';
import { TypingAnimation } from './TypingAnimation';
import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { ConversationTypeEnum } from '../../models/conversationAttributes';
import { useSelectedIsGroup } from '../../state/selectors/selectedConversation'; import { TypingAnimation } from './TypingAnimation';
interface TypingBubbleProps { interface TypingBubbleProps {
conversationType: ConversationTypeEnum; conversationType: ConversationTypeEnum;
isTyping: boolean; isTyping: boolean;
} }
const TypingBubbleContainer = styled.div<TypingBubbleProps>` const TypingBubbleContainer = styled.div<Pick<TypingBubbleProps, 'isTyping'>>`
height: ${props => (props.isTyping ? 'auto' : '0px')}; height: ${props => (props.isTyping ? 'auto' : '0px')};
display: flow-root; display: flow-root;
padding-bottom: ${props => (props.isTyping ? '4px' : '0px')}; padding-bottom: ${props => (props.isTyping ? '4px' : '0px')};
@ -23,13 +22,13 @@ const TypingBubbleContainer = styled.div<TypingBubbleProps>`
`; `;
export const TypingBubble = (props: TypingBubbleProps) => { export const TypingBubble = (props: TypingBubbleProps) => {
const isOpenOrClosedGroup = useSelectedIsGroup(); const isPrivate = props.conversationType === ConversationTypeEnum.PRIVATE;
if (!isOpenOrClosedGroup || !props.isTyping) { if (!isPrivate || !props.isTyping) {
return null; return null;
} }
return ( return (
<TypingBubbleContainer {...props}> <TypingBubbleContainer isTyping={props.isTyping}>
<TypingAnimation /> <TypingAnimation />
</TypingBubbleContainer> </TypingBubbleContainer>
); );

Loading…
Cancel
Save