Merge branch 'master' into feat/remove-legacy-style-components

# Conflicts:
#	src/components/MessageInput/MessageInputFlat.tsx
#	src/components/MessageInput/__tests__/MessageInput.test.js

Author: MartinCupela

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
     name: Release from "${{ github.ref_name }}" branch
     runs-on: ubuntu-latest
     # GH does not allow to limit branches in the workflow_dispatch settings so this here is a safety measure
-    if: ${{ !inputs.docs_only && (github.ref_name == 'master' || github.ref_name == 'rc' || github.ref_name == 'release-v9') }}
+    if: ${{ !inputs.docs_only && (startsWith(github.ref_name, 'release') || startsWith(github.ref_name, 'master')) }}
     env:
       NODE_OPTIONS: --max_old_space_size=4096
     steps:
@@ -53,8 +53,8 @@ jobs:
   docs_release:
     name: Publish documentation from "${{ github.ref_name }}" branch to ${{ inputs.docs_env }}
     runs-on: ubuntu-latest
-    # skip during dry runs, release to production only from master, release to staging from anywhere
-    if: ${{ !inputs.dry_run && ((github.ref_name == 'master' && contains('production,staging', inputs.docs_env)) || (github.ref_name != 'master' && inputs.docs_env == 'staging')) }}
+    # skip during dry runs, publish to production only from branches with names starting with "release", publish to staging from anywhere
+    if: ${{ !inputs.dry_run && ((startsWith(github.ref_name, "release") && inputs.docs_env == "production") || inputs.docs_env == "staging") }}
     outputs:
       target-version: $${{ steps.target-version.outputs }}
     steps:

.releaserc.json

@@ -1,14 +1,23 @@
 {
   "branches": [
-    "main",
-    "master",
     {
-      "name": "beta",
+      "name": "master",
+      "channel": "rc",
       "prerelease": true
     },
     {
-      "name": "rc",
-      "prerelease": true
+      "name": "release-v11",
+      "channel": "latest"
+    },
+    {
+      "name": "release-v10",
+      "channel": "v10",
+      "range": "10.x"
+    },
+    {
+      "name": "release-v9",
+      "channel": "v9",
+      "range": "9.x"
     }
   ],
   "plugins": [

developers/RELEASE.md

@@ -17,7 +17,7 @@ At the moment these manual actions have to be taken to achieve a successfull rel
 2. make sure that the peer dependencies `@stream-io/stream-chat-css` and `stream-chat-js` are installed at their latest version (see `package.json`, `yarn.lock`) (if applicable)
 3. squash-merge required pull requests to `master` branch with appropriate message name, for example: `fix(scope): new feature`, if this feature is breaking, make sure to include `BREAKING CHANGE: <reason>` in the message footer
 4. navigate to ["Actions"](https://github.com/GetStream/stream-chat-react/actions) and in the left bar select the "Release" workflow
-5. click "Run workflow" and select the branch you want to release from then adjust the prompt options and click "Run workflow", note that allowed branches for __PACKAGE RELEASE__ are: `master`, `release-v9` and `rc`, there's _is no such limititation_ for the __DOCUMENTATION RELEASE__, extend the workflow condition and `.releaserc.json` as needed
+5. click "Run workflow" and select the branch you want to release from then adjust the prompt options and click "Run workflow", note that allowed branches for __PACKAGE RELEASE__ are: branch names starting with `release` and `master`, there _is no such limititation_ for the __DOCUMENTATION RELEASE__, extend the workflow condition and `.releaserc.json` as needed. The `master` branch is the release-candidate branch.
 
 ## Available release prompt options
 

src/components/Channel/Channel.tsx

@@ -1142,7 +1142,7 @@ const ChannelInner = <
 
   const loadMoreThread = async (limit: number = DEFAULT_THREAD_PAGE_SIZE) => {
     // FIXME: should prevent loading more, if state.thread.reply_count === channel.state.threads[parentID].length
-    if (state.threadLoadingMore || !state.thread) return;
+    if (state.threadLoadingMore || !state.thread || !state.threadHasMore) return;
 
     dispatch({ type: 'startLoadingThread' });
     const parentId = state.thread.id;

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

@@ -30,6 +30,7 @@ import { MessageList } from '../../MessageList';
 import { Thread } from '../../Thread';
 import { MessageProvider } from '../../../context';
 import { MessageActionsBox } from '../../MessageActions';
+import { DEFAULT_THREAD_PAGE_SIZE } from '../../../constants/limits';
 
 jest.mock('../../Loading', () => ({
   LoadingErrorIndicator: jest.fn(() => <div />),
@@ -558,39 +559,68 @@ describe('Channel', () => {
       await waitFor(() => expect(hasThread).toHaveBeenCalledWith(threadMessage.id));
     });
 
-    it('should be able to load more messages in a thread', async () => {
+    it('should be able to load more messages in a thread until reaching the end', async () => {
       const { channel, chatClient } = await initClient();
       const getRepliesSpy = jest.spyOn(channel, 'getReplies');
       const threadMessage = messages[0];
-
-      const replies = [generateMessage({ parent_id: threadMessage.id })];
+      const replies = Array.from({ length: DEFAULT_THREAD_PAGE_SIZE }, () =>
+        generateMessage({ parent_id: threadMessage.id }),
+      );
 
       useMockedApis(chatClient, [threadRepliesApi(replies)]);
 
       const hasThreadMessages = jest.fn();
 
-      await renderComponent(
-        { channel, chatClient },
-        ({ loadMoreThread, openThread, thread, threadMessages }) => {
-          if (!thread) {
-            // first, open a thread
-            openThread(threadMessage, { preventDefault: () => null });
-          } else if (!threadMessages.length) {
-            // then, load more messages in the thread
-            loadMoreThread();
-          } else {
-            // then, call our mock fn so we can verify what was passed as threadMessages
-            hasThreadMessages(threadMessages);
-          }
-        },
+      let callback = ({ loadMoreThread, openThread, thread, threadMessages }) => {
+        if (!thread) {
+          // first, open a thread
+          openThread(threadMessage, { preventDefault: () => null });
+        } else if (!threadMessages.length) {
+          // then, load more messages in the thread
+          loadMoreThread();
+        } else {
+          // then, call our mock fn so we can verify what was passed as threadMessages
+          hasThreadMessages(threadMessages);
+        }
+      };
+      const { rerender } = await render(
+        <Chat client={chatClient}>
+          <Channel channel={channel}>
+            <CallbackEffectWithChannelContexts callback={callback} />
+          </Channel>
+        </Chat>,
       );
 
       await waitFor(() => {
+        expect(getRepliesSpy).toHaveBeenCalledTimes(1);
         expect(getRepliesSpy).toHaveBeenCalledWith(threadMessage.id, expect.any(Object));
-      });
-      await waitFor(() => {
         expect(hasThreadMessages).toHaveBeenCalledWith(replies);
       });
+
+      useMockedApis(chatClient, [threadRepliesApi([])]);
+      callback = ({ loadMoreThread }) => {
+        loadMoreThread();
+      };
+      await act(() => {
+        rerender(
+          <Chat client={chatClient}>
+            <Channel channel={channel}>
+              <CallbackEffectWithChannelContexts callback={callback} />
+            </Channel>
+          </Chat>,
+        );
+      });
+      expect(getRepliesSpy).toHaveBeenCalledTimes(2);
+      await act(() => {
+        rerender(
+          <Chat client={chatClient}>
+            <Channel channel={channel}>
+              <CallbackEffectWithChannelContexts callback={callback} />
+            </Channel>
+          </Chat>,
+        );
+      });
+      expect(getRepliesSpy).toHaveBeenCalledTimes(2);
     });
 
     it('should allow closing a thread after it has been opened', async () => {