stream-chat-react-native-core 5.12.0-beta.2 → 5.12.0-beta.4

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

@@ -629,31 +629,47 @@ var ChannelWithContext = function ChannelWithContext(props) {
   }());
   var loadChannelAtFirstUnreadMessage = function loadChannelAtFirstUnreadMessage() {
     if (!channel) return;
-    var unreadCount = channel.countUnread();
-    if (unreadCount <= scrollToFirstUnreadThreshold) return;
-    setMessages([]);
+    var unreadMessageIdToScrollTo;
     return channelQueryCallRef.current((0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee2() {
-      var lastReadDate;
+      var lastReadDate, _channel$state$messag;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             setLoading(true);
-            lastReadDate = channel.lastRead() || new Date(0);
-            _context2.next = 4;
+            lastReadDate = channel.lastRead();
+            if (!lastReadDate) {
+              _context2.next = 9;
+              break;
+            }
+            setHasNoMoreRecentMessagesToLoad(false);
+            _context2.next = 6;
             return channel.query({
               messages: {
                 created_at_around: lastReadDate,
-                limit: 25
+                limit: 30
               }
-            });
-          case 4:
+            }, 'new');
+          case 6:
+            unreadMessageIdToScrollTo = (_channel$state$messag = channel.state.messages.find(function (m) {
+              return lastReadDate < m.created_at;
+            })) == null ? void 0 : _channel$state$messag.id;
+            _context2.next = 11;
+            break;
+          case 9:
+            _context2.next = 11;
+            return channel.state.loadMessageIntoState('latest');
+          case 11:
             setLoading(false);
-          case 5:
+          case 12:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
-    })));
+    })), function () {
+      if (unreadMessageIdToScrollTo) {
+        setTargetedMessage(unreadMessageIdToScrollTo);
+      }
+    });
   };
   var loadChannelAroundMessage = function loadChannelAroundMessage(_ref3) {
     var messageId = _ref3.messageId;
@@ -1997,7 +2013,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1980,
+        lineNumber: 2000,
         columnNumber: 12
       }
     });
@@ -2011,7 +2027,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1985,
+        lineNumber: 2005,
         columnNumber: 7
       }
     }, t('Please select a channel first'));
@@ -2024,7 +2040,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1992,
+      lineNumber: 2012,
       columnNumber: 5
     }
   }), _react["default"].createElement(_ChannelContext.ChannelProvider, {
@@ -2032,7 +2048,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1998,
+      lineNumber: 2018,
       columnNumber: 7
     }
   }, _react["default"].createElement(_OwnCapabilitiesContext.OwnCapabilitiesProvider, {
@@ -2040,7 +2056,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1999,
+      lineNumber: 2019,
       columnNumber: 9
     }
   }, _react["default"].createElement(_TypingContext.TypingProvider, {
@@ -2048,7 +2064,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2000,
+      lineNumber: 2020,
       columnNumber: 11
     }
   }, _react["default"].createElement(_PaginatedMessageListContext.PaginatedMessageListProvider, {
@@ -2056,7 +2072,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2001,
+      lineNumber: 2021,
       columnNumber: 13
     }
   }, _react["default"].createElement(_MessagesContext.MessagesProvider, {
@@ -2064,7 +2080,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2002,
+      lineNumber: 2022,
       columnNumber: 15
     }
   }, _react["default"].createElement(_ThreadContext.ThreadProvider, {
@@ -2072,7 +2088,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2003,
+      lineNumber: 2023,
       columnNumber: 17
     }
   }, _react["default"].createElement(_SuggestionsContext.SuggestionsProvider, {
@@ -2080,7 +2096,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2004,
+      lineNumber: 2024,
       columnNumber: 19
     }
   }, _react["default"].createElement(_MessageInputContext.MessageInputProvider, {
@@ -2088,7 +2104,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2005,
+      lineNumber: 2025,
       columnNumber: 21
     }
   }, _react["default"].createElement(_reactNative.View, {
@@ -2098,7 +2114,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2006,
+      lineNumber: 2026,
       columnNumber: 23
     }
   }, children))))))))));
@@ -2149,7 +2165,7 @@ var Channel = function Channel(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2063,
+      lineNumber: 2083,
       columnNumber: 5
     }
   }));