stream-chat-react-native-core 5.29.1-beta.3 → 5.30.0-beta.1

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

@@ -70,6 +70,7 @@ var _MessageAvatar = require("../Message/MessageSimple/MessageAvatar");
 var _MessageBounce = require("../Message/MessageSimple/MessageBounce");
 var _MessageContent = require("../Message/MessageSimple/MessageContent");
 var _MessageDeleted = require("../Message/MessageSimple/MessageDeleted");
+var _MessageEditedTimestamp = require("../Message/MessageSimple/MessageEditedTimestamp");
 var _MessageError = require("../Message/MessageSimple/MessageError");
 var _MessageFooter = require("../Message/MessageSimple/MessageFooter");
 var _MessagePinnedHeader = require("../Message/MessageSimple/MessagePinnedHeader");
@@ -245,7 +246,6 @@ var ChannelWithContext = function ChannelWithContext(props) {
     _props$FlatList = props.FlatList,
     FlatList = _props$FlatList === void 0 ? _native.FlatList : _props$FlatList,
     forceAlignMessages = props.forceAlignMessages,
-    formatDate = props.formatDate,
     _props$Gallery = props.Gallery,
     Gallery = _props$Gallery === void 0 ? _Gallery.Gallery : _props$Gallery,
     getMessagesGroupStyles = props.getMessagesGroupStyles,
@@ -332,6 +332,8 @@ var ChannelWithContext = function ChannelWithContext(props) {
     messageContentOrder = _props$messageContent === void 0 ? ['quoted_reply', 'gallery', 'files', 'text', 'attachments'] : _props$messageContent,
     _props$MessageDeleted = props.MessageDeleted,
     MessageDeleted = _props$MessageDeleted === void 0 ? _MessageDeleted.MessageDeleted : _props$MessageDeleted,
+    _props$MessageEditedT = props.MessageEditedTimestamp,
+    MessageEditedTimestamp = _props$MessageEditedT === void 0 ? _MessageEditedTimestamp.MessageEditedTimestamp : _props$MessageEditedT,
     _props$MessageError = props.MessageError,
     MessageError = _props$MessageError === void 0 ? _MessageError.MessageError : _props$MessageError,
     _props$MessageFooter = props.MessageFooter,
@@ -443,7 +445,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
     lastRead = _useState10[0],
     setLastRead = _useState10[1];
-  var _useState11 = (0, _react.useState)(!(channel != null && channel.state.messages.length)),
+  var _useState11 = (0, _react.useState)(false),
     _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
     loading = _useState12[0],
     setLoading = _useState12[1];
@@ -486,7 +488,6 @@ var ChannelWithContext = function ChannelWithContext(props) {
   (0, _react.useEffect)(function () {
     var initChannel = function () {
       var _ref = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee() {
-        var channelLoaded;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -496,26 +497,21 @@ var ChannelWithContext = function ChannelWithContext(props) {
               }
               return _context.abrupt("return");
             case 2:
-              channelLoaded = false;
               if (channel.initialized) {
-                _context.next = 7;
+                _context.next = 5;
                 break;
               }
-              _context.next = 6;
+              _context.next = 5;
               return loadChannel();
-            case 6:
-              channelLoaded = true;
-            case 7:
+            case 5:
               if (messageId) {
                 loadChannelAroundMessage({
                   messageId: messageId
                 });
               } else if (initialScrollToFirstUnreadMessage && channel.countUnread() > scrollToFirstUnreadThreshold) {
                 loadChannelAtFirstUnreadMessage();
-              } else if (!channelLoaded) {
-                loadChannel();
               }
-            case 8:
+            case 6:
             case "end":
               return _context.stop();
           }
@@ -1016,25 +1012,26 @@ var ChannelWithContext = function ChannelWithContext(props) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
             if (!(!(channel != null && channel.initialized) || !channel.state.isUpToDate)) {
-              _context8.next = 7;
+              _context8.next = 5;
               break;
             }
             _context8.next = 3;
             return channel == null ? void 0 : channel.watch();
           case 3:
-            channel == null ? void 0 : channel.state.setIsUpToDate(true);
-            setHasNoMoreRecentMessagesToLoad(true);
-            _context8.next = 9;
+            _context8.next = 7;
             break;
-          case 7:
-            _context8.next = 9;
+          case 5:
+            _context8.next = 7;
             return channel.state.loadMessageIntoState('latest');
-          case 9:
+          case 7:
           case "end":
             return _context8.stop();
         }
       }, _callee8);
-    })));
+    })), function () {
+      channel == null ? void 0 : channel.state.setIsUpToDate(true);
+      setHasNoMoreRecentMessagesToLoad(true);
+    });
   };
   var reloadThread = function () {
     var _ref12 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee9() {
@@ -2313,7 +2310,6 @@ var ChannelWithContext = function ChannelWithContext(props) {
     FileAttachmentIcon: FileAttachmentIcon,
     FlatList: FlatList,
     forceAlignMessages: forceAlignMessages,
-    formatDate: formatDate,
     Gallery: Gallery,
     getMessagesGroupStyles: getMessagesGroupStyles,
     Giphy: Giphy,
@@ -2344,6 +2340,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     MessageContent: MessageContent,
     messageContentOrder: messageContentOrder,
     MessageDeleted: MessageDeleted,
+    MessageEditedTimestamp: MessageEditedTimestamp,
     MessageError: MessageError,
     MessageFooter: MessageFooter,
     MessageHeader: MessageHeader,