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

package/lib/commonjs/components/MessageList/MessageList.js

@@ -611,6 +611,12 @@ var MessageListWithContext = function MessageListWithContext(props) {
       animated: false,
       offset: info.averageItemLength * info.index
     });
+    var targetAgain = function targetAgain() {
+      if (messageIdLastScrolledToRef.current) {
+        setTargetedMessage(messageIdLastScrolledToRef.current);
+      }
+    };
+    targetAgain();
     failScrollTimeoutId.current = setTimeout(function () {
       try {
         var _flatListRef$current2;
@@ -619,9 +625,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
           index: info.index,
           viewPosition: 0.5
         });
-        if (messageIdLastScrolledToRef.current) {
-          setTargetedMessage(messageIdLastScrolledToRef.current);
-        }
+        targetAgain();
         scrollToIndexFailedRetryCountRef.current = 0;
       } catch (e) {
         if (!onScrollToIndexFailedRef.current || scrollToIndexFailedRetryCountRef.current > MAX_RETRIES_AFTER_SCROLL_FAILURE) {
@@ -683,11 +687,6 @@ var MessageListWithContext = function MessageListWithContext(props) {
         messageIdLastScrolledToRef.current = messageIdToScroll;
       }
     }, 150);
-    return function () {
-      clearTimeout(failScrollTimeoutId.current);
-      clearTimeout(scrollToDebounceTimeoutRef.current);
-      clearTimeout(initialScrollSettingTimeoutRef.current);
-    };
   }, [targetedMessage, initialScrollToFirstUnreadMessage, messageList]);
   var messagesWithImages = legacyImageViewerSwipeBehaviour && messageList.filter(function (message) {
     var isMessageTypeDeleted = message.type === 'deleted';
@@ -754,7 +753,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1027,
+        lineNumber: 1028,
         columnNumber: 7
       }
     }, _react["default"].createElement(EmptyStateIndicator, {
@@ -762,7 +761,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1031,
+        lineNumber: 1032,
         columnNumber: 9
       }
     }));
@@ -773,14 +772,14 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1039,
+        lineNumber: 1040,
         columnNumber: 7
       }
     }, _react["default"].createElement(FooterComponent, {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1040,
+        lineNumber: 1041,
         columnNumber: 9
       }
     }));
@@ -791,14 +790,14 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1048,
+        lineNumber: 1049,
         columnNumber: 7
       }
     }, _react["default"].createElement(HeaderComponent, {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1049,
+        lineNumber: 1050,
         columnNumber: 9
       }
     }));
@@ -810,7 +809,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1059,
+        lineNumber: 1060,
         columnNumber: 7
       }
     }, _react["default"].createElement(LoadingIndicator, {
@@ -818,7 +817,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1060,
+        lineNumber: 1061,
         columnNumber: 9
       }
     }));
@@ -830,7 +829,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1067,
+        lineNumber: 1068,
         columnNumber: 30
       }
     });
@@ -839,7 +838,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1068,
+        lineNumber: 1069,
         columnNumber: 46
       }
     });
@@ -860,7 +859,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1084,
+      lineNumber: 1085,
       columnNumber: 5
     }
   }, _react["default"].createElement(FlatList, (0, _extends2["default"])({
@@ -896,7 +895,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1088,
+      lineNumber: 1089,
       columnNumber: 7
     }
   })), !loading && _react["default"].createElement(_react["default"].Fragment, null, _react["default"].createElement(_reactNative.View, {
@@ -904,28 +903,28 @@ var MessageListWithContext = function MessageListWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1133,
+      lineNumber: 1134,
       columnNumber: 11
     }
   }, _react["default"].createElement(StickyHeaderComponent, {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1134,
+      lineNumber: 1135,
       columnNumber: 13
     }
   })), !disableTypingIndicator && TypingIndicator && _react["default"].createElement(TypingIndicatorContainer, {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1137,
+      lineNumber: 1138,
       columnNumber: 13
     }
   }, _react["default"].createElement(TypingIndicator, {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1138,
+      lineNumber: 1139,
       columnNumber: 15
     }
   })), _react["default"].createElement(ScrollToBottomButton, {
@@ -935,14 +934,14 @@ var MessageListWithContext = function MessageListWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1141,
+      lineNumber: 1142,
       columnNumber: 11
     }
   })), _react["default"].createElement(NetworkDownIndicator, {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1148,
+      lineNumber: 1149,
       columnNumber: 7
     }
   }));
@@ -1049,7 +1048,7 @@ var MessageList = function MessageList(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1206,
+      lineNumber: 1207,
       columnNumber: 5
     }
   }));