stream-chat-react-native-core 5.22.1-beta.1 → 5.22.2-beta.1

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

@@ -443,6 +443,8 @@ var ChannelWithContext = function ChannelWithContext(props) {
     _useState28 = (0, _slicedToArray2["default"])(_useState27, 2),
     hasNoMoreRecentMessagesToLoad = _useState28[0],
     setHasNoMoreRecentMessagesToLoad = _useState28[1];
+  var messagesRef = (0, _react.useRef)(messages);
+  messagesRef.current = messages;
   var _useTargetedMessage = (0, _useTargetedMessage2.useTargetedMessage)(),
     setTargetedMessage = _useTargetedMessage.setTargetedMessage,
     targetedMessage = _useTargetedMessage.targetedMessage;
@@ -666,37 +668,38 @@ var ChannelWithContext = function ChannelWithContext(props) {
     });
   };
   var loadChannelAroundMessage = function loadChannelAroundMessage(_ref3) {
-    var messageId = _ref3.messageId;
+    var messageIdToLoadAround = _ref3.messageId;
     return channelQueryCallRef.current((0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee3() {
       return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            setHasNoMoreRecentMessagesToLoad(false);
             setLoading(true);
-            if (!messageId) {
-              _context3.next = 7;
+            if (!messageIdToLoadAround) {
+              _context3.next = 8;
               break;
             }
-            _context3.next = 5;
-            return channel.state.loadMessageIntoState(messageId);
-          case 5:
-            _context3.next = 10;
+            setHasNoMoreRecentMessagesToLoad(false);
+            channel.state.setIsUpToDate(false);
+            _context3.next = 6;
+            return channel.state.loadMessageIntoState(messageIdToLoadAround);
+          case 6:
+            _context3.next = 11;
             break;
-          case 7:
-            _context3.next = 9;
+          case 8:
+            _context3.next = 10;
             return channel.state.loadMessageIntoState('latest');
-          case 9:
-            channel.state.setIsUpToDate(true);
           case 10:
-            setLoading(false);
+            channel.state.setIsUpToDate(true);
           case 11:
+            setLoading(false);
+          case 12:
           case "end":
             return _context3.stop();
         }
       }, _callee3);
     })), function () {
-      if (messageId) {
-        setTargetedMessage(messageId);
+      if (messageIdToLoadAround) {
+        setTargetedMessage(messageIdToLoadAround);
       }
     });
   };
@@ -1427,144 +1430,138 @@ var ChannelWithContext = function ChannelWithContext(props) {
     setHasMore(updatedHasMore);
     setMessages(newMessages);
   }, defaultDebounceInterval, debounceOptions)).current;
-  var loadMore = function () {
-    var _ref20 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee16() {
-      var limit,
-        oldestMessage,
-        oldestID,
-        queryResponse,
-        updatedHasMore,
-        _args16 = arguments;
-      return _regenerator["default"].wrap(function _callee16$(_context16) {
-        while (1) switch (_context16.prev = _context16.next) {
-          case 0:
-            limit = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : 20;
-            if (!(loadingMore || hasMore === false)) {
-              _context16.next = 3;
-              break;
-            }
-            return _context16.abrupt("return");
-          case 3:
-            setLoadingMore(true);
-            if (messages.length) {
-              _context16.next = 6;
-              break;
-            }
-            return _context16.abrupt("return", setLoadingMore(false));
-          case 6:
-            oldestMessage = messages && messages[0];
-            if (!(oldestMessage && oldestMessage.status !== _utils.MessageStatusTypes.RECEIVED)) {
-              _context16.next = 9;
-              break;
-            }
-            return _context16.abrupt("return", setLoadingMore(false));
-          case 9:
-            oldestID = oldestMessage && oldestMessage.id;
-            _context16.prev = 10;
-            if (!channel) {
-              _context16.next = 17;
-              break;
-            }
-            _context16.next = 14;
-            return channel.query({
-              messages: {
-                id_lt: oldestID,
-                limit: limit
-              }
-            });
-          case 14:
-            queryResponse = _context16.sent;
-            updatedHasMore = queryResponse.messages.length === limit;
-            loadMoreFinished(updatedHasMore, channel.state.messages);
-          case 17:
-            _context16.next = 24;
+  var loadMore = (0, _react.useCallback)((0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee16() {
+    var limit,
+      currentMessages,
+      oldestMessage,
+      oldestID,
+      queryResponse,
+      updatedHasMore,
+      _args16 = arguments;
+    return _regenerator["default"].wrap(function _callee16$(_context16) {
+      while (1) switch (_context16.prev = _context16.next) {
+        case 0:
+          limit = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : 20;
+          if (!(loadingMore || hasMore === false)) {
+            _context16.next = 3;
             break;
-          case 19:
-            _context16.prev = 19;
-            _context16.t0 = _context16["catch"](10);
-            if (_context16.t0 instanceof Error) {
-              setError(_context16.t0);
-            } else {
-              setError(true);
-            }
-            setLoadingMore(false);
-            throw _context16.t0;
-          case 24:
-          case "end":
-            return _context16.stop();
-        }
-      }, _callee16, null, [[10, 19]]);
-    }));
-    return function loadMore() {
-      return _ref20.apply(this, arguments);
-    };
-  }();
-  var loadMoreRecent = function () {
-    var _ref21 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee17() {
-      var limit,
-        recentMessage,
-        state,
-        _args17 = arguments;
-      return _regenerator["default"].wrap(function _callee17$(_context17) {
-        while (1) switch (_context17.prev = _context17.next) {
-          case 0:
-            limit = _args17.length > 0 && _args17[0] !== undefined ? _args17[0] : 5;
-            if (!hasNoMoreRecentMessagesToLoad) {
-              _context17.next = 3;
-              break;
-            }
-            return _context17.abrupt("return");
-          case 3:
-            setLoadingMoreRecent(true);
-            recentMessage = messages[messages.length - 1];
-            if (!((recentMessage == null ? void 0 : recentMessage.status) !== _utils.MessageStatusTypes.RECEIVED)) {
-              _context17.next = 8;
-              break;
-            }
-            setLoadingMoreRecent(false);
-            return _context17.abrupt("return");
-          case 8:
-            _context17.prev = 8;
-            if (!channel) {
-              _context17.next = 15;
-              break;
-            }
-            _context17.next = 12;
-            return channel.query({
-              messages: {
-                id_gte: recentMessage.id,
-                limit: limit
-              },
-              watch: true
-            });
-          case 12:
-            state = _context17.sent;
-            setHasNoMoreRecentMessagesToLoad(state.messages.length < limit);
-            loadMoreRecentFinished(channel.state.messages);
-          case 15:
-            _context17.next = 23;
+          }
+          return _context16.abrupt("return");
+        case 3:
+          setLoadingMore(true);
+          currentMessages = messagesRef.current;
+          if (currentMessages.length) {
+            _context16.next = 7;
             break;
-          case 17:
-            _context17.prev = 17;
-            _context17.t0 = _context17["catch"](8);
-            console.warn('Message pagination request failed with error', _context17.t0);
-            if (_context17.t0 instanceof Error) {
-              setError(_context17.t0);
-            } else {
-              setError(true);
+          }
+          return _context16.abrupt("return", setLoadingMore(false));
+        case 7:
+          oldestMessage = currentMessages && currentMessages[0];
+          if (!(oldestMessage && oldestMessage.status !== _utils.MessageStatusTypes.RECEIVED)) {
+            _context16.next = 10;
+            break;
+          }
+          return _context16.abrupt("return", setLoadingMore(false));
+        case 10:
+          oldestID = oldestMessage && oldestMessage.id;
+          _context16.prev = 11;
+          if (!channel) {
+            _context16.next = 18;
+            break;
+          }
+          _context16.next = 15;
+          return channel.query({
+            messages: {
+              id_lt: oldestID,
+              limit: limit
             }
-            setLoadingMoreRecent(false);
-            throw _context17.t0;
-          case 23:
-          case "end":
-            return _context17.stop();
-        }
-      }, _callee17, null, [[8, 17]]);
-    }));
-    return function loadMoreRecent() {
-      return _ref21.apply(this, arguments);
-    };
-  }();
+          });
+        case 15:
+          queryResponse = _context16.sent;
+          updatedHasMore = queryResponse.messages.length === limit;
+          loadMoreFinished(updatedHasMore, channel.state.messages);
+        case 18:
+          _context16.next = 25;
+          break;
+        case 20:
+          _context16.prev = 20;
+          _context16.t0 = _context16["catch"](11);
+          if (_context16.t0 instanceof Error) {
+            setError(_context16.t0);
+          } else {
+            setError(true);
+          }
+          setLoadingMore(false);
+          throw _context16.t0;
+        case 25:
+        case "end":
+          return _context16.stop();
+      }
+    }, _callee16, null, [[11, 20]]);
+  })), [channelId, hasMore, loadingMore]);
+  var loadMoreRecent = (0, _react.useCallback)((0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee17() {
+    var limit,
+      currentMessages,
+      recentMessage,
+      queryResponse,
+      _args17 = arguments;
+    return _regenerator["default"].wrap(function _callee17$(_context17) {
+      while (1) switch (_context17.prev = _context17.next) {
+        case 0:
+          limit = _args17.length > 0 && _args17[0] !== undefined ? _args17[0] : 5;
+          if (!hasNoMoreRecentMessagesToLoad) {
+            _context17.next = 3;
+            break;
+          }
+          return _context17.abrupt("return");
+        case 3:
+          setLoadingMoreRecent(true);
+          currentMessages = messagesRef.current;
+          recentMessage = currentMessages[currentMessages.length - 1];
+          if (!((recentMessage == null ? void 0 : recentMessage.status) !== _utils.MessageStatusTypes.RECEIVED)) {
+            _context17.next = 9;
+            break;
+          }
+          setLoadingMoreRecent(false);
+          return _context17.abrupt("return");
+        case 9:
+          _context17.prev = 9;
+          if (!channel) {
+            _context17.next = 16;
+            break;
+          }
+          _context17.next = 13;
+          return channel.query({
+            messages: {
+              id_gte: recentMessage.id,
+              limit: limit
+            },
+            watch: true
+          });
+        case 13:
+          queryResponse = _context17.sent;
+          setHasNoMoreRecentMessagesToLoad(queryResponse.messages.length < limit);
+          loadMoreRecentFinished(channel.state.messages);
+        case 16:
+          _context17.next = 24;
+          break;
+        case 18:
+          _context17.prev = 18;
+          _context17.t0 = _context17["catch"](9);
+          console.warn('Message pagination request failed with error', _context17.t0);
+          if (_context17.t0 instanceof Error) {
+            setError(_context17.t0);
+          } else {
+            setError(true);
+          }
+          setLoadingMoreRecent(false);
+          throw _context17.t0;
+        case 24:
+        case "end":
+          return _context17.stop();
+      }
+    }, _callee17, null, [[9, 18]]);
+  })), [channelId, hasNoMoreRecentMessagesToLoad]);
   var loadMoreRecentFinished = (0, _react.useRef)((0, _debounce["default"])(function (newMessages) {
     setLoadingMoreRecent(false);
     setMessages(newMessages);
@@ -2056,7 +2053,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 2053,
+        lineNumber: 2083,
         columnNumber: 12
       }
     });
@@ -2070,7 +2067,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 2058,
+        lineNumber: 2088,
         columnNumber: 7
       }
     }, t('Please select a channel first'));
@@ -2083,7 +2080,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2065,
+      lineNumber: 2095,
       columnNumber: 5
     }
   }), _react["default"].createElement(_ChannelContext.ChannelProvider, {
@@ -2091,7 +2088,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2071,
+      lineNumber: 2101,
       columnNumber: 7
     }
   }, _react["default"].createElement(_OwnCapabilitiesContext.OwnCapabilitiesProvider, {
@@ -2099,7 +2096,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2072,
+      lineNumber: 2102,
       columnNumber: 9
     }
   }, _react["default"].createElement(_TypingContext.TypingProvider, {
@@ -2107,7 +2104,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2073,
+      lineNumber: 2103,
       columnNumber: 11
     }
   }, _react["default"].createElement(_PaginatedMessageListContext.PaginatedMessageListProvider, {
@@ -2115,7 +2112,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2074,
+      lineNumber: 2104,
       columnNumber: 13
     }
   }, _react["default"].createElement(_MessagesContext.MessagesProvider, {
@@ -2123,7 +2120,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2075,
+      lineNumber: 2105,
       columnNumber: 15
     }
   }, _react["default"].createElement(_ThreadContext.ThreadProvider, {
@@ -2131,7 +2128,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2076,
+      lineNumber: 2106,
       columnNumber: 17
     }
   }, _react["default"].createElement(_SuggestionsContext.SuggestionsProvider, {
@@ -2139,7 +2136,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2077,
+      lineNumber: 2107,
       columnNumber: 19
     }
   }, _react["default"].createElement(_MessageInputContext.MessageInputProvider, {
@@ -2147,7 +2144,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2078,
+      lineNumber: 2108,
       columnNumber: 21
     }
   }, _react["default"].createElement(_reactNative.View, {
@@ -2157,7 +2154,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2079,
+      lineNumber: 2109,
       columnNumber: 23
     }
   }, children))))))))));
@@ -2208,7 +2205,7 @@ var Channel = function Channel(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2136,
+      lineNumber: 2166,
       columnNumber: 5
     }
   }));