fix: use styled for generic attachment shadow

renamed attachment container to image grid container
pull/3020/head
William Grant 1 year ago
parent 78da584c02
commit 19b883291f

@ -69,10 +69,6 @@
color: var(--message-bubbles-received-text-color); color: var(--message-bubbles-received-text-color);
background: var(--message-bubbles-received-background-color); background: var(--message-bubbles-received-background-color);
} }
&.message-selected {
box-shadow: var(--drop-shadow);
}
} }
.module-message__generic-attachment__icon-container { .module-message__generic-attachment__icon-container {

@ -54,7 +54,7 @@ type Props = {
highlight?: boolean; highlight?: boolean;
}; };
const StyledAttachmentContainer = styled.div<{ const StyledImageGridContainer = styled.div<{
messageDirection: MessageModelType; messageDirection: MessageModelType;
}>` }>`
text-align: center; text-align: center;
@ -64,6 +64,10 @@ const StyledAttachmentContainer = styled.div<{
justify-content: ${props => (props.messageDirection === 'incoming' ? 'flex-start' : 'flex-end')}; justify-content: ${props => (props.messageDirection === 'incoming' ? 'flex-start' : 'flex-end')};
`; `;
const StyledGenericAttachmentContainer = styled(MessageHighlighter)<{ selected: boolean }>`
${props => props.selected && 'box-shadow: var(--drop-shadow);'}
`;
export const MessageAttachment = (props: Props) => { export const MessageAttachment = (props: Props) => {
const { messageId, imageBroken, handleImageError, highlight = false } = props; const { messageId, imageBroken, handleImageError, highlight = false } = props;
@ -141,14 +145,14 @@ export const MessageAttachment = (props: Props) => {
) { ) {
return ( return (
<MessageHighlighter highlight={highlight}> <MessageHighlighter highlight={highlight}>
<StyledAttachmentContainer messageDirection={direction}> <StyledImageGridContainer messageDirection={direction}>
<ImageGrid <ImageGrid
messageId={messageId} messageId={messageId}
attachments={attachments} attachments={attachments}
onError={handleImageError} onError={handleImageError}
onClickAttachment={onClickOnImageGrid} onClickAttachment={onClickOnImageGrid}
/> />
</StyledAttachmentContainer> </StyledImageGridContainer>
</MessageHighlighter> </MessageHighlighter>
); );
} }
@ -178,12 +182,10 @@ export const MessageAttachment = (props: Props) => {
const extension = getExtensionForDisplay({ contentType, fileName }); const extension = getExtensionForDisplay({ contentType, fileName });
return ( return (
<MessageHighlighter <StyledGenericAttachmentContainer
highlight={highlight} highlight={highlight}
className={classNames( selected={selected}
'module-message__generic-attachment', className={'module-message__generic-attachment'}
selected ? 'message-selected' : undefined
)}
> >
{pending ? ( {pending ? (
<div className="module-message__generic-attachment__spinner-container"> <div className="module-message__generic-attachment__spinner-container">
@ -220,7 +222,7 @@ export const MessageAttachment = (props: Props) => {
{fileSize} {fileSize}
</div> </div>
</div> </div>
</MessageHighlighter> </StyledGenericAttachmentContainer>
); );
}; };

@ -142,7 +142,7 @@ export const GenericReadableMessage = (props: Props) => {
selected={selected} selected={selected}
isDetailView={isDetailView} isDetailView={isDetailView}
isRightClicked={isRightClicked} isRightClicked={isRightClicked}
className={classNames(selected && 'message-selected')} className={classNames(selected ? 'message-selected' : undefined)}
onContextMenu={handleContextMenu} onContextMenu={handleContextMenu}
key={`readable-message-${messageId}`} key={`readable-message-${messageId}`}
> >

Loading…
Cancel
Save