Fix collapsed corners for link previews and image attachments
This commit is contained in:
parent
65dc9d6afb
commit
9d3498d938
9 changed files with 260 additions and 181 deletions
|
@ -28,7 +28,7 @@ import { MessageMetadata } from './MessageMetadata';
|
|||
import { MessageTextMetadataSpacer } from './MessageTextMetadataSpacer';
|
||||
import { ImageGrid } from './ImageGrid';
|
||||
import { GIF } from './GIF';
|
||||
import { Image } from './Image';
|
||||
import { CurveType, Image } from './Image';
|
||||
import { ContactName } from './ContactName';
|
||||
import type { QuotedAttachmentType } from './Quote';
|
||||
import { Quote } from './Quote';
|
||||
|
@ -908,18 +908,17 @@ export class Message extends React.PureComponent<Props, State> {
|
|||
<div className={containerClassName}>
|
||||
<ImageGrid
|
||||
attachments={attachments}
|
||||
withContentAbove={
|
||||
isSticker || withContentAbove || shouldCollapseAbove
|
||||
}
|
||||
withContentBelow={
|
||||
isSticker || withContentBelow || shouldCollapseBelow
|
||||
}
|
||||
direction={direction}
|
||||
withContentAbove={isSticker || withContentAbove}
|
||||
withContentBelow={isSticker || withContentBelow}
|
||||
isSticker={isSticker}
|
||||
stickerSize={STICKER_SIZE}
|
||||
bottomOverlay={bottomOverlay}
|
||||
i18n={i18n}
|
||||
theme={theme}
|
||||
onError={this.handleImageError}
|
||||
theme={theme}
|
||||
shouldCollapseAbove={shouldCollapseAbove}
|
||||
shouldCollapseBelow={shouldCollapseBelow}
|
||||
tabIndex={tabIndex}
|
||||
onClick={attachment => {
|
||||
if (!isDownloaded(attachment)) {
|
||||
|
@ -1060,6 +1059,7 @@ export class Message extends React.PureComponent<Props, State> {
|
|||
openLink,
|
||||
previews,
|
||||
quote,
|
||||
shouldCollapseAbove,
|
||||
theme,
|
||||
kickOffAttachmentDownload,
|
||||
} = this.props;
|
||||
|
@ -1113,6 +1113,8 @@ export class Message extends React.PureComponent<Props, State> {
|
|||
<ImageGrid
|
||||
attachments={[first.image]}
|
||||
withContentAbove={withContentAbove}
|
||||
direction={direction}
|
||||
shouldCollapseAbove={shouldCollapseAbove}
|
||||
withContentBelow
|
||||
onError={this.handleImageError}
|
||||
i18n={i18n}
|
||||
|
@ -1124,10 +1126,14 @@ export class Message extends React.PureComponent<Props, State> {
|
|||
{first.image && previewHasImage && !isFullSizeImage ? (
|
||||
<div className="module-message__link-preview__icon_container">
|
||||
<Image
|
||||
smallCurveTopLeft={!withContentAbove}
|
||||
noBorder
|
||||
noBackground
|
||||
softCorners
|
||||
curveBottomLeft={
|
||||
withContentAbove ? CurveType.Tiny : CurveType.Small
|
||||
}
|
||||
curveBottomRight={CurveType.Tiny}
|
||||
curveTopRight={CurveType.Tiny}
|
||||
curveTopLeft={CurveType.Tiny}
|
||||
alt={i18n('previewThumbnail', [first.domain])}
|
||||
height={72}
|
||||
width={72}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue