stream-chat-react-native-core 5.23.1 → 5.23.2-beta.2

package/lib/module/components/Channel/Channel.js

@@ -558,14 +558,17 @@ var ChannelWithContext = function ChannelWithContext(props) {
   (0, _react.useEffect)(function () {
     var handleEvent = function handleEvent(event) {
       if (shouldSyncChannel) {
-        var _event$message;
-        if (thread) {
-          var updatedThreadMessages = thread.id && channel && channel.state.threads[thread.id] || threadMessages;
-          setThreadMessages(updatedThreadMessages);
-        }
-        if (channel && thread && ((_event$message = event.message) == null ? void 0 : _event$message.id) === thread.id) {
-          var updatedThread = channel.state.formatMessage(event.message);
-          setThread(updatedThread);
+        var isTypingEvent = event.type === 'typing.start' || event.type === 'typing.stop';
+        if (!isTypingEvent) {
+          var _event$message;
+          if (thread != null && thread.id) {
+            var updatedThreadMessages = thread.id && channel && channel.state.threads[thread.id] || threadMessages;
+            setThreadMessages(updatedThreadMessages);
+          }
+          if (channel && thread != null && thread.id && ((_event$message = event.message) == null ? void 0 : _event$message.id) === thread.id) {
+            var updatedThread = channel.state.formatMessage(event.message);
+            setThread(updatedThread);
+          }
         }
         if (channel && event.type !== 'message.new' && event.type !== 'message.read' && event.type !== 'typing.start' && event.type !== 'typing.stop') {
           copyChannelState();
@@ -911,20 +914,19 @@ var ChannelWithContext = function ChannelWithContext(props) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
             if (!(!(channel != null && channel.initialized) || !channel.state.isUpToDate)) {
-              _context6.next = 5;
+              _context6.next = 7;
               break;
             }
             _context6.next = 3;
             return channel == null ? void 0 : channel.watch();
           case 3:
-            _context6.next = 7;
-            break;
-          case 5:
-            _context6.next = 7;
-            return loadLatestMessagesRef.current(true);
-          case 7:
             channel == null ? void 0 : channel.state.setIsUpToDate(true);
             setHasNoMoreRecentMessagesToLoad(true);
+            _context6.next = 9;
+            break;
+          case 7:
+            _context6.next = 9;
+            return channel.state.loadMessageIntoState('latest');
           case 9:
           case "end":
             return _context6.stop();
@@ -2002,12 +2004,12 @@ var ChannelWithContext = function ChannelWithContext(props) {
       return _ref26.apply(this, arguments);
     };
   }();
-  var openThread = function openThread(message) {
+  var openThread = (0, _react.useCallback)(function (message) {
     var _channel$state2;
     var newThreadMessages = message != null && message.id ? (channel == null ? void 0 : (_channel$state2 = channel.state) == null ? void 0 : _channel$state2.threads[message.id]) || [] : [];
     setThread(message);
     setThreadMessages(newThreadMessages);
-  };
+  }, [setThread, setThreadMessages]);
   var closeThread = (0, _react.useCallback)(function () {
     setThread(null);
     setThreadMessages([]);
@@ -2283,7 +2285,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 2284,
+        lineNumber: 2290,
         columnNumber: 12
       }
     });
@@ -2297,7 +2299,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 2289,
+        lineNumber: 2295,
         columnNumber: 7
       }
     }, t('Please select a channel first'));
@@ -2310,7 +2312,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2296,
+      lineNumber: 2302,
       columnNumber: 5
     }
   }), _react["default"].createElement(_ChannelContext.ChannelProvider, {
@@ -2318,7 +2320,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2302,
+      lineNumber: 2308,
       columnNumber: 7
     }
   }, _react["default"].createElement(_OwnCapabilitiesContext.OwnCapabilitiesProvider, {
@@ -2326,7 +2328,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2303,
+      lineNumber: 2309,
       columnNumber: 9
     }
   }, _react["default"].createElement(_TypingContext.TypingProvider, {
@@ -2334,7 +2336,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2304,
+      lineNumber: 2310,
       columnNumber: 11
     }
   }, _react["default"].createElement(_PaginatedMessageListContext.PaginatedMessageListProvider, {
@@ -2342,7 +2344,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2305,
+      lineNumber: 2311,
       columnNumber: 13
     }
   }, _react["default"].createElement(_MessagesContext.MessagesProvider, {
@@ -2350,7 +2352,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2306,
+      lineNumber: 2312,
       columnNumber: 15
     }
   }, _react["default"].createElement(_ThreadContext.ThreadProvider, {
@@ -2358,7 +2360,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2307,
+      lineNumber: 2313,
       columnNumber: 17
     }
   }, _react["default"].createElement(_SuggestionsContext.SuggestionsProvider, {
@@ -2366,7 +2368,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2308,
+      lineNumber: 2314,
       columnNumber: 19
     }
   }, _react["default"].createElement(_MessageInputContext.MessageInputProvider, {
@@ -2374,7 +2376,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2309,
+      lineNumber: 2315,
       columnNumber: 21
     }
   }, _react["default"].createElement(_reactNative.View, {
@@ -2384,13 +2386,13 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2310,
+      lineNumber: 2316,
       columnNumber: 23
     }
   }, children))))))))));
 };
 var Channel = function Channel(props) {
-  var _props$thread, _props$thread2, _props$channel;
+  var _props$thread, _props$thread2;
   var _useChatContext = (0, _ChatContext.useChatContext)(),
     client = _useChatContext.client,
     enableOfflineSupport = _useChatContext.enableOfflineSupport;
@@ -2413,7 +2415,6 @@ var Channel = function Channel(props) {
     watcherCount = _useChannelState.watcherCount,
     watchers = _useChannelState.watchers;
   return _react["default"].createElement(ChannelWithContext, (0, _extends2["default"])({
-    key: (_props$channel = props.channel) == null ? void 0 : _props$channel.cid,
     client: client,
     enableOfflineSupport: enableOfflineSupport,
     t: t
@@ -2436,7 +2437,7 @@ var Channel = function Channel(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2367,
+      lineNumber: 2373,
       columnNumber: 5
     }
   }));