fix: prevent showing link previews in AttachmentPreviewList

GetStream · May 22, 2024 · f805971 · f805971
1 parent 28b6dfd
commit f805971
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/components/MessageInput/AttachmentPreviewList/AttachmentPreviewList.tsx b/src/components/MessageInput/AttachmentPreviewList/AttachmentPreviewList.tsx
@@ -23,6 +23,7 @@ import {
   isLocalImageAttachment,
   isLocalMediaAttachment,
   isLocalVoiceRecordingAttachment,
+  isScrapedContent,
 } from '../../Attachment';
 import { useMessageInputContext } from '../../../context';
 
@@ -66,6 +67,7 @@ export const AttachmentPreviewList = <
         data-testid='attachment-list-scroll-container'
       >
         {attachments.map((attachment) => {
+          if (isScrapedContent(attachment)) return null;
           if (isLocalVoiceRecordingAttachment(attachment)) {
             return (
               <VoiceRecordingPreview

diff --git a/src/components/MessageInput/MessageInputFlat.tsx b/src/components/MessageInput/MessageInputFlat.tsx
@@ -279,9 +279,11 @@ const MessageInputV2 = <
           </div>
           <div className='str-chat__message-textarea-container'>
             {displayQuotedMessage && <QuotedMessagePreview quotedMessage={quotedMessage} />}
-            {isUploadEnabled && !!(numberOfUploads || attachments.length) && (
-              <AttachmentPreviewList />
-            )}
+            {isUploadEnabled &&
+              !!(
+                numberOfUploads ||
+                (attachments.length && attachments.length !== linkPreviews.size)
+              ) && <AttachmentPreviewList />}
 
             <div className='str-chat__message-textarea-with-emoji-picker'>
               <ChatAutoComplete />

diff --git a/src/components/MessageInput/__tests__/MessageInput.test.js b/src/components/MessageInput/__tests__/MessageInput.test.js
@@ -562,6 +562,17 @@ function axeNoViolations(container) {
         });
       });
 
+      // todo: adjust tests once merged PR: feat: remove legacy style components #2394
+      it.todo('should show attachment previews if at least 1 file uploaded');
+      it.todo('should show attachment previews if at least one non-scraped attachments available');
+      it.todo('should not show scraped content in attachment previews');
+      it.todo(
+        'should not show attachment previews if no files uploaded and no attachments available',
+      );
+      it.todo(
+        'should not show attachment previews if no files uploaded and attachments available are only link previews',
+      );
+
       // TODO: Check if pasting plaintext is not prevented -> tricky because recreating exact event is hard
       // TODO: Remove image/file -> difficult because there is no easy selector and components are in react-file-utils
     });