Revert "Merge pull request #788 from GetStream/channel-concurrency-fix"

tsirlucas · tsirlucas · commit d981af0e5f6f · 2021-08-27T17:06:35.000-03:00
This reverts commit eab95f0, reversing changes made to 5fa9f29.
diff --git a/docusaurus/docs/reactnative/basics/hello_stream_chat.mdx b/docusaurus/docs/reactnative/basics/hello_stream_chat.mdx
@@ -425,7 +425,7 @@ export const App = () => {
     <OverlayProvider>
       <Chat client={client}>
         {channel ? (
-          <Channel channel={channel} keyboardVerticalOffset={0} thread={thread} threadList={!!thread}>
+          <Channel channel={channel} keyboardVerticalOffset={0} thread={thread}>
             {thread ? (
               <Thread />
             ) : (
@@ -540,7 +540,7 @@ export const App = () => {
       <View style={{ flex: 1 }}>
         <Chat client={client}>
           {channel ? (
-            <Channel channel={channel} keyboardVerticalOffset={60} thread={thread} threadList={!!thread}>
+            <Channel channel={channel} keyboardVerticalOffset={60} thread={thread}>
               {thread ? (
                 <Thread />
               ) : (
diff --git a/docusaurus/docs/reactnative/basics/stream_chat_with_navigation.mdx b/docusaurus/docs/reactnative/basics/stream_chat_with_navigation.mdx
@@ -242,7 +242,7 @@ export const ThreadScreen = () => {
   const { setThread, thread } = useAppThread();
 
   return (
-    <Channel channel={channel} thread={thread} threadList>
+    <Channel channel={channel} thread={thread}>
       <Thread onThreadDismount={() => setThread(undefined)} />
     </Channel>
   );
diff --git a/docusaurus/docs/reactnative/basics/troubleshooting.mdx b/docusaurus/docs/reactnative/basics/troubleshooting.mdx
@@ -30,7 +30,7 @@ We suggest you keep track of a `thread` state on your own and provide it to any
 
 ```tsx {2}
 <Chat client={chatClient} i18nInstance={streami18n}>
-  <Channel channel={channel} thread={thread} threadList>
+  <Channel channel={channel} thread={thread}>
     <Thread onThreadDismount={() => setThread(null)} />
   </Channel>
 </Chat>
@@ -73,7 +73,7 @@ To do this make sure your `Channel` components are always aware of the thread st
 ```
 
 ```tsx
-<Channel channel={channel} thread={thread} threadList>
+<Channel channel={channel} thread={thread}>
   <Thread onThreadDismount={() => setThread(null)} />
 </Channel>
 ```
diff --git a/docusaurus/docs/reactnative/common-content/core-components/channel/props/thread_list.mdx b/docusaurus/docs/reactnative/common-content/core-components/channel/props/thread_list.mdx
diff --git a/docusaurus/docs/reactnative/core-components/channel.mdx b/docusaurus/docs/reactnative/core-components/channel.mdx
@@ -113,7 +113,6 @@ import SendButton from '../common-content/core-components/channel/props/send_but
 import ShowThreadMessageInChannelButton from '../common-content/core-components/channel/props/show_thread_message_in_channel_button.mdx'
 import SupportedReactions from '../common-content/core-components/channel/props/supported_reactions.mdx';
 import Thread from '../common-content/core-components/channel/props/thread.mdx'
-import ThreadList from '../common-content/core-components/channel/props/thread_list.mdx';
 import ThreadRepliesEnabled from '../common-content/core-components/channel/props/thread_replies_enabled.mdx'
 import ThreadReply from '../common-content/core-components/channel/props/thread_reply.mdx';
 import TypingEventsEnabled from '../common-content/core-components/channel/props/typing_events_enabled.mdx'
@@ -678,10 +677,6 @@ Callback function to set the [ref](https://reactjs.org/docs/refs-and-the-dom.htm
 
 <Thread />
 
-### threadList
-
-<ThreadList />
-
 ### threadReply
 
 <ThreadReply />
diff --git a/docusaurus/docs/reactnative/ui-components/thread.mdx b/docusaurus/docs/reactnative/ui-components/thread.mdx
@@ -18,7 +18,7 @@ Component to render thread replies for a message, along with and input box for a
 ```tsx
 <OverlayProvider>
   <Chat client={client}>
-    <Channel channel={channel} thread={messageId} threadList>
+    <Channel channel={channel} thread={messageId}>
       <Thread />
     </Channel>
   </Chat>
diff --git a/examples/ExpoMessaging/App.js b/examples/ExpoMessaging/App.js
@@ -105,7 +105,7 @@ const ThreadScreen = () => {
   return (
     <SafeAreaView>
       <Chat client={chatClient} i18nInstance={streami18n}>
-        <Channel channel={channel} keyboardVerticalOffset={headerHeight} thread={thread} threadList>
+        <Channel channel={channel} keyboardVerticalOffset={headerHeight} thread={thread}>
           <View
             style={{
               flex: 1,
diff --git a/examples/NativeMessaging/App.js b/examples/NativeMessaging/App.js
@@ -104,7 +104,7 @@ const ThreadScreen = () => {
   return (
     <SafeAreaView>
       <Chat client={chatClient} i18nInstance={streami18n}>
-        <Channel channel={channel} keyboardVerticalOffset={headerHeight} thread={thread} threadList>
+        <Channel channel={channel} keyboardVerticalOffset={headerHeight} thread={thread}>
           <View
             style={{
               flex: 1,
diff --git a/examples/SampleApp/src/screens/ThreadScreen.tsx b/examples/SampleApp/src/screens/ThreadScreen.tsx
@@ -93,7 +93,6 @@ export const ThreadScreen: React.FC<ThreadScreenProps> = ({
         enforceUniqueReaction
         keyboardVerticalOffset={0}
         thread={thread}
-        threadList
       >
         <View style={styles.container}>
           <ThreadHeader thread={thread} />
diff --git a/examples/TypeScriptMessaging/App.tsx b/examples/TypeScriptMessaging/App.tsx
@@ -172,7 +172,7 @@ const ThreadScreen: React.FC<ThreadScreenProps> = ({ navigation }) => {
   return (
     <SafeAreaView>
       <Chat client={chatClient} i18nInstance={streami18n}>
-        <Channel channel={channel} keyboardVerticalOffset={headerHeight} thread={thread} threadList>
+        <Channel channel={channel} keyboardVerticalOffset={headerHeight} thread={thread}>
           <View
             style={{
               flex: 1,
diff --git a/package/package.json b/package/package.json
@@ -81,7 +81,7 @@
     "path": "0.12.7",
     "react-art": "^17.0.2",
     "react-native-markdown-package": "1.8.1",
-    "stream-chat": "~4.0.0"
+    "stream-chat": "~3.13.1"
   },
   "peerDependencies": {
     "react": "*",
diff --git a/package/src/components/Channel/Channel.tsx b/package/src/components/Channel/Channel.tsx
@@ -559,8 +559,6 @@ const ChannelWithContext = <
     ChannelContextValue<At, Ch, Co, Ev, Me, Re, Us>['watchers']
   >({});
 
-  const [syncingChannel, setSyncingChannel] = useState(false);
-
   const { setTargetedMessage, targetedMessage } = useTargetedMessage(messageId);
 
   const channelId = channel?.id || '';
@@ -735,7 +733,7 @@ const ChannelWithContext = <
       client.off('connection.changed', connectionChangedHandler);
       channel?.off(handleEvent);
     };
-  }, [channelId, connectionChangedHandler, connectionRecoveredHandler, handleEvent]);
+  }, [channelId, connectionRecoveredHandler, handleEvent]);
 
   const channelQueryCall = async (queryCall: () => void = () => null) => {
     setError(false);
@@ -898,8 +896,7 @@ const ChannelWithContext = <
   };
 
   const resyncChannel = async () => {
-    if (!channel || syncingChannel) return;
-    setSyncingChannel(true);
+    if (!channel) return;
 
     setError(false);
     try {
@@ -997,8 +994,6 @@ const ChannelWithContext = <
       setError(err);
       setLoading(false);
     }
-
-    setSyncingChannel(false);
   };
 
   const reloadChannel = () =>
diff --git a/package/src/components/Message/MessageSimple/MessageReplies.tsx b/package/src/components/Message/MessageSimple/MessageReplies.tsx
@@ -220,14 +220,12 @@ const areEqual = <
   const {
     message: prevMessage,
     noBorder: prevNoBorder,
-    onOpenThread: prevOnOpenThread,
     t: prevT,
     threadList: prevThreadList,
   } = prevProps;
   const {
     message: nextMessage,
     noBorder: nextNoBorder,
-    onOpenThread: nextOnOpenThread,
     t: nextT,
     threadList: nextThreadList,
   } = nextProps;
@@ -244,9 +242,6 @@ const areEqual = <
   const tEqual = prevT === nextT;
   if (!tEqual) return false;
 
-  const onOpenThreadEqual = prevOnOpenThread === nextOnOpenThread;
-  if (!onOpenThreadEqual) return false;
-
   return true;
 };
 
diff --git a/package/src/components/Thread/components/ThreadFooterComponent.tsx b/package/src/components/Thread/components/ThreadFooterComponent.tsx
@@ -146,18 +146,6 @@ const areEqual = <
     prevThread?.reply_count === nextThread?.reply_count;
   if (!threadEqual) return false;
 
-  const latestReactionsEqual =
-    prevThread &&
-    nextThread &&
-    Array.isArray(prevThread.latest_reactions) &&
-    Array.isArray(nextThread.latest_reactions)
-      ? prevThread.latest_reactions.length === nextThread.latest_reactions.length &&
-        prevThread.latest_reactions.every(
-          ({ type }, index) => type === nextThread.latest_reactions?.[index].type,
-        )
-      : prevThread?.latest_reactions === nextThread?.latest_reactions;
-  if (!latestReactionsEqual) return false;
-
   return true;
 };
 
diff --git a/package/yarn.lock b/package/yarn.lock
@@ -10680,10 +10680,10 @@ stream-buffers@~2.2.0:
   resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
   integrity sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ=
 
-stream-chat@~4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-4.0.0.tgz#7aec92015c8d1a2ee1344ca32b2f51a70cace600"
-  integrity sha512-u4oTd4d19E23t0IVj60G/DhJVNIEUUQt7SI8Zx8Rhum9GLfQ8VwXsgcJYUsLHaiIjpMVjttyoYmR/F8RP8f3+w==
+stream-chat@~3.13.1:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-3.13.1.tgz#1692246dd74968dee7596a6a8c1e1a02656bb634"
+  integrity sha512-JWgVwRgmAE/a7P9i+LK2Lr2C4dXfRaedm2c4jKsZuMPR6KwINIy0kgdGyds3Xqmp4/LPSfhXZJ7wExmlfo9+7g==
   dependencies:
     "@babel/runtime" "^7.13.10"
     "@types/jsonwebtoken" "^8.5.0"

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,6 @@ export const ThreadScreen: React.FC<ThreadScreenProps> = ({`
`93`	`93`	`enforceUniqueReaction`
`94`	`94`	`keyboardVerticalOffset={0}`
`95`	`95`	`thread={thread}`
`96`		`- threadList`
`97`	`96`	`>`
`98`	`97`	`<View style={styles.container}>`
`99`	`98`	`<ThreadHeader thread={thread} />`