stream-chat-react-native-core 5.38.1 → 5.39.0-beta.2

package/lib/commonjs/components/Channel/Channel.js

@@ -415,7 +415,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     _props$supportedReact = props.supportedReactions,
     supportedReactions = _props$supportedReact === void 0 ? reactionData : _props$supportedReact,
     t = props.t,
-    threadProps = props.thread,
+    threadFromProps = props.thread,
     threadList = props.threadList,
     threadMessages = props.threadMessages,
     typing = props.typing,
@@ -431,6 +431,8 @@ var ChannelWithContext = function ChannelWithContext(props) {
     VideoThumbnail = _props$VideoThumbnail === void 0 ? _VideoThumbnail.VideoThumbnail : _props$VideoThumbnail,
     watcherCount = props.watcherCount,
     watchers = props.watchers;
+  var threadProps = threadFromProps.thread,
+    threadInstance = threadFromProps.threadInstance;
   var _useTheme = (0, _ThemeContext.useTheme)(),
     _useTheme$theme = _useTheme.theme,
     selectChannel = _useTheme$theme.channel.selectChannel,
@@ -630,7 +632,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
             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) {
+          if (channel && thread != null && thread.id && ((_event$message = event.message) == null ? void 0 : _event$message.id) === thread.id && !threadInstance) {
             var updatedThread = channel.state.formatMessage(event.message);
             setThread(updatedThread);
           }
@@ -1079,7 +1081,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
             _yield$channel$getMes = _context9.sent;
             _messages = _yield$channel$getMes.messages;
             _messages2 = (0, _slicedToArray2["default"])(_messages, 1), threadMessage = _messages2[0];
-            if (threadMessage) {
+            if (threadMessage && !threadInstance) {
               formattedMessage = channel.state.formatMessage(threadMessage);
               setThread(formattedMessage);
             }
@@ -1579,7 +1581,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
   }();
   var sendMessageRequest = function () {
     var _ref21 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee16(message, retrying) {
-      var _updatedMessage, extraFields, attachments, id, mentioned_users, parent_id, text, mentionedUserIds, _messageData, messageResponse;
+      var _updatedMessage, extraFields, attachments, id, mentioned_users, parent_id, text, mentionedUserIds, _messageData, messageResponse, _updatedMessage2;
       return _regenerator["default"].wrap(function _callee16$(_context16) {
         while (1) switch (_context16.prev = _context16.next) {
           case 0:
@@ -1641,17 +1643,24 @@ var ChannelWithContext = function ChannelWithContext(props) {
               } else {
                 updateMessage(messageResponse.message);
               }
+              threadInstance == null ? void 0 : threadInstance.upsertReplyLocally == null ? void 0 : threadInstance.upsertReplyLocally({
+                message: messageResponse.message
+              });
             }
-            _context16.next = 30;
+            _context16.next = 32;
             break;
           case 24:
             _context16.prev = 24;
             _context16.t0 = _context16["catch"](0);
             console.log(_context16.t0);
             message.status = _utils.MessageStatusTypes.FAILED;
-            updateMessage(Object.assign({}, message, {
+            _updatedMessage2 = Object.assign({}, message, {
               cid: channel.cid
-            }));
+            });
+            updateMessage(_updatedMessage2);
+            threadInstance == null ? void 0 : threadInstance.upsertReplyLocally == null ? void 0 : threadInstance.upsertReplyLocally({
+              message: _updatedMessage2
+            });
             if (enableOfflineSupport) {
               dbApi.updateMessage({
                 message: Object.assign({}, message, {
@@ -1659,7 +1668,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
                 })
               });
             }
-          case 30:
+          case 32:
           case "end":
             return _context16.stop();
         }
@@ -1687,6 +1696,9 @@ var ChannelWithContext = function ChannelWithContext(props) {
               commands: [],
               messageInput: ''
             });
+            threadInstance == null ? void 0 : threadInstance.upsertReplyLocally == null ? void 0 : threadInstance.upsertReplyLocally({
+              message: messagePreview
+            });
             if (enableOfflineSupport) {
               dbApi.upsertMessages({
                 messages: [Object.assign({}, messagePreview, {
@@ -1695,9 +1707,9 @@ var ChannelWithContext = function ChannelWithContext(props) {
                 })]
               });
             }
-            _context17.next = 7;
+            _context17.next = 8;
             return sendMessageRequest(messagePreview);
-          case 7:
+          case 8:
           case "end":
             return _context17.stop();
         }
@@ -1945,7 +1957,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
   };
   var sendReaction = function () {
     var _ref26 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee21(type, messageId) {
-      var payload;
+      var payload, sendReactionResponse;
       return _regenerator["default"].wrap(function _callee21$(_context21) {
         while (1) switch (_context21.prev = _context21.next) {
           case 0:
@@ -1989,6 +2001,13 @@ var ChannelWithContext = function ChannelWithContext(props) {
               }
             });
           case 11:
+            sendReactionResponse = _context21.sent;
+            if (sendReactionResponse != null && sendReactionResponse.message) {
+              threadInstance == null ? void 0 : threadInstance.upsertReplyLocally == null ? void 0 : threadInstance.upsertReplyLocally({
+                message: sendReactionResponse.message
+              });
+            }
+          case 13:
           case "end":
             return _context21.stop();
         }
@@ -2000,7 +2019,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
   }();
   var deleteMessage = function () {
     var _ref27 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee22(message) {
-      var _data;
+      var _updatedMessage3, _data;
       return _regenerator["default"].wrap(function _callee22$(_context22) {
         while (1) switch (_context22.prev = _context22.next) {
           case 0:
@@ -2034,15 +2053,19 @@ var ChannelWithContext = function ChannelWithContext(props) {
               messageId: message.id
             });
             removeMessage(message);
-            _context22.next = 19;
+            _context22.next = 21;
             break;
           case 14:
-            updateMessage(Object.assign({}, message, {
+            _updatedMessage3 = Object.assign({}, message, {
               cid: channel.cid,
               deleted_at: new Date().toISOString(),
               type: 'deleted'
-            }));
-            _context22.next = 17;
+            });
+            updateMessage(_updatedMessage3);
+            threadInstance == null ? void 0 : threadInstance.upsertReplyLocally({
+              message: _updatedMessage3
+            });
+            _context22.next = 19;
             return _DBSyncManager.DBSyncManager.queueTask({
               client: client,
               task: {
@@ -2053,12 +2076,12 @@ var ChannelWithContext = function ChannelWithContext(props) {
                 type: 'delete-message'
               }
             });
-          case 17:
+          case 19:
             _data = _context22.sent;
             if (_data != null && _data.message) {
               updateMessage(Object.assign({}, _data.message));
             }
-          case 19:
+          case 21:
           case "end":
             return _context22.stop();
         }
@@ -2119,11 +2142,13 @@ var ChannelWithContext = function ChannelWithContext(props) {
     };
   }();
   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]);
+    if (channel.initialized) {
+      channel.markRead({
+        thread_id: message.id
+      });
+    }
+  }, [channel, setThread]);
   var closeThread = (0, _react.useCallback)(function () {
     setThread(null);
     setThreadMessages([]);
@@ -2410,6 +2435,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     setThreadLoadingMore: setThreadLoadingMore,
     thread: thread,
     threadHasMore: threadHasMore,
+    threadInstance: threadInstance,
     threadLoadingMore: threadLoadingMore,
     threadMessages: threadMessages
   });
@@ -2471,14 +2497,20 @@ var ChannelWithContext = function ChannelWithContext(props) {
   }));
 };
 var Channel = function Channel(props) {
-  var _props$thread, _props$thread2;
   var _useChatContext = (0, _ChatContext.useChatContext)(),
     client = _useChatContext.client,
     enableOfflineSupport = _useChatContext.enableOfflineSupport;
   var _useTranslationContex = (0, _TranslationContext.useTranslationContext)(),
     t = _useTranslationContex.t;
-  var shouldSyncChannel = (_props$thread = props.thread) != null && _props$thread.id ? !!props.threadList : true;
-  var _useChannelState = (0, _useChannelState2.useChannelState)(props.channel, props.threadList ? (_props$thread2 = props.thread) == null ? void 0 : _props$thread2.id : undefined),
+  var threadFromProps = props == null ? void 0 : props.thread;
+  var threadMessage = threadFromProps != null && threadFromProps.threadInstance ? threadFromProps.thread : threadFromProps;
+  var threadInstance = threadFromProps == null ? void 0 : threadFromProps.threadInstance;
+  var thread = {
+    thread: threadMessage,
+    threadInstance: threadInstance
+  };
+  var shouldSyncChannel = threadMessage != null && threadMessage.id ? !!props.threadList : true;
+  var _useChannelState = (0, _useChannelState2.useChannelState)(props.channel, props.threadList ? threadMessage == null ? void 0 : threadMessage.id : undefined),
     members = _useChannelState.members,
     messages = _useChannelState.messages,
     read = _useChannelState.read,
@@ -2509,6 +2541,7 @@ var Channel = function Channel(props) {
     setTyping: setTyping,
     setWatcherCount: setWatcherCount,
     setWatchers: setWatchers,
+    thread: thread,
     threadMessages: threadMessages,
     typing: typing,
     watcherCount: watcherCount,