Skip to content

Commit 3ccf813

Browse files
authored
runfix(cells): address multipart file preview issues [WPB-19357] (#19433)
* runfix(cells): address multipart file preview issues [WPB-19357] * remove extraneous css * add self closing tag
1 parent fb70268 commit 3ccf813

File tree

3 files changed

+47
-45
lines changed

3 files changed

+47
-45
lines changed

src/script/components/MessagesList/Message/ContentMessage/asset/MultipartAssets/FileAssetCard/FileAssetSmall/FileAssetSmall.tsx

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -59,33 +59,32 @@ export const FileAssetSmall = ({
5959
};
6060

6161
return (
62-
<button
63-
onClick={showModal}
64-
css={hollowWrapperButtonStyles}
65-
aria-label={t('cells.filePreviewButton.ariaLabel', {name})}
66-
>
67-
<FileCard.Root extension={extension} name={name} size={size}>
68-
<FileCard.Header>
69-
<FileCard.Icon type={isError ? 'unavailable' : 'file'} />
70-
{!isError && <FileCard.Type />}
71-
<FileAssetOptions src={src} name={name} extension={extension} onOpen={showModal} />
72-
</FileCard.Header>
73-
<FileCard.Name variant={isError ? 'secondary' : 'primary'} truncateAfterLines={2} />
74-
<FilePreviewModal
75-
id={id}
76-
fileUrl={src}
77-
filePdfPreviewUrl={pdfPreviewUrl}
78-
fileImagePreviewUrl={imagePreviewUrl}
79-
fileName={name}
80-
fileExtension={extension}
81-
senderName={senderName}
82-
timestamp={timestamp}
83-
isOpen={isOpen}
84-
onClose={() => setIsOpen(false)}
85-
isError={isError}
86-
isLoading={isLoading}
87-
/>
88-
</FileCard.Root>
89-
</button>
62+
<FileCard.Root extension={extension} name={name} size={size}>
63+
<button
64+
onClick={showModal}
65+
css={hollowWrapperButtonStyles}
66+
aria-label={t('cells.filePreviewButton.ariaLabel', {name})}
67+
/>
68+
<FileCard.Header>
69+
<FileCard.Icon type={isError ? 'unavailable' : 'file'} />
70+
{!isError && <FileCard.Type />}
71+
<FileAssetOptions src={src} name={name} extension={extension} onOpen={showModal} />
72+
</FileCard.Header>
73+
<FileCard.Name variant={isError ? 'secondary' : 'primary'} truncateAfterLines={2} />
74+
<FilePreviewModal
75+
id={id}
76+
fileUrl={src}
77+
filePdfPreviewUrl={pdfPreviewUrl}
78+
fileImagePreviewUrl={imagePreviewUrl}
79+
fileName={name}
80+
fileExtension={extension}
81+
senderName={senderName}
82+
timestamp={timestamp}
83+
isOpen={isOpen}
84+
onClose={() => setIsOpen(false)}
85+
isError={isError}
86+
isLoading={isLoading}
87+
/>
88+
</FileCard.Root>
9089
);
9190
};

src/script/components/MessagesList/Message/ContentMessage/asset/MultipartAssets/MultipartAssets.styles.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,11 @@ export const fileCardStyles = {
6363

6464
export const hollowWrapperButtonStyles: CSSObject = {
6565
padding: '0',
66+
position: 'absolute',
67+
left: '0',
68+
width: '100%',
69+
height: '100%',
6670
border: 'none',
6771
background: 'none',
68-
textAlign: 'unset',
6972
cursor: 'pointer',
7073
};

src/script/components/MessagesList/Message/ContentMessage/asset/MultipartAssets/VideoAssetCard/VideoAssetSmall/VideoAssetSmall.tsx

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,21 @@ export const VideoAssetSmall = ({
5252

5353
return (
5454
<>
55-
<button
56-
css={hollowWrapperButtonStyles}
57-
onClick={() => setIsOpen(true)}
58-
aria-label={t('accessibility.conversationAssetImageAlt', {
59-
username: senderName,
60-
messageDate: timestamp,
61-
})}
62-
aria-haspopup="dialog"
63-
aria-expanded={isOpen}
64-
aria-controls={id}
55+
<MediaFilePreviewCard
56+
label={src ? t('conversationFileVideoPreviewLabel', {src}) : ''}
57+
isLoading={isLoading}
58+
isError={isError}
6559
>
66-
<MediaFilePreviewCard
67-
label={src ? t('conversationFileVideoPreviewLabel', {src}) : ''}
68-
isLoading={isLoading}
69-
isError={isError}
60+
<button
61+
css={hollowWrapperButtonStyles}
62+
onClick={() => setIsOpen(true)}
63+
aria-label={t('accessibility.conversationAssetImageAlt', {
64+
username: senderName,
65+
messageDate: timestamp,
66+
})}
67+
aria-haspopup="dialog"
68+
aria-expanded={isOpen}
69+
aria-controls={id}
7070
>
7171
{!isLoading && !isError && (
7272
<>
@@ -76,8 +76,8 @@ export const VideoAssetSmall = ({
7676
</div>
7777
</>
7878
)}
79-
</MediaFilePreviewCard>
80-
</button>
79+
</button>
80+
</MediaFilePreviewCard>
8181
<FileFullscreenModal
8282
id={id}
8383
isOpen={isOpen}

0 commit comments

Comments
 (0)