stream-chat-react-native-core 6.0.0-rc.10 → 6.0.0-rc.12

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

@@ -1036,6 +1036,8 @@ var ChannelWithContext = function ChannelWithContext(props) {
           _context6.next = 8;
           return channel.state.loadMessageIntoState('latest');
         case 8:
+          setMessages((0, _toConsumableArray2["default"])(channel.state.messages));
+        case 9:
         case "end":
           return _context6.stop();
       }
@@ -1272,14 +1274,15 @@ var ChannelWithContext = function ChannelWithContext(props) {
             return loadLatestMessagesRef.current(true);
           case 3:
             setLoading(false);
-            channel == null ? void 0 : channel.state.setIsUpToDate(true);
-            setHasNoMoreRecentMessagesToLoad(true);
-          case 6:
+          case 4:
           case "end":
             return _context10.stop();
         }
       }, _callee10);
-    })));
+    })), function () {
+      channel == null ? void 0 : channel.state.setIsUpToDate(true);
+      setHasNoMoreRecentMessagesToLoad(true);
+    });
   };
   var getChannelConfigSafely = function getChannelConfigSafely() {
     try {
@@ -1729,6 +1732,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
       latestMessageSet,
       latestLengthBeforeMerge,
       didMerge,
+      shouldSetStateUpToDate,
       currentMessages,
       recentMessage,
       queryResponse,
@@ -1745,43 +1749,44 @@ var ChannelWithContext = function ChannelWithContext(props) {
           latestLengthBeforeMerge = (latestMessageSet == null ? void 0 : latestMessageSet.messages.length) || 0;
           didMerge = mergeOverlappingMessageSetsRef.current(true);
           if (!didMerge) {
-            _context16.next = 12;
+            _context16.next = 13;
             break;
           }
-          if (!(latestMessageSet && latestLengthBeforeMerge >= limit)) {
-            _context16.next = 12;
+          if (!(latestMessageSet && latestLengthBeforeMerge > 0)) {
+            _context16.next = 13;
             break;
           }
+          shouldSetStateUpToDate = latestMessageSet.messages.length < limit && latestMessageSet.isCurrent;
           setLoadingMoreRecent(true);
-          channel.state.setIsUpToDate(true);
-          setHasNoMoreRecentMessagesToLoad(true);
+          channel.state.setIsUpToDate(shouldSetStateUpToDate);
+          setHasNoMoreRecentMessagesToLoad(shouldSetStateUpToDate);
           loadMoreRecentFinished(channel.state.messages);
           restartSetsMergeFuncRef.current();
           return _context16.abrupt("return");
-        case 12:
+        case 13:
           if (!channel.state.isUpToDate) {
-            _context16.next = 15;
+            _context16.next = 16;
             break;
           }
           setLoadingMoreRecent(false);
           return _context16.abrupt("return");
-        case 15:
+        case 16:
           currentMessages = channel.state.messages;
           recentMessage = currentMessages[currentMessages.length - 1];
           if (!((recentMessage == null ? void 0 : recentMessage.status) !== _utils.MessageStatusTypes.RECEIVED)) {
-            _context16.next = 20;
+            _context16.next = 21;
             break;
           }
           setLoadingMoreRecent(false);
           return _context16.abrupt("return");
-        case 20:
+        case 21:
           setLoadingMoreRecent(true);
-          _context16.prev = 21;
+          _context16.prev = 22;
           if (!channel) {
-            _context16.next = 32;
+            _context16.next = 33;
             break;
           }
-          _context16.next = 25;
+          _context16.next = 26;
           return channel.query({
             messages: {
               id_gte: recentMessage.id,
@@ -1789,7 +1794,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
             },
             watch: true
           });
-        case 25:
+        case 26:
           queryResponse = _context16.sent;
           gotAllRecentMessages = queryResponse.messages.length < limit;
           currentSet = channel.state.messageSets.find(function (set) {
@@ -1804,12 +1809,12 @@ var ChannelWithContext = function ChannelWithContext(props) {
           channel.state.setIsUpToDate(gotAllRecentMessages);
           setHasNoMoreRecentMessagesToLoad(gotAllRecentMessages);
           loadMoreRecentFinished(channel.state.messages);
-        case 32:
-          _context16.next = 40;
+        case 33:
+          _context16.next = 41;
           break;
-        case 34:
-          _context16.prev = 34;
-          _context16.t0 = _context16["catch"](21);
+        case 35:
+          _context16.prev = 35;
+          _context16.t0 = _context16["catch"](22);
           console.warn('Message pagination request failed with error', _context16.t0);
           if (_context16.t0 instanceof Error) {
             setError(_context16.t0);
@@ -1818,11 +1823,11 @@ var ChannelWithContext = function ChannelWithContext(props) {
           }
           setLoadingMoreRecent(false);
           throw _context16.t0;
-        case 40:
+        case 41:
         case "end":
           return _context16.stop();
       }
-    }, _callee16, null, [[21, 34]]);
+    }, _callee16, null, [[22, 35]]);
   })), [channelId, hasNoMoreRecentMessagesToLoad]);
   var loadMoreRecentFinished = (0, _react.useRef)((0, _debounce["default"])(function (newMessages) {
     setLoadingMoreRecent(false);