Merge branch 'master' into emoji-fonts

Author: DanC5

CHANGELOG.md

@@ -1,6 +1,27 @@
 # Changelog
 
 
+## [5.1.0](https://github.com/GetStream/stream-chat-react/releases/tag/v5.1.0) 2021-03-30
+
+### Feature
+
+- Add type support for Moment.js date objects [#809](https://github.com/GetStream/stream-chat-react/pull/809)
+- Add i18n translation support for `ChannelPreview` [#810](https://github.com/GetStream/stream-chat-react/pull/810)
+- Allow `addNotification` function to be called anywhere within `Channel` [#811](https://github.com/GetStream/stream-chat-react/pull/811)
+- Hide `MessageActions` if no actions exist [#816](https://github.com/GetStream/stream-chat-react/pull/816)
+
+### Chore
+
+- Refactor failed message UI component [#811](https://github.com/GetStream/stream-chat-react/pull/811)
+- Remove extra `watchers` query [#817](https://github.com/GetStream/stream-chat-react/pull/817)
+- Prevent `queryUsers` from searching a null value [#817](https://github.com/GetStream/stream-chat-react/pull/817)
+
+## [5.0.3](https://github.com/GetStream/stream-chat-react/releases/tag/v5.0.3) 2021-03-24
+
+### Feature
+
+- Add customization options for `renderText` function [#807](https://github.com/GetStream/stream-chat-react/pull/807)
+
 ## [5.0.2](https://github.com/GetStream/stream-chat-react/releases/tag/v5.0.2) 2021-03-23
 
 ### Bug

docs/build/bundle.c41241d6.js renamed to docs/build/bundle.487833e0.js

@@ -1,6 +1,6 @@
 /*! exports provided: 0, 128, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 142, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 158, 159, default */
 
-/*! exports provided: 1 reply, Attach files, Cancel, Channel Missing, Close, Close emoji picker, Commands matching, Connection failure, reconnecting now..., Delete, Delivered, Edit Message, Emoji matching, Empty message..., Error adding flag: Either the flag already exist or there is issue with network connection ..., Error connecting to chat, refresh the page to try again., Error muting a user ..., Error pinning message, Error removing message pin, Error unmuting a user ..., Error · Unsent, Error: {{ errorMessage }}, Flag, Message Failed · Click to try again, Message deleted, Message failed. Click to try again., Message has been successfully flagged, Message pinned, Mute, New, New Messages!, Nothing yet..., Only visible to you, Open emoji picker, People matching, Pick your emoji, Pin, Pinned by, Send, Sending..., Start of a new thread, This message was deleted..., Thread, Type your message, Unmute, Unpin, You have no channels currently, You've reached the maximum number of files, live, this content could not be displayed, {{ commaSeparatedUsers }} and {{ lastUser }} are typing..., {{ commaSeparatedUsers }} and {{ moreCount }} more, {{ commaSeparatedUsers }}, and {{ lastUser }}, {{ firstUser }} and {{ secondUser }}, {{ firstUser }} and {{ secondUser }} are typing..., {{ imageCount }} more, {{ memberCount }} members, {{ replyCount }} replies, {{ user }} has been muted, {{ user }} has been unmuted, {{ user }} is typing..., {{ watcherCount }} online, 🏙 Attachment..., default */
+/*! exports provided: 1 reply, Attach files, Cancel, Channel Missing, Close, Close emoji picker, Commands matching, Connection failure, reconnecting now..., Delete, Delivered, Edit Message, Emoji matching, Empty message..., Error adding flag: Either the flag already exist or there is issue with network connection ..., Error connecting to chat, refresh the page to try again., Error muting a user ..., Error pinning message, Error removing message pin, Error unmuting a user ..., Error · Unsent, Error: {{ errorMessage }}, Flag, Message Failed · Click to try again, Message Failed · Unauthorized, Message deleted, Message has been successfully flagged, Message pinned, Mute, New, New Messages!, Nothing yet..., Only visible to you, Open emoji picker, People matching, Pick your emoji, Pin, Pinned by, Send, Sending..., Start of a new thread, This message was deleted..., Thread, Type your message, Unmute, Unpin, You have no channels currently, You've reached the maximum number of files, live, this content could not be displayed, {{ commaSeparatedUsers }} and {{ lastUser }} are typing..., {{ commaSeparatedUsers }} and {{ moreCount }} more, {{ commaSeparatedUsers }}, and {{ lastUser }}, {{ firstUser }} and {{ secondUser }}, {{ firstUser }} and {{ secondUser }} are typing..., {{ imageCount }} more, {{ memberCount }} members, {{ replyCount }} replies, {{ user }} has been muted, {{ user }} has been unmuted, {{ user }} is typing..., {{ watcherCount }} online, 🏙 Attachment..., default */
 
 /*! exports provided: ACORN_OPTIONS, default */
 
@@ -44,7 +44,7 @@
 
 /*! exports provided: ChannelContext, ChannelProvider, useChannelContext, withChannelContext */
 
-/*! exports provided: ChannelContext, ChannelProvider, useChannelContext, withChannelContext, ChatContext, ChatProvider, useChatContext, withChatContext, isDayjs, isDate, isNumberOrString, TranslationContext, TranslationProvider, useTranslationContext, withTranslationContext */
+/*! exports provided: ChannelContext, ChannelProvider, useChannelContext, withChannelContext, ChatContext, ChatProvider, useChatContext, withChatContext, isDayOrMoment, isDate, isNumberOrString, TranslationContext, TranslationProvider, useTranslationContext, withTranslationContext */
 
 /*! exports provided: ChannelHeader */
 
@@ -448,7 +448,7 @@
 
 /*! exports provided: isBrowser, default */
 
-/*! exports provided: isDayjs, isDate, isNumberOrString, TranslationContext, TranslationProvider, useTranslationContext, withTranslationContext */
+/*! exports provided: isDayOrMoment, isDate, isNumberOrString, TranslationContext, TranslationProvider, useTranslationContext, withTranslationContext */
 
 /*! exports provided: isElement, isHTMLElement, isShadowRoot */
 
@@ -628,7 +628,7 @@
 
 /*! exports provided: v1, v3, v4, v5, NIL, version, validate, stringify, parse */
 
-/*! exports provided: validateAndGetMessage, isUserMuted, MESSAGE_ACTIONS, defaultPinPermissions, getMessageActions, areMessagePropsEqual, areMessageUIPropsEqual, messageHasReactions, messageHasAttachments, getImages, getNonImageAttachments, getReadByTooltipText */
+/*! exports provided: validateAndGetMessage, isUserMuted, MESSAGE_ACTIONS, defaultPinPermissions, getMessageActions, showMessageActionsBox, areMessagePropsEqual, areMessageUIPropsEqual, messageHasReactions, messageHasAttachments, getImages, getNonImageAttachments, getReadByTooltipText */
 
 /*! exports provided: walk, childKeys */
 

docs/build/bundle.c41241d6.js.LICENSE.txt renamed to docs/build/bundle.487833e0.js.LICENSE.txt

@@ -9,6 +9,6 @@
   </head>
   <body>
     <div id="rsg-root"></div>
-    <script src="build/bundle.c41241d6.js"></script>
+    <script src="build/bundle.487833e0.js"></script>
   </body>
 </html>

docs/index.html

@@ -1,6 +1,6 @@
 {
   "name": "stream-chat-react",
-  "version": "5.0.3",
+  "version": "5.1.0",
   "description": "React components to create chat conversations or livestream style chat",
   "author": "GetStream",
   "homepage": "https://getstream.io/chat/",

package.json

@@ -474,6 +474,7 @@ const ChannelInner = <
       try {
         queryResponse = await channel.query({
           messages: { id_lt: oldestID, limit: perPage },
+          watchers: { limit: perPage },
         });
       } catch (e) {
         console.warn('message pagination request failed with error', e);
@@ -572,10 +573,14 @@ const ChannelInner = <
             status: 'received',
           });
         }
-      } catch (e) {
-        // set the message to failed..
+      } catch (error) {
+        // error response isn't usable so needs to be stringified then parsed
+        const stringError = JSON.stringify(error);
+        const parsedError = stringError ? JSON.parse(stringError) : {};
+
         updateMessage({
           ...message,
+          errorStatusCode: (parsedError.status as number) || undefined,
           status: 'failed',
         });
       }
@@ -644,6 +649,7 @@ const ChannelInner = <
       // set the message status to sending
       updateMessage({
         ...message,
+        errorStatusCode: undefined,
         status: 'sending',
       });
 

src/components/Channel/Channel.tsx

@@ -407,6 +407,9 @@ describe('Channel', () => {
               id_lt: messages[0].id,
               limit,
             },
+            watchers: {
+              limit,
+            },
           }),
         );
 

src/components/Channel/__tests__/Channel.test.js

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import debounce from 'lodash.debounce';
 
 import { AutoCompleteTextarea } from '../AutoCompleteTextarea';
@@ -244,7 +244,7 @@ const UnMemoizedChatAutoComplete = <
     value,
   } = props;
 
-  const { channel, emojiConfig, thread } = useChannelContext<
+  const { channel, emojiConfig } = useChannelContext<
     At,
     Ch,
     Co,
@@ -257,18 +257,6 @@ const UnMemoizedChatAutoComplete = <
 
   const [searching, setSearching] = useState(false);
 
-  useEffect(() => {
-    const getWatchers = async () => {
-      await channel?.watch({
-        watchers: { limit: 100, offset: 0 },
-      });
-    };
-
-    if (!thread) {
-      getWatchers();
-    }
-  }, []);
-
   const members = channel?.state?.members;
   const watchers = channel?.state?.watchers;
   const { emojiData, EmojiIndex } = emojiConfig || {};
@@ -341,7 +329,7 @@ const UnMemoizedChatAutoComplete = <
     query: string,
     onReady: (users: UserResponse<Us>[]) => void,
   ) => {
-    if (searching) return;
+    if (!query || searching) return;
     setSearching(true);
 
     try {

src/components/ChatAutoComplete/ChatAutoComplete.tsx

@@ -39,7 +39,7 @@ const UnMemoizedDateSeparator = (props: DateSeparatorProps) => {
         <hr className='str-chat__date-separator-line' />
       )}
       <div className='str-chat__date-separator-date'>
-        {unread ? t('New') : formattedDate}
+        {unread ? `${t('New')} - ${formattedDate}` : formattedDate}
       </div>
       {(position === 'left' || position === 'center') && (
         <hr className='str-chat__date-separator-line' />

src/components/DateSeparator/DateSeparator.tsx

@@ -12,9 +12,7 @@ Dayjs.extend(calendar);
 
 afterEach(cleanup); // eslint-disable-line
 
-// this changes every time tests are run,
-// but by mocking the actual renderers tests are still deterministic
-const now = new Date();
+const now = new Date('2020-03-30T22:57:47.173Z');
 
 const withContext = (props) => {
   const t = jest.fn((key) => key);
@@ -41,7 +39,7 @@ describe('DateSeparator', () => {
     const { Component, t } = withContext({ date: now, unread: true });
     const { queryByText } = render(Component);
 
-    expect(queryByText('New')).toBeInTheDocument();
+    expect(queryByText('New - 03/30/2020')).toBeInTheDocument();
     expect(t).toHaveBeenCalledWith('New');
   });
 
@@ -58,7 +56,7 @@ describe('DateSeparator', () => {
         <div
           className="str-chat__date-separator-date"
         >
-          New
+          New - 03/30/2020
         </div>
       </div>
     `);