stream-chat-react-native-core 5.26.0-beta.3 → 5.26.0-beta.4

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.reactionData = exports.Channel = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
@@ -447,6 +447,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     hasNoMoreRecentMessagesToLoad = _useState26[0],
     setHasNoMoreRecentMessagesToLoad = _useState26[1];
   var _useTargetedMessage = (0, _useTargetedMessage2.useTargetedMessage)(),
+    prevTargetedMessage = _useTargetedMessage.prevTargetedMessage,
     setTargetedMessage = _useTargetedMessage.setTargetedMessage,
     targetedMessage = _useTargetedMessage.targetedMessage;
   var hasOverlappingRecentMessagesRef = (0, _react.useRef)(false);
@@ -542,7 +543,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
   var copyMessagesState = (0, _react.useRef)((0, _throttle["default"])(function () {
     if (channel) {
       clearInterval(mergeSetsIntervalRef.current);
-      setMessages((0, _toConsumableArray2["default"])(channel.state.messages));
+      setMessages(channel.state.messages);
       restartSetsMergeFuncRef.current();
     }
   }, newMessageStateUpdateThrottleInterval, throttleOptions)).current;
@@ -557,7 +558,6 @@ var ChannelWithContext = function ChannelWithContext(props) {
     }
   }, stateUpdateThrottleInterval, throttleOptions)).current;
   var copyChannelState = (0, _react.useRef)((0, _throttle["default"])(function () {
-    var onComplete = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
     setLoading(false);
     if (channel) {
       setMembers((0, _extends2["default"])({}, channel.state.members));
@@ -566,7 +566,6 @@ var ChannelWithContext = function ChannelWithContext(props) {
       setTyping((0, _extends2["default"])({}, channel.state.typing));
       setWatcherCount(channel.state.watcher_count);
       setWatchers((0, _extends2["default"])({}, channel.state.watchers));
-      onComplete == null ? void 0 : onComplete();
     }
   }, stateUpdateThrottleInterval, throttleOptions)).current;
   (0, _react.useEffect)(function () {
@@ -585,6 +584,8 @@ var ChannelWithContext = function ChannelWithContext(props) {
   }, [channelId, shouldSyncChannel]);
   (0, _react.useEffect)(function () {
     var handleEvent = function handleEvent(event) {
+      var ignorableEvents = ['user.watching.start', 'user.watching.stop'];
+      if (ignorableEvents.includes(event.type)) return;
       if (shouldSyncChannel) {
         var isTypingEvent = event.type === 'typing.start' || event.type === 'typing.stop';
         if (!isTypingEvent) {
@@ -598,7 +599,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
             setThread(updatedThread);
           }
         }
-        if (channel && event.type !== 'message.new' && event.type !== 'message.read' && event.type !== 'typing.start' && event.type !== 'typing.stop') {
+        if (channel && channel.initialized && event.type !== 'message.new' && event.type !== 'message.read' && event.type !== 'typing.start' && event.type !== 'typing.stop') {
           copyChannelState();
         }
       }
@@ -662,24 +663,23 @@ var ChannelWithContext = function ChannelWithContext(props) {
               return id === scrollToMessageId;
             }) : -1;
             if (channel && scrollToMessageIndex !== -1) {
+              copyChannelState.cancel();
               limitAfter = 4;
               currentLength = currentMessages.length;
-              if (scrollToMessageIndex !== -1) {
-                noOfMessagesAfter = currentLength - scrollToMessageIndex - 1;
-                if (noOfMessagesAfter > limitAfter) {
-                  endIndex = scrollToMessageIndex + limitAfter;
-                  channel.state.clearMessages();
-                  channel.state.messages = currentMessages.slice(0, endIndex + 1);
-                  splitLatestCurrentMessageSetRef.current();
-                  restOfMessages = currentMessages.slice(endIndex + 1);
-                  if (hadCurrentLatestMessages) {
-                    latestSet = channel.state.messageSets.find(function (set) {
-                      return set.isLatest;
-                    });
-                    if (latestSet) {
-                      latestSet.messages = restOfMessages;
-                      hasOverlappingRecentMessagesRef.current = true;
-                    }
+              noOfMessagesAfter = currentLength - scrollToMessageIndex - 1;
+              if (noOfMessagesAfter > limitAfter) {
+                endIndex = scrollToMessageIndex + limitAfter;
+                channel.state.clearMessages();
+                channel.state.messages = currentMessages.slice(0, endIndex + 1);
+                splitLatestCurrentMessageSetRef.current();
+                restOfMessages = currentMessages.slice(endIndex + 1);
+                if (hadCurrentLatestMessages) {
+                  latestSet = channel.state.messageSets.find(function (set) {
+                    return set.isLatest;
+                  });
+                  if (latestSet) {
+                    latestSet.messages = restOfMessages;
+                    hasOverlappingRecentMessagesRef.current = true;
                   }
                 }
               }
@@ -687,14 +687,15 @@ var ChannelWithContext = function ChannelWithContext(props) {
             hasLatestMessages = channel.state.latestMessages.length > 0;
             channel.state.setIsUpToDate(hasLatestMessages);
             setHasNoMoreRecentMessagesToLoad(hasLatestMessages);
-            copyChannelState(function () {
-              restartSetsMergeFuncRef.current();
-              onAfterQueryCall == null ? void 0 : onAfterQueryCall();
-            });
-            _context2.next = 25;
+            copyChannelState();
+            if (scrollToMessageIndex !== -1) {
+              copyChannelState.flush();
+            }
+            onAfterQueryCall == null ? void 0 : onAfterQueryCall();
+            _context2.next = 27;
             break;
-          case 20:
-            _context2.prev = 20;
+          case 22:
+            _context2.prev = 22;
             _context2.t0 = _context2["catch"](3);
             if (_context2.t0 instanceof Error) {
               setError(_context2.t0);
@@ -703,11 +704,11 @@ var ChannelWithContext = function ChannelWithContext(props) {
             }
             setLoading(false);
             setLastRead(new Date());
-          case 25:
+          case 27:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[3, 20]]);
+      }, _callee2, null, [[3, 22]]);
     }));
     return function (_x) {
       return _ref2.apply(this, arguments);
@@ -770,7 +771,11 @@ var ChannelWithContext = function ChannelWithContext(props) {
             return _context3.stop();
         }
       }, _callee3);
-    })), undefined, function () {
+    })), function () {
+      if (unreadMessageIdToScrollTo) {
+        restartSetsMergeFuncRef.current();
+      }
+    }, function () {
       return unreadMessageIdToScrollTo;
     });
   };
@@ -818,10 +823,16 @@ var ChannelWithContext = function ChannelWithContext(props) {
       }, _callee4);
     })), function () {
       if (messageIdToLoadAround) {
+        clearInterval(mergeSetsIntervalRef.current);
         setTargetedMessage(messageIdToLoadAround);
       }
     }, messageIdToLoadAround);
   };
+  (0, _react.useEffect)(function () {
+    if (!targetedMessage && prevTargetedMessage) {
+      restartSetsMergeFuncRef.current();
+    }
+  }, [targetedMessage]);
   var loadChannelAtMessage = function loadChannelAtMessage(_ref7) {
     var _ref7$after = _ref7.after,
       after = _ref7$after === void 0 ? 2 : _ref7$after,
@@ -902,7 +913,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
       var currentLength = channel.state.messages.length || 0;
       var didMerge = mergeOverlappingMessageSetsRef.current(true);
       if (didMerge && channel.state.messages.length !== currentLength) {
-        setMessages((0, _toConsumableArray2["default"])(channel.state.messages));
+        setMessages(channel.state.messages);
       }
     }, 1000);
   });
@@ -2333,7 +2344,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 2328,
+        lineNumber: 2342,
         columnNumber: 12
       }
     });
@@ -2347,7 +2358,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 2333,
+        lineNumber: 2347,
         columnNumber: 7
       }
     }, t('Please select a channel first'));
@@ -2360,7 +2371,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2340,
+      lineNumber: 2354,
       columnNumber: 5
     }
   }), _react["default"].createElement(_ChannelContext.ChannelProvider, {
@@ -2368,7 +2379,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2346,
+      lineNumber: 2360,
       columnNumber: 7
     }
   }, _react["default"].createElement(_OwnCapabilitiesContext.OwnCapabilitiesProvider, {
@@ -2376,7 +2387,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2347,
+      lineNumber: 2361,
       columnNumber: 9
     }
   }, _react["default"].createElement(_TypingContext.TypingProvider, {
@@ -2384,7 +2395,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2348,
+      lineNumber: 2362,
       columnNumber: 11
     }
   }, _react["default"].createElement(_PaginatedMessageListContext.PaginatedMessageListProvider, {
@@ -2392,7 +2403,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2349,
+      lineNumber: 2363,
       columnNumber: 13
     }
   }, _react["default"].createElement(_MessagesContext.MessagesProvider, {
@@ -2400,7 +2411,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2350,
+      lineNumber: 2364,
       columnNumber: 15
     }
   }, _react["default"].createElement(_ThreadContext.ThreadProvider, {
@@ -2408,7 +2419,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2351,
+      lineNumber: 2365,
       columnNumber: 17
     }
   }, _react["default"].createElement(_SuggestionsContext.SuggestionsProvider, {
@@ -2416,7 +2427,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2352,
+      lineNumber: 2366,
       columnNumber: 19
     }
   }, _react["default"].createElement(_MessageInputContext.MessageInputProvider, {
@@ -2424,7 +2435,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2353,
+      lineNumber: 2367,
       columnNumber: 21
     }
   }, _react["default"].createElement(_reactNative.View, {
@@ -2434,7 +2445,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2354,
+      lineNumber: 2368,
       columnNumber: 23
     }
   }, children))))))))));
@@ -2485,7 +2496,7 @@ var Channel = function Channel(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2411,
+      lineNumber: 2425,
       columnNumber: 5
     }
   }));