Merge pull request #840 from GetStream/vishal/image-attachment-fix

fix: allow images attached through file picker to display in gallery view
fix: sticky date header flashing wrong date on first render

Author: vishalnarkhede

package/src/components/MessageList/MessageList.tsx

@@ -349,8 +349,8 @@ const MessageListWithContext = <
   const [lastReceivedId, setLastReceivedId] = useState(getLastReceivedMessage(messageList)?.id);
   const [scrollToBottomButtonVisible, setScrollToBottomButtonVisible] = useState(false);
 
-  const [stickyHeaderDate, setStickyHeaderDate] = useState<Date>(new Date());
-  const stickyHeaderDateRef = useRef(new Date());
+  const [stickyHeaderDate, setStickyHeaderDate] = useState<Date | undefined>();
+  const stickyHeaderDateRef = useRef<Date | undefined>();
   /**
    * channel.lastRead throws error if the channel is not initialized.
    */
@@ -396,7 +396,7 @@ const MessageListWithContext = <
         lastItem?.item?.created_at &&
         !lastItem.item.deleted_at &&
         typeof lastItem.item.created_at !== 'string' &&
-        lastItem.item.created_at.toDateString() !== stickyHeaderDateRef.current.toDateString()
+        lastItem.item.created_at.toDateString() !== stickyHeaderDateRef.current?.toDateString()
       ) {
         stickyHeaderDateRef.current = lastItem.item.created_at;
         setStickyHeaderDate(lastItem.item.created_at);
@@ -819,11 +819,14 @@ const MessageListWithContext = <
   }, [imageString, numberOfMessagesWithImages, threadExists, threadList]);
 
   const stickyHeaderFormatDate =
-    stickyHeaderDate.getFullYear() === new Date().getFullYear() ? 'MMM D' : 'MMM D, YYYY';
-  const tStickyHeaderDate = tDateTimeParser(stickyHeaderDate);
-  const stickyHeaderDateToRender = isDayOrMoment(tStickyHeaderDate)
-    ? tStickyHeaderDate.format(stickyHeaderFormatDate)
-    : new Date(tStickyHeaderDate).toDateString();
+    stickyHeaderDate?.getFullYear() === new Date().getFullYear() ? 'MMM D' : 'MMM D, YYYY';
+  const tStickyHeaderDate = stickyHeaderDate ? tDateTimeParser(stickyHeaderDate) : null;
+  const stickyHeaderDateToRender =
+    tStickyHeaderDate === null
+      ? null
+      : isDayOrMoment(tStickyHeaderDate)
+      ? tStickyHeaderDate.format(stickyHeaderFormatDate)
+      : new Date(tStickyHeaderDate).toDateString();
 
   const dismissImagePicker = () => {
     if (!hasMoved && selectedPicker) {
@@ -890,11 +893,12 @@ const MessageListWithContext = <
       {!loading && (
         <>
           <View style={styles.stickyHeader}>
-            {StickyHeader ? (
-              <StickyHeader dateString={stickyHeaderDateToRender} />
-            ) : messageListLengthAfterUpdate ? (
-              <DateHeader dateString={stickyHeaderDateToRender} />
-            ) : null}
+            {stickyHeaderDateToRender &&
+              (StickyHeader ? (
+                <StickyHeader dateString={stickyHeaderDateToRender} />
+              ) : messageListLengthAfterUpdate ? (
+                <DateHeader dateString={stickyHeaderDateToRender} />
+              ) : null)}
           </View>
           {!disableTypingIndicator && TypingIndicator && typingEventsEnabled !== false && (
             <TypingIndicatorContainer>

package/src/components/MessageList/__tests__/__snapshots__/MessageList.test.js.snap

@@ -896,45 +896,7 @@ exports[`MessageList should render the message list and match snapshot 1`] = `
             "top": 0,
           }
         }
-      >
-        <View
-          style={
-            Array [
-              Object {
-                "alignItems": "center",
-                "alignSelf": "center",
-                "borderRadius": 8,
-                "height": 16,
-                "justifyContent": "center",
-                "marginTop": 8,
-                "paddingHorizontal": 8,
-              },
-              Object {
-                "backgroundColor": "#00000099",
-              },
-              Object {},
-            ]
-          }
-        >
-          <Text
-            style={
-              Array [
-                Object {
-                  "fontSize": 12,
-                  "textAlign": "center",
-                  "textAlignVertical": "center",
-                },
-                Object {
-                  "color": "#FFFFFF",
-                },
-                Object {},
-              ]
-            }
-          >
-            Sep 3
-          </Text>
-        </View>
-      </View>
+      />
       <View
         style={
           Array [

package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap

@@ -858,45 +858,7 @@ exports[`Thread should match thread snapshot 1`] = `
             "top": 0,
           }
         }
-      >
-        <View
-          style={
-            Array [
-              Object {
-                "alignItems": "center",
-                "alignSelf": "center",
-                "borderRadius": 8,
-                "height": 16,
-                "justifyContent": "center",
-                "marginTop": 8,
-                "paddingHorizontal": 8,
-              },
-              Object {
-                "backgroundColor": "#00000099",
-              },
-              Object {},
-            ]
-          }
-        >
-          <Text
-            style={
-              Array [
-                Object {
-                  "fontSize": 12,
-                  "textAlign": "center",
-                  "textAlignVertical": "center",
-                },
-                Object {
-                  "color": "#FFFFFF",
-                },
-                Object {},
-              ]
-            }
-          >
-            Sep 3
-          </Text>
-        </View>
-      </View>
+      />
       <View
         style={
           Array [

package/src/contexts/messageInputContext/MessageInputContext.tsx

@@ -664,13 +664,21 @@ export const MessageInputProvider = <
         return;
       }
       if (file.state === FileState.UPLOADED || file.state === FileState.FINISHED) {
-        attachments.push({
-          asset_url: file.url,
-          file_size: file.file.size,
-          mime_type: file.file.type,
-          title: file.file.name,
-          type: 'file',
-        } as Attachment<At>);
+        if (file.file.type?.startsWith('image/')) {
+          attachments.push({
+            fallback: file.file.name,
+            image_url: file.url,
+            type: 'image',
+          } as Attachment<At>);
+        } else {
+          attachments.push({
+            asset_url: file.url,
+            file_size: file.file.size,
+            mime_type: file.file.type,
+            title: file.file.name,
+            type: 'file',
+          } as Attachment<At>);
+        }
       }
     }